nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace string_to_argv() with g_strsplit()

Browse Source
This commit is contained in:
Sascha Kruse 2013-02-16 03:54:39 +01:00
parent e2dc1872a7
commit 023473ac25
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dunst.c
View File

@ -235,7 +235,7 @@ void context_menu(void) {
exit(0); exit(0);
} else { } else {
browser = string_append(browser, buf, " "); browser = string_append(browser, buf, " ");
char **cmd = string_to_argv(browser); char **cmd = g_strsplit(browser, " ", 0);
execvp(cmd[0], cmd); execvp(cmd[0], cmd);
} }
} }
@ -1711,7 +1711,7 @@ void load_options(char *cmdline_config_path)
dmenu = option_get_string("global", "dmenu", "-dmenu", dmenu, "path to dmenu"); dmenu = option_get_string("global", "dmenu", "-dmenu", dmenu, "path to dmenu");
dmenu_cmd = string_to_argv(dmenu); dmenu_cmd = g_strsplit(dmenu, " ", 0);
browser = option_get_string("global", "browser", "-browser", browser, "path to browser"); browser = option_get_string("global", "browser", "-browser", browser, "path to browser");

18
utils.c
View File

@ -60,24 +60,6 @@ char *string_append(char *a, const char *b, const char *sep)
} }
char **string_to_argv(const char *s)
{
char *str = strdup(s);
char **argv = NULL;
char *p = strtok (str, " ");
int n_spaces = 0;
while (p) {
argv = realloc (argv, sizeof (char*) * ++n_spaces);
argv[n_spaces-1] = p;
p = strtok (NULL, " ");
}
argv = realloc (argv, sizeof (char*) * (n_spaces+1));
argv[n_spaces] = NULL;
return argv;
}
int digit_count(int i) int digit_count(int i)
{ {
int len = 0; int len = 0;

2
utils.h
View File

@ -10,8 +10,6 @@ char *string_replace(const char *needle, const char *replacement,
char *string_append(char *a, const char *b, const char *sep); char *string_append(char *a, const char *b, const char *sep);
char **string_to_argv(const char *s);
/* exit with an error message */ /* exit with an error message */
void die(char *msg, int exit_value); void die(char *msg, int exit_value);