1 files changed, 8 insertions, 6 deletions

diff --git a/uzbl.c b/uzbl.c
index 698cb8e..2eeb9e3 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -363,8 +363,9 @@ parse_command(const char *cmd) {
     Command *c = NULL;
     char buffer[512];
     strcpy (buffer, cmd);
-    char * command_name  = strtok (buffer, " ");
-    gchar * command_param = strtok (NULL,  " ,");
+    char * saveptr;
+    char * command_name  = strtok_r (buffer, " ", &saveptr);
+    gchar * command_param = strtok_r (NULL,  " ,", &saveptr);
   
     if((c = g_hash_table_lookup(commands, command_name)) != NULL){
         if (c->func_2_params != NULL) {
@@ -515,7 +516,7 @@ key_press_cb (WebKitWebView* page, GdkEventKey* event)
     //EXTERNAL BINDINGS
     if((act = g_hash_table_lookup(external_bindings, event->string)) != NULL)
         if (!insert_mode || (event->state == modmask)) {
-            run_command(act, NULL);
+            run_command (act, NULL);
             result = TRUE;
         }
     
@@ -578,6 +579,7 @@ settings_init () {
     gboolean res  = FALSE;
     gchar** keysi = NULL;
     gchar** keyse = NULL;
+    char *saveptr;
 
     if (!config_file) {
         const char* XDG_CONFIG_HOME = getenv ("XDG_CONFIG_HOME");
@@ -601,15 +603,15 @@ settings_init () {
 
             char buffer[512];
             strcpy (buffer, XDG_CONFIG_DIRS);
-            const gchar* dir = strtok (buffer, ":");
+            const gchar* dir = (char *) strtok_r (buffer, ":", &saveptr);
             while (dir && ! file_exists (config_file_path)) {
                 strcpy (config_file_path, dir);
-                strcat (config_file_path, "/uzbl/config");
+                strcat (config_file_path, "/uzbl/config_file_pathig");
                 if (file_exists (config_file_path)) {
                     printf ("Config file %s found.\n", config_file_path);
                     config_file = &config_file_path[0];
                 }
-                dir = strtok (NULL, ":");
+                dir = (char * ) strtok_r (NULL, ":", &saveptr);
             }
         }
     }