deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-13 17:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use glib to parse and launch commands for util_exec

Browse Source 
Fixes #958
This commit is contained in:
TingPing
2014-04-25 13:41:38 -04:00
committed by TingPing
parent b8c02f71d9
commit 5849a0588e
6 changed files with 19 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/fe-gtk/menu.c
View File

@@ -403,8 +403,10 @@ toggle_cb (GtkWidget *item, char *pref_name)
static int
is_in_path (char *cmd)
{
char *prog = strdup (cmd + 1); /* 1st char is "!" */
char *prog = g_strdup (cmd + 1); /* 1st char is "!" */
char *space, *path, *orig;
char **argv;
int argc;
orig = prog; /* save for free()ing */
/* special-case these default entries. */
@@ -413,16 +415,17 @@ is_in_path (char *cmd)
/* don't check for gnome-terminal, but the thing it's executing! */
prog += 18;
space = strchr (prog, ' '); /* this isn't 100% but good enuf */
if (space)
*space = 0;
path = g_find_program_in_path (prog);
if (path)
if (g_shell_parse_argv (prog, &argc, &argv, NULL))
{
g_free (path);
g_free (orig);
return 1;
path = g_find_program_in_path (argv[0]);
if (path)
{
g_free (path);
g_free (orig);
g_strfreev (argv);
return 1;
}
g_strfreev (argv);
}
g_free (orig);