diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-04-03 22:48:10 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-04-03 22:48:10 +0000 |
commit | dfa9de71769f2ce9449b43f389962cc977663179 (patch) | |
tree | ba971502e855d025beebca3c9b4843d1460d5b18 /shell | |
parent | db2a9b683a49282750a36ed872f21814ad81c80e (diff) | |
download | busybox-w32-dfa9de71769f2ce9449b43f389962cc977663179.tar.gz busybox-w32-dfa9de71769f2ce9449b43f389962cc977663179.tar.bz2 busybox-w32-dfa9de71769f2ce9449b43f389962cc977663179.zip |
simplify maybe_die() slightly
Diffstat (limited to 'shell')
-rw-r--r-- | shell/hush.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c index 6734c9212..efb20d91e 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -615,7 +615,8 @@ static void maybe_die(const char *notice, const char *msg) | |||
615 | * but it SEGVs. ?! Oh well... explicit temp ptr works around that */ | 615 | * but it SEGVs. ?! Oh well... explicit temp ptr works around that */ |
616 | void FAST_FUNC (*fp)(const char *s, ...) = bb_error_msg_and_die; | 616 | void FAST_FUNC (*fp)(const char *s, ...) = bb_error_msg_and_die; |
617 | #if ENABLE_HUSH_INTERACTIVE | 617 | #if ENABLE_HUSH_INTERACTIVE |
618 | fp = (G_interactive_fd ? bb_error_msg : bb_error_msg_and_die); | 618 | if (G_interactive_fd) |
619 | fp = bb_error_msg; | ||
619 | #endif | 620 | #endif |
620 | fp(msg ? "%s: %s" : notice, notice, msg); | 621 | fp(msg ? "%s: %s" : notice, notice, msg); |
621 | } | 622 | } |