busybox-1.4.0-syslogd-n.patch 1.6 KB

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