Fixed segfault with 'cut -f 1 -d:' and added 'cut -s' suport.

[oweals/busybox.git] / mkfifo.c

diff --git a/mkfifo.c b/mkfifo.c
index b273df04633abc38665bffb0412d4999b8546bcd..f701a97d58f50b8124196507baf52be7d4145689 100644 (file)
--- a/mkfifo.c
+++ b/mkfifo.c
@@ -26,11 +26,13 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-static const char mkfifo_usage[] = "mkfifo [OPTIONS] name\n\n"
-       "Creates a named pipe (identical to 'mknod name p')\n\n"
-
+static const char mkfifo_usage[] = "mkfifo [OPTIONS] name\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nCreates a named pipe (identical to 'mknod name p')\n\n"
        "Options:\n"
-       "\t-m\tcreate the pipe using the specified mode (default a=rw)\n";
+       "\t-m\tcreate the pipe using the specified mode (default a=rw)\n"
+#endif
+       ;
 
 extern int mkfifo_main(int argc, char **argv)
 {
@@ -58,12 +60,11 @@ extern int mkfifo_main(int argc, char **argv)
                argc--;
                argv++;
        }
-       if (argc < 1)
+       if (argc < 1 || *argv[0] == '-')
                usage(mkfifo_usage);
        if (mkfifo(*argv, mode) < 0) {
                perror("mkfifo");
                exit(255);
-       } else {
-               exit(TRUE);
        }
+       return(TRUE);
 }