X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fscript.c;h=1ce59ea0d8001a50a6b52d348912b5af515c4912;hb=fd3ec60757a84b7551e03b3a48dd30f35015c448;hp=5ca56737df8eed573a7bc3de36425422aedfff44;hpb=cadbf587a09bd4adde664cd635b962315228b3f5;p=tinc

diff --git a/src/script.c b/src/script.c
index 5ca56737..1ce59ea0 100644
--- a/src/script.c
+++ b/src/script.c
@@ -1,7 +1,7 @@
 /*
     script.c -- call an external script
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2015 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2017 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "system.h"
 
 #include "conf.h"
+#include "device.h"
 #include "logger.h"
 #include "names.h"
 #include "script.h"
@@ -63,8 +64,58 @@ static void putenv(const char *p) {}
 static void unputenv(const char *p) {}
 #endif
 
-bool execute_script(const char *name, char **envp) {
-#ifdef HAVE_SYSTEM
+static const int min_env_size;
+
+int environment_add(environment_t *env, const char *format, ...) {
+	if(env->n >= env->size) {
+		env->size = env->n ? env->n * 2 : min_env_size;
+		env->entries = xrealloc(env->entries, env->size * sizeof *env->entries);
+	}
+
+	if(format) {
+		va_list ap;
+		va_start(ap, format);
+		vasprintf(&env->entries[env->n], format, ap);
+		va_end(ap);
+	} else {
+		env->entries[env->n] = NULL;
+	}
+
+	return env->n++;
+}
+
+void environment_update(environment_t *env, int pos, const char *format, ...) {
+	free(env->entries[pos]);
+	va_list ap;
+	va_start(ap, format);
+	vasprintf(&env->entries[pos], format, ap);
+	va_end(ap);
+}
+
+void environment_init(environment_t *env) {
+	env->n = 0;
+	env->size = min_env_size;
+	env->entries = 0; //xzalloc(env->size * sizeof *env->entries);
+
+	if(netname)
+		environment_add(env, "NETNAME=%s", netname);
+	if(myname)
+		environment_add(env, "NAME=%s", myname);
+	if(device)
+		environment_add(env, "DEVICE=%s", device);
+	if(iface)
+		environment_add(env, "INTERFACE=%s", iface);
+	if(debug_level >= 0)
+		environment_add(env, "DEBUG=%d", debug_level);
+}
+
+void environment_exit(environment_t *env) {
+	for(int i = 0; i < env->n; i++)
+		free(env->entries[i]);
+	free(env->entries);
+}
+
+bool execute_script(const char *name, environment_t *env) {
 	char scriptname[PATH_MAX];
 	char *command;
 
@@ -75,9 +126,11 @@ bool execute_script(const char *name, char **envp) {
 #ifdef HAVE_MINGW
 	if(!*scriptextension) {
 		const char *pathext = getenv("PATHEXT") ?: ".COM;.EXE;.BAT;.CMD";
-		char fullname[strlen(scriptname) + strlen(pathext)];
-		char *ext = fullname + strlen(scriptname);
-		strcpy(fullname, scriptname);
+		size_t pathlen = strlen(pathext);
+		size_t scriptlen = strlen(scriptname);
+		char fullname[scriptlen + pathlen + 1];
+		char *ext = fullname + scriptlen;
+		strncpy(fullname, scriptname, sizeof fullname);
 
 		const char *p = pathext;
 		bool found = false;
@@ -88,7 +141,7 @@ bool execute_script(const char *name, char **envp) {
 				ext[q - p] = 0;
 				q++;
 			} else {
-				strcpy(ext, p);
+				strncpy(ext, p, pathlen + 1);
 			}
 			if((found = !access(fullname, F_OK)))
 				break;
@@ -106,8 +159,8 @@ bool execute_script(const char *name, char **envp) {
 
 	/* Set environment */
 
-	for(int i = 0; envp[i]; i++)
-		putenv(envp[i]);
+	for(int i = 0; i < env->n; i++)
+		putenv(env->entries[i]);
 
 	if(scriptinterpreter)
 		xasprintf(&command, "%s \"%s\"", scriptinterpreter, scriptname);
@@ -120,8 +173,8 @@ bool execute_script(const char *name, char **envp) {
 
 	/* Unset environment */
 
-	for(int i = 0; envp[i]; i++)
-		unputenv(envp[i]);
+	for(int i = 0; i < env->n; i++)
+		unputenv(env->entries[i]);
 
 	if(status != -1) {
 #ifdef WEXITSTATUS
@@ -144,6 +197,6 @@ bool execute_script(const char *name, char **envp) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
 		return false;
 	}
-#endif
+
 	return true;
 }