svn commit: trunk/busybox/coreutils

[aldot at busybox.net]

Author: aldot
Date: 2007-01-17 11:45:14 -0800 (Wed, 17 Jan 2007)
New Revision: 17351

Log:
- rewrite find_param to use index_in_str_array


Modified:
   trunk/busybox/coreutils/stty.c


Changeset:
Modified: trunk/busybox/coreutils/stty.c
===================================================================
--- trunk/busybox/coreutils/stty.c	2007-01-17 19:44:59 UTC (rev 17350)
+++ trunk/busybox/coreutils/stty.c	2007-01-17 19:45:14 UTC (rev 17351)
@@ -615,8 +615,9 @@
 	param_ospeed = 7 | 0x80,
 };
 
-static int find_param(const char *name)
+static int find_param(const char * const name)
 {
+#if 0
 #ifdef HAVE_C_LINE
 	if (streq(name, "line")) return param_line;
 #endif
@@ -630,6 +631,25 @@
 	if (streq(name, "ispeed")) return param_ispeed;
 	if (streq(name, "ospeed")) return param_ospeed;
 	return 0;
+#else
+	const char * const params[] = {
+		"line",
+		"rows",
+		"cols",
+		"columns",
+		"size",
+		"speed",
+		"ispeed",
+		"ospeed",
+		NULL
+	};
+	int i = index_in_str_array(params, name);
+	if (i) {
+		if (!(i == 4 || i == 5))
+			i |= 0x80;
+	}
+	return i;
+#endif
 }
 
 static int recover_mode(const char *arg, struct termios *mode)