[Xfce4-commits] r23115 - libxfcegui4/trunk/libxfcegui4

[Jasper Huijsmans]

Author: jasper
Date: 2006-09-09 15:27:34 +0000 (Sat, 09 Sep 2006)
New Revision: 23115

Modified:
   libxfcegui4/trunk/libxfcegui4/xfce-exec.c
Log:
Fix handling of quoted commands (bug #2276).


Modified: libxfcegui4/trunk/libxfcegui4/xfce-exec.c
===================================================================
--- libxfcegui4/trunk/libxfcegui4/xfce-exec.c	2006-09-09 13:35:41 UTC (rev 23114)
+++ libxfcegui4/trunk/libxfcegui4/xfce-exec.c	2006-09-09 15:27:34 UTC (rev 23115)
@@ -1,6 +1,6 @@
 /* $Id$
  * 
- * Copyright (C) 2004-2005 The Xfce Development Team
+ * Copyright (C) 2004-2006 The Xfce Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -187,9 +187,9 @@
     {
         char *s;
         
-        for (s = realcmd + 1; *s+1 != '\0'; ++s)
+        for (s = realcmd + 1; *s != '\0' && *s != '\"'; ++s)
             *(s-1) = *s;
-        *s = '\0';
+        *(s-1) = '\0';
     }
         
     if (g_path_is_absolute (realcmd) && 
@@ -230,9 +230,9 @@
         {
             char *s;
             
-            for (s = argv[0] + 1; *s+1 != '\0'; ++s)
+            for (s = argv[0] + 1; *s != '\0' && *s != '\"'; ++s)
                 *(s-1) = *s;
-            *s = '\0';
+	    *(s-1) = '\0';
         }
     }