diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-27 07:44:51 +0300 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-27 07:44:51 +0300 |
commit | d0119d15f97750c49f9955e6c6f952f03d72e795 (patch) | |
tree | 193a70e3d5ed19939c8460afb725c0fdf38d065d /libbb | |
parent | 8d42f86b146871ae4c4cafd3801a85f381249a14 (diff) |
Simple fixes accumulated after 1.3.0.
busybox-1.3.0.ash.patch
busybox-1.3.0.bb_strtou.patch
busybox-1.3.0.CONFIG_FEATURE_TAR_GNU_EXTENSIONS.patch
busybox-1.3.0.dhcprelay.patch
busybox-1.3.0.dpkg_ar.patch
busybox-1.3.0.find.patch
busybox-1.3.0.mount.patch
busybox-1.3.0.perror.patch
busybox-1.3.0.sed.patch
busybox-1.3.0.shadow.patch
busybox-1.3.0.xregcomp.patch
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/Kbuild | 2 | ||||
-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, 7 deletions
diff --git a/libbb/Kbuild b/libbb/Kbuild index c15615302..827a5ce9f 100644 --- a/libbb/Kbuild +++ b/libbb/Kbuild @@ -113,5 +113,7 @@ lib-$(CONFIG_EJECT) += find_mount_point.o lib-$(CONFIG_AWK) += xregcomp.o lib-$(CONFIG_SED) += xregcomp.o +lib-$(CONFIG_GREP) += xregcomp.o lib-$(CONFIG_LESS) += 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); } |