Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/httpd_indexcgi.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/httpd_indexcgi.c (modified) (8 diffs)

branches/2.2.9/mindi-busybox/networking/httpd_indexcgi.c

@@ -2 +2 @@
  * Copyright (c) 2007 Denys Vlasenko <vda.linux@googlemail.com>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
@@ -29 +29 @@
 /* Currently malloc machinery is the biggest part of libc we pull in. */
 /* We have only one realloc and one strdup, any idea how to do without? */
-/* Size (i386, approximate):
+
+/* Size (i386, static uclibc, approximate):
  *   text    data     bss     dec     hex filename
  *  13036      44    3052   16132    3f04 index.cgi
@@ -126 +127 @@
     if (buffer + (BUFFER_SIZE-HEADROOM) - dst >= size)
         return;
-    write(1, buffer, dst - buffer);
+    write(STDOUT_FILENO, buffer, dst - buffer);
     dst = buffer;
 }
@@ -149 +150 @@
         *dst = c;
         if ((c - '0') > 9 /* not a digit */
-         && ((c|0x20) - 'a') > 26 /* not A-Z or a-z */
+         && ((c|0x20) - 'a') > ('z' - 'a') /* not A-Z or a-z */
          && !strchr("._-+@", c)
         ) {
@@ -211 +212 @@
 }
 
-int main(void)
+int main(int argc, char *argv[])
 {
     dir_list_t *dir_list;
@@ -226 +227 @@
     if (!QUERY_STRING
      || QUERY_STRING[0] != '/'
+     || strstr(QUERY_STRING, "//")
      || strstr(QUERY_STRING, "/../")
      || strcmp(strrchr(QUERY_STRING, '/'), "/..") == 0
@@ -290 +292 @@
     cdir = dir_list;
     while (dir_list_count--) {
-        struct tm *tm;
+        struct tm *ptm;
 
         if (S_ISDIR(cdir->dl_mode)) {
@@ -314 +316 @@
             fmt_ull(cdir->dl_size);
         fmt_str("<td class=dt>");
-        tm = gmtime(&cdir->dl_mtime);
-        fmt_04u(1900 + tm->tm_year); *dst++ = '-';
-        fmt_02u(tm->tm_mon + 1); *dst++ = '-';
-        fmt_02u(tm->tm_mday); *dst++ = ' ';
-        fmt_02u(tm->tm_hour); *dst++ = ':';
-        fmt_02u(tm->tm_min); *dst++ = ':';
-        fmt_02u(tm->tm_sec);
+        ptm = gmtime(&cdir->dl_mtime);
+        fmt_04u(1900 + ptm->tm_year); *dst++ = '-';
+        fmt_02u(ptm->tm_mon + 1); *dst++ = '-';
+        fmt_02u(ptm->tm_mday); *dst++ = ' ';
+        fmt_02u(ptm->tm_hour); *dst++ = ':';
+        fmt_02u(ptm->tm_min); *dst++ = ':';
+        fmt_02u(ptm->tm_sec);
         *dst++ = '\n';