Fix whitespace.

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index a771b0e..99c0485 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -54,8 +54,8 @@ static bool show_help = false;
 static bool show_version = false;
 
 static char *name = NULL;
-static char *identname = NULL;                         /* program name for syslog */
-static char *pidfilename = NULL;                       /* pid file location */
+static char *identname = NULL;          /* program name for syslog */
+static char *pidfilename = NULL;        /* pid file location */
 static char *confdir = NULL;
 static char controlcookie[1024];
 char *netname = NULL;
@@ -163,34 +163,34 @@ static bool parse_options(int argc, char **argv) {
 
        while((r = getopt_long(argc, argv, "c:n:Dd::Lo:RU:", long_options, &option_index)) != EOF) {
                switch (r) {
-                       case 0:                         /* long option */
+                       case 0:   /* long option */
                                break;
 
-                       case 'c':                               /* config file */
+                       case 'c': /* config file */
                                confbase = xstrdup(optarg);
                                break;
 
-                       case 'n':                               /* net name given */
+                       case 'n': /* net name given */
                                netname = xstrdup(optarg);
                                break;
 
-                       case 1:                                 /* show help */
+                       case 1:   /* show help */
                                show_help = true;
                                break;
 
-                       case 2:                                 /* show version */
+                       case 2:   /* show version */
                                show_version = true;
                                break;
 
-                       case 5:                                 /* open control socket here */
+                       case 5:   /* open control socket here */
                                pidfilename = xstrdup(optarg);
                                break;
 
-                       case 6:
+                       case 6:   /* force */
                                force = true;
                                break;
 
-                       case '?':
+                       case '?': /* wrong options */
                                usage(true);
                                return false;
 
@@ -199,15 +199,15 @@ static bool parse_options(int argc, char **argv) {
                }
        }
 
-        if(!netname && (netname = getenv("NETNAME")))
-                netname = xstrdup(netname);
+       if(!netname && (netname = getenv("NETNAME")))
+               netname = xstrdup(netname);
 
-        /* netname "." is special: a "top-level name" */
+       /* netname "." is special: a "top-level name" */
 
-        if(netname && (!*netname || !strcmp(netname, "."))) {
-                free(netname);
-                netname = NULL;
-        }
+       if(netname && (!*netname || !strcmp(netname, "."))) {
+               free(netname);
+               netname = NULL;
+       }
 
        if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
                fprintf(stderr, "Invalid character in netname!\n");
@@ -332,7 +332,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
                filename = buf2;
        }
 
-       umask(0077);                            /* Disallow everything for group and other */
+       umask(0077); /* Disallow everything for group and other */
 
        disable_old_keys(filename, what);
 
@@ -355,7 +355,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 static bool ecdsa_keygen(bool ask) {
        ecdsa_t key;
        FILE *f;
-       char *filename;
+       char *pubname, *privname;
 
        fprintf(stderr, "Generating ECDSA keypair:\n");
 
@@ -365,28 +365,29 @@ static bool ecdsa_keygen(bool ask) {
        } else
                fprintf(stderr, "Done.\n");
 
-       xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
-       f = ask_and_open(filename, "private ECDSA key", "a", ask);
+       xasprintf(&privname, "%s" SLASH "ecdsa_key.priv", confbase);
+       f = ask_and_open(privname, "private ECDSA key", "a", ask);
+       free(privname);
 
        if(!f)
                return false;
-  
+
 #ifdef HAVE_FCHMOD
        /* Make it unreadable for others. */
        fchmod(fileno(f), 0600);
 #endif
-               
+
        ecdsa_write_pem_private_key(&key, f);
 
        fclose(f);
-       free(filename);
 
        if(name)
-               xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+               xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
        else
-               xasprintf(&filename, "%s" SLASH "ecdsa_key.pub", confbase);
+               xasprintf(&pubname, "%s" SLASH "ecdsa_key.pub", confbase);
 
-       f = ask_and_open(filename, "public ECDSA key", "a", ask);
+       f = ask_and_open(pubname, "public ECDSA key", "a", ask);
+       free(pubname);
 
        if(!f)
                return false;
@@ -396,7 +397,6 @@ static bool ecdsa_keygen(bool ask) {
        free(pubkey);
 
        fclose(f);
-       free(filename);
 
        return true;
 }
@@ -408,7 +408,7 @@ static bool ecdsa_keygen(bool ask) {
 static bool rsa_keygen(int bits, bool ask) {
        rsa_t key;
        FILE *f;
-       char *filename;
+       char *pubname, *privname;
 
        fprintf(stderr, "Generating %d bits keys:\n", bits);
 
@@ -418,28 +418,29 @@ static bool rsa_keygen(int bits, bool ask) {
        } else
                fprintf(stderr, "Done.\n");
 
-       xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
-       f = ask_and_open(filename, "private RSA key", "a", ask);
+       xasprintf(&privname, "%s" SLASH "rsa_key.priv", confbase);
+       f = ask_and_open(privname, "private RSA key", "a", ask);
+       free(privname);
 
        if(!f)
                return false;
-  
+
 #ifdef HAVE_FCHMOD
        /* Make it unreadable for others. */
        fchmod(fileno(f), 0600);
 #endif
-               
+
        rsa_write_pem_private_key(&key, f);
 
        fclose(f);
-       free(filename);
 
        if(name)
-               xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+               xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
        else
-               xasprintf(&filename, "%s" SLASH "rsa_key.pub", confbase);
+               xasprintf(&pubname, "%s" SLASH "rsa_key.pub", confbase);
 
-       f = ask_and_open(filename, "public RSA key", "a", ask);
+       f = ask_and_open(pubname, "public RSA key", "a", ask);
+       free(pubname);
 
        if(!f)
                return false;
@@ -447,7 +448,6 @@ static bool rsa_keygen(int bits, bool ask) {
        rsa_write_pem_public_key(&key, f);
 
        fclose(f);
-       free(filename);
 
        return true;
 }
@@ -579,7 +579,7 @@ bool sendline(int fd, char *format, ...) {
                blen -= result;
        }
 
-       return true;    
+       return true;
 }
 
 static void pcap(int fd, FILE *out, int snaplen) {
@@ -781,7 +781,7 @@ static bool connect_tincd(bool verbose) {
        }
 
        sendline(fd, "%d ^%s %d", ID, controlcookie, TINC_CTL_VERSION_CURRENT);
-       
+
        if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &version, &pid) != 3 || code != 4 || version != TINC_CTL_VERSION_CURRENT) {
                if(verbose)
                        fprintf(stderr, "Could not fully establish control socket connection\n");
@@ -833,12 +833,15 @@ static int cmd_start(int argc, char *argv[]) {
        pid_t pid = fork();
        if(pid == -1) {
                fprintf(stderr, "Could not fork: %s\n", strerror(errno));
+               free(nargv);
                return 1;
        }
 
        if(!pid)
                exit(execvp(c, nargv));
-       
+
+       free(nargv);
+
        int status = -1;
        if(waitpid(pid, &status, 0) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
                fprintf(stderr, "Error starting %s\n", c);
@@ -1226,7 +1229,7 @@ static struct {
        {"ECDSAPrivateKeyFile", VAR_SERVER},
        {"ExperimentalProtocol", VAR_SERVER},
        {"Forwarding", VAR_SERVER},
-       {"GraphDumpFile", VAR_SERVER},
+       {"GraphDumpFile", VAR_SERVER | VAR_OBSOLETE},
        {"Hostnames", VAR_SERVER},
        {"IffOneQueue", VAR_SERVER},
        {"Interface", VAR_SERVER},
@@ -1245,6 +1248,8 @@ static struct {
        {"ProcessPriority", VAR_SERVER},
        {"Proxy", VAR_SERVER},
        {"ReplayWindow", VAR_SERVER},
+       {"ScriptsExtension", VAR_SERVER},
+       {"ScriptsInterpreter", VAR_SERVER},
        {"StrictSubnets", VAR_SERVER},
        {"TunnelServer", VAR_SERVER},
        {"UDPRcvBuf", VAR_SERVER},
@@ -1307,14 +1312,14 @@ static int cmd_config(int argc, char *argv[]) {
        char *value;
        int len;
 
-        len = strcspn(line, "\t =");
-        value = line + len;
-        value += strspn(value, "\t ");
-        if(*value == '=') {
-                value++;
-                value += strspn(value, "\t ");
-        }
-        line[len] = '\0';
+       len = strcspn(line, "\t =");
+       value = line + len;
+       value += strspn(value, "\t ");
+       if(*value == '=') {
+               value++;
+               value += strspn(value, "\t ");
+       }
+       line[len] = '\0';
        variable = strchr(line, '.');
        if(variable) {
                node = line;
@@ -2133,6 +2138,8 @@ static int cmd_shell(int argc, char *argv[]) {
                }
        }
 
+       free(nargv);
+
        if(tty)
                printf("\n");
        return result;
@@ -2146,7 +2153,7 @@ int main(int argc, char *argv[]) {
 
        if(!parse_options(argc, argv))
                return 1;
-       
+
        make_names();
 
        if(show_version) {