aboutsummaryrefslogtreecommitdiff
path: root/libbb/error_msg_and_die.c
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-03 02:56:00 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-03 02:56:00 +0000
commitcd4370bd6ed20fd2c944f03206d3cd56023f390f (patch)
tree66b3617e0b6ceed9c3123000104df0d78bf9bf2a /libbb/error_msg_and_die.c
parentb0c043bbed7ee35df4171d8551695c74458c8d97 (diff)
downloadbusybox-w32-cd4370bd6ed20fd2c944f03206d3cd56023f390f.tar.gz
busybox-w32-cd4370bd6ed20fd2c944f03206d3cd56023f390f.tar.bz2
busybox-w32-cd4370bd6ed20fd2c944f03206d3cd56023f390f.zip
convert calloc to xzalloc
fix sleep-on-die option git-svn-id: svn://busybox.net/trunk/busybox@17140 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb/error_msg_and_die.c')
-rw-r--r--libbb/error_msg_and_die.c11
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
16int die_sleep; 16int die_sleep;
17 17
18void sleep_and_die(void)
19{
20 if (die_sleep)
21 sleep(die_sleep);
22 exit(xfunc_error_retval);
23}
24
18void bb_error_msg_and_die(const char *s, ...) 25void 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}