[BusyBox-cvs] CVS update of busybox/coreutils (od.c)

[Glenn McGrath]

    Date: Thursday, July 22, 2004 @ 19:42:29
  Author: bug1
    Path: /var/cvs/busybox/coreutils

Modified: od.c (1.6 -> 1.7)

Felipe Kellermann writes,

"As noticed today by Steven Scholz, the od's `-v' was broken.
I've fixed that and now both the flags `-v' and `-a' are OK"

Fixes a segfault in
echo "uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu\02bar\4"| ./busybox od -av


Index: busybox/coreutils/od.c
diff -u busybox/coreutils/od.c:1.6 busybox/coreutils/od.c:1.7
--- busybox/coreutils/od.c:1.6	Wed Mar 19 02:42:02 2003
+++ busybox/coreutils/od.c	Thu Jul 22 19:42:28 2004
@@ -155,13 +155,13 @@
 	"4/4 \"    %011o \" \"\\n\"",			/* O */
 };
 
-static const signed char od_opts[] = "aBbcDdeFfHhIiLlOovXx";
+static const signed char od_opts[] = "aBbcDdeFfHhIiLlOoXxv";
 
 static const signed char od_o2si[] = {
 	0, 1, 2, 3, 5,
 	4, 6, 6, 7, 8,
 	9, 0xa, 0xb, 0xa, 0xa,
-	0xb, 1, -1, 8, 9,
+	0xb, 1, 8, 9,
 };
 
 int od_main(int argc, char **argv)
@@ -173,7 +173,9 @@
 	bb_dump_length = -1;
 
 	while ((ch = getopt(argc, argv, od_opts)) > 0) {
-		if (((p = strchr(od_opts, ch)) != NULL) && (*p >= 0)) {
+		if (ch == 'v') {
+			bb_dump_vflag = ALL;
+		} else if (((p = strchr(od_opts, ch)) != NULL) && (*p >= 0)) {
 			if (first) {
 				first = 0;
 				bb_dump_add("\"%07.7_Ao\n\"");
@@ -182,8 +184,6 @@
 				bb_dump_add("\"         \"");
 			}
 			bb_dump_add(add_strings[od_o2si[(int)(p-od_opts)]]);
-		} else if (ch == 'v') {
-			bb_dump_vflag = ALL;
 		} else {	/* P, p, s, w, or other unhandled */
 			bb_show_usage();
 		}