main: strdup command line arguments that are modified

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index f88506c..38d023f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -103,6 +103,7 @@ static int add_listener_arg(char *arg, bool tls)
        char *host = NULL;
        char *port = arg;
        char *s;
+       int l;
 
        s = strrchr(arg, ':');
        if (s) {
@@ -111,6 +112,14 @@ static int add_listener_arg(char *arg, bool tls)
                *s = 0;
        }
 
+       if (host && *host == '[') {
+               l = strlen(host);
+               if (l >= 2) {
+                       host[l-1] = 0;
+                       host++;
+               }
+       }
+
        return uh_socket_bind(host, port, tls);
 }
 
@@ -156,7 +165,7 @@ static int usage(const char *name)
        return 1;
 }
 
-static void init_defaults(void)
+static void init_defaults_pre(void)
 {
        conf.script_timeout = 60;
        conf.network_timeout = 30;
@@ -166,11 +175,21 @@ static void init_defaults(void)
        conf.realm = "Protected Area";
        conf.cgi_prefix = "/cgi-bin";
        conf.cgi_path = "/sbin:/usr/sbin:/bin:/usr/bin";
+}
 
+static void init_defaults_post(void)
+{
        uh_index_add("index.html");
        uh_index_add("index.htm");
        uh_index_add("default.html");
        uh_index_add("default.htm");
+
+       if (conf.cgi_prefix) {
+               char *str = malloc(strlen(conf.docroot) + strlen(conf.cgi_prefix) + 1);
+               strcpy(str, conf.docroot);
+               strcat(str, conf.cgi_prefix);
+               conf.cgi_docroot_path = str;
+       };
 }
 
 static void fixup_prefix(char *str)
@@ -204,7 +223,7 @@ int main(int argc, char **argv)
        BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);
 
        uh_dispatch_add(&cgi_dispatch);
-       init_defaults();
+       init_defaults_pre();
        signal(SIGPIPE, SIG_IGN);
 
        while ((ch = getopt(argc, argv, "afSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:N:x:i:t:k:T:A:u:U:")) != -1) {
@@ -230,6 +249,7 @@ int main(int argc, char **argv)
                        break;
 #endif
                case 'p':
+                       optarg = strdup(optarg);
                        bound += add_listener_arg(optarg, (ch == 's'));
                        break;
 
@@ -286,6 +306,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'i':
+                       optarg = strdup(optarg);
                        port = strchr(optarg, '=');
                        if (optarg[0] != '.' || !port) {
                                fprintf(stderr, "Error: Invalid interpreter: %s\n",
@@ -318,6 +339,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'd':
+                       optarg = strdup(optarg);
                        port = alloca(strlen(optarg) + 1);
                        if (!port)
                                return -1;
@@ -334,6 +356,7 @@ int main(int argc, char **argv)
                        }
 
                        printf("%s", port);
+                       return 0;
                        break;
 
                /* basic auth realm */
@@ -394,11 +417,6 @@ int main(int argc, char **argv)
 
        uh_config_parse();
 
-       if (!bound) {
-               fprintf(stderr, "Error: No sockets bound, unable to continue\n");
-               return 1;
-       }
-
        if (!conf.docroot) {
                if (!realpath(".", uh_buf)) {
                        fprintf(stderr, "Error: Unable to determine work dir\n");
@@ -407,6 +425,13 @@ int main(int argc, char **argv)
                conf.docroot = strdup(uh_buf);
        }
 
+       init_defaults_post();
+
+       if (!bound) {
+               fprintf(stderr, "Error: No sockets bound, unable to continue\n");
+               return 1;
+       }
+
 #ifdef HAVE_TLS
        if (n_tls) {
                if (!tls_crt || !tls_key) {