X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=1a8592d3bed8bf8a828269acc605203e91c17e1a;hp=d81fdd693608d9f11b5b9fe465ada80a7c55fef4;hb=7eed829d288d0fdec2f31709a18ec420e489c2e4;hpb=96f5d98fc299a53fcdad304a56eb3a77a2c229e7

diff --git a/src/process.c b/src/process.c
index d81fdd69..1a8592d3 100644
--- 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.
 
-    $Id: process.c,v 1.1.2.68 2003/08/08 19:56:11 guus Exp $
+    $Id: process.c,v 1.1.2.70 2003/08/08 22:45:46 guus Exp $
 */
 
 #include "system.h"
@@ -359,22 +359,23 @@ bool detach(void)
 bool execute_script(const char *name, char **envp)
 {
 #ifdef HAVE_SYSTEM
-	pid_t pid;
 	int status;
 	struct stat s;
 	char *scriptname;
 
 	cp();
 
-	asprintf(&scriptname, "\"%s/%s\"", confbase, name);
-
 #ifndef HAVE_MINGW
+	asprintf(&scriptname, "%s/%s", confbase, name);
+
 	/* First check if there is a script */
 
 	if(stat(scriptname, &s))
 		return true;
 
 	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+
+	free(scriptname);
 #endif
 
 #ifdef HAVE_PUTENV
@@ -384,6 +385,7 @@ bool execute_script(const char *name, char **envp)
 		putenv(*envp++);
 #endif
 
+	asprintf(&scriptname, "\"%s/%s\"", confbase, name);
 	status = system(scriptname);
 
 	free(scriptname);
@@ -394,22 +396,20 @@ bool execute_script(const char *name, char **envp)
 	if(status != -1) {
 		if(WIFEXITED(status)) {	/* Child exited by itself */
 			if(WEXITSTATUS(status)) {
-				logger(LOG_ERR, _("Process %d (%s) exited with non-zero status %d"),
-					   pid, name, WEXITSTATUS(status));
+				logger(LOG_ERR, _("Script %s exited with non-zero status %d"),
+					   name, WEXITSTATUS(status));
 				return false;
 			}
 		} else if(WIFSIGNALED(status)) {	/* Child was killed by a signal */
-			logger(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
+			logger(LOG_ERR, _("Script %s was killed by signal %d (%s)"),
 				   name, WTERMSIG(status), strsignal(WTERMSIG(status)));
 			return false;
 		} else {			/* Something strange happened */
-			logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
-				   name);
+			logger(LOG_ERR, _("Script %s terminated abnormally"), name);
 			return false;
 		}
 	} else {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "system",
-			   strerror(errno));
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno));
 		return false;
 	}
 #endif