Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/sort.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/sort.c (modified) (13 diffs)

branches/2.2.9/mindi-busybox/coreutils/sort.c

@@ -7 +7 @@
  * MAINTAINER: Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * See SuS3 sort standard at:
@@ -33 +33 @@
     FLAG_c  = 0x10,         /* Check: no output, exit(!ordered) */
     FLAG_s  = 0x20,         /* Stable sort, no ascii fallback at end */
-    FLAG_z  = 0x40,         /* Input is null terminated, not \n */
+    FLAG_z  = 0x40,         /* Input and output is NUL terminated, not \n */
 /* These can be applied to search keys, the previous four can't */
     FLAG_b  = 0x80,         /* Ignore leading blanks */
@@ -53 +53 @@
 
 static struct sort_key {
-    struct sort_key *next_key;  /* linked list */
-    unsigned range[4];  /* start word, start char, end word, end char */
+    struct sort_key *next_key;  /* linked list */
+    unsigned range[4];          /* start word, start char, end word, end char */
     unsigned flags;
 } *key_list;
@@ -60 +60 @@
 static char *get_key(char *str, struct sort_key *key, int flags)
 {
-    int start = 0, end = 0, len, i, j;
+    int start = 0, end = 0, len, j;
+    unsigned i;
 
     /* Special case whole string, so we don't have to make a copy */
@@ -128 +129 @@
     if (flags & FLAG_i) {
         for (start = end = 0; str[end]; end++)
-            if (isprint(str[end]))
+            if (isprint_asciionly(str[end]))
                 str[start++] = str[end];
         str[start] = '\0';
@@ -151 +152 @@
     ((option_mask32 & FLAG_z) \
     ? bb_get_chunk_from_file(fp, NULL) \
-    : xmalloc_getline(fp))
+    : xmalloc_fgetline(fp))
 #else
-#define GET_LINE(fp) xmalloc_getline(fp)
+#define GET_LINE(fp) xmalloc_fgetline(fp)
 #endif
 
@@ -275 +276 @@
 #endif
 
-int sort_main(int argc, char **argv);
-int sort_main(int argc, char **argv)
+int sort_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int sort_main(int argc UNUSED_PARAM, char **argv)
 {
-    FILE *fp, *outfile = stdout;
-    char *line, **lines = NULL;
+    char *line, **lines;
     char *str_ignored, *str_o, *str_t;
     llist_t *lst_k = NULL;
     int i, flag;
-    int linecount = 0;
+    int linecount;
+    unsigned opts;
 
     xfunc_error_retval = 2;
@@ -289 +290 @@
     /* Parse command line options */
     /* -o and -t can be given at most once */
-    opt_complementary = "o--o:t--t:" /* -t, -o: maximum one of each */
+    opt_complementary = "o--o:t--t:" /* -t, -o: at most one of each */
             "k::"; /* -k takes list */
-    getopt32(argv, OPT_STR, &str_ignored, &str_ignored, &str_o, &lst_k, &str_t);
-#if ENABLE_FEATURE_SORT_BIG
-    if (option_mask32 & FLAG_o) outfile = xfopen(str_o, "w");
-    if (option_mask32 & FLAG_t) {
+    opts = getopt32(argv, OPT_STR, &str_ignored, &str_ignored, &str_o, &lst_k, &str_t);
+    /* global b strips leading and trailing spaces */
+    if (opts & FLAG_b)
+        option_mask32 |= FLAG_bb;
+#if ENABLE_FEATURE_SORT_BIG
+    if (opts & FLAG_t) {
         if (!str_t[0] || str_t[1])
             bb_error_msg_and_die("bad -t parameter");
         key_separator = str_t[0];
     }
+    /* note: below this point we use option_mask32, not opts,
+     * since that reduces register pressure and makes code smaller */
+
     /* parse sort key */
     while (lst_k) {
@@ -314 +320 @@
         };
         struct sort_key *key = add_key();
-        char *str_k = lst_k->data;
-        const char *temp2;
+        char *str_k = llist_pop(&lst_k);
 
         i = 0; /* i==0 before comma, 1 after (-k3,6) */
@@ -327 +332 @@
             }
             while (*str_k) {
+                const char *temp2;
+
                 if (*str_k == ',' && !i++) {
                     str_k++;
                     break;
                 } /* no else needed: fall through to syntax error
-                     because comma isn't in OPT_STR */
+                    because comma isn't in OPT_STR */
                 temp2 = strchr(OPT_STR, *str_k);
                 if (!temp2)
@@ -339 +346 @@
                     bb_error_msg_and_die("unknown sort type");
                 /* b after ',' means strip _trailing_ space */
-                if (i && flag == FLAG_b) flag = FLAG_bb;
+                if (i && flag == FLAG_b)
+                    flag = FLAG_bb;
                 key->flags |= flag;
                 str_k++;
             }
         }
-        /* leaking lst_k... */
-        lst_k = lst_k->link;
-    }
-#endif
-    /* global b strips leading and trailing spaces */
-    if (option_mask32 & FLAG_b) option_mask32 |= FLAG_bb;
+    }
+#endif
 
     /* Open input files and read data */
-    for (i = argv[optind] ? optind : optind-1; argv[i]; i++) {
-        fp = stdin;
-        if (i >= optind && NOT_LONE_DASH(argv[i]))
-            fp = xfopen(argv[i], "r");
+    argv += optind;
+    if (!*argv)
+        *--argv = (char*)"-";
+    linecount = 0;
+    lines = NULL;
+    do {
+        /* coreutils 6.9 compat: abort on first open error,
+         * do not continue to next file: */
+        FILE *fp = xfopen_stdin(*argv);
         for (;;) {
             line = GET_LINE(fp);
-            if (!line) break;
-            if (!(linecount & 63))
-                lines = xrealloc(lines, sizeof(char *) * (linecount + 64));
+            if (!line)
+                break;
+            lines = xrealloc_vector(lines, 6, linecount);
             lines[linecount++] = line;
         }
-        fclose(fp);
-    }
+        fclose_if_not_stdin(fp);
+    } while (*++argv);
+
 #if ENABLE_FEATURE_SORT_BIG
     /* if no key, perform alphabetic sort */
@@ -372 +382 @@
     if (option_mask32 & FLAG_c) {
         int j = (option_mask32 & FLAG_u) ? -1 : 0;
-        for (i = 1; i < linecount; i++)
+        for (i = 1; i < linecount; i++) {
             if (compare_keys(&lines[i-1], &lines[i]) > j) {
-                fprintf(stderr, "Check line %d\n", i);
-                return 1;
+                fprintf(stderr, "Check line %u\n", i);
+                return EXIT_FAILURE;
             }
-        return 0;
+        }
+        return EXIT_SUCCESS;
     }
 #endif
     /* Perform the actual sort */
-    qsort(lines, linecount, sizeof(char *), compare_keys);
+    qsort(lines, linecount, sizeof(lines[0]), compare_keys);
     /* handle -u */
     if (option_mask32 & FLAG_u) {
@@ -389 +400 @@
         option_mask32 |= FLAG_s;
         for (i = 1; i < linecount; i++) {
-            if (!compare_keys(&lines[flag], &lines[i]))
+            if (compare_keys(&lines[flag], &lines[i]) == 0)
                 free(lines[i]);
             else
                 lines[++flag] = lines[i];
         }
-        if (linecount) linecount = flag+1;
-    }
+        if (linecount)
+            linecount = flag+1;
+    }
+
     /* Print it */
+#if ENABLE_FEATURE_SORT_BIG
+    /* Open output file _after_ we read all input ones */
+    if (option_mask32 & FLAG_o)
+        xmove_fd(xopen(str_o, O_WRONLY|O_CREAT|O_TRUNC), STDOUT_FILENO);
+#endif
+    flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
     for (i = 0; i < linecount; i++)
-        fprintf(outfile, "%s\n", lines[i]);
+        printf("%s%c", lines[i], flag);
 
     fflush_stdout_and_exit(EXIT_SUCCESS);