add forking

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index 37cba7f..41b8eba 100644 (file)
--- a/main.c
+++ b/main.c
@@ -40,6 +40,64 @@ static int run_server(void)
        return 0;
 }
 
+static void uh_config_parse(void)
+{
+       const char *path = conf.file;
+       FILE *c;
+       char line[512];
+       char *col1;
+       char *col2;
+       char *eol;
+
+       if (!path)
+               path = "/etc/httpd.conf";
+
+       c = fopen(path, "r");
+       if (!c)
+               return;
+
+       memset(line, 0, sizeof(line));
+
+       while (fgets(line, sizeof(line) - 1, c)) {
+               if ((line[0] == '/') && (strchr(line, ':') != NULL)) {
+                       if (!(col1 = strchr(line, ':')) || (*col1++ = 0) ||
+                               !(col2 = strchr(col1, ':')) || (*col2++ = 0) ||
+                               !(eol = strchr(col2, '\n')) || (*eol++  = 0))
+                               continue;
+
+                       uh_auth_add(line, col1, col2);
+               } else if (!strncmp(line, "I:", 2)) {
+                       if (!(col1 = strchr(line, ':')) || (*col1++ = 0) ||
+                               !(eol = strchr(col1, '\n')) || (*eol++  = 0))
+                               continue;
+
+                       uh_index_add(strdup(col1));
+               } else if (!strncmp(line, "E404:", 5)) {
+                       if (!(col1 = strchr(line, ':')) || (*col1++ = 0) ||
+                               !(eol = strchr(col1, '\n')) || (*eol++  = 0))
+                               continue;
+
+                       conf.error_handler = strdup(col1);
+               }
+#ifdef HAVE_CGI
+               else if ((line[0] == '*') && (strchr(line, ':') != NULL)) {
+                       if (!(col1 = strchr(line, '*')) || (*col1++ = 0) ||
+                               !(col2 = strchr(col1, ':')) || (*col2++ = 0) ||
+                               !(eol = strchr(col2, '\n')) || (*eol++  = 0))
+                               continue;
+
+                       if (!uh_interpreter_add(col1, col2))
+                               fprintf(stderr,
+                                               "Unable to add interpreter %s for extension %s: "
+                                               "Out of memory\n", col2, col1
+                               );
+               }
+#endif
+       }
+
+       fclose(c);
+}
+
 static void add_listener_arg(char *arg, bool tls)
 {
        char *host = NULL;
@@ -65,6 +123,7 @@ static void init_defaults(void)
 {
        conf.network_timeout = 30;
        conf.http_keepalive = 0; /* fixme */
+       conf.max_requests = 3;
 
        uh_index_add("index.html");
        uh_index_add("index.htm");
@@ -74,32 +133,150 @@ static void init_defaults(void)
 
 int main(int argc, char **argv)
 {
-       int ch;
+       bool nofork = false;
+       char *port;
+       int opt, ch;
+       int cur_fd;
 
        init_defaults();
        signal(SIGPIPE, SIG_IGN);
 
-       while ((ch = getopt(argc, argv, "sp:h:")) != -1) {
+       while ((ch = getopt(argc, argv, "fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:x:i:t:T:A:u:U:")) != -1) {
                bool tls = false;
+
                switch(ch) {
                case 's':
                        tls = true;
+                       /* fall through */
                case 'p':
                        add_listener_arg(optarg, tls);
                        break;
 
                case 'h':
-                       /* docroot */
                        if (!realpath(optarg, conf.docroot)) {
                                fprintf(stderr, "Error: Invalid directory %s: %s\n",
                                                optarg, strerror(errno));
                                exit(1);
                        }
                        break;
+
+               case 'E':
+                       if (optarg[0] != '/') {
+                               fprintf(stderr, "Error: Invalid error handler: %s\n",
+                                               optarg);
+                               exit(1);
+                       }
+                       conf.error_handler = optarg;
+                       break;
+
+               case 'I':
+                       if (optarg[0] == '/') {
+                               fprintf(stderr, "Error: Invalid index page: %s\n",
+                                               optarg);
+                               exit(1);
+                       }
+                       uh_index_add(optarg);
+                       break;
+
+               case 'S':
+                       conf.no_symlinks = 1;
+                       break;
+
+               case 'D':
+                       conf.no_dirlists = 1;
+                       break;
+
+               case 'R':
+                       conf.rfc1918_filter = 1;
+                       break;
+
+               case 'n':
+                       conf.max_requests = atoi(optarg);
+                       break;
+
+               case 't':
+                       conf.script_timeout = atoi(optarg);
+                       break;
+
+               case 'T':
+                       conf.network_timeout = atoi(optarg);
+                       break;
+
+               case 'A':
+                       conf.tcp_keepalive = atoi(optarg);
+                       break;
+
+               case 'f':
+                       nofork = 1;
+                       break;
+
+               case 'd':
+                       port = alloca(strlen(optarg) + 1);
+                       if (!port)
+                               return -1;
+
+                       /* "decode" plus to space to retain compat */
+                       for (opt = 0; optarg[opt]; opt++)
+                               if (optarg[opt] == '+')
+                                       optarg[opt] = ' ';
+
+                       /* opt now contains strlen(optarg) -- no need to re-scan */
+                       if (uh_urldecode(port, opt, optarg, opt) < 0) {
+                               fprintf(stderr, "uhttpd: invalid encoding\n");
+                               return -1;
+                       }
+
+                       printf("%s", port);
+                       break;
+
+               /* basic auth realm */
+               case 'r':
+                       conf.realm = optarg;
+                       break;
+
+               /* md5 crypt */
+               case 'm':
+                       printf("%s\n", crypt(optarg, "$1$"));
+                       return 0;
+                       break;
+
+               /* config file */
+               case 'c':
+                       conf.file = optarg;
+                       break;
+
                default:
                        return usage(argv[0]);
                }
        }
 
+       uh_config_parse();
+
+       /* fork (if not disabled) */
+       if (!nofork) {
+               switch (fork()) {
+               case -1:
+                       perror("fork()");
+                       exit(1);
+
+               case 0:
+                       /* daemon setup */
+                       if (chdir("/"))
+                               perror("chdir()");
+
+                       cur_fd = open("/dev/null", O_WRONLY);
+                       if (cur_fd > 0) {
+                               dup2(cur_fd, 0);
+                               dup2(cur_fd, 1);
+                               dup2(cur_fd, 2);
+                       }
+
+                       break;
+
+               default:
+                       exit(0);
+               }
+       }
+
        return run_server();
 }