Reformat all code using astyle.

[tinc] / src / script.c

diff --git a/src/script.c b/src/script.c
index 80c58c0..81216a3 100644 (file)
--- a/src/script.c
+++ b/src/script.c
@@ -30,8 +30,11 @@
 #ifdef HAVE_PUTENV
 static void unputenv(const char *p) {
        const char *e = strchr(p, '=');
-       if(!e)
+
+       if(!e) {
                return;
+       }
+
        int len = e - p;
 #ifndef HAVE_UNSETENV
 #ifdef HAVE_MINGW
@@ -48,12 +51,14 @@ static void unputenv(const char *p) {
        // We must keep what we putenv() around in memory.
        // To do this without memory leaks, keep things in a list and reuse if possible.
        static list_t list = {};
+
        for list_each(char, data, &list) {
                if(!strcmp(data, var)) {
                        putenv(data);
                        return;
                }
        }
+
        char *data = xstrdup(var);
        list_insert_tail(&list, data);
        putenv(data);
@@ -97,21 +102,32 @@ void environment_init(environment_t *env) {
        env->size = min_env_size;
        env->entries = xzalloc(env->size * sizeof(*env->entries));
 
-       if(netname)
+       if(netname) {
                environment_add(env, "NETNAME=%s", netname);
-       if(myname)
+       }
+
+       if(myname) {
                environment_add(env, "NAME=%s", myname);
-       if(device)
+       }
+
+       if(device) {
                environment_add(env, "DEVICE=%s", device);
-       if(iface)
+       }
+
+       if(iface) {
                environment_add(env, "INTERFACE=%s", iface);
-       if(debug_level >= 0)
+       }
+
+       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++)
+       for(int i = 0; i < env->n; i++) {
                free(env->entries[i]);
+       }
+
        free(env->entries);
 }
 
@@ -124,8 +140,9 @@ bool execute_script(const char *name, environment_t *env) {
        /* First check if there is a script */
 
 #ifdef HAVE_MINGW
+
        if(!*scriptextension) {
-               const char *pathext = getenv("PATHEXT") ?: ".COM;.EXE;.BAT;.CMD";
+               const char *pathext = getenv("PATHEXT") ? : ".COM;.EXE;.BAT;.CMD";
                size_t pathlen = strlen(pathext);
                size_t scriptlen = strlen(scriptname);
                char fullname[scriptlen + pathlen + 1];
@@ -134,8 +151,10 @@ bool execute_script(const char *name, environment_t *env) {
 
                const char *p = pathext;
                bool found = false;
+
                while(p && *p) {
                        const char *q = strchr(p, ';');
+
                        if(q) {
                                memcpy(ext, p, q - p);
                                ext[q - p] = 0;
@@ -143,29 +162,37 @@ bool execute_script(const char *name, environment_t *env) {
                        } else {
                                strncpy(ext, p, pathlen + 1);
                        }
-                       if((found = !access(fullname, F_OK)))
+
+                       if((found = !access(fullname, F_OK))) {
                                break;
+                       }
+
                        p = q;
                }
-               if(!found)
+
+               if(!found) {
                        return true;
+               }
        } else
 #endif
 
-       if(access(scriptname, F_OK))
-               return true;
+               if(access(scriptname, F_OK)) {
+                       return true;
+               }
 
        logger(DEBUG_STATUS, LOG_INFO, "Executing script %s", name);
 
        /* Set environment */
 
-       for(int i = 0; i < env->n; i++)
+       for(int i = 0; i < env->n; i++) {
                putenv(env->entries[i]);
+       }
 
-       if(scriptinterpreter)
+       if(scriptinterpreter) {
                xasprintf(&command, "%s \"%s\"", scriptinterpreter, scriptname);
-       else
+       } else {
                xasprintf(&command, "\"%s\"", scriptname);
+       }
 
        int status = system(command);
 
@@ -173,25 +200,28 @@ bool execute_script(const char *name, environment_t *env) {
 
        /* Unset environment */
 
-       for(int i = 0; i < env->n; i++)
+       for(int i = 0; i < env->n; i++) {
                unputenv(env->entries[i]);
+       }
 
        if(status != -1) {
 #ifdef WEXITSTATUS
+
                if(WIFEXITED(status)) {          /* Child exited by itself */
                        if(WEXITSTATUS(status)) {
                                logger(DEBUG_ALWAYS, LOG_ERR, "Script %s exited with non-zero status %d",
-                                          name, WEXITSTATUS(status));
+                                      name, WEXITSTATUS(status));
                                return false;
                        }
                } else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
                        logger(DEBUG_ALWAYS, LOG_ERR, "Script %s was killed by signal %d (%s)",
-                                  name, WTERMSIG(status), strsignal(WTERMSIG(status)));
+                              name, WTERMSIG(status), strsignal(WTERMSIG(status)));
                        return false;
                } else {                         /* Something strange happened */
                        logger(DEBUG_ALWAYS, LOG_ERR, "Script %s terminated abnormally", name);
                        return false;
                }
+
 #endif
        } else {
                logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));