+/* vi: set sw=4 ts=4: */
/*
* cut.c - minimalist version of cut
*
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Mark Whitley <markw@lineo.com>, <markw@enol.com>
- *
- * 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
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
+ * Written by Mark Whitley <markw@codepoet.org>
+ * debloated by Bernhard Reutner-Fischer
*
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h> /* getopt */
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include "busybox.h"
+#include "libbb.h"
+/* This is a NOEXEC applet. Be very careful! */
-/* globals from other files */
-extern int optind;
-extern char *optarg;
+/* 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)
-/* globals in this file only */
-static char part = 0; /* (b)yte, (c)har, (f)ields */
-static int startpos = 1;
-static int endpos = -1;
-static char delim = '\t'; /* delimiter, default is tab */
-static unsigned int supress_non_delimited_lines = 0;
+struct cut_list {
+ int startpos;
+ int endpos;
+};
+enum {
+ BOL = 0,
+ EOL = INT_MAX,
+ NON_RANGE = -1
+};
-/*
- * decompose_list() - parses a list and puts values into startpos and endpos.
- * valid list formats: N, N-, N-M, -M
- */
-static void decompose_list(const char *list)
+static int cmpfunc(const void *a, const void *b)
{
- unsigned int nminus = 0;
- char *ptr;
-
- /* the list must contain only digits and no more than one minus sign */
- for (ptr = (char *)list; *ptr; ptr++) {
- if (!isdigit(*ptr) && *ptr != '-') {
- error_msg_and_die("invalid byte or field list\n");
- }
- if (*ptr == '-') {
- nminus++;
- if (nminus > 1) {
- error_msg_and_die("invalid byte or field list\n");
- }
- }
- }
-
- /* handle single value 'N' case */
- if (nminus == 0) {
- startpos = strtol(list, &ptr, 10);
- if (startpos == 0) {
- error_msg_and_die("missing list of fields\n");
- }
- endpos = startpos;
- }
- /* handle multi-value cases */
- else if (nminus == 1) {
- /* handle 'N-' case */
- if (list[strlen(list) - 1] == '-') {
- startpos = strtol(list, &ptr, 10);
- }
- /* handle '-M' case */
- else if (list[0] == '-') {
- endpos = strtol(&list[1], NULL, 10);
- }
- /* handle 'N-M' case */
- else {
- startpos = strtol(list, &ptr, 10);
- endpos = strtol(ptr+1, &ptr, 10);
- }
-
- /* a sanity check */
- if (startpos == 0) {
- startpos = 1;
- }
- }
+ return (((struct cut_list *) a)->startpos -
+ ((struct cut_list *) b)->startpos);
}
-
-/*
- * snippy-snip
- */
-static void cut_file(FILE *file)
+static void cut_file(FILE *file, char delim, const struct cut_list *cut_lists, unsigned nlists)
{
char *line;
- unsigned int cr_hits = 0;
+ unsigned linenum = 0; /* keep these zero-based to be consistent */
/* go through every line in the file */
- for (line = NULL; (line = get_line_from_file(file)) != NULL; free(line)) {
- /* cut based on chars/bytes */
- if (part == 'c' || part == 'b') {
- int i;
- /* a valid end position has been specified */
- if (endpos > 0) {
- for (i = startpos-1; i < endpos; i++) {
- fputc(line[i], stdout);
- }
- fputc('\n', stdout);
- }
- /* otherwise, just go to the end of the line */
- else {
- for (i = startpos-1; line[i]; i++) {
- fputc(line[i], stdout);
- }
- }
- }
- /* cut based on fields */
- else if (part == 'f') {
- char *ptr;
- char *start = line;
- unsigned int delims_hit = 0;
-
- if (delim == '\n') {
- cr_hits++;
- if (cr_hits >= startpos && cr_hits <= endpos) {
- while (*start && *start != '\n') {
- fputc(*start, stdout);
- start++;
- }
- fputc('\n', stdout);
- }
- }
- else {
- for (ptr = line; (ptr = strchr(ptr, delim)) != NULL; ptr++) {
- delims_hit++;
- if (delims_hit == (startpos - 1)) {
- start = ptr+1;
+ 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]);
}
- if (delims_hit == endpos) {
+ 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;
}
}
-
- /* we didn't hit any delimeters */
- if (delims_hit == 0 && !supress_non_delimited_lines) {
- fputs(line, stdout);
+ }
+ } 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;
}
- /* we =did= hit some delimiters */
- else if (delims_hit > 0) {
- /* we have a fixed end point */
- if (ptr) {
- while (start < ptr) {
- fputc(*start, stdout);
- start++;
- }
- fputc('\n', stdout);
+ }
+
+ /* 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;
+ }
+
+ /* 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++;
}
- /* or we're just going til the end of the line */
- else {
- while (*start) {
- fputc(*start, stdout);
- start++;
- }
+
+ /* 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 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);
}
}
-extern 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)
{
- int opt;
-
- while ((opt = getopt(argc, argv, "b:c:d:f:ns")) > 0) {
- switch (opt) {
- case 'b':
- case 'c':
- case 'f':
- /* make sure they didn't ask for two types of lists */
- if (part != 0) {
- error_msg_and_die("only one type of list may be specified\n");
- }
- part = (char)opt;
- decompose_list(optarg);
- break;
- case 'd':
- if (strlen(optarg) > 1) {
- error_msg_and_die("the delimiter must be a single character\n");
- }
- delim = optarg[0];
- break;
- case 'n':
- /* no-op */
- break;
- case 's':
- supress_non_delimited_lines++;
- break;
+ /* 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");
}
+ delim = ltok[0];
}
- if (part == 0) {
- error_msg_and_die("you must specify a list of bytes, characters, or fields\n");
+ /* 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",
+ _op_on_field);
+ }
+ if (delim != '\t') {
+ bb_error_msg_and_die
+ ("a delimiter may be specified%s", _op_on_field);
+ }
}
- if (supress_non_delimited_lines && part != 'f') {
- error_msg_and_die("suppressing non-delimited lines makes sense"
- " only when operating on fields\n");
+ /*
+ * 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) {
- if (delim != '\t' && part != 'f') {
- error_msg_and_die("a delimiter may be specified only when operating on fields\n");
- }
+ /* it's actually legal to pass an empty list */
+ if (!ltok[0])
+ continue;
- /* 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 || (strcmp(argv[optind], "-") == 0)) {
- cut_file(stdin);
- }
- else {
- int i;
- FILE *file;
- for (i = optind; i < argc; i++) {
- file = fopen(argv[i], "r");
- if (file == NULL) {
- perror_msg("%s", argv[i]);
+ /* get the start pos */
+ ntok = strsep(<ok, "-");
+ if (!ntok[0]) {
+ s = BOL;
+ } else {
+ 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 {
- cut_file(file);
- fclose(file);
+ 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++;
}
+
+ /* make sure we got some cut positions out of all that */
+ if (nlists == 0)
+ bb_error_msg_and_die("missing list of positions");
+
+ /* 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);
}
- return EXIT_SUCCESS;
+ {
+ 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);
+ }
}
projects / oweals / busybox.git / blobdiff