Ticket #219: lighttpd-1.4.1-include_glob.diff

lighttpd-1.4.1

@@ -56 +56 @@
 sys/socket.h sys/time.h unistd.h sys/sendfile.h sys/uio.h \
 getopt.h sys/epoll.h sys/select.h poll.h sys/poll.h sys/devpoll.h sys/filio.h \
 sys/mman.h sys/event.h sys/port.h winsock2.h pwd.h sys/syslimits.h \
-sys/resource.h sys/un.h syslog.h])
+sys/resource.h sys/un.h syslog.h glob.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -397 +397 @@
                   strdup strerror strstr strtol sendfile  getopt socket \
                   gethostbyname poll sigtimedwait epoll_ctl getrlimit chroot \
                   getuid select signal pathconf\
-                  writev sigaction sendfile64 send_file kqueue port_create localtime_r])
+                  writev sigaction sendfile64 send_file kqueue port_create localtime_r\
+                  glob])
 
 AC_MSG_CHECKING(for Large File System support)
 AC_ARG_ENABLE(lfs,

doc/configuration.txt

@@ -36 +36 @@
   <array>  : "(" [ <string> "=>" ] <value> [, [ <string> "=>" ] <value> ]* ")"
   INCLUDE  : "include" VALUE
   INCLUDE_SHELL : "include_shell" STRING_VALUE
+  INCLUDE_GLOB : "include_glob" STRING_VALUE
   
 Example
 -------
@@ -64 +65 @@
   # read configuration from output of a command
   include_shell "/usr/local/bin/confmimetype /etc/mime.types"
 
+  # include all files matching the specified glob pattern
+  include_glob "*.conf"
+
 
 Conditional Configuration
 =========================

src/configfile.c

@@ -745 +745 @@
                                                 tid = TK_INCLUDE;
                                         } else if (strcmp(token->ptr, "include_shell") == 0) {
                                                 tid = TK_INCLUDE_SHELL;
+                                        } else if (strcmp(token->ptr, "include_glob") == 0) {
+                                                tid = TK_INCLUDE_GLOB;
                                         } else if (strcmp(token->ptr, "else") == 0) {
                                                 tid = TK_ELSE;
                                         } else {
@@ -844 +846 @@
         tokenizer_t t;
         stream s;
         int ret;
+        size_t i;
         buffer *filename;
+        data_string *ds;
+
+        /* don't parse it if we've parsed it already */
+        for (i = 0; i < context->parsed->used; i++) {
+                if (buffer_is_equal_string(
+                                ((data_string *)(context->parsed->data[i]))->value,
+                                fn, strlen(fn))) {
+                        return 0;
+                }
+        }
+
+        ds = data_string_init();
+        buffer_copy_string(ds->value, fn);
+        array_insert_unique(context->parsed, (data_unset *)ds);
 
         if (buffer_is_empty(context->basedir) &&
                         (fn[0] == '/' || fn[0] == '\\') &&
@@ -910 +927 @@
         context->ok = 1;
         context->configs_stack = array_init();
         context->configs_stack->is_weakref = 1;
+        context->parsed = array_init();
         context->basedir = buffer_init();
 }
 
 static void context_free(config_t *context) {
         array_free(context->configs_stack);
+        array_free(context->parsed);
         buffer_free(context->basedir);
 }
 

src/configfile.h

@@ -10 +10 @@
         int     ok;
         array  *all_configs;
         array  *configs_stack; /* to parse nested block */
+        array  *parsed; /* keep track of the configs we've parsed */
         data_config *current; /* current started with { */
         buffer *basedir;
 } config_t;

src/configparser.y

@@ -7 +7 @@
 #include <stdio.h>
 #include <string.h>
 #include "config.h"
+#ifdef HAVE_GLOB_H
+# include <errno.h>
+# include <glob.h>
+#endif
 #include "configfile.h"
 #include "buffer.h"
 #include "array.h"
@@ -132 +136 @@
 metaline ::= condlines(A) EOL. { A = NULL; }
 metaline ::= include.
 metaline ::= include_shell.
+metaline ::= include_glob.
 metaline ::= EOL.
 
 %type       value                  {data_unset *}
@@ -504 +509 @@
     A = NULL;
   }
 }
+
+include_glob ::= INCLUDE_GLOB stringop(A). {
+  if (ctx->ok) {
+#ifdef HAVE_GLOB
+    size_t i;
+    int ret;
+    glob_t gbuf;
+    buffer *globstr;
+
+    /* construct full path for passing to glob() */
+    if (buffer_is_empty(ctx->basedir) &&
+        (A->ptr[0] == '/' || A->ptr[0] == '\\') &&
+        (A->ptr[0] == '.' && (A->ptr[1] == '/' || A->ptr[1] == '\\'))) {
+      globstr = buffer_init_buffer(A);
+    } else {
+      globstr = buffer_init_buffer(ctx->basedir);
+      buffer_append_string_buffer(globstr, A);
+    }
+
+    errno = 0;
+    if (0 != (ret = glob(globstr->ptr, GLOB_ERR|GLOB_MARK, NULL, &gbuf))) {
+      ctx->ok = 0;
+
+      if (ret == GLOB_NOMATCH) {
+        fprintf(stderr, "nothing matches glob pattern '%s'\n", globstr->ptr);
+      }
+      else if (errno) {
+        fprintf(stderr, "glob: %s\n", strerror(errno));
+      }
+      else {
+        fprintf(stderr, "internal glob() error\n");
+      }
+    }
+    else {
+      for (i = 0; gbuf.gl_pathv[i] != NULL; i++) {
+        const char *path = gbuf.gl_pathv[i];
+
+        /* skip directories ('/' is appended due to GLOB_MARK option) */
+        if (path[strlen(path) - 1] == '/') {
+          continue;
+        }
+
+        /* remove the basedir we added to get the glob results */
+        if (!buffer_is_empty(ctx->basedir)) {
+          path += strlen(ctx->basedir->ptr);
+        }
+
+        if (0 != config_parse_file(ctx->srv, ctx, path)) {
+          ctx->ok = 0;
+          break;
+        }
+      }
+    }
+    buffer_free(globstr);
+    globstr = NULL;
+    globfree(&gbuf);
+
+#else
+    fprintf(stderr, "The include_glob directive requires the glob() function.\n");
+    ctx->ok = 0;
+#endif
+
+    buffer_free(A);
+    A = NULL;
+  }
+}