diff options
-rw-r--r-- | coreutils/cut.c | 7 | ||||
-rw-r--r-- | include/libbb.h | 2 |
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 @@ | |||
1 | /* vi: set sw=8 ts=8: */ | ||
1 | /* | 2 | /* |
2 | * cut.c - minimalist version of cut | 3 | * cut.c - minimalist version of cut |
3 | * | 4 | * |
@@ -300,12 +301,12 @@ extern int cut_main(int argc, char **argv) | |||
300 | if(part == 0) | 301 | if(part == 0) |
301 | bb_error_msg_and_die("you must specify a list of bytes, characters, or fields"); | 302 | bb_error_msg_and_die("you must specify a list of bytes, characters, or fields"); |
302 | if(opt & 0x80000000UL) | 303 | if(opt & 0x80000000UL) |
303 | bb_error_msg_and_die("only one type of list may be specified"); | 304 | bb_error_msg_and_die("only one type of list may be specified"); |
304 | parse_lists(sopt); | 305 | parse_lists(sopt); |
305 | if((opt & (OPT_DELIM_FLGS))) { | 306 | if((opt & (OPT_DELIM_FLGS))) { |
306 | if (strlen(sdopt) > 1) { | 307 | if (strlen(sdopt) > 1) { |
307 | bb_error_msg_and_die("the delimiter must be a single character"); | 308 | bb_error_msg_and_die("the delimiter must be a single character"); |
308 | } | 309 | } |
309 | delim = sdopt[0]; | 310 | delim = sdopt[0]; |
310 | } | 311 | } |
311 | supress_non_delimited_lines = opt & OPT_SUPRESS_FLGS; | 312 | 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)); | |||
161 | 161 | ||
162 | extern const char *bb_opt_complementaly; | 162 | extern const char *bb_opt_complementaly; |
163 | extern const struct option *bb_applet_long_options; | 163 | extern const struct option *bb_applet_long_options; |
164 | extern unsigned long bb_getopt_ulflags(int argc, char **argv, const char *applet_opts); | 164 | extern unsigned long bb_getopt_ulflags(int argc, char **argv, const char *applet_opts, ...); |
165 | //#warning rename? | 165 | //#warning rename? |
166 | extern FILE *bb_wfopen_input(const char *filename); | 166 | extern FILE *bb_wfopen_input(const char *filename); |
167 | 167 | ||