chiark / gitweb /
add uft8 validation for safe volume label exporting
[elogind.git] / udev_utils.c
index 2b5683fda65b5801207fb8a878cac167fe32a758..c7292d0f045765a24241ca3044e2157e2b993278 100644 (file)
@@ -1,7 +1,7 @@
 /*
- * udev_lib - generic stuff used by udev
+ * udev_utils.c - generic stuff used by udev
  *
- * Copyright (C) 2004 Kay Sievers <kay@vrfy.org>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -27,8 +27,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <dirent.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
+#include <syslog.h>
 #include <sys/utsname.h>
 
 #include "udev_libc_wrapper.h"
 #include "list.h"
 
 
-int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem)
+int log_priority(const char *priority)
 {
-       char *pos;
-
-       memset(udev, 0x00, sizeof(struct udevice));
-       INIT_LIST_HEAD(&udev->symlink_list);
-
-       if (subsystem)
-               strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
-
-       if (devpath) {
-               strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
-               no_trailing_slash(udev->devpath);
-
-               if (strncmp(udev->devpath, "/block/", 7) == 0)
-                       udev->type = DEV_BLOCK;
-               else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-                       udev->type = DEV_NET;
-               else if (strncmp(udev->devpath, "/class/", 7) == 0)
-                       udev->type = DEV_CLASS;
-               else if (strncmp(udev->devpath, "/devices/", 9) == 0)
-                       udev->type = DEV_DEVICE;
-
-               /* get kernel name */
-               pos = strrchr(udev->devpath, '/');
-               if (pos) {
-                       strlcpy(udev->kernel_name, &pos[1], sizeof(udev->kernel_name));
-                       dbg("kernel_name='%s'", udev->kernel_name);
-
-                       /* Some block devices have '!' in their name, change that to '/' */
-                       pos = udev->kernel_name;
-                       while (pos[0] != '\0') {
-                               if (pos[0] == '!')
-                                       pos[0] = '/';
-                               pos++;
-                       }
-
-                       /* get kernel number */
-                       pos = &udev->kernel_name[strlen(udev->kernel_name)];
-                       while (isdigit(pos[-1]))
-                               pos--;
-                       strlcpy(udev->kernel_number, pos, sizeof(udev->kernel_number));
-                       dbg("kernel_number='%s'", udev->kernel_number);
-               }
-       }
-
-       udev->mode = 0660;
-       strcpy(udev->owner, "root");
-       strcpy(udev->group, "root");
+       char *endptr;
+       int prio;
+
+       prio = strtol(priority, &endptr, 10);
+       if (endptr[0] == '\0')
+               return prio;
+       if (strncasecmp(priority, "err", 3) == 0)
+               return LOG_ERR;
+       if (strcasecmp(priority, "info") == 0)
+               return LOG_INFO;
+       if (strcasecmp(priority, "debug") == 0)
+               return LOG_DEBUG;
+       if (string_is_true(priority))
+               return LOG_ERR;
 
        return 0;
 }
 
-void udev_cleanup_device(struct udevice *udev)
-{
-       struct name_entry *name_loop;
-       struct name_entry *temp_loop;
-
-       list_for_each_entry_safe(name_loop, temp_loop, &udev->symlink_list, node) {
-               list_del(&name_loop->node);
-               free(name_loop);
-       }
-}
-
 int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
 {
        static unsigned int kversion = 0;
@@ -125,131 +80,50 @@ int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, u
                return 0;
 }
 
-int create_path(const char *path)
-{
-       char p[PATH_SIZE];
-       char *pos;
-       struct stat stats;
-
-       strcpy (p, path);
-       pos = strrchr(p, '/');
-       if (pos == p || pos == NULL)
-               return 0;
-
-       while (pos[-1] == '/')
-               pos--;
-
-       pos[0] = '\0';
-
-       dbg("stat '%s'\n", p);
-       if (stat (p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-               return 0;
-
-       if (create_path (p) != 0)
-               return -1;
-
-       dbg("mkdir '%s'\n", p);
-       return mkdir(p, 0755);
-}
-
-/* Reset permissions on the device node, before unlinking it to make sure,
- * that permisions of possible hard links will be removed too.
- */
-int unlink_secure(const char *filename)
-{
-       int retval;
-
-       retval = chown(filename, 0, 0);
-       if (retval)
-               dbg("chown(%s, 0, 0) failed with error '%s'", filename, strerror(errno));
-
-       retval = chmod(filename, 0000);
-       if (retval)
-               dbg("chmod(%s, 0000) failed with error '%s'", filename, strerror(errno));
-
-       retval = unlink(filename);
-       if (errno == ENOENT)
-               retval = 0;
-
-       if (retval)
-               dbg("unlink(%s) failed with error '%s'", filename, strerror(errno));
-
-       return retval;
-}
-
-int file_map(const char *filename, char **buf, size_t *bufsize)
+int name_list_add(struct list_head *name_list, const char *name, int sort)
 {
-       struct stat stats;
-       int fd;
+       struct name_entry *loop_name;
+       struct name_entry *new_name;
 
-       fd = open(filename, O_RDONLY);
-       if (fd < 0) {
-               return -1;
+       list_for_each_entry(loop_name, name_list, node) {
+               /* avoid doubles */
+               if (strcmp(loop_name->name, name) == 0) {
+                       dbg("'%s' is already in the list", name);
+                       return 0;
+               }
        }
 
-       if (fstat(fd, &stats) < 0) {
-               close(fd);
-               return -1;
-       }
+       if (sort)
+               list_for_each_entry(loop_name, name_list, node) {
+                       if (sort && strcmp(loop_name->name, name) > 0)
+                               break;
+               }
 
-       *buf = mmap(NULL, stats.st_size, PROT_READ, MAP_SHARED, fd, 0);
-       if (*buf == MAP_FAILED) {
-               close(fd);
-               return -1;
+       new_name = malloc(sizeof(struct name_entry));
+       if (new_name == NULL) {
+               dbg("error malloc");
+               return -ENOMEM;
        }
-       *bufsize = stats.st_size;
 
-       close(fd);
+       strlcpy(new_name->name, name, sizeof(new_name->name));
+       dbg("adding '%s'", new_name->name);
+       list_add_tail(&new_name->node, &loop_name->node);
 
        return 0;
 }
 
-void file_unmap(char *buf, size_t bufsize)
-{
-       munmap(buf, bufsize);
-}
-
-/* return number of chars until the next newline, skip escaped newline */
-size_t buf_get_line(const char *buf, size_t buflen, size_t cur)
-{
-       int escape = 0;
-       size_t count;
-
-       for (count = cur; count < buflen; count++) {
-               if (!escape && buf[count] == '\n')
-                       break;
-
-               if (buf[count] == '\\')
-                       escape = 1;
-               else
-                       escape = 0;
-       }
-
-       return count - cur;
-}
-
-void no_trailing_slash(char *path)
-{
-       size_t len;
-
-       len = strlen(path);
-       while (len > 0 && path[len-1] == '/')
-               path[--len] = '\0';
-}
-
-int name_list_add(struct list_head *name_list, const char *name, int sort)
+int name_list_key_add(struct list_head *name_list, const char *key, const char *value)
 {
        struct name_entry *loop_name;
        struct name_entry *new_name;
 
        list_for_each_entry(loop_name, name_list, node) {
-               /* avoid doubles */
-               if (strcmp(loop_name->name, name) == 0) {
-                       dbg("'%s' is already in the list", name);
+               if (strncmp(loop_name->name, key, strlen(key)) == 0) {
+                       dbg("key already present '%s', replace it", loop_name->name);
+                       snprintf(loop_name->name, sizeof(loop_name->name), "%s=%s", key, value);
+                       loop_name->name[sizeof(loop_name->name)-1] = '\0';
                        return 0;
                }
-               if (sort && strcmp(loop_name->name, name) > 0)
-                       break;
        }
 
        new_name = malloc(sizeof(struct name_entry));
@@ -258,12 +132,25 @@ int name_list_add(struct list_head *name_list, const char *name, int sort)
                return -ENOMEM;
        }
 
-       strlcpy(new_name->name, name, sizeof(new_name->name));
+       snprintf(new_name->name, sizeof(new_name->name), "%s=%s", key, value);
+       new_name->name[sizeof(new_name->name)-1] = '\0';
+       dbg("adding '%s'", new_name->name);
        list_add_tail(&new_name->node, &loop_name->node);
 
        return 0;
 }
 
+void name_list_cleanup(struct list_head *name_list)
+{
+       struct name_entry *name_loop;
+       struct name_entry *temp_loop;
+
+       list_for_each_entry_safe(name_loop, temp_loop, name_list, node) {
+               list_del(&name_loop->node);
+               free(name_loop);
+       }
+}
+
 /* calls function for every file found in specified directory */
 int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix)
 {