X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcut.c;h=9cc22be16ef1773c293023a699c87d5ae5f7fa65;hb=e40e76f3cd3702b1891231f585e5f38867a52b29;hp=7ba947fae5f664dd928ec6a1f2b4fefddf73ec59;hpb=1385899416a4396385ad421ae1f532be7103738a;p=oweals%2Fbusybox.git diff --git a/coreutils/cut.c b/coreutils/cut.c index 7ba947fae..9cc22be16 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -4,24 +4,23 @@ * * Copyright (C) 1999,2000,2001 by Lineo, inc. * Written by Mark Whitley - * debloated by Bernhard Fischer + * debloated by Bernhard Reutner-Fischer * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include "busybox.h" +#include "libbb.h" -/* option vars */ -static const char optstring[] = "b:c:f:d:sn"; +/* This is a NOEXEC applet. Be very careful! */ -#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 unsigned opt; -static char delim = '\t'; /* delimiter, default is tab */ +/* 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) struct cut_list { int startpos; @@ -34,11 +33,6 @@ enum { NON_RANGE = -1 }; -/* 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 - @@ -46,34 +40,39 @@ static int cmpfunc(const void *a, const void *b) } -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 = bb_get_chomped_line_from_file(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; /* cut based on chars/bytes XXX: only works when sizeof(char) == byte */ - if ((opt & (CUT_OPT_CHAR_FLGS | CUT_OPT_BYTE_FLGS))) { + if (option_mask32 & (CUT_OPT_CHAR_FLGS | CUT_OPT_BYTE_FLGS)) { /* print the chars specified in each cut list */ 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'; putchar(line[spos]); } 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; + } } } } else if (delim == '\n') { /* cut by lines */ @@ -81,16 +80,17 @@ static void cut_file(FILE * file) /* 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 */ if (cl_pos >= nlists) @@ -98,7 +98,7 @@ static void cut_file(FILE * file) spos = cut_lists[cl_pos].startpos; /* 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; } } @@ -115,7 +115,7 @@ static void cut_file(FILE * file) /* does this line contain any delimiters? */ if (strchr(line, delim) == NULL) { - if (!(opt & CUT_OPT_SUPPRESS_FLGS)) + if (!(option_mask32 & CUT_OPT_SUPPRESS_FLGS)) puts(line); goto next_line; } @@ -125,7 +125,6 @@ static void cut_file(FILE * file) for (; cl_pos < nlists && line; cl_pos++) { spos = cut_lists[cl_pos].startpos; do { - /* find the field we're looking for */ while (line && ndelim < spos) { field = strsep(&line, delimiter); @@ -150,35 +149,38 @@ static void cut_file(FILE * file) * this is a list, and we're not at the end of that * list */ } while (spos <= cut_lists[cl_pos].endpos && line - && cut_lists[cl_pos].endpos != NON_RANGE); + && cut_lists[cl_pos].endpos != NON_RANGE); } } /* if we printed anything at all, we need to finish it with a * newline cuz we were handed a chomped line */ putchar('\n'); - next_line: + next_line: linenum++; free(printed); free(orig_line); } } -static const char _op_on_field[] = " only when operating on fields"; - -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"; - opt = getopt32(argc, argv, optstring, &sopt, &sopt, &sopt, <ok); + opt = getopt32(argv, optstring, &sopt, &sopt, &sopt, <ok); +// argc -= optind; + argv += optind; 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 (opt & BB_GETOPT_ERROR) - bb_error_msg_and_die("only one type of list may be specified"); + bb_error_msg_and_die("expected a list of bytes, characters, or fields"); - if ((opt & (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"); } delim = ltok[0]; @@ -186,6 +188,8 @@ int cut_main(int argc, char **argv) /* non-field (char or byte) cutting has some special handling */ 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", @@ -206,19 +210,16 @@ int cut_main(int argc, char **argv) char *ntok; 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(<ok, "-"); - 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); @@ -229,15 +230,14 @@ int cut_main(int argc, char **argv) } /* get the end pos */ - ntok = strsep(<ok, "-"); - 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_u(ltok); + /* if the user specified and end position of 0, + * that means "til the end of the line" */ if (e == 0) e = EOL; e--; /* again, arrays are zero based, lines are 1 based */ @@ -245,16 +245,13 @@ int cut_main(int argc, char **argv) e = NON_RANGE; } - /* 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++; } /* make sure we got some cut positions out of all that */ @@ -267,24 +264,24 @@ int cut_main(int argc, char **argv) qsort(cut_lists, nlists, sizeof(struct cut_list), cmpfunc); } - /* argv[(optind)..(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[optind] == NULL - || (argv[optind][0] == '-' && argv[optind][1] == '\0')) { - cut_file(stdin); - } else { - FILE *file; - - for (; optind < argc; optind++) { - file = bb_wfopen(argv[optind], "r"); - if (file) { - cut_file(file); - fclose(file); + { + int retval = EXIT_SUCCESS; + + if (!*argv) + *--argv = (char *)"-"; + + do { + 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); + fflush_stdout_and_exit(retval); } - if (ENABLE_FEATURE_CLEAN_UP) - free(cut_lists); - return EXIT_SUCCESS; }