svn commit: [25946] trunk/busybox/shell

vapier at busybox.net vapier at busybox.net
Fri Apr 3 22:48:10 UTC 2009


Author: vapier
Date: 2009-04-03 22:48:10 +0000 (Fri, 03 Apr 2009)
New Revision: 25946

Log:
simplify maybe_die() slightly

Modified:
   trunk/busybox/shell/hush.c


Changeset:
Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c	2009-04-03 22:31:18 UTC (rev 25945)
+++ trunk/busybox/shell/hush.c	2009-04-03 22:48:10 UTC (rev 25946)
@@ -615,7 +615,8 @@
 	 * 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);
 }



More information about the busybox-cvs mailing list