rpm2cpio: handle bz2 too; code shrink

[oweals/busybox.git] / coreutils / sort.c

diff --git a/coreutils/sort.c b/coreutils/sort.c
index d8df4c53260e63a8aa9de10c3a9a6f375e034562..fad6d124465b27b8b6e8770a80794f5261a0a8e7 100644 (file)
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -59,7 +59,8 @@ static struct sort_key {
 
 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 */
        if (key->range[0] == 1 && !key->range[1] && !key->range[2] && !key->range[3]
@@ -150,9 +151,9 @@ static struct sort_key *add_key(void)
 #define GET_LINE(fp) \
        ((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
 
 /* Iterate through keys list and perform comparisons */
@@ -275,7 +276,7 @@ static unsigned str2u(char **str)
 #endif
 
 int sort_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int sort_main(int argc, char **argv)
+int sort_main(int argc UNUSED_PARAM, char **argv)
 {
        FILE *fp, *outfile = stdout;
        char *line, **lines = NULL;
@@ -292,7 +293,7 @@ int sort_main(int argc, char **argv)
                        "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_o) outfile = xfopen_for_write(str_o);
        if (option_mask32 & FLAG_t) {
                if (!str_t[0] || str_t[1])
                        bb_error_msg_and_die("bad -t parameter");
@@ -313,7 +314,7 @@ int sort_main(int argc, char **argv)
                        0
                };
                struct sort_key *key = add_key();
-               char *str_k = lst_k->data;
+               char *str_k = llist_pop(&lst_k);
                const char *temp2;
 
                i = 0; /* i==0 before comma, 1 after (-k3,6) */
@@ -343,27 +344,28 @@ int sort_main(int argc, char **argv)
                                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;
 
        /* 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*)"-";
+       do {
+               /* coreutils 6.9 compat: abort on first open error,
+                * do not continue to next file: */
+               fp = xfopen_stdin(*argv);
                for (;;) {
                        line = GET_LINE(fp);
                        if (!line) break;
-                       if (!(linecount & 63))
-                               lines = xrealloc(lines, sizeof(char *) * (linecount + 64));
+                       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 */
        if (!key_list)