emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add prototype update missing from last_patch89. Fix screwy

Browse Source 
formatting in cut.
This commit is contained in:
Eric Andersen 2003-06-20 09:16:00 +00:00
parent 0f08e53535
commit c9e7024924
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coreutils/cut.c
View File

@ -1,3 +1,4 @@
/* vi: set sw=8 ts=8: */
/* /*
* cut.c - minimalist version of cut * cut.c - minimalist version of cut
* *
@ -300,12 +301,12 @@ extern int cut_main(int argc, char **argv)
if(part == 0) if(part == 0)
bb_error_msg_and_die("you must specify a list of bytes, characters, or fields"); bb_error_msg_and_die("you must specify a list of bytes, characters, or fields");
if(opt & 0x80000000UL) 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); parse_lists(sopt);
if((opt & (OPT_DELIM_FLGS))) { if((opt & (OPT_DELIM_FLGS))) {
if (strlen(sdopt) > 1) { 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]; delim = sdopt[0];
} }
supress_non_delimited_lines = opt & OPT_SUPRESS_FLGS; supress_non_delimited_lines = opt & OPT_SUPRESS_FLGS;

2
include/libbb.h
View File

@ -161,7 +161,7 @@ extern void bb_fflush_stdout_and_exit(int retval) __attribute__ ((noreturn));
extern const char *bb_opt_complementaly; extern const char *bb_opt_complementaly;
extern const struct option *bb_applet_long_options; 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? //#warning rename?
extern FILE *bb_wfopen_input(const char *filename); extern FILE *bb_wfopen_input(const char *filename);