aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-06-20 09:16:00 +0000
committerEric Andersen <andersen@codepoet.org>2003-06-20 09:16:00 +0000
commitc9e702492431593a22be3c3e5ab57643d478f77d (patch)
treeda652c44e21c8f54c092b1152fd3850f9d09ce4d
parent0f08e53535a7a1c0d4f7699f2e4224a255921559 (diff)
downloadbusybox-c9e702492431593a22be3c3e5ab57643d478f77d.tar.gz
Add prototype update missing from last_patch89. Fix screwy
formatting in cut.
-rw-r--r--coreutils/cut.c7
-rw-r--r--include/libbb.h2
2 files changed, 5 insertions, 4 deletions
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 8ae762fb3..34ec3690c 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -1,3 +1,4 @@
+/* vi: set sw=8 ts=8: */
/*
* cut.c - minimalist version of cut
*
@@ -300,12 +301,12 @@ extern int cut_main(int argc, char **argv)
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");
+ 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");
- }
+ bb_error_msg_and_die("the delimiter must be a single character");
+ }
delim = sdopt[0];
}
supress_non_delimited_lines = opt & OPT_SUPRESS_FLGS;
diff --git a/include/libbb.h b/include/libbb.h
index 0a9f2a271..6f8a5040c 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -161,7 +161,7 @@ extern void bb_fflush_stdout_and_exit(int retval) __attribute__ ((noreturn));
extern const char *bb_opt_complementaly;
extern const struct option *bb_applet_long_options;
-extern unsigned long bb_getopt_ulflags(int argc, char **argv, const char *applet_opts);
+extern unsigned long bb_getopt_ulflags(int argc, char **argv, const char *applet_opts, ...);
//#warning rename?
extern FILE *bb_wfopen_input(const char *filename);