fix compile errors on linux

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index 00e43cf..26dc55c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -17,6 +17,8 @@
  *  limitations under the License.
  */
 
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE  700
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -25,11 +27,13 @@
 #include <errno.h>
 #include <netdb.h>
 #include <signal.h>
+#include <unistd.h>
 
 #include <libubox/usock.h>
 
 #include "uhttpd.h"
 
+char uh_buf[4096];
 
 static int run_server(void)
 {
@@ -141,13 +145,9 @@ static int usage(const char *name)
                "       -u string       URL prefix for HTTP/JSON handler\n"
                "       -U file         Override ubus socket path\n"
 #endif
-#ifdef HAVE_CGI
                "       -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"
-#endif
-#if defined(HAVE_CGI) || defined(HAVE_LUA) || defined(HAVE_UBUS)
                "       -t seconds      CGI, Lua and UBUS script timeout in seconds, default is 60\n"
-#endif
                "       -T seconds      Network timeout in seconds, default is 30\n"
                "       -d string       URL decode given string\n"
                "       -r string       Specify basic auth realm\n"
@@ -161,8 +161,11 @@ static void init_defaults(void)
 {
        conf.script_timeout = 60;
        conf.network_timeout = 30;
-       conf.http_keepalive = 0; /* fixme */
+       conf.http_keepalive = 20;
        conf.max_requests = 3;
+       conf.realm = "Protected Area";
+       conf.cgi_prefix = "/cgi-bin";
+       conf.cgi_path = "/sbin:/usr/sbin:/bin:/usr/bin";
 
        uh_index_add("index.html");
        uh_index_add("index.htm");
@@ -170,6 +173,21 @@ static void init_defaults(void)
        uh_index_add("default.htm");
 }
 
+static void fixup_prefix(char *str)
+{
+       int len;
+
+       if (!str || !str[0])
+               return;
+
+       len = strlen(str) - 1;
+
+       while (len > 0 && str[len] == '/')
+               len--;
+
+       str[len + 1] = 0;
+}
+
 int main(int argc, char **argv)
 {
        bool nofork = false;
@@ -178,6 +196,9 @@ int main(int argc, char **argv)
        int cur_fd;
        int bound = 0;
 
+       BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);
+
+       uh_dispatch_add(&cgi_dispatch);
        init_defaults();
        signal(SIGPIPE, SIG_IGN);
 
@@ -193,11 +214,12 @@ int main(int argc, char **argv)
                        break;
 
                case 'h':
-                       if (!realpath(optarg, conf.docroot)) {
+                       if (!realpath(optarg, uh_buf)) {
                                fprintf(stderr, "Error: Invalid directory %s: %s\n",
                                                optarg, strerror(errno));
                                exit(1);
                        }
+                       conf.docroot = strdup(uh_buf);
                        break;
 
                case 'E':
@@ -234,6 +256,23 @@ int main(int argc, char **argv)
                        conf.max_requests = atoi(optarg);
                        break;
 
+               case 'x':
+                       fixup_prefix(optarg);
+                       conf.cgi_prefix = optarg;
+                       break;
+
+               case 'i':
+                       port = strchr(optarg, '=');
+                       if (optarg[0] != '.' || !port) {
+                               fprintf(stderr, "Error: Invalid interpreter: %s\n",
+                                               optarg);
+                               exit(1);
+                       }
+
+                       *port++ = 0;
+                       uh_interpreter_add(optarg, port);
+                       break;
+
                case 't':
                        conf.script_timeout = atoi(optarg);
                        break;