diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-24 22:02:01 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-24 22:02:01 +0000 |
| commit | 218f2f4882482e1d023ddbf4b9f6cbf1f6b0145d (patch) | |
| tree | e58717abf91e17db281fbbdfdc0072c198ce85b7 /libbb | |
| parent | 84d2d493b4b664d1465cff955367fb9bc7769e5d (diff) | |
| download | busybox-218f2f4882482e1d023ddbf4b9f6cbf1f6b0145d.tar.gz | |
accumulated post-1.4.0 fixes
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/vdprintf.c | 4 | ||||
| -rw-r--r-- | libbb/xfuncs.c | 7 | ||||
| -rw-r--r-- | libbb/xreadlink.c | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/libbb/vdprintf.c b/libbb/vdprintf.c index ea2a9d4bf..d16c51947 100644 --- a/libbb/vdprintf.c +++ b/libbb/vdprintf.c @@ -7,12 +7,8 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdio.h> -#include <unistd.h> #include "libbb.h" - - #if defined(__GLIBC__) && __GLIBC__ < 2 int vdprintf(int d, const char *format, va_list ap) { diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 4252e7646..f6b904f78 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -81,13 +81,14 @@ char * xstrndup(const char *s, int n) t = (char*) s; while (m) { if (!*t) break; - m--; t++; + m--; + t++; } - n = n - m; + n -= m; t = xmalloc(n + 1); t[n] = '\0'; - return memcpy(t,s,n); + return memcpy(t, s, n); } // Die if we can't open a file and return a FILE * to it. diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c index 76f52ca06..fb67cdef1 100644 --- a/libbb/xreadlink.c +++ b/libbb/xreadlink.c @@ -36,7 +36,7 @@ char *xreadlink(const char *path) char *xmalloc_realpath(const char *path) { -#ifdef __GLIBC__ +#if defined(__GLIBC__) && !defined(__UCLIBC__) /* glibc provides a non-standard extension */ return realpath(path, NULL); #else |