svn commit: [25944] trunk/busybox/shell

[vda at busybox.net]

Author: vda
Date: 2009-04-03 21:16:45 +0000 (Fri, 03 Apr 2009)
New Revision: 25944

Log:
hush: yet another randomconfig fix



Modified:
   trunk/busybox/shell/hush.c


Changeset:
Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c	2009-04-03 21:13:31 UTC (rev 25943)
+++ trunk/busybox/shell/hush.c	2009-04-03 21:16:45 UTC (rev 25944)
@@ -994,22 +994,12 @@
 	/*maybe_set_sighandler(SIGTERM);*/
 	/*maybe_set_sighandler(SIGINT );*/
 }
-/* Used only to suppress ^Z in `cmd` */
-static void set_jobctrl_signals_to_IGN(void)
-{
-	bb_signals(0
-		+ (1 << SIGTSTP)
-		+ (1 << SIGTTIN)
-		+ (1 << SIGTTOU)
-		, SIG_IGN);
-}
 
 #else /* !JOB */
 
 #define set_fatal_signals_to_sigexit(handler) ((void)0)
-#define set_jobctrl_signals_to_IGN(handler)  ((void)0)
 
-#endif /* JOB */
+#endif
 
 /* Restores tty foreground process group, and exits. */
 static void hush_exit(int exitcode) NORETURN;
@@ -3754,7 +3744,11 @@
 		 * 'command execution'.
 		 * SUSv3 says ctrl-Z should be ignored, ctrl-C should not.
 		 */
-		set_jobctrl_signals_to_IGN();
+		bb_signals(0
+			+ (1 << SIGTSTP)
+			+ (1 << SIGTTIN)
+			+ (1 << SIGTTOU)
+			, SIG_IGN);
 
 		/* Note: freeing 'head' here would break NOMMU. */
 		_exit(run_list(head));