+/* vi: set sw=8 ts=8: */
/*
* cut.c - minimalist version of cut
*
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h> /* getopt */
+#include <getopt.h>
+#include <unistd.h>
#include <string.h>
#include <limits.h>
#include "busybox.h"
-/* globals from other files */
-extern int optind;
-extern char *optarg;
-
-
/* option vars */
-static char part = 0; /* (b)yte, (c)har, (f)ields */
-static unsigned int supress_non_delimited_lines = 0;
+static const char optstring[] = "b:c:f:d:sn";
+#define OPT_BYTE_FLGS 1
+#define OPT_CHAR_FLGS 2
+#define OPT_FIELDS_FLGS 4
+#define OPT_DELIM_FLGS 8
+#define OPT_SUPRESS_FLGS 16
+static char part; /* (b)yte, (c)har, (f)ields */
+static unsigned int supress_non_delimited_lines;
static char delim = '\t'; /* delimiter, default is tab */
struct cut_list {
} else {
s = strtoul(ntok, &junk, 10);
if(*junk != '\0' || s < 0)
- error_msg_and_die("invalid byte or field list");
+ bb_error_msg_and_die("invalid byte or field list");
/* account for the fact that arrays are zero based, while the user
* expects the first char on the line to be char # 1 */
} else {
e = strtoul(ntok, &junk, 10);
if(*junk != '\0' || e < 0)
- error_msg_and_die("invalid byte or field list");
+ bb_error_msg_and_die("invalid byte or field list");
/* if the user specified and end position of 0, that means "til the
* end of the line */
if (e == 0)
/* if there's something left to tokenize, the user past an invalid list */
if (ltok)
- error_msg_and_die("invalid byte or field list");
+ bb_error_msg_and_die("invalid byte or field list");
/* add the new list */
cut_lists = xrealloc(cut_lists, sizeof(struct cut_list) * (++nlists));
/* make sure we got some cut positions out of all that */
if (nlists == 0)
- error_msg_and_die("missing list of positions");
+ 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 */
unsigned int linenum = 0; /* keep these zero-based to be consistent */
/* go through every line in the file */
- while ((line = get_line_from_file(file)) != NULL) {
- chomp(line);
+ while ((line = bb_get_chomped_line_from_file(file)) != NULL) {
/* cut based on chars/bytes XXX: only works when sizeof(char) == byte */
- if (part == 'c' || part == 'b')
+ if ((part & (OPT_CHAR_FLGS | OPT_BYTE_FLGS)))
cut_line_by_chars(line);
/* cut based on fields */
- else if (part == 'f') {
+ else {
if (delim == '\n')
cut_file_by_lines(line, linenum);
else
extern 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");
- }
- part = (char)opt;
- parse_lists(optarg);
- break;
- case 'd':
- if (strlen(optarg) > 1) {
- error_msg_and_die("the delimiter must be a single character");
- }
- delim = optarg[0];
- break;
- case 'n':
- /* no-op */
- break;
- case 's':
- supress_non_delimited_lines++;
- break;
+ unsigned long opt;
+ char *sopt, *sdopt;
+
+ bb_opt_complementaly = "b~bcf:c~bcf:f~bcf";
+ opt = bb_getopt_ulflags(argc, argv, optstring, &sopt, &sopt, &sopt, &sdopt);
+ part = opt & (OPT_BYTE_FLGS|OPT_CHAR_FLGS|OPT_FIELDS_FLGS);
+ if(part == 0)
+ bb_error_msg_and_die("you must specify a list of bytes, characters, or fields");
+ if(opt & 0x80000000UL)
+ bb_error_msg_and_die("only one type of list may be specified");
+ parse_lists(sopt);
+ if((opt & (OPT_DELIM_FLGS))) {
+ if (strlen(sdopt) > 1) {
+ bb_error_msg_and_die("the delimiter must be a single character");
}
+ delim = sdopt[0];
}
-
- if (part == 0) {
- error_msg_and_die("you must specify a list of bytes, characters, or fields");
- }
+ supress_non_delimited_lines = opt & OPT_SUPRESS_FLGS;
/* non-field (char or byte) cutting has some special handling */
- if (part != 'f') {
+ if (part != OPT_FIELDS_FLGS) {
if (supress_non_delimited_lines) {
- error_msg_and_die("suppressing non-delimited lines makes sense"
+ bb_error_msg_and_die("suppressing non-delimited lines makes sense"
" only when operating on fields");
}
- if (delim != '\t' && part != 'f') {
- error_msg_and_die("a delimiter may be specified only when operating on fields");
+ if (delim != '\t') {
+ bb_error_msg_and_die("a delimiter may be specified only when operating on fields");
}
}
int i;
FILE *file;
for (i = optind; i < argc; i++) {
- file = fopen(argv[i], "r");
- if (file == NULL) {
- perror_msg("%s", argv[i]);
- } else {
+ file = bb_wfopen(argv[i], "r");
+ if(file) {
cut_file(file);
fclose(file);
}
projects / oweals / busybox.git / blobdiff