man: fix typos

[elogind.git] / extras / floppy / create_floppy_devices.c

diff --git a/extras/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c
index 91d3a581953c8e05521b2b33da6cb137bdaa9521..f5069f722065b2aa56fb2bb9bcd5c8eb550a7282 100644 (file)
--- a/extras/floppy/create_floppy_devices.c
+++ b/extras/floppy/create_floppy_devices.c
@@ -21,6 +21,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
+#include <pwd.h>
+#include <grp.h>
+
+#include "../../udev/udev.h"
 
 static char *table[] = {
        "", "d360", "h1200", "u360", "u720", "h360", "h720",
@@ -34,42 +38,61 @@ static char *table[] = {
 static int t360[] = { 1, 0 };
 static int t1200[] = { 2, 5, 6, 10, 12, 14, 16, 18, 20, 23, 0 };
 static int t3in[] = { 8, 9, 26, 27, 28, 7, 11, 15, 19, 24, 25, 29, 31, 3, 4, 13, 17, 21, 22, 30, 0 };
+static int *table_sup[] = { NULL, t360, t1200, t3in+5+8, t3in+5, t3in, t3in };
 
-static int *table_sup[] = { NULL, t360, t1200, t3in + 5 + 8, t3in + 5, t3in, t3in };
+static void log_fn(struct udev *udev, int priority,
+                  const char *file, int line, const char *fn,
+                  const char *format, va_list args)
+{
+       vsyslog(priority, format, args);
+}
 
 int main(int argc, char **argv)
 {
+       struct udev *udev;
        char *dev;
+       char *devname;
        char node[64];
        int type = 0, i, fdnum, c;
        int major = 2, minor;
-       int mode = 0;
+       uid_t uid = 0;
+       gid_t gid = 0;
+       mode_t mode = 0660;
        int create_nodes = 0;
        int print_nodes = 0;
-       int unlink_nodes = 0;
        int is_err = 0;
 
-       while ((c = getopt(argc, argv, "cdm:M:t:u")) != -1) {
+       udev = udev_new();
+       if (udev == NULL)
+               goto exit;
+
+       logging_init("create_floppy_devices");
+       udev_set_log_fn(udev, log_fn);
+       udev_selinux_init(udev);
+
+       while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
                switch (c) {
                case 'c':
                        create_nodes = 1;
-                       unlink_nodes = 0;
                        break;
                case 'd':
                        print_nodes = 1;
                        break;
+               case 'U':
+                       uid = util_lookup_user(udev, optarg);
+                       break;
+               case 'G':
+                       gid = util_lookup_group(udev, optarg);
+                       break;
                case 'M':
-                       mode = strtol(optarg, NULL, 10);
+                       mode = strtol(optarg, NULL, 0);
+                       mode = mode & 0666;
                        break;
                case 'm':
-                       major = strtol(optarg, NULL, 10);
+                       major = strtol(optarg, NULL, 0);
                        break;
                case 't':
-                       type = strtol(optarg, NULL, 10);
-                       break;
-               case 'u':
-                       unlink_nodes = 1;
-                       create_nodes = 0;
+                       type = strtol(optarg, NULL, 0);
                        break;
                default:
                        is_err++;
@@ -78,18 +101,30 @@ int main(int argc, char **argv)
        }
 
        if (is_err || optind >= argc) {
-               fprintf(stderr,"Usage: %s [-d|-c|-u|-m <major>|-t <type>] <device>\n",
-                       argv[0]);
+               printf("Usage:  %s [OPTION] device\n"
+                      "  -c   create\n"
+                      "  -d   debug\n"
+                      "  -m   Major number\n"
+                      "  -t   floppy type number\n"
+                      "  -U   device node user ownership\n"
+                      "  -G   device node group owner\n"
+                      "  -M   device node mode\n"
+                      "\n", argv[0]);
                return 1;
        }
 
        dev = argv[optind];
-       if (dev[strlen(dev) - 3] != 'f' || dev[strlen(dev) -2 ] != 'd') {
+       devname = strrchr(dev, '/');
+       if (devname != NULL)
+               devname = &devname[1];
+       else
+               devname = dev;
+       if (strncmp(devname, "fd", 2) != 0) {
                fprintf(stderr,"Device '%s' is not a floppy device\n", dev);
                return 1;
        }
 
-       fdnum = strtol(dev + 2, NULL, 10);
+       fdnum = strtol(&devname[2], NULL, 10);
        if (fdnum < 0 || fdnum > 7) {
                fprintf(stderr,"Floppy device number %d out of range (0-7)\n", fdnum);
                return 1;
@@ -112,15 +147,23 @@ int main(int argc, char **argv)
 
        i = 0;
        while (table_sup[type][i]) {
-               sprintf(node, "%s%s",dev, table[table_sup[type][i]]);
+               sprintf(node, "%s%s", dev, table[table_sup[type][i]]);
                minor = (table_sup[type][i] << 2) + fdnum;
                if (print_nodes)
                        printf("%s b %d %d %d\n", node, mode, major, minor);
-               if (create_nodes)
+               if (create_nodes) {
+                       unlink(node);
+                       udev_selinux_setfscreatecon(udev, node, S_IFBLK | mode);
                        mknod(node, S_IFBLK | mode, makedev(major,minor));
+                       udev_selinux_resetfscreatecon(udev);
+                       chown(node, uid, gid);
+                       chmod(node, S_IFBLK | mode);
+               }
                i++;
        }
 
+       udev_selinux_exit(udev);
+       udev_unref(udev);
+exit:
        return 0;
 }
-