Changeset 2161

Timestamp:

04/29/2008 11:03:41 AM (2 weeks ago)

Author:

stbuehler

Message:

Do not rely on PATH_MAX (POSIX does not require it) (#580)

Files:

• branches/lighttpd-1.4.x/NEWS (modified) (1 diff)
• branches/lighttpd-1.4.x/src/configfile.c (modified) (4 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -23 +23 @@
-  * Fix mod_magnet to set con->mode = p->id if it generates content, so returning 4xx/5xx doesn't append an error page
-  * Remove lighttpd.spec* from source, fixing all problems with it ;-)
+  * Do not rely on PATH_MAX (POSIX does not require it) (#580)
-
-- 1.4.19 - 2008-03-10

branches/lighttpd-1.4.x/src/configfile.c

@@ -8 +8 @@
-#include <stdio.h>
-#include <ctype.h>
+#include <limits.h>
-#include <assert.h>
-
@@ -910 +911 @@
-}
-
+static char* getCWD() {
+        char *s, *s1;
+        size_t len;
+#ifdef PATH_MAX
+        len = PATH_MAX;
+#else
+        len = 4096;
+#endif
+
+        s = malloc(len);
+        if (!s) return NULL;
+        while (NULL == getcwd(s, len)) {
+                if (errno != ERANGE || SSIZE_MAX - len < len) return NULL;
+                len *= 2;
+                s1 = realloc(s, len);
+                if (!s1) {
+                        free(s);
+                        return NULL;
+                }
+                s = s1;
+        }
+        return s;
+}
+
-int config_parse_cmd(server *srv, config_t *context, const char *cmd) {
-        proc_handler_t proc;
@@ -916 +941 @@
-        buffer *source;
-        buffer *out;
-oldpwd[PATH_MAX]
-
-getcwd(oldpwd, sizeof(oldpwd
+*oldpwd
+
+(oldpwd = getCWD(
-                log_error_write(srv, __FILE__, __LINE__, "s",
-                                "cannot get cwd", strerror(errno));
@@ -943 +968 @@
-        buffer_free(out);
-        chdir(oldpwd);
+        free(oldpwd);
-        return ret;
-}