X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcut.c;h=2c27b704f58e2795988765a42c60b974712f2e3b;hb=d5ac9c88a7f620f6b775e404b145017827a10480;hp=89a934e76b60fc7d3da3a92d3f32744d7b449751;hpb=7ab9c7ee52db8759d457819f5480378fa3aa97cc;p=oweals%2Fbusybox.git diff --git a/coreutils/cut.c b/coreutils/cut.c index 89a934e76..2c27b704f 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -1,372 +1,306 @@ /* vi: set sw=4 ts=4: */ /* - * cut implementation for busybox + * cut.c - minimalist version of cut * - * Copyright (c) Michael J. Holme + * Copyright (C) 1999,2000,2001 by Lineo, inc. + * Written by Mark Whitley + * debloated by Bernhard Reutner-Fischer * - * This version of cut is adapted from Minix cut and was modified - * by Erik Andersen to be used in busybox. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Original copyright notice is retained at the end of this file. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -#include "internal.h" -#include -#include -#include -#include -#include -#include -#define BB_DECLARE_EXTERN -#define bb_need_help -#include "messages.c" - -#define MAX_FIELD 80 /* Pointers to the beginning of each field - * are stored in columns[], if a line holds - * more than MAX_FIELD columns the array - * boundary is exceed. But unlikely at 80 */ - -#define MAX_ARGS 32 /* Maximum number of fields following -f or - * -c switches */ -int args[MAX_ARGS * 2]; -int num_args; - -/* Lots of new defines, should easen maintainance... */ -#define DUMP_STDIN 0 /* define for mode: no options */ -#define OPTIONF 1 /* define for mode: option -f */ -#define OPTIONC 2 /* define for mode: option -c */ -#define OPTIONB 3 /* define for mode: option -b */ -#define NOTSET 0 /* option not selected */ -#define SET 1 /* option selected */ - -/* Defines for the warnings */ -#define DELIMITER_NOT_APPLICABLE 0 -#define OVERRIDING_PREVIOUS_MODE 1 -#define OPTION_NOT_APPLICABLE 2 -#define UNKNOWN_OPTION 3 -#define FILE_NOT_READABLE 4 - -/* Defines for the fatal errors */ -#define SYNTAX_ERROR 101 -#define POSITION_ERROR 102 -#define LINE_TO_LONG_ERROR 103 -#define RANGE_ERROR 104 -#define MAX_FIELDS_EXEEDED_ERROR 105 -#define MAX_ARGS_EXEEDED_ERROR 106 - - -int mode; /* 0 = dump stdin to stdout, 1=-f, 2=-c */ -char delim = '\t'; /* default delimiting character */ -FILE *fd; -char *name; -char line[BUFSIZ]; -int exit_status; - -int cut_main(int argc, char **argv); -void warn(int warn_number, char *option); -void cuterror(int err); -void get_args(void); -void cut(void); - -void warn(int warn_number, char *option) +//usage:#define cut_trivial_usage +//usage: "[OPTIONS] [FILE]..." +//usage:#define cut_full_usage "\n\n" +//usage: "Print selected fields from each input FILE to stdout\n" +//usage: "\n -b LIST Output only bytes from LIST" +//usage: "\n -c LIST Output only characters from LIST" +//usage: "\n -d CHAR Use CHAR instead of tab as the field delimiter" +//usage: "\n -s Output only the lines containing delimiter" +//usage: "\n -f N Print only these fields" +//usage: "\n -n Ignored" +//usage: +//usage:#define cut_example_usage +//usage: "$ echo \"Hello world\" | cut -f 1 -d ' '\n" +//usage: "Hello\n" +//usage: "$ echo \"Hello world\" | cut -f 2 -d ' '\n" +//usage: "world\n" + +#include "libbb.h" + +/* This is a NOEXEC applet. Be very careful! */ + + +/* 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; + int endpos; +}; + +enum { + BOL = 0, + EOL = INT_MAX, + NON_RANGE = -1 +}; + +static int cmpfunc(const void *a, const void *b) { - static char *warn_msg[] = { - "%s: Option -d allowed only with -f\n", - "%s: -%s overrides earlier option\n", - "%s: -%s not allowed in current mode\n", - "%s: Cannot open %s\n" - }; - - fprintf(stderr, warn_msg[warn_number], name, option); - exit_status = warn_number + 1; - + return (((struct cut_list *) a)->startpos - + ((struct cut_list *) b)->startpos); } -void cuterror(int err) +static void cut_file(FILE *file, char delim, const struct cut_list *cut_lists, unsigned nlists) { - static char *err_mes[] = { - "%s: syntax error\n", - "%s: position must be >0\n", - "%s: line longer than BUFSIZ\n", - "%s: range must not decrease from left to right\n", - "%s: MAX_FIELD exceeded\n", - "%s: MAX_ARGS exceeded\n" - }; - - fprintf(stderr, err_mes[err - 101], name); - exit(err); -} - + char *line; + unsigned linenum = 0; /* keep these zero-based to be consistent */ + + /* go through every line in the file */ + while ((line = xmalloc_fgetline(file)) != NULL) { + + /* set up a list so we can keep track of what's been printed */ + 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 (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 < linelen) { + if (!printed[spos]) { + printed[spos] = 'X'; + putchar(line[spos]); + } + spos++; + if (spos > cut_lists[cl_pos].endpos + /* 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 */ + spos = cut_lists[cl_pos].startpos; + + /* get out if we have no more lists to process or if the lines + * are lower than what we're interested in */ + 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 < (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 + ) { + cl_pos++; + /* get out if there's no more lists to process */ + if (cl_pos >= nlists) + goto next_line; + spos = cut_lists[cl_pos].startpos; + /* get out if the current line is lower than the one + * we just became interested in */ + if ((int)linenum < spos) + goto next_line; + } + } -void get_args() -{ - int i = 0; - int arg_ptr = 0; - int flag; - - num_args = 0; - do { - if (num_args == MAX_ARGS) - cuterror(MAX_ARGS_EXEEDED_ERROR); - if (!isdigit(line[i]) && line[i] != '-') - cuterror(SYNTAX_ERROR); - - args[arg_ptr] = 1; - args[arg_ptr + 1] = BUFSIZ; - flag = 1; - - while (line[i] != ',' && line[i] != 0) { - if (isdigit(line[i])) { - args[arg_ptr] = 0; - while (isdigit(line[i])) - args[arg_ptr] = 10 * args[arg_ptr] + line[i++] - '0'; - if (!args[arg_ptr]) - cuterror(POSITION_ERROR); - arg_ptr++; + /* If we made it here, it means we've found the line we're + * looking for, so print it */ + puts(line); + goto next_line; + } else { /* cut by fields */ + int ndelim = -1; /* zero-based / one-based problem */ + int nfields_printed = 0; + char *field = NULL; + char delimiter[2]; + + delimiter[0] = delim; + delimiter[1] = 0; + + /* does this line contain any delimiters? */ + if (strchr(line, delim) == NULL) { + if (!(option_mask32 & CUT_OPT_SUPPRESS_FLGS)) + puts(line); + goto next_line; } - if (line[i] == '-') { - arg_ptr |= 1; - i++; - flag = 0; + + /* process each list on this line, for as long as we've got + * a line to process */ + 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); + ndelim++; + } + + /* we found it, and it hasn't been printed yet */ + if (field && ndelim == spos && !printed[ndelim]) { + /* if this isn't our first time through, we need to + * print the delimiter after the last field that was + * printed */ + if (nfields_printed > 0) + putchar(delim); + fputs(field, stdout); + printed[ndelim] = 'X'; + nfields_printed++; /* shouldn't overflow.. */ + } + + spos++; + + /* keep going as long as we have a line to work with, + * 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); } } - if (flag && arg_ptr & 1) - args[arg_ptr] = args[arg_ptr - 1]; - if (args[num_args * 2] > args[num_args * 2 + 1]) - cuterror(RANGE_ERROR); - num_args++; - arg_ptr = num_args * 2; + /* 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: + linenum++; + free(printed); + free(orig_line); } - while (line[i++]); } - -void cut() +int cut_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int cut_main(int argc UNUSED_PARAM, char **argv) { - int i, j, length, maxcol=0; - char *columns[MAX_FIELD]; - - while (fgets(line, BUFSIZ, fd)) { - length = strlen(line) - 1; - *(line + length) = 0; - switch (mode) { - case DUMP_STDIN: - printf("%s", line); - break; - case OPTIONF: - columns[maxcol++] = line; - for (i = 0; i < length; i++) { - if (*(line + i) == delim) { - *(line + i) = 0; - if (maxcol == MAX_FIELD) - cuterror(MAX_FIELDS_EXEEDED_ERROR); - columns[maxcol] = line + i + 1; - maxcol++; - } - } - if (maxcol != 1) { - for (i = 0; i < num_args; i++) { - for (j = args[i * 2]; j <= args[i * 2 + 1]; j++) - if (j <= maxcol) { - printf("%s", columns[j - 1]); - if (i != num_args - 1 || j != args[i * 2 + 1]) - putchar(delim); - } - } - } - break; - case OPTIONC: - for (i = 0; i < num_args; i++) { - for (j = args[i * 2]; - j <= (args[i * 2 + 1] > - length ? length : args[i * 2 + 1]); j++) - putchar(*(line + j - 1)); - } + /* 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(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 & 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"); } - if (maxcol != 1) - putchar('\n'); + delim = ltok[0]; } -} + /* 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"; -int cut_main(int argc, char **argv) -{ - int i = 1; - int numberFilenames = 0; - - name = argv[0]; - - if (argc == 1 || strcmp(argv[1], dash_dash_help)==0) - usage( "cut [OPTION]... [FILE]...\n" -#ifndef BB_FEATURE_TRIVIAL_HELP - "\nPrints selected fields from each input FILE to standard output.\n\n" - "Options:\n" - "\t-b LIST\tOutput only bytes from LIST\n" - "\t-c LIST\tOutput only characters from LIST\n" - "\t-d DELIM\tUse DELIM instead of tab as the field delimiter\n" - "\t-f N\tPrint only these fields\n" - "\t-n\tIgnored\n" -#endif - ); - - while (i < argc) { - if (argv[i][0] == '-') { - switch (argv[i++][1]) { - case 'd': - if (mode == OPTIONC || mode == OPTIONB) - warn(DELIMITER_NOT_APPLICABLE, "d"); - delim = argv[i++][0]; - break; - case 'f': - sprintf(line, "%s", argv[i++]); - if (mode == OPTIONC || mode == OPTIONB) - warn(OVERRIDING_PREVIOUS_MODE, "f"); - mode = OPTIONF; - break; - case 'b': - sprintf(line, "%s", argv[i++]); - if (mode == OPTIONF || mode == OPTIONC) - warn(OVERRIDING_PREVIOUS_MODE, "b"); - mode = OPTIONB; - break; - case 'c': - sprintf(line, "%s", argv[i++]); - if (mode == OPTIONF || mode == OPTIONB) - warn(OVERRIDING_PREVIOUS_MODE, "c"); - mode = OPTIONC; - break; - case '\0': /* - means: read from stdin */ - numberFilenames++; - break; - case 'n': /* needed for Posix, but no effect here */ - if (mode != OPTIONB) - warn(OPTION_NOT_APPLICABLE, "n"); - break; - default: - warn(UNKNOWN_OPTION, &(argv[i - 1][1])); - } - } else { - i++; - numberFilenames++; + if (opt & CUT_OPT_SUPPRESS_FLGS) { + bb_error_msg_and_die + ("suppressing non-delimited lines makes sense%s", + _op_on_field); + } + if (delim != '\t') { + bb_error_msg_and_die + ("a delimiter may be specified%s", _op_on_field); } } -/* Here follow the checks, if the selected options are reasonable. */ - if (mode == OPTIONB) /* since in Minix char := byte */ - mode = OPTIONC; - get_args(); - if (numberFilenames != 0) { - i = 1; - while (i < argc) { - if (argv[i][0] == '-') { - switch (argv[i][1]) { - case 'f': - case 'c': - case 'b': - case 'd': - i += 2; - break; - case 'n': - case 'i': - case 's': - i++; - break; - case '\0': - fd = stdin; - i++; - cut(); - break; - default: - i++; - } + /* + * parse list and put values into startpos and endpos. + * valid list formats: N, N-, N-M, -M + * more than one list can be separated by commas + */ + { + char *ntok; + int s = 0, e = 0; + + /* 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 (!ltok[0]) + continue; + + /* get the start pos */ + ntok = strsep(<ok, "-"); + if (!ntok[0]) { + s = BOL; } else { - if ((fd = fopen(argv[i++], "r")) == NULL) { - warn(FILE_NOT_READABLE, argv[i - 1]); - } else { - cut(); - fclose(fd); - } + 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 */ + if (s != 0) + s--; + } + + /* get the end pos */ + if (ltok == NULL) { + e = NON_RANGE; + } else if (!ltok[0]) { + e = EOL; + } else { + 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; + e--; /* again, arrays are zero based, lines are 1 based */ + if (e == s) + e = NON_RANGE; } + + /* add the new list */ + 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++; } - } else { - fd = stdin; - cut(); - } - exit(exit_status); -} + /* make sure we got some cut positions out of all that */ + if (nlists == 0) + bb_error_msg_and_die("missing list of positions"); -/* cut - extract columns from a file or stdin. Author: Michael J. Holme - * - * Copyright 1989, Michael John Holme, All rights reserved. - * This code may be freely distributed, provided that this notice - * remains intact. - * - * V1.1: 6th September 1989 - * - * Bugs, criticisms, etc, - * c/o Mark Powell - * JANET sq79@uk.ac.liv - * ARPA sq79%liv.ac.uk@nsfnet-relay.ac.uk - * UUCP ...!mcvax!ukc!liv.ac.uk!sq79 - *------------------------------------------------------------------------- - * Changed for POSIX1003.2/Draft10 conformance - * Thomas Brupbacher (tobr@mw.lpc.ethz.ch), September 1990. - * Changes: - * - separation of error messages ( stderr) and output (stdout). - * - support for -b and -n (no effect, -b acts as -c) - * - support for -s - *------------------------------------------------------------------------- - */ + /* now that the lists are parsed, we need to sort them to make life + * easier on us when it comes time to print the chars / fields / lines + */ + qsort(cut_lists, nlists, sizeof(cut_lists[0]), cmpfunc); + } -/* - * Copyright (c) 1987,1997, Prentice Hall - * All rights reserved. - * - * Redistribution and use of the MINIX operating system in source and - * binary forms, with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * Neither the name of Prentice Hall nor the names of the software - * authors or contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, AND - * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL PRENTICE HALL OR ANY AUTHORS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ + { + 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); + } +}