"insmod caches the symbolname in a variable before modifying it and uses

[oweals/busybox.git] / miscutils / makedevs.c

diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 691236e298694ff6c2da489792b1dc94ca861e71..308d651ae92e4433a397bc4140c83b254952c5f3 100644 (file)
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com>
  * 
@@ -5,71 +6,67 @@
  * Make ranges of device files quickly. 
  * known bugs: can't deal with alpha ranges
  */
- 
-#include "internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-
-const char makedevs_usage[] = 
-"makedevs 0.01 -- Create an entire range of device files\n\n"
-"\tmakedevs /dev/ttyS c 4 64 0 63        (ttyS0-ttyS63)\n"
-"\tmakedevs /dev/hda b 3 0 0 8 s         (hda,hda1-hda8)\n";
+#include "busybox.h"
 
-int
-makedevs_main(struct FileInfo * i, int argc, char * * argv)
+int makedevs_main(int argc, char **argv)
 {
+       mode_t mode;
+       char *basedev, *type, *nodname, buf[255];
+       int major, Sminor, S, E;
+
+       if (argc < 7 || *argv[1]=='-')
+               bb_show_usage();
 
-const char *basedev = argv[1];
-const char *type = argv[2];
-int major = atoi(argv[3]);
-int Sminor = atoi(argv[4]);
-int S = atoi(argv[5]);
-int E = atoi(argv[6]);
-int sbase = argc == 8 ? 1 : 0;
+       basedev = argv[1];
+       type = argv[2];
+       major = atoi(argv[3]) << 8;  /* correcting param to mknod() */
+       Sminor = atoi(argv[4]);
+       S = atoi(argv[5]);
+       E = atoi(argv[6]);
+       nodname = argc == 8 ? basedev : buf;
 
-mode_t mode = 0;
-dev_t dev = 0;
-char devname[255];
-char buf[255];
+       mode = 0660;
 
        switch (type[0]) {
-               case 'c':
-                       mode = S_IFCHR; break;
-               case 'b':
-                       mode = S_IFBLK; break;
-               case 'f':
-                       mode = S_IFIFO; break;
-               default:
-                       usage(makedevs_usage);
-                       return 2;
-       }       
-       mode |= 0660; 
-
-       while ( S <= E ) {
-                       
-               if (type[0] != 'f')
-                       dev = (major << 8) | Sminor;
-               strcpy(devname, basedev);
-               
-               if (sbase == 0) {
-                       sprintf(buf, "%d", S); 
-                       strcat(devname, buf);
-               } else {
-                       sbase = 0;
-               }
-                               
-               if (mknod (devname, mode, dev))
-                       printf("Failed to create: %s\n", devname);              
-       
-               S++; Sminor++;
+       case 'c':
+               mode |= S_IFCHR;
+               break;
+       case 'b':
+               mode |= S_IFBLK;
+               break;
+       case 'f':
+               mode |= S_IFIFO;
+               break;
+       default:
+               bb_show_usage();
+       }
+
+       while (S <= E) {
+               int sz;
+
+               sz = snprintf(buf, sizeof(buf), "%s%d", basedev, S);
+               if(sz<0 || sz>=sizeof(buf))  /* libc different */
+                       bb_error_msg_and_die("%s too large", basedev);
+
+       /* if mode != S_IFCHR and != S_IFBLK third param in mknod() ignored */
+
+               if (mknod(nodname, mode, major | Sminor))
+                       bb_error_msg("Failed to create: %s", nodname);
+
+               if (nodname == basedev) /* ex. /dev/hda - to /dev/hda1 ... */
+                       nodname = buf;
+               S++;
+               Sminor++;
        }
 
-return 0;
+       return 0;
 }
 
 /*