summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger2009-04-03 22:48:10 +0000
committerMike Frysinger2009-04-03 22:48:10 +0000
commitdfa9de71769f2ce9449b43f389962cc977663179 (patch)
treeba971502e855d025beebca3c9b4843d1460d5b18
parentdb2a9b683a49282750a36ed872f21814ad81c80e (diff)
downloadbusybox-dfa9de71769f2ce9449b43f389962cc977663179.zip
busybox-dfa9de71769f2ce9449b43f389962cc977663179.tar.gz
simplify maybe_die() slightly
-rw-r--r--shell/hush.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 6734c92..efb20d9 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -615,7 +615,8 @@ static void maybe_die(const char *notice, const char *msg)
* but it SEGVs. ?! Oh well... explicit temp ptr works around that */
void FAST_FUNC (*fp)(const char *s, ...) = bb_error_msg_and_die;
#if ENABLE_HUSH_INTERACTIVE
- fp = (G_interactive_fd ? bb_error_msg : bb_error_msg_and_die);
+ if (G_interactive_fd)
+ fp = bb_error_msg;
#endif
fp(msg ? "%s: %s" : notice, notice, msg);
}