svn commit: trunk/busybox: libbb shell

[vda at busybox.net]

Author: vda
Date: 2007-05-17 06:02:41 -0700 (Thu, 17 May 2007)
New Revision: 18640

Log:
more compile fixes from randomconfig run


Modified:
   trunk/busybox/libbb/vfork_daemon_rexec.c
   trunk/busybox/shell/hush.c


Changeset:
Modified: trunk/busybox/libbb/vfork_daemon_rexec.c
===================================================================
--- trunk/busybox/libbb/vfork_daemon_rexec.c	2007-05-17 12:58:30 UTC (rev 18639)
+++ trunk/busybox/libbb/vfork_daemon_rexec.c	2007-05-17 13:02:41 UTC (rev 18640)
@@ -100,6 +100,7 @@
 	return r;
 }
 
+#if ENABLE_FEATURE_PREFER_APPLETS
 void save_nofork_data(struct nofork_save_area *save)
 {
 	save->current_applet = current_applet;
@@ -162,6 +163,7 @@
 	save_nofork_data(&old);
 	return run_nofork_applet_prime(&old, a, argv);
 }
+#endif /* FEATURE_PREFER_APPLETS */
 
 int spawn_and_wait(char **argv)
 {

Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c	2007-05-17 12:58:30 UTC (rev 18639)
+++ trunk/busybox/shell/hush.c	2007-05-17 13:02:41 UTC (rev 18640)
@@ -486,6 +486,10 @@
 	{ NULL, NULL, NULL }
 };
 
+#if ENABLE_FEATURE_SH_STANDALONE
+struct nofork_save_area nofork_save;
+#endif
+
 #if ENABLE_HUSH_JOB
 
 /* move to libbb? */
@@ -537,10 +541,6 @@
 static struct pipe *toplevel_list;
 static sigjmp_buf toplevel_jb;
 smallint ctrl_z_flag;
-#if ENABLE_FEATURE_SH_STANDALONE
-struct nofork_save_area nofork_save;
-#endif
-
 static void handler_ctrl_c(int sig)
 {
 	debug_printf_jobs("got sig %d\n", sig);
@@ -1105,7 +1105,9 @@
 
 	/* If there is data waiting, eat it up */
 	if (i->p && *i->p) {
+#if ENABLE_HUSH_INTERACTIVE
  take_cached:
+#endif
 		ch = *i->p++;
 		if (i->eof_flag && !*i->p)
 			ch = EOF;
@@ -1120,11 +1122,9 @@
 			i->promptmode = 2;
 			i->__promptme = 0;
 			goto take_cached;
-		} else
+		}
 #endif
-		{
-			ch = fgetc(i->file);
-		}
+		ch = fgetc(i->file);
 	}
 	debug_printf("file_get: got a '%c' %d\n", ch, ch);
 #if ENABLE_HUSH_INTERACTIVE