diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-26 18:17:42 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-26 18:17:42 +0000 |
| commit | 666da5e2c6edec979966d16771818b32dcfafe04 (patch) | |
| tree | c23e6a01fc51d8419c1562f70836148c705ac46a /libbb | |
| parent | 270c17c0e66ffe9fe0e47e891a583b5c6f8512ef (diff) | |
| download | busybox-666da5e2c6edec979966d16771818b32dcfafe04.tar.gz | |
merge post-1.3.0 fixes
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/Kbuild | 3 | ||||
| -rw-r--r-- | libbb/bb_strtonum.c | 1 | ||||
| -rw-r--r-- | libbb/perror_nomsg.c | 9 | ||||
| -rw-r--r-- | libbb/perror_nomsg_and_die.c | 10 |
4 files changed, 15 insertions, 8 deletions
diff --git a/libbb/Kbuild b/libbb/Kbuild index c15615302..64e4531ce 100644 --- a/libbb/Kbuild +++ b/libbb/Kbuild @@ -113,5 +113,6 @@ lib-$(CONFIG_EJECT) += find_mount_point.o lib-$(CONFIG_AWK) += xregcomp.o lib-$(CONFIG_SED) += xregcomp.o -lib-$(CONFIG_LESS) += xregcomp.o +lib-$(CONFIG_GREP) += xregcomp.o +lib-$(CONFIG_MDEV) += xregcomp.o lib-$(CONFIG_DEVFSD) += xregcomp.o diff --git a/libbb/bb_strtonum.c b/libbb/bb_strtonum.c index 6fbd1f87d..50ef0ba26 100644 --- a/libbb/bb_strtonum.c +++ b/libbb/bb_strtonum.c @@ -17,6 +17,7 @@ * errno = ERANGE if value had alphanumeric terminating char ("1234abcg"). * errno = ERANGE if value is out of range, missing, etc. * errno = ERANGE if value had minus sign for strtouXX (even "-0" is not ok ) + * return value is all-ones in this case. */ static unsigned long long ret_ERANGE(void) diff --git a/libbb/perror_nomsg.c b/libbb/perror_nomsg.c index 3aefd5301..8059f9fd8 100644 --- a/libbb/perror_nomsg.c +++ b/libbb/perror_nomsg.c @@ -7,10 +7,13 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include "libbb.h" +/* gcc warns about a null format string, therefore we provide + * modified definition without "attribute (format)" + * instead of including libbb.h */ +//#include "libbb.h" +extern void bb_perror_msg(const char *s, ...); void bb_perror_nomsg(void) { - /* Ignore the gcc warning about a null format string. */ - bb_perror_msg(NULL); + bb_perror_msg(0); } diff --git a/libbb/perror_nomsg_and_die.c b/libbb/perror_nomsg_and_die.c index e5623c2a9..c416df67c 100644 --- a/libbb/perror_nomsg_and_die.c +++ b/libbb/perror_nomsg_and_die.c @@ -7,11 +7,13 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stddef.h> -#include "libbb.h" +/* gcc warns about a null format string, therefore we provide + * modified definition without "attribute (format)" + * instead of including libbb.h */ +//#include "libbb.h" +extern void bb_perror_msg_and_die(const char *s, ...); void bb_perror_nomsg_and_die(void) { - /* Ignore the gcc warning about a null format string. */ - bb_perror_msg_and_die(NULL); + bb_perror_msg_and_die(0); } |