Changeset 1927

Timestamp:

09/01/08 12:51:30 (3 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/main.c (modified) (2 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-09-01  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/main.c (figure_pid_file_path): Fixes the functionality,
+        it was not working properly because and incorrect string
+        comparison.
-
-        * cherokee/main_worker.c, cherokee/handler_cgi_base.c,

cherokee/trunk/cherokee/main.c

@@ -65 +65 @@
-{
-        FILE *f;
+        char *p;
-        char *line;
-        char  tmp[512];
@@ -75 +76 @@
-                line = fgets (tmp, sizeof(tmp), f);
-                if ((line != NULL) &&
-cmp (line, "server!pid_file = "
+ncmp (line, "server!pid_file = ", 18
-                {
-                        fclose(f);
+                        p = line + 18;
+                        while (*p) {
+                                if ((*p == '\r') ||
+                                    (*p == '\n'))
+                                {
+                                        *p = '\0';
+                                        break;
+                                }
+                                p += 1;
+                        }
-                        return strdup(line + 18);
-                }