package/busybox/busybox-1.4.0-syslogd-n.patch

   1 --- busybox-1.4.0/libbb/vdprintf.c      Fri Jan 19 22:23:06 2007
   2 +++ busybox-1.4.0-syslogd-n/libbb/vdprintf.c    Tue Jan 23 21:50:54 2007
   3 @@ -7,11 +7,7 @@
   4   * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
   5   */
   6
   7 -#include <stdio.h>
   8 -#include <unistd.h>
   9  #include "libbb.h"
  10 -
  11 -
  12
  13  #if defined(__GLIBC__) && __GLIBC__ < 2
  14  int vdprintf(int d, const char *format, va_list ap)
  15 --- busybox-1.4.0/libbb/xfuncs.c        Fri Jan 19 22:23:06 2007
  16 +++ busybox-1.4.0-syslogd-n/libbb/xfuncs.c      Tue Jan 23 21:47:27 2007
  17 @@ -81,13 +81,14 @@
  18         t = (char*) s;
  19         while (m) {
  20                 if (!*t) break;
  21 -               m--; t++;
  22 +               m--;
  23 +               t++;
  24         }
  25 -       n = n - m;
  26 +       n -= m;
  27         t = xmalloc(n + 1);
  28         t[n] = '\0';
  29
  30 -       return memcpy(t,s,n);
  31 +       return memcpy(t, s, n);
  32  }
  33
  34  // Die if we can't open a file and return a FILE * to it.
  35 --- busybox-1.4.0/libbb/xreadlink.c     Fri Jan 19 22:23:06 2007
  36 +++ busybox-1.4.0-syslogd-n/libbb/xreadlink.c   Tue Jan 23 22:35:45 2007
  37 @@ -36,7 +36,7 @@
  38
  39  char *xmalloc_realpath(const char *path)
  40  {
  41 -#ifdef __GLIBC__
  42 +#if defined(__GLIBC__) && !defined(__UCLIBC__)
  43         /* glibc provides a non-standard extension */
  44         return realpath(path, NULL);
  45  #else
  46 --- busybox-1.4.0/sysklogd/syslogd.c    Fri Jan 19 22:23:02 2007
  47 +++ busybox-1.4.0-syslogd-n/sysklogd/syslogd.c  Wed Jan 24 21:52:07 2007
  48 @@ -569,7 +569,7 @@
  49         //if (option_mask32 & OPT_locallog) // -L
  50  #endif
  51  #if ENABLE_FEATURE_IPC_SYSLOG
  52 -       if ((option_mask32 & OPT_circularlog) && opt_C) // -C
  53 +       if (opt_C) // -Cn
  54                 shm_size = xatoul_range(opt_C, 4, INT_MAX/1024) * 1024;
  55  #endif
  56
  57 @@ -588,7 +588,7 @@
  58  #ifdef BB_NOMMU
  59                 vfork_daemon_rexec(0, 1, argc, argv, "-n");
  60  #else
  61 -               xdaemon(0, 1);
  62 +               bb_daemonize();
  63  #endif
  64         }
  65         umask(0);