Attribution for Vil Brekin and some code style cleanups.

diff --git a/THANKS b/THANKS
index 9c02e933773a66e6bd9c6ded462e540f1cf1b3f9..8da657c885747f23ae09530ab926ba46ae6ac300 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -44,6 +44,7 @@ We would like to thank the following people for their contributions to tinc:
 * Teemu Kiviniemi
 * Timothy Redaelli
 * Tonnerre Lombard
+* Vil Brekin
 * Wessel Dankers
 * Wouter van Heyst
 

diff --git a/src/process.c b/src/process.c
index a682226808725729c88f49796d00bb1d4902480b..262b092c165404dd2e78f8e586a6661fac611b8a 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -358,7 +358,7 @@ bool execute_script(const char *name, char **envp) {
        int status, len;
        char *scriptname;
        int i;
-    char *aInterpreter = NULL;
+       char *interpreter = NULL;
 
 #ifndef HAVE_MINGW
        len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
@@ -379,19 +379,15 @@ bool execute_script(const char *name, char **envp) {
        }
 #endif
 
-    // Custom scripts interpreter
-    if(get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &aInterpreter))
-    {
-        // Force custom scripts interpreter allowing execution of scripts on android without execution flag (such as on /sdcard)
-        free(scriptname);
-        len = xasprintf(&scriptname, "%s \"%s/%s\"", aInterpreter, confbase, name);
-        if(len < 0)
-        {
-            free(aInterpreter);
-            return false;
-        }
-    }
-    free(aInterpreter);
+       // Custom scripts interpreter
+       if(get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &interpreter)) {
+               // Force custom scripts interpreter allowing execution of scripts on android without execution flag (such as on /sdcard)
+               free(scriptname);
+               len = xasprintf(&scriptname, "%s \"%s/%s\"", interpreter, confbase, name);
+               free(interpreter);
+               if(len < 0)
+                       return false;
+       }
 
        ifdebug(STATUS) logger(LOG_INFO, "Executing script %s", name);