Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/comm.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/comm.c (modified) (6 diffs)

branches/2.2.5/mindi-busybox/coreutils/comm.c

@@ -8 +8 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-#define COMM_OPT_1 0x01
-#define COMM_OPT_2 0x02
-#define COMM_OPT_3 0x04
-
-/* These three variables control behaviour if non-zero */
-
-static int only_file_1;
-static int only_file_2;
-static int both;
+#define COMM_OPT_1 (1 << 0)
+#define COMM_OPT_2 (1 << 1)
+#define COMM_OPT_3 (1 << 2)
 
 /* writeline outputs the input given, appropriately aligned according to class */
-static void writeline(char *line, int class)
+static void writeline(char *line, int class, int flags)
 {
     if (class == 0) {
-        if (!only_file_1)
+        if (flags & COMM_OPT_1)
             return;
     } else if (class == 1) {
-        if (!only_file_2)
+        if (flags & COMM_OPT_2)
             return;
-        if (only_file_1)
+        if (!(flags & COMM_OPT_1))
             putchar('\t');
-    }
-    else /*if (class == 2)*/ {
-        if (!both)
+    } else /*if (class == 2)*/ {
+        if (flags & COMM_OPT_3)
             return;
-        if (only_file_1)
+        if (!(flags & COMM_OPT_1))
             putchar('\t');
-        if (only_file_2)
+        if (!(flags & COMM_OPT_2))
             putchar('\t');
     }
@@ -47 +36 @@
 }
 
-/* This is the real core of the program - lines are compared here */
-static void cmp_files(char **infiles)
+int comm_main(int argc, char **argv);
+int comm_main(int argc, char **argv)
 {
 #define LINE_LEN 100
@@ -56 +45 @@
     FILE *streams[2];
     int i;
+    unsigned flags;
+
+    opt_complementary = "=2";
+    flags = getopt32(argv, "123");
+    argv += optind;
 
     for (i = 0; i < 2; ++i) {
-        streams[i] = ((infiles[i][0] == '=' && infiles[i][1]) ? stdin : bb_xfopen(infiles[i], "r"));
+        streams[i] = (argv[i][0] == '-' && !argv[i][1]) ? stdin : xfopen(argv[i], "r");
         fgets(thisline[i], LINE_LEN, streams[i]);
     }
+
+    /* This is the real core of the program - lines are compared here */
 
     while (*thisline[0] || *thisline[1]) {
@@ -83 +79 @@
 
         if (order == 0 && !i)
-            writeline(thisline[1], 2);
+            writeline(thisline[1], 2, flags);
         else if (order > 0 && !(i & BB_EOF_1))
-            writeline(thisline[1], 1);
+            writeline(thisline[1], 1, flags);
         else if (order < 0 && !(i & BB_EOF_0))
-            writeline(thisline[0], 0);
+            writeline(thisline[0], 0, flags);
 
         if (i & BB_EOF_0 & BB_EOF_1) {
@@ -96 +92 @@
             while (!feof(streams[i])) {
                 if ((order < 0 && i) || (order > 0 && !i))
-                    writeline(thisline[i], i);
+                    writeline(thisline[i], i, flags);
                 fgets(thisline[i], LINE_LEN, streams[i]);
             }
@@ -109 +105 @@
     }
 
-    fclose(streams[0]);
-    fclose(streams[1]);
+    if (ENABLE_FEATURE_CLEAN_UP) {
+        fclose(streams[0]);
+        fclose(streams[1]);
+    }
+
+    return EXIT_SUCCESS;
 }
-
-int comm_main(int argc, char **argv)
-{
-    unsigned long flags;
-
-    flags = bb_getopt_ulflags(argc, argv, "123");
-
-    if (optind + 2 != argc)
-        bb_show_usage();
-
-    only_file_1 = !(flags & COMM_OPT_1);
-    only_file_2 = !(flags & COMM_OPT_2);
-    both = !(flags & COMM_OPT_3);
-
-    cmp_files(argv + optind);
-    exit(EXIT_SUCCESS);
-}