X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcut.c;h=257f3d6498f040b93c3afd092d3d05497b4049c9;hb=be039374f3bd1c76535387ac4d079506804be270;hp=262390e170bfee14615d1b91f74de6e7301792ff;hpb=6c6ea6cba2aee7b116dc3d5a64f511fb97468cd1;p=oweals%2Fbusybox.git

diff --git a/coreutils/cut.c b/coreutils/cut.c
index 262390e17..257f3d649 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -1,246 +1,288 @@
+/* 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@codepoet.org>
- *
- * 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 Fischer
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#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;
+static char delim = '\t';	/* delimiter, default is tab */
 
+struct cut_list {
+	int startpos;
+	int endpos;
+};
 
-/*
- * 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)
-{
-	unsigned int nminus = 0;
-	char *ptr;
+enum {
+	BOL = 0,
+	EOL = INT_MAX,
+	NON_RANGE = -1
+};
 
-	/* 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");
-			}
-		}
-	}
+/* growable array holding a series of lists */
+static struct cut_list *cut_lists;
+static unsigned int nlists;	/* number of elements in above list */
 
-	/* 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;
-		}
-	}
-}
+static int cmpfunc(const void *a, const void *b)
+{
+	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 *line;
-	unsigned int cr_hits = 0;
+	char *line = NULL;
+	unsigned int 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);
+	while ((line = xmalloc_getline(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 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 < strlen(line)) {
+					if (!printed[spos]) {
+						printed[spos] = 'X';
+						putchar(line[spos]);
+					}
+					spos++;
+					if (spos > cut_lists[cl_pos].endpos
+						|| cut_lists[cl_pos].endpos == NON_RANGE)
+						break;
 				}
-				fputc('\n', stdout);
 			}
-			/* otherwise, just go to the end of the line */
-			else {
-				for (i = startpos-1; line[i]; i++) {
-					fputc(line[i], 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 (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) {
+				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 (linenum < spos)
+						goto next_line;
 				}
 			}
-		} 
-		/* 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);
-				}
+
+			/* 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;
+			const char delimiter[2] = { delim, 0 };
+
+			/* does this line contain any delimiters? */
+			if (strchr(line, delim) == NULL) {
+				if (!(option_mask32 & CUT_OPT_SUPPRESS_FLGS))
+					puts(line);
+				goto next_line;
 			}
-			else {
-				for (ptr = line; (ptr = strchr(ptr, delim)) != NULL; ptr++) {
-					delims_hit++;
-					if (delims_hit == (startpos - 1)) {
-						start = ptr+1;
-					}
-					if (delims_hit == endpos) {
-						break;
-					}
-				}
-			
-				/* we didn't hit any delimeters */
-				if (delims_hit == 0 && !supress_non_delimited_lines) {
-					fputs(line, stdout);
-				}
-				/* 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);
+
+			/* 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)
+static const char _op_on_field[] ALIGN1 = " only when operating on fields";
+
+int cut_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cut_main(int argc, 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;
+	char *sopt, *ltok;
+
+	opt_complementary = "b--bcf:c--bcf:f--bcf";
+	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)))
+		bb_error_msg_and_die("expected a list of bytes, characters, or fields");
+
+	if (option_mask32 & CUT_OPT_DELIM_FLGS) {
+		if (strlen(ltok) > 1) {
+			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 (!(option_mask32 & CUT_OPT_FIELDS_FLGS)) {
+		if (option_mask32 & 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 (strlen(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) {
+				s = BOL;
+			} else {
+				s = xatoi_u(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 */
+			ntok = strsep(&ltok, "-");
+			if (ntok == NULL) {
+				e = NON_RANGE;
+			} else if (strlen(ntok) == 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 */
+				if (e == 0)
+					e = EOL;
+				e--;	/* again, arrays are zero based, lines are 1 based */
+				if (e == s)
+					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;
+		}
+
+		/* 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(struct cut_list), cmpfunc);
 	}
 
-	/* argv[(optind)..(argc-1)] should be names of file to process. If no
+	/* 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[optind] == NULL || (strcmp(argv[optind], "-") == 0)) {
+	if (argv[0] == NULL || LONE_DASH(argv[0])) {
 		cut_file(stdin);
-	}
-	else {
-		int i;
+	} else {
 		FILE *file;
-		for (i = optind; i < argc; i++) {
-			file = fopen(argv[i], "r");
-			if (file == NULL) {
-				perror_msg("%s", argv[i]);
-			} else {
+
+		do {
+			file = fopen_or_warn(argv[0], "r");
+			if (file) {
 				cut_file(file);
 				fclose(file);
 			}
-		}
+		} while (*++argv);
 	}
-
+	if (ENABLE_FEATURE_CLEAN_UP)
+		free(cut_lists);
 	return EXIT_SUCCESS;
 }