From 66e702d90d83977dc089736d7e4146330bc5df28 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 24 Sep 2012 14:02:07 +0200
Subject: [PATCH] Attribution for Vil Brekin and some code style cleanups.
---
THANKS | 1 +
src/process.c | 24 ++++++++++--------------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/THANKS b/THANKS
index 9c02e933..8da657c8 100644
--- 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 a6822268..262b092c 100644
--- 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);
--
2.39.5