c9e702492
Eric Andersen
2003-06-20
Subject
Add prototype update missing from last_patch89. Fix screwy formatting in cut.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/cut.c+4 -3
| @@ -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; | |
include/libbb.h+1 -1
| @@ -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); | |