udevinfo: restore -d option

[elogind.git] / udev_utils.c

diff --git a/udev_utils.c b/udev_utils.c
index 5b0355d0e9986722d3b32f348ab9035a61b53ac0..c7292d0f045765a24241ca3044e2157e2b993278 100644 (file)
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -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
  *
  *     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,39 +27,34 @@
 #include <errno.h>
 #include <ctype.h>
 #include <dirent.h>
 #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 <sys/utsname.h>
 

+#include "udev_libc_wrapper.h"

 #include "udev.h"
 #include "logging.h"
 #include "udev_utils.h"
 #include "list.h"
 
 
 #include "udev.h"
 #include "logging.h"
 #include "udev_utils.h"
 #include "list.h"
 
 

-void udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem)
+int log_priority(const char *priority)

 {
 {

-       memset(udev, 0x00, sizeof(struct udevice));
-
-       if (devpath)
-               strfieldcpy(udev->devpath, devpath);
-       if (subsystem)
-               strfieldcpy(udev->subsystem, subsystem);
-
-       if (strcmp(udev->subsystem, "block") == 0)
-               udev->type = 'b';
-       else if (strcmp(udev->subsystem, "net") == 0)
-               udev->type = 'n';
-       else if (strncmp(udev->devpath, "/block/", 7) == 0)
-               udev->type = 'b';
-       else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-               udev->type = 'n';
-       else if (strncmp(udev->devpath, "/class/", 7) == 0)
-               udev->type = 'c';
-
-       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;

 }
 
 int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
 }
 
 int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)


@@ -85,166 +80,84 @@ int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, u
                return 0;
 }
 
                return 0;
 }
 

-int create_path(const char *path)
-{
-       char p[NAME_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);
-}
-
-int parse_get_pair(char **orig_string, char **left, char **right)
+int name_list_add(struct list_head *name_list, const char *name, int sort)

 {
 {

-       char *temp;
-       char *string = *orig_string;
-
-       if (!string)
-               return -ENODEV;
-
-       /* eat any whitespace */
-       while (isspace(*string) || *string == ',')
-               ++string;
-
-       /* split based on '=' */
-       temp = strsep(&string, "=");
-       *left = temp;
-       if (!string)
-               return -ENODEV;
-
-       /* take the right side and strip off the '"' */
-       while (isspace(*string))
-               ++string;
-       if (*string == '"')
-               ++string;
-       else
-               return -ENODEV;
-
-       temp = strsep(&string, "\"");
-       if (!string || *temp == '\0')
-               return -ENODEV;
-       *right = temp;
-       *orig_string = string;
-       
-       return 0;
-}
-
-int file_map(const char *filename, char **buf, size_t *bufsize)
-{
-       struct stat stats;
-       int fd;
-
-       fd = open(filename, O_RDONLY);
-       if (fd < 0) {
-               return -1;
+       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);
+                       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;
 }
 
 
        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 name_list_key_add(struct list_head *name_list, const char *key, const char *value)

 {
 {

-       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;
+       struct name_entry *loop_name;
+       struct name_entry *new_name;
+
+       list_for_each_entry(loop_name, name_list, node) {
+               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;
+               }

        }
 
        }
 

-       return count - cur;
-}
+       new_name = malloc(sizeof(struct name_entry));
+       if (new_name == NULL) {
+               dbg("error malloc");
+               return -ENOMEM;
+       }

 
 

-void no_trailing_slash(char *path)
-{
-       size_t len;
+       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);

 
 

-       len = strlen(path);
-       while (len > 0 && path[len-1] == '/')
-               path[--len] = '\0';
+       return 0;

 }
 
 }
 

-struct files {
-       struct list_head list;
-       char name[NAME_SIZE];
-};
-
-/* sort files in lexical order */
-static int file_list_insert(char *filename, struct list_head *file_list)
+void name_list_cleanup(struct list_head *name_list)

 {
 {

-       struct files *loop_file;
-       struct files *new_file;
+       struct name_entry *name_loop;
+       struct name_entry *temp_loop;

 
 

-       list_for_each_entry(loop_file, file_list, list) {
-               if (strcmp(loop_file->name, filename) > 0) {
-                       break;
-               }
-       }
-
-       new_file = malloc(sizeof(struct files));
-       if (new_file == NULL) {
-               dbg("error malloc");
-               return -ENOMEM;
+       list_for_each_entry_safe(name_loop, temp_loop, name_list, node) {
+               list_del(&name_loop->node);
+               free(name_loop);

        }
        }

-
-       strfieldcpy(new_file->name, filename);
-       list_add_tail(&new_file->list, &loop_file->list);
-       return 0;

 }
 
 /* calls function for every file found in specified directory */
 }
 
 /* calls function for every file found in specified directory */

-int call_foreach_file(file_fnct_t fnct, const char *dirname,
-                     const char *suffix, void *data)
+int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix)

 {
        struct dirent *ent;
        DIR *dir;
        char *ext;
 {
        struct dirent *ent;
        DIR *dir;
        char *ext;

-       struct files *loop_file;
-       struct files *tmp_file;
-       LIST_HEAD(file_list);
+       char filename[PATH_SIZE];

 
        dbg("open directory '%s'", dirname);
        dir = opendir(dirname);
 
        dbg("open directory '%s'", dirname);
        dir = opendir(dirname);


@@ -261,7 +174,7 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname,
                if ((ent->d_name[0] == '.') || (ent->d_name[0] == COMMENT_CHARACTER))
                        continue;
 
                if ((ent->d_name[0] == '.') || (ent->d_name[0] == COMMENT_CHARACTER))
                        continue;
 

-               /* look for file with specified suffix */
+               /* look for file matching with specified suffix */

                ext = strrchr(ent->d_name, '.');
                if (ext == NULL)
                        continue;
                ext = strrchr(ent->d_name, '.');
                if (ext == NULL)
                        continue;


@@ -270,20 +183,10 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname,
                        continue;
 
                dbg("put file '%s/%s' in list", dirname, ent->d_name);
                        continue;
 
                dbg("put file '%s/%s' in list", dirname, ent->d_name);

-               file_list_insert(ent->d_name, &file_list);
-       }
-
-       /* call function for every file in the list */
-       list_for_each_entry_safe(loop_file, tmp_file, &file_list, list) {
-               char filename[NAME_SIZE];
-
-               snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
-               filename[NAME_SIZE-1] = '\0';
-
-               fnct(filename, data);

 
 

-               list_del(&loop_file->list);
-               free(loop_file);
+               snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
+               filename[sizeof(filename)-1] = '\0';
+               name_list_add(name_list, filename, 1);

        }
 
        closedir(dir);
        }
 
        closedir(dir);