Small things.

diff --git a/lib/utils.h b/lib/utils.h
index af65427420166db47e0155698b47029e4094f68e..4b0ab3ddea4ce2302be90d1a34be7101833d627c 100644 (file)
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -40,7 +40,7 @@ extern void bin2hex(char *src, char *dst, int length);
 
 #ifdef HAVE_MINGW
 extern char *winerror(int);
 
 #ifdef HAVE_MINGW
 extern char *winerror(int);

-#define strerror(x) (x>0?strerror(x):winerror(GetLastError()))
+#define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))

 #endif
 
 #endif                                                 /* __TINC_UTILS_H__ */
 #endif
 
 #endif                                                 /* __TINC_UTILS_H__ */

diff --git a/src/process.c b/src/process.c
index 43ce5bde73b2948e793735125aa643d68cb45cb7..d81fdd693608d9f11b5b9fe465ada80a7c55fef4 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     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.67 2003/08/08 19:43:47 guus Exp $
+    $Id: process.c,v 1.1.2.68 2003/08/08 19:56:11 guus Exp $

 */
 
 #include "system.h"
 */
 
 #include "system.h"


@@ -100,8 +100,13 @@ bool install_service(void) {
        strncat(command, program_name, sizeof(command));
        for(argp = g_argv + 1; *argp; argp++) {
                space = strchr(*argp, ' ');
        strncat(command, program_name, sizeof(command));
        for(argp = g_argv + 1; *argp; argp++) {
                space = strchr(*argp, ' ');

-               strncat(command, space?" \"":" ", sizeof(command));
+               strncat(command, " ", sizeof(command));
+               
+               if(space)
+                       strncat(command, "\"", sizeof(command));
+               

                strncat(command, *argp, sizeof(command));
                strncat(command, *argp, sizeof(command));

+

                if(space)
                        strncat(command, "\"", sizeof(command));
        }
                if(space)
                        strncat(command, "\"", sizeof(command));
        }


@@ -372,10 +377,12 @@ bool execute_script(const char *name, char **envp)
        ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
 #endif
 
        ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
 #endif
 

+#ifdef HAVE_PUTENV

        /* Set environment */
        
        while(*envp)
                putenv(*envp++);
        /* Set environment */
        
        while(*envp)
                putenv(*envp++);

+#endif

 
        status = system(scriptname);
 
 
        status = system(scriptname);