Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/cut.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/cut.c (modified) (15 diffs)

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

@@ -5 +5 @@
  * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Mark Whitley <markw@codepoet.org>
- * debloated by Bernhard Fischer
+ * debloated by Bernhard Reutner-Fischer
  *
- * 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.
  */
 
@@ -17 +17 @@
 /* option vars */
 static const char optstring[] ALIGN1 = "b:c:f:d:sn";
-#define CUT_OPT_BYTE_FLGS   (1<<0)
-#define CUT_OPT_CHAR_FLGS   (1<<1)
-#define CUT_OPT_FIELDS_FLGS (1<<2)
-#define CUT_OPT_DELIM_FLGS  (1<<3)
-#define CUT_OPT_SUPPRESS_FLGS (1<<4)
-
-static char delim = '\t';   /* delimiter, default is tab */
+#define CUT_OPT_BYTE_FLGS     (1 << 0)
+#define CUT_OPT_CHAR_FLGS     (1 << 1)
+#define CUT_OPT_FIELDS_FLGS   (1 << 2)
+#define CUT_OPT_DELIM_FLGS    (1 << 3)
+#define CUT_OPT_SUPPRESS_FLGS (1 << 4)
 
 struct cut_list {
@@ -36 +34 @@
 };
 
-/* growable array holding a series of lists */
-static struct cut_list *cut_lists;
-static unsigned int nlists; /* number of elements in above list */
-
-
 static int cmpfunc(const void *a, const void *b)
 {
     return (((struct cut_list *) a)->startpos -
             ((struct cut_list *) b)->startpos);
-
 }
 
-static void cut_file(FILE * file)
+static void cut_file(FILE *file, char delim, const struct cut_list *cut_lists, unsigned nlists)
 {
-    char *line = NULL;
-    unsigned int linenum = 0;   /* keep these zero-based to be consistent */
+    char *line;
+    unsigned linenum = 0;   /* keep these zero-based to be consistent */
 
     /* go through every line in the file */
-    while ((line = xmalloc_getline(file)) != NULL) {
+    while ((line = xmalloc_fgetline(file)) != NULL) {
 
         /* set up a list so we can keep track of what's been printed */
-        char * printed = xzalloc(strlen(line) * sizeof(char));
-        char * orig_line = line;
-        unsigned int cl_pos = 0;
+        int linelen = strlen(line);
+        char *printed = xzalloc(linelen + 1);
+        char *orig_line = line;
+        unsigned cl_pos = 0;
         int spos;
 
@@ -67 +60 @@
             for (; cl_pos < nlists; cl_pos++) {
                 spos = cut_lists[cl_pos].startpos;
-                while (spos < strlen(line)) {
+                while (spos < linelen) {
                     if (!printed[spos]) {
                         printed[spos] = 'X';
@@ -74 +67 @@
                     spos++;
                     if (spos > cut_lists[cl_pos].endpos
-                        || cut_lists[cl_pos].endpos == NON_RANGE)
+                    /* NON_RANGE is -1, so if below is true,
+                     * the above was true too (spos is >= 0) */
+                    /* || cut_lists[cl_pos].endpos == NON_RANGE */
+                    ) {
                         break;
+                    }
                 }
             }
@@ -83 +80 @@
             /* get out if we have no more lists to process or if the lines
              * are lower than what we're interested in */
-            if (linenum < spos || cl_pos >= nlists)
+            if (((int)linenum < spos) || (cl_pos >= nlists))
                 goto next_line;
 
             /* if the line we're looking for is lower than the one we were
              * passed, it means we displayed it already, so move on */
-            while (spos < linenum) {
+            while (spos < (int)linenum) {
                 spos++;
                 /* go to the next list if we're at the end of this one */
                 if (spos > cut_lists[cl_pos].endpos
-                    || cut_lists[cl_pos].endpos == NON_RANGE) {
+                 || cut_lists[cl_pos].endpos == NON_RANGE
+                ) {
                     cl_pos++;
                     /* get out if there's no more lists to process */
@@ -100 +98 @@
                     /* get out if the current line is lower than the one
                      * we just became interested in */
-                    if (linenum < spos)
+                    if ((int)linenum < spos)
                         goto next_line;
                 }
@@ -113 +111 @@
             int nfields_printed = 0;
             char *field = NULL;
-            const char delimiter[2] = { delim, 0 };
+            char delimiter[2];
+
+            delimiter[0] = delim;
+            delimiter[1] = 0;
 
             /* does this line contain any delimiters? */
@@ -151 +152 @@
                      * list */
                 } while (spos <= cut_lists[cl_pos].endpos && line
-                         && cut_lists[cl_pos].endpos != NON_RANGE);
+                        && cut_lists[cl_pos].endpos != NON_RANGE);
             }
         }
@@ -164 +165 @@
 }
 
-static const char _op_on_field[] ALIGN1 = " only when operating on fields";
-
-int cut_main(int argc, char **argv);
-int cut_main(int argc, char **argv)
+int cut_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cut_main(int argc UNUSED_PARAM, char **argv)
 {
+    /* growable array holding a series of lists */
+    struct cut_list *cut_lists = NULL;
+    unsigned nlists = 0;    /* number of elements in above list */
+    char delim = '\t';  /* delimiter, default is tab */
     char *sopt, *ltok;
+    unsigned opt;
 
     opt_complementary = "b--bcf:c--bcf:f--bcf";
-    getopt32(argv, optstring, &sopt, &sopt, &sopt, &ltok);
+    opt = getopt32(argv, optstring, &sopt, &sopt, &sopt, &ltok);
 //  argc -= optind;
     argv += optind;
-    if (!(option_mask32 & (CUT_OPT_BYTE_FLGS | CUT_OPT_CHAR_FLGS | CUT_OPT_FIELDS_FLGS)))
+    if (!(opt & (CUT_OPT_BYTE_FLGS | CUT_OPT_CHAR_FLGS | CUT_OPT_FIELDS_FLGS)))
         bb_error_msg_and_die("expected a list of bytes, characters, or fields");
 
-    if (option_mask32 & CUT_OPT_DELIM_FLGS) {
-        if (strlen(ltok) > 1) {
+    if (opt & CUT_OPT_DELIM_FLGS) {
+        if (ltok[0] && ltok[1]) { /* more than 1 char? */
             bb_error_msg_and_die("the delimiter must be a single character");
         }
@@ -186 +190 @@
 
     /*  non-field (char or byte) cutting has some special handling */
-    if (!(option_mask32 & CUT_OPT_FIELDS_FLGS)) {
-        if (option_mask32 & CUT_OPT_SUPPRESS_FLGS) {
+    if (!(opt & CUT_OPT_FIELDS_FLGS)) {
+        static const char _op_on_field[] ALIGN1 = " only when operating on fields";
+
+        if (opt & CUT_OPT_SUPPRESS_FLGS) {
             bb_error_msg_and_die
                 ("suppressing non-delimited lines makes sense%s",
@@ -207 +213 @@
         int s = 0, e = 0;
 
-        /* take apart the lists, one by one (they are separated with commas */
+        /* take apart the lists, one by one (they are separated with commas) */
         while ((ltok = strsep(&sopt, ",")) != NULL) {
 
             /* it's actually legal to pass an empty list */
-            if (strlen(ltok) == 0)
+            if (!ltok[0])
                 continue;
 
             /* get the start pos */
             ntok = strsep(&ltok, "-");
-            if (ntok == NULL) {
-                bb_error_msg
-                    ("internal error: ntok is null for start pos!?\n");
-            } else if (strlen(ntok) == 0) {
+            if (!ntok[0]) {
                 s = BOL;
             } else {
-                s = xatoi_u(ntok);
+                s = xatoi_positive(ntok);
                 /* account for the fact that arrays are zero based, while
                  * the user expects the first char on the line to be char #1 */
@@ -230 +233 @@
 
             /* get the end pos */
-            ntok = strsep(&ltok, "-");
-            if (ntok == NULL) {
+            if (ltok == NULL) {
                 e = NON_RANGE;
-            } else if (strlen(ntok) == 0) {
+            } else if (!ltok[0]) {
                 e = EOL;
             } else {
-                e = xatoi_u(ntok);
-                /* if the user specified and end position of 0, that means "til the
-                 * end of the line */
+                e = xatoi_positive(ltok);
+                /* if the user specified and end position of 0,
+                 * that means "til the end of the line" */
                 if (e == 0)
                     e = EOL;
@@ -246 +248 @@
             }
 
-            /* if there's something left to tokenize, the user passed
-             * an invalid list */
-            if (ltok)
-                bb_error_msg_and_die("invalid byte or field list");
-
             /* add the new list */
-            cut_lists = xrealloc(cut_lists, sizeof(struct cut_list) * (++nlists));
-            cut_lists[nlists-1].startpos = s;
-            cut_lists[nlists-1].endpos = e;
+            cut_lists = xrealloc_vector(cut_lists, 4, nlists);
+            /* NB: startpos is always >= 0,
+             * while endpos may be = NON_RANGE (-1) */
+            cut_lists[nlists].startpos = s;
+            cut_lists[nlists].endpos = e;
+            nlists++;
         }
 
@@ -264 +264 @@
          * easier on us when it comes time to print the chars / fields / lines
          */
-        qsort(cut_lists, nlists, sizeof(struct cut_list), cmpfunc);
-    }
-
-    /* argv[0..argc-1] should be names of file to process. If no
-     * files were specified or '-' was specified, take input from stdin.
-     * Otherwise, we process all the files specified. */
-    if (argv[0] == NULL || LONE_DASH(argv[0])) {
-        cut_file(stdin);
-    } else {
-        FILE *file;
+        qsort(cut_lists, nlists, sizeof(cut_lists[0]), cmpfunc);
+    }
+
+    {
+        int retval = EXIT_SUCCESS;
+
+        if (!*argv)
+            *--argv = (char *)"-";
 
         do {
-            file = fopen_or_warn(argv[0], "r");
-            if (file) {
-                cut_file(file);
-                fclose(file);
-            }
+            FILE *file = fopen_or_warn_stdin(*argv);
+            if (!file) {
+                retval = EXIT_FAILURE;
+                continue;
+            }
+            cut_file(file, delim, cut_lists, nlists);
+            fclose_if_not_stdin(file);
         } while (*++argv);
-    }
-    if (ENABLE_FEATURE_CLEAN_UP)
-        free(cut_lists);
-    return EXIT_SUCCESS;
+
+        if (ENABLE_FEATURE_CLEAN_UP)
+            free(cut_lists);
+        fflush_stdout_and_exit(retval);
+    }
 }