svn commit: [25746] trunk/busybox/shell

vda at busybox.net vda at busybox.net
Thu Mar 19 02:00:00 UTC 2009


Author: vda
Date: 2009-03-19 01:59:59 +0000 (Thu, 19 Mar 2009)
New Revision: 25746

Log:
ash: fix "ash -c 'exec 1>&0'" complaining that fd 0 is busy



Modified:
   trunk/busybox/shell/ash.c


Changeset:
Modified: trunk/busybox/shell/ash.c
===================================================================
--- trunk/busybox/shell/ash.c	2009-03-18 23:14:59 UTC (rev 25745)
+++ trunk/busybox/shell/ash.c	2009-03-19 01:59:59 UTC (rev 25746)
@@ -11684,7 +11684,8 @@
 {
 	union node n;
 
-	/* XXX Fix (char *) cast. */
+	/* XXX Fix (char *) cast. It _is_ a bug. ps is variable's value,
+	 * and token processing _can_ alter it (delete NULs etc). */
 	setinputstring((char *)ps);
 	readtoken1(pgetc(), PSSYNTAX, nullstr, 0);
 	popfile();
@@ -13802,15 +13803,20 @@
 	}
  state3:
 	state = 4;
-	if (minusc)
+	if (minusc) {
+		/* evalstring pushes parsefile stack.
+		 * Ensure we don't falsely claim that 0 (stdin)
+		 * is one of stacked source fds */
+		if (!sflag)
+			g_parsefile->fd = -1;
 		evalstring(minusc, 0);
+	}
 
 	if (sflag || minusc == NULL) {
 #if ENABLE_FEATURE_EDITING_SAVEHISTORY
 		if (iflag) {
 			const char *hp = lookupvar("HISTFILE");
-
-			if (hp != NULL)
+			if (hp)
 				line_input_state->hist_file = hp;
 		}
 #endif



More information about the busybox-cvs mailing list