gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 12:58:08 +01:00
Code Issues Projects Releases Wiki Activity

Parse Exec fields when generating menu-entries from XDG desktop-files.

Browse Source 
Exec fields in desktop-files are subject to escaping.  Unescape them.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
This commit is contained in:
Jeremy Sowden
2019-06-20 21:23:53 +01:00
committed by Carlos R. Mafra
parent b32ccee5cb
commit 41ab926090
2 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
util/wmmenugen.h
View File

@@ -30,6 +30,7 @@
#define F_RESTART_SELF (1 << 1) #define F_RESTART_SELF (1 << 1)
#define F_RESTART_OTHER (1 << 2) #define F_RESTART_OTHER (1 << 2)
#define F_QUIT (1 << 3) #define F_QUIT (1 << 3)
#define F_FREE_CMD_LINE (1 << 4)
/* a representation of a Window Maker menu entry. all menus are /* a representation of a Window Maker menu entry. all menus are

71
util/wmmenugen_parse_xdg.c
View File

@@ -76,6 +76,7 @@ static int getBooleanValue(const char *line);
static void getMenuHierarchyFor(char **xdgmenuspec); static void getMenuHierarchyFor(char **xdgmenuspec);
static int compare_matchlevel(int *current_level, const char *found_locale); static int compare_matchlevel(int *current_level, const char *found_locale);
static Bool xdg_to_wm(XDGMenuEntry *xdg, WMMenuEntry *wmentry); static Bool xdg_to_wm(XDGMenuEntry *xdg, WMMenuEntry *wmentry);
static char *parse_xdg_exec(char *exec);
static void init_xdg_storage(XDGMenuEntry *xdg); static void init_xdg_storage(XDGMenuEntry *xdg);
static void init_wm_storage(WMMenuEntry *wm); static void init_wm_storage(WMMenuEntry *wm);
@@ -221,17 +222,78 @@ static Bool xdg_to_wm(XDGMenuEntry *xdg, WMMenuEntry *wm)
*p = '\0'; *p = '\0';
} }
if (xdg->Exec) if (xdg->Exec) {
wm->CmdLine = xdg->Exec; wm->CmdLine = parse_xdg_exec(xdg->Exec);
else /* xdg->TryExec */ if (!wm->CmdLine)
return False;
} else /* xdg->TryExec */
wm->CmdLine = xdg->TryExec; wm->CmdLine = xdg->TryExec;
wm->SubMenu = xdg->Category; wm->SubMenu = xdg->Category;
wm->Flags = xdg->Flags; wm->Flags = xdg->Flags;
if (wm->CmdLine != xdg->TryExec)
wm->Flags |= F_FREE_CMD_LINE;
return True; return True;
} }
static char *parse_xdg_exec(char *exec)
{
char *cmd_line, *dst, *src;
Bool quoted = False;
cmd_line = wstrdup(exec);
for (dst = src = cmd_line; *src; src++) {
if (quoted) {
if (*src == '"')
quoted = False;
else if (*src == '\\')
switch (*++src) {
case '"':
case '`':
case '$':
case '\\':
*dst++ = *src;
break;
default:
goto err_out;
}
else
*dst++ = *src;
} else {
if (*src == '"')
quoted = True;
else if (*src == '%') {
src++;
if (*src == '%')
*dst++ = *src;
else if (strchr ("fFuUdDnNickvm", *src))
*dst++ = *src;
else
/*
* Invalid field-code.
*/
goto err_out;
} else
*dst++ = *src;
}
}
if (quoted)
goto err_out;
do
*dst = '\0';
while (dst > cmd_line && isspace(*--dst));
return cmd_line;
err_out:
wfree(cmd_line);
return NULL;
}
/* (re-)initialize a XDGMenuEntry storage /* (re-)initialize a XDGMenuEntry storage
*/ */
static void init_xdg_storage(XDGMenuEntry *xdg) static void init_xdg_storage(XDGMenuEntry *xdg)
@@ -261,6 +323,9 @@ static void init_xdg_storage(XDGMenuEntry *xdg)
*/ */
static void init_wm_storage(WMMenuEntry *wm) static void init_wm_storage(WMMenuEntry *wm)
{ {
if (wm->Flags & F_FREE_CMD_LINE)
wfree(wm->CmdLine);
wm->Name = NULL; wm->Name = NULL;
wm->CmdLine = NULL; wm->CmdLine = NULL;
wm->Flags = 0; wm->Flags = 0;