chiark / gitweb /
[PATCH] add support for subdirs
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>
Wed, 12 Nov 2003 11:48:01 +0000 (03:48 -0800)
committerGreg KH <gregkh@suse.de>
Wed, 27 Apr 2005 04:06:23 +0000 (21:06 -0700)
  support subdirectory creation/removal for NAME="/devfs/is/crazy/video0"
  create parent subdirs for device node if needed
  remove subdirs when last node is removed

udev-add.c
udev-remove.c

index eb1c0fb..9c54602 100644 (file)
@@ -101,6 +101,32 @@ static int create_node(struct udevice *dev)
                return -EINVAL;
        }
 
+       /* create subdirectories if requested */
+       if (strchr(dev->name, '/')) {
+               char path[255];
+               char *pos;
+               struct stat stats;
+
+               strncpy(path, filename, sizeof(path));
+               pos = strchr(path+1, '/');
+               while (1) {
+                       pos = strchr(pos+1, '/');
+                       if (pos == NULL)
+                               break;
+                       *pos = 0x00;
+                       if (stat(path, &stats)) {
+                               retval = mkdir(path, 0755);
+                               if (retval) {
+                                       dbg("mkdir(%s) failed with error '%s'",
+                                           path, strerror(errno));
+                                       return retval;
+                               }
+                               dbg("created %s", path);
+                       }
+                       *pos = '/';
+               }
+       }
+
        dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
        retval = mknod(filename, dev->mode, res);
        if (retval)
index 666928f..1cf5d51 100644 (file)
@@ -69,12 +69,45 @@ exit:
 static int delete_node(char *name)
 {
        char filename[255];
+       int retval;
 
        strncpy(filename, udev_root, sizeof(filename));
        strncat(filename, name, sizeof(filename));
 
        dbg("unlinking %s", filename);
-       return unlink(filename);
+       retval = unlink(filename);
+       if (retval) {
+               dbg("unlink(%s) failed with error '%s'",
+                       filename, strerror(errno));
+               return retval;
+       }
+
+       /* remove subdirectories */
+       if (strchr(name, '/')) {
+               char *pos;
+
+               pos = strrchr(filename, '/');
+               while (1) {
+                       *pos = 0x00;
+                       pos = strrchr(filename, '/');
+
+                       /* don't remove the last one */
+                       if ((pos == filename) || (pos == NULL))
+                               break;
+
+                       /* remove if empty */
+                       retval = rmdir(filename);
+                       if (retval) {
+                               if (errno == ENOTEMPTY)
+                                       return 0;
+                               dbg("rmdir(%s) failed with error '%s'",
+                                   filename, strerror(errno));
+                               break;
+                       }
+                       dbg("removed %s", filename);
+               }
+       }
+       return retval;
 }
 
 int udev_remove_device(char *device, char *subsystem)