[BusyBox-cvs] svn commit: trunk/busybox/coreutils

[vapier at busybox.net]

Author: vapier
Date: 2005-05-12 16:41:13 -0600 (Thu, 12 May 2005)
New Revision: 10316

Log:
err, added 2 to the wrong var :) also touchup the option detection to shrink size

Modified:
   trunk/busybox/coreutils/comm.c


Changeset:
Modified: trunk/busybox/coreutils/comm.c
===================================================================
--- trunk/busybox/coreutils/comm.c	2005-05-12 22:36:32 UTC (rev 10315)
+++ trunk/busybox/coreutils/comm.c	2005-05-12 22:41:13 UTC (rev 10316)
@@ -38,7 +38,7 @@
 static int both;
 
 /* writeline outputs the input given, appropriately aligned according to class */
-static void writeline (char *line, int class)
+static void writeline(char *line, int class)
 {
 	switch (class) {
 		case 1:
@@ -133,24 +133,18 @@
 	return 0;
 }
 
-int comm_main (int argc, char **argv)
+int comm_main(int argc, char **argv)
 {
-	unsigned long opt;
-	only_file_1 = 1;
-	only_file_2 = 1;
-	both = 1;
+	unsigned long flags;
 
-	opt = bb_getopt_ulflags(argc, argv, "123");
+	flags = bb_getopt_ulflags(argc, argv, "123");
 
-	if (optind != argc + 2)
+	if (optind + 2 != argc)
 		bb_show_usage();
 
-	if (opt & COMM_OPT_1)
-		only_file_1 = 0;
-	if (opt & COMM_OPT_2)
-		only_file_2 = 0;
-	if (opt & COMM_OPT_3)
-		both = 0;
+	only_file_1 = !(flags & COMM_OPT_1);
+	only_file_2 = !(flags & COMM_OPT_2);
+	both = !(flags & COMM_OPT_3);
 
 	exit(cmp_files(argv + optind) == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }