Add prototype update missing from last_patch89. Fix screwy

formatting in cut.

diff --git a/coreutils/cut.c b/coreutils/cut.c
index 8ae762fb3cd90198170307586b8fd3fa4dfdfc70..34ec3690c1812c7368729526aee828b23f2e3017 100644 (file)
--- 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 0a9f2a271c54858845d40dcab7746d3f5daa1b6f..6f8a5040cf6e4977b9b82285f5655a2d244a12e6 100644 (file)
--- 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);