diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-03 02:56:00 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-03 02:56:00 +0000 |
commit | 9b1381fd2fb7179f731709542507015799f90a51 (patch) | |
tree | 66b3617e0b6ceed9c3123000104df0d78bf9bf2a /libbb/error_msg_and_die.c | |
parent | bb3d0fab3b46d64e93687bc30b405d0878eca296 (diff) | |
download | busybox-w32-9b1381fd2fb7179f731709542507015799f90a51.tar.gz busybox-w32-9b1381fd2fb7179f731709542507015799f90a51.tar.bz2 busybox-w32-9b1381fd2fb7179f731709542507015799f90a51.zip |
convert calloc to xzalloc
fix sleep-on-die option
Diffstat (limited to 'libbb/error_msg_and_die.c')
-rw-r--r-- | libbb/error_msg_and_die.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c index 10d953513..7c5a4ebe9 100644 --- a/libbb/error_msg_and_die.c +++ b/libbb/error_msg_and_die.c | |||
@@ -15,6 +15,13 @@ | |||
15 | 15 | ||
16 | int die_sleep; | 16 | int die_sleep; |
17 | 17 | ||
18 | void sleep_and_die(void) | ||
19 | { | ||
20 | if (die_sleep) | ||
21 | sleep(die_sleep); | ||
22 | exit(xfunc_error_retval); | ||
23 | } | ||
24 | |||
18 | void bb_error_msg_and_die(const char *s, ...) | 25 | void bb_error_msg_and_die(const char *s, ...) |
19 | { | 26 | { |
20 | va_list p; | 27 | va_list p; |
@@ -22,7 +29,5 @@ void bb_error_msg_and_die(const char *s, ...) | |||
22 | va_start(p, s); | 29 | va_start(p, s); |
23 | bb_verror_msg(s, p, NULL); | 30 | bb_verror_msg(s, p, NULL); |
24 | va_end(p); | 31 | va_end(p); |
25 | if (die_sleep) | 32 | sleep_and_die(); |
26 | sleep(die_sleep); | ||
27 | exit(xfunc_error_retval); | ||
28 | } | 33 | } |