Changeset 630

Timestamp:

08/27/2005 02:43:45 PM (3 years ago)

Author:

jan

Message:

added -m to set the location of the modules

Location:

branches/lighttpd-merge-1.4.x/src

Files:

• base.h (modified) (1 diff)
• plugin.c (modified) (1 diff)
• server.c (modified) (5 diffs)

branches/lighttpd-merge-1.4.x/src/base.h

@@ -437 +437 @@
         buffer *event_handler;
         
+        buffer *modules_dir;
         array *modules;
         

branches/lighttpd-merge-1.4.x/src/plugin.c

@@ -113 +113 @@
                 buffer_reset(srv->tmp_buf);
                 /* for make distcheck */
-                if (NULL != (inst = strstr(LIBRARY_DIR, "/_inst/lib"))) {
-                        buffer_copy_string_len(srv->tmp_buf, LIBRARY_DIR, strlen(LIBRARY_DIR) - strlen(inst));
+                if (NULL != (inst = strstr(srv->srvconf.modules_dir->ptr, "/_inst/lib"))) {
+                        buffer_copy_string_len(srv->tmp_buf, srv->srvconf.modules_dir->ptr,
+                                strlen(srv->srvconf.modules_dir->ptr) - strlen(inst));
                         buffer_append_string(srv->tmp_buf, "/_build/src/.libs");
                         buffer_append_string(srv->tmp_buf, inst + strlen("/_inst/lib") );
                 } else {
-                        buffer_copy_string(srv->tmp_buf, LIBRARY_DIR);
+                        buffer_copy_string_buffer(srv->tmp_buf, srv->srvconf.modules_dir);
                 }
                 buffer_append_string(srv->tmp_buf, "/");

branches/lighttpd-merge-1.4.x/src/server.c

@@ -162 +162 @@
         
         srv->srvconf.modules = array_init();
+        srv->srvconf.modules_dir = buffer_init_string(LIBRARY_DIR);
         
         /* use syslog */
@@ -198 +199 @@
         CLEAN(srvconf.event_handler);
         CLEAN(srvconf.pid_file);
+        CLEAN(srvconf.modules_dir);
         
         CLEAN(tmp_chunk_len);
@@ -275 +277 @@
 "usage:\n" \
 " -f <name>  filename of the config-file\n" \
+" -m <name>  module directory (default: "LIBRARY_DIR")\n" \
 " -p         print the parsed config-file in internal form, and exit\n" \
 " -t         test the config-file, and exit\n" \
@@ -331 +334 @@
         srv->srvconf.dont_daemonize = 0;
         
-        while(-1 != (o = getopt(argc, argv, "f:hvDpt"))) {
+        while(-1 != (o = getopt(argc, argv, "f:m:hvDpt"))) {
                 switch(o) {
                 case 'f': 
@@ -338 +341 @@
                                 return -1;
                         }
+                        break;
+                case 'm':
+                        buffer_copy_string(srv->srvconf.modules_dir, optarg);
                         break;
                 case 'p': print_config = 1; break;