Update to changelog -- mostly from Larry Doolittle.

[oweals/busybox.git] / mkfifo.c

diff --git a/mkfifo.c b/mkfifo.c
index 676592ac7df6df779c1a184073f73c86727a1463..728e1ec2f44d7a01d1278a2698ff46ca49cb7fb7 100644 (file)
--- a/mkfifo.c
+++ b/mkfifo.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mkfifo implementation for busybox
  *
@@ -19,43 +20,40 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>
 
-static const char mkfifo_usage[] = "mkfifo [OPTIONS] name\n\n"
-"Create the named fifo\n\n"
-"Options:\n"
-"\t-m\tcreate the fifo with the specified mode; default = a=rw-umask\n";
-
 extern int mkfifo_main(int argc, char **argv)
 {
-    char *thisarg;
-    mode_t mode = 0666;
-    argc--;
-    argv++;
+       char *thisarg;
+       mode_t mode = 0666;
+
+       argc--;
+       argv++;
 
-    /* Parse any options */
-    while (argc > 1) {
-       if (**argv != '-') usage(mkfifo_usage);
-       thisarg = *argv; thisarg++;
-       switch (*thisarg) {
-           case 'm':
-               argc--; argv++;
-               parse_mode(*argv, &mode);
-               break;
-           default:
-               usage (mkfifo_usage);
-           }
-       argc--; argv++;
-    }
-    if (argc < 1) usage (mkfifo_usage);
-    if (mkfifo(*argv, mode) < 0) {
-        perror("mkfifo");
-        exit(255);
-    } else {
-        exit(TRUE);
-    }
+       /* Parse any options */
+       while (argc > 1) {
+               if (**argv != '-')
+                       usage(mkfifo_usage);
+               thisarg = *argv;
+               thisarg++;
+               switch (*thisarg) {
+               case 'm':
+                       argc--;
+                       argv++;
+                       parse_mode(*argv, &mode);
+                       break;
+               default:
+                       usage(mkfifo_usage);
+               }
+               argc--;
+               argv++;
+       }
+       if (argc < 1 || *argv[0] == '-')
+               usage(mkfifo_usage);
+       if (mkfifo(*argv, mode) < 0)
+               perror_msg_and_die("mkfifo");
+       return EXIT_SUCCESS;
 }