main: use proper variable when warning about unsupported features

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index ce51db9..fba5f80 100644 (file)
--- a/main.c
+++ b/main.c
@@ -151,6 +151,7 @@ static int usage(const char *name)
                "       -u string       URL prefix for UBUS via JSON-RPC handler\n"
                "       -U file         Override ubus socket path\n"
                "       -a              Do not authenticate JSON-RPC requests against UBUS session api\n"
+               "       -X              Enable CORS HTTP headers on JSON-RPC api\n"
 #endif
                "       -x string       URL prefix for CGI handler, default is '/cgi-bin'\n"
                "       -i .ext=path    Use interpreter at path for files with the given extension\n"
@@ -165,7 +166,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;
@@ -175,11 +176,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)
@@ -191,7 +202,7 @@ static void fixup_prefix(char *str)
 
        len = strlen(str) - 1;
 
-       while (len > 0 && str[len] == '/')
+       while (len >= 0 && str[len] == '/')
                len--;
 
        str[len + 1] = 0;
@@ -213,10 +224,10 @@ 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) {
+       while ((ch = getopt(argc, argv, "afSDRXC:K:E:I:p:s:h:c:l:L:d:r:m:n:N:x:i:t:k:T:A:u:U:")) != -1) {
                switch(ch) {
 #ifdef HAVE_TLS
                case 'C':
@@ -235,10 +246,11 @@ int main(int argc, char **argv)
                case 'K':
                case 's':
                        fprintf(stderr, "uhttpd: TLS support not compiled, "
-                                       "ignoring -%c\n", opt);
+                                       "ignoring -%c\n", ch);
                        break;
 #endif
                case 'p':
+                       optarg = strdup(optarg);
                        bound += add_listener_arg(optarg, (ch == 's'));
                        break;
 
@@ -295,6 +307,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",
@@ -327,6 +340,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'd':
+                       optarg = strdup(optarg);
                        port = alloca(strlen(optarg) + 1);
                        if (!port)
                                return -1;
@@ -343,6 +357,7 @@ int main(int argc, char **argv)
                        }
 
                        printf("%s", port);
+                       return 0;
                        break;
 
                /* basic auth realm */
@@ -373,7 +388,7 @@ int main(int argc, char **argv)
                case 'l':
                case 'L':
                        fprintf(stderr, "uhttpd: Lua support not compiled, "
-                                       "ignoring -%c\n", opt);
+                                       "ignoring -%c\n", ch);
                        break;
 #endif
 #ifdef HAVE_UBUS
@@ -388,12 +403,17 @@ int main(int argc, char **argv)
                case 'U':
                        conf.ubus_socket = optarg;
                        break;
+
+               case 'X':
+                       conf.ubus_cors = 1;
+                       break;
 #else
                case 'a':
                case 'u':
                case 'U':
+               case 'X':
                        fprintf(stderr, "uhttpd: UBUS support not compiled, "
-                                       "ignoring -%c\n", opt);
+                                       "ignoring -%c\n", ch);
                        break;
 #endif
                default:
@@ -403,11 +423,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");
@@ -416,6 +431,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) {