From 023473ac2557f37d842c81c67192feac1f898eb8 Mon Sep 17 00:00:00 2001
From: Sascha Kruse <knopwob@googlemail.com>
Date: Sat, 16 Feb 2013 03:54:39 +0100
Subject: [PATCH] replace string_to_argv() with g_strsplit()

---
 dunst.c |  4 ++--
 utils.c | 18 ------------------
 utils.h |  2 --
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/dunst.c b/dunst.c
index 4e12732..c095b4e 100644
--- a/dunst.c
+++ b/dunst.c
@@ -235,7 +235,7 @@ void context_menu(void) {
                     exit(0);
             } else {
                     browser = string_append(browser, buf, " ");
-                    char **cmd = string_to_argv(browser);
+                    char **cmd = g_strsplit(browser, " ", 0);
                     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_cmd = string_to_argv(dmenu);
+        dmenu_cmd = g_strsplit(dmenu, " ", 0);
 
         browser = option_get_string("global", "browser", "-browser", browser, "path to browser");
 
diff --git a/utils.c b/utils.c
index 23c546f..8432037 100644
--- a/utils.c
+++ b/utils.c
@@ -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 len = 0;
diff --git a/utils.h b/utils.h
index c1e1c90..ed63679 100644
--- a/utils.h
+++ b/utils.h
@@ -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_to_argv(const char *s);
-
 /* exit with an error message */
 void die(char *msg, int exit_value);