svn commit: trunk/busybox/shell

[vda at busybox.net]

Author: vda
Date: 2008-05-06 08:30:27 -0700 (Tue, 06 May 2008)
New Revision: 21938

Log:
ash: make set -o and set +o work as in dash/bash.
by Cristian Ionescu-Idbohrn.

function                                             old     new   delta
options                                              565     625     +60
getoptscmd                                           709     698     -11



Modified:
   trunk/busybox/shell/ash.c


Changeset:
Modified: trunk/busybox/shell/ash.c
===================================================================
--- trunk/busybox/shell/ash.c	2008-05-06 12:08:19 UTC (rev 21937)
+++ trunk/busybox/shell/ash.c	2008-05-06 15:30:27 UTC (rev 21938)
@@ -9486,7 +9486,7 @@
  * Oh well. Let's mimic that.
  */
 static int
-minus_o(char *name, int val)
+plus_minus_o(char *name, int val)
 {
 	int i;
 
@@ -9497,13 +9497,15 @@
 				return 0;
 			}
 		}
-		ash_msg("illegal option -o %s", name);
+		ash_msg("illegal option %co %s", val ? '-' : '+', name);
 		return 1;
 	}
-	out1str("Current option settings\n");
 	for (i = 0; i < NOPTS; i++)
-		out1fmt("%-16s%s\n", optnames(i),
-				optlist[i] ? "on" : "off");
+		if (val) {
+			out1fmt("%-16s%s\n", optnames(i), optlist[i] ? "on" : "off");
+		} else {
+			out1fmt("set %co %s\n", optlist[i] ? '-' : '+', optnames(i));
+		}
 	return 0;
 }
 static void
@@ -9517,7 +9519,7 @@
 			return;
 		}
 	}
-	ash_msg_and_raise_error("illegal option -%c", flag);
+	ash_msg_and_raise_error("illegal option %c%c", val ? '-' : '+', flag);
 	/* NOTREACHED */
 }
 static int
@@ -9555,7 +9557,7 @@
 			if (c == 'c' && cmdline) {
 				minusc = p;     /* command is after shell args */
 			} else if (c == 'o') {
-				if (minus_o(*argptr, val)) {
+				if (plus_minus_o(*argptr, val)) {
 					/* it already printed err message */
 					return 1; /* error */
 				}