diff options
| author | Ron Yorston | 2022-04-21 08:02:15 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2022-06-26 17:17:02 +0200 |
| commit | 95fec31be601bfdced6bed7007a33b26e968e0db (patch) | |
| tree | 147d782f1ac7adc82f7da60cc4418270f1268f91 | |
| parent | 8d67007a4dedef77dd0cf757bcc0e6fbee267ced (diff) | |
| download | busybox-95fec31be601bfdced6bed7007a33b26e968e0db.zip busybox-95fec31be601bfdced6bed7007a33b26e968e0db.tar.gz | |
libbb: restore special handling of nomsg errors
The functions bb_perror_nomsg() and bb_perror_nomsg_and_die() are
used to print error messages where no specific information is
available. For example:
$ busybox mktemp -p /
mktemp: (null): Permission denied
mktemp(3) doesn't tell us the name of the file it tried to create.
However, printing '(null)' is a regression introduced by commit
6937487be (libbb: reduce the overhead of single parameter bb_error_msg()
calls). Restore the previous behaviour by reverting the changes to
the two functions mentioned:
$ busybox mktemp -p /
mktemp: Permission denied
function old new delta
bb_perror_nomsg_and_die 7 14 +7
bb_perror_nomsg 7 14 +7
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 14/0) Total: 14 bytes
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/perror_nomsg.c | 4 | ||||
| -rw-r--r-- | libbb/perror_nomsg_and_die.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libbb/perror_nomsg.c b/libbb/perror_nomsg.c index d7d53de..a2a11cc 100644 --- a/libbb/perror_nomsg.c +++ b/libbb/perror_nomsg.c @@ -12,11 +12,11 @@ * instead of including libbb.h */ //#include "libbb.h" #include "platform.h" -extern void bb_simple_perror_msg(const char *s) FAST_FUNC; +extern void bb_perror_msg(const char *s, ...) FAST_FUNC; /* suppress gcc "no previous prototype" warning */ void FAST_FUNC bb_perror_nomsg(void); void FAST_FUNC bb_perror_nomsg(void) { - bb_simple_perror_msg(0); + bb_perror_msg(0); } diff --git a/libbb/perror_nomsg_and_die.c b/libbb/perror_nomsg_and_die.c index bea5f25..543ff51 100644 --- a/libbb/perror_nomsg_and_die.c +++ b/libbb/perror_nomsg_and_die.c @@ -12,11 +12,11 @@ * instead of including libbb.h */ //#include "libbb.h" #include "platform.h" -extern void bb_simple_perror_msg_and_die(const char *s) FAST_FUNC; +extern void bb_perror_msg_and_die(const char *s, ...) FAST_FUNC; /* suppress gcc "no previous prototype" warning */ void FAST_FUNC bb_perror_nomsg_and_die(void); void FAST_FUNC bb_perror_nomsg_and_die(void) { - bb_simple_perror_msg_and_die(0); + bb_perror_msg_and_die(0); } |