Quote when needed and don't try stuff that doesn't work under Windows.
authorGuus Sliepen <guus@tinc-vpn.org>
Fri, 8 Aug 2003 19:43:47 +0000 (19:43 +0000)
committerGuus Sliepen <guus@tinc-vpn.org>
Fri, 8 Aug 2003 19:43:47 +0000 (19:43 +0000)
src/process.c

index 5566510..43ce5bd 100644 (file)
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.c,v 1.1.2.66 2003/08/08 17:17:13 guus Exp $
+    $Id: process.c,v 1.1.2.67 2003/08/08 19:43:47 guus Exp $
 */
 
 #include "system.h"
@@ -99,10 +99,8 @@ bool install_service(void) {
 
        strncat(command, program_name, sizeof(command));
        for(argp = g_argv + 1; *argp; argp++) {
-               space = strchr(*argp, " ");
-               strncat(command, " ", sizeof(command));
-               if(space)
-                       strncat(command, "\"", sizeof(command));
+               space = strchr(*argp, ' ');
+               strncat(command, space?" \"":" ", sizeof(command));
                strncat(command, *argp, sizeof(command));
                if(space)
                        strncat(command, "\"", sizeof(command));
@@ -363,26 +361,29 @@ bool execute_script(const char *name, char **envp)
 
        cp();
 
-       asprintf(&scriptname, "%s/%s", confbase, name);
+       asprintf(&scriptname, "\"%s/%s\"", confbase, name);
 
+#ifndef HAVE_MINGW
        /* First check if there is a script */
 
        if(stat(scriptname, &s))
                return true;
 
+       ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+#endif
+
        /* Set environment */
        
        while(*envp)
                putenv(*envp++);
 
-       ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
-
        status = system(scriptname);
 
        free(scriptname);
 
        /* Unset environment? */
 
+#ifdef WEXITSTATUS
        if(status != -1) {
                if(WIFEXITED(status)) { /* Child exited by itself */
                        if(WEXITSTATUS(status)) {
@@ -405,6 +406,7 @@ bool execute_script(const char *name, char **envp)
                return false;
        }
 #endif
+#endif
        return true;
 }