chiark / gitweb /
store the imported device information in the udevdb
[elogind.git] / udev_db.c
index f2a890ea421c7b3ad8b633a8275727298b5ff405..264af79d063c49500753913028df3f352323c3ed 100644 (file)
--- a/udev_db.c
+++ b/udev_db.c
@@ -4,7 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004 Kay Sievers <kay.sievers@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
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <dirent.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "logging.h"
 #include "udev_db.h"
 
 #define PATH_TO_NAME_CHAR              '@'
 
-static int get_db_filename(struct udevice *udev, char *filename, int len)
+static int get_db_filename(const char *devpath, char *filename, int len)
 {
-       char devpath[SYSFS_PATH_MAX];
+       char temp[PATH_SIZE];
        char *pos;
 
        /* replace '/' to transform path into a filename */
-       strfieldcpy(devpath, udev->devpath);
-       pos = strchr(&devpath[1], '/');
+       strlcpy(temp, devpath, sizeof(temp));
+       pos = strchr(&temp[1], '/');
        while (pos) {
                pos[0] = PATH_TO_NAME_CHAR;
                pos = strchr(&pos[1], '/');
        }
-       snprintf(filename, len, "%s%s", udev_db_path, devpath);
+       snprintf(filename, len, "%s%s", udev_db_path, temp);
        filename[len-1] = '\0';
 
        return 0;
@@ -59,28 +61,33 @@ static int get_db_filename(struct udevice *udev, char *filename, int len)
 
 int udev_db_add_device(struct udevice *udev)
 {
-       char filename[SYSFS_PATH_MAX];
+       char filename[PATH_SIZE];
+       struct name_entry *name_loop;
        FILE *f;
 
        if (udev->test_run)
                return 0;
 
-       get_db_filename(udev, filename, SYSFS_PATH_MAX);
+       get_db_filename(udev->devpath, filename, sizeof(filename));
 
        create_path(filename);
 
        f = fopen(filename, "w");
        if (f == NULL) {
-               dbg("unable to create db file '%s'", filename);
+               err("unable to create db file '%s'", filename);
                return -1;
        }
        dbg("storing data for device '%s' in '%s'", udev->devpath, filename);
 
        fprintf(f, "P:%s\n", udev->devpath);
        fprintf(f, "N:%s\n", udev->name);
-       fprintf(f, "S:%s\n", udev->symlink);
-       fprintf(f, "A:%d\n", udev->partitions);
-
+       list_for_each_entry(name_loop, &udev->symlink_list, node)
+               fprintf(f, "S:%s\n", name_loop->name);
+       fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
+       fprintf(f, "A:%u\n", udev->partitions);
+       fprintf(f, "R:%u\n", udev->ignore_remove);
+       list_for_each_entry(name_loop, &udev->env_list, node)
+               fprintf(f, "E:%s\n", name_loop->name);
        fclose(f);
 
        return 0;
@@ -88,7 +95,8 @@ int udev_db_add_device(struct udevice *udev)
 
 static int parse_db_file(struct udevice *udev, const char *filename)
 {
-       char line[NAME_SIZE];
+       char line[PATH_SIZE];
+       unsigned int major, minor;
        char *bufline;
        char *buf;
        size_t bufsize;
@@ -96,7 +104,7 @@ static int parse_db_file(struct udevice *udev, const char *filename)
        size_t count;
 
        if (file_map(filename, &buf, &bufsize) != 0) {
-               dbg("unable to read db file '%s'", filename);
+               err("unable to read db file '%s'", filename);
                return -1;
        }
 
@@ -108,26 +116,49 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 
                switch(bufline[0]) {
                case 'P':
-                       if (count > DEVPATH_SIZE)
-                               count = DEVPATH_SIZE-1;
-                       strncpy(udev->devpath, &bufline[2], count-2);
+                       if (count > sizeof(udev->devpath))
+                               count = sizeof(udev->devpath);
+                       strlcpy(udev->devpath, &bufline[2], count-1);
                        break;
                case 'N':
-                       if (count > NAME_SIZE)
-                               count = NAME_SIZE-1;
-                       strncpy(udev->name, &bufline[2], count-2);
+                       if (count > sizeof(udev->name))
+                               count = sizeof(udev->name);
+                       strlcpy(udev->name, &bufline[2], count-1);
+                       break;
+               case 'M':
+                       if (count > sizeof(line))
+                               count = sizeof(line);
+                       strlcpy(line, &bufline[2], count-1);
+                       sscanf(line, "%u:%u", &major, &minor);
+                       udev->devt = makedev(major, minor);
                        break;
                case 'S':
-                       if (count > NAME_SIZE)
-                               count = NAME_SIZE-1;
-                       strncpy(udev->symlink, &bufline[2], count-2);
+                       if (count > sizeof(line))
+                               count =  sizeof(line);
+                       strlcpy(line, &bufline[2], count-1);
+                       name_list_add(&udev->symlink_list, line, 0);
                        break;
                case 'A':
-                       strfieldcpy(line, &bufline[2]);
+                       if (count > sizeof(line))
+                               count =  sizeof(line);
+                       strlcpy(line, &bufline[2], count-1);
                        udev->partitions = atoi(line);
                        break;
+               case 'R':
+                       if (count > sizeof(line))
+                               count =  sizeof(line);
+                       strlcpy(line, &bufline[2], count-1);
+                       udev->ignore_remove = atoi(line);
+                       break;
+               case 'E':
+                       if (count > sizeof(line))
+                               count =  sizeof(line);
+                       strlcpy(line, &bufline[2], count-1);
+                       name_list_add(&udev->env_list, line, 0);
+                       break;
                }
        }
+       file_unmap(buf, bufsize);
 
        if (udev->name[0] == '\0')
                return -1;
@@ -135,39 +166,49 @@ static int parse_db_file(struct udevice *udev, const char *filename)
        return 0;
 }
 
-int udev_db_get_device(struct udevice *udev)
+int udev_db_delete_device(struct udevice *udev)
 {
-       char filename[SYSFS_PATH_MAX];
+       char filename[PATH_SIZE];
 
-       get_db_filename(udev, filename, SYSFS_PATH_MAX);
+       get_db_filename(udev->devpath, filename, sizeof(filename));
+       unlink(filename);
 
-       return parse_db_file(udev, filename);
+       return 0;
 }
 
-int udev_db_delete_device(struct udevice *udev)
+int udev_db_get_device(struct udevice *udev, const char *devpath)
 {
-       char filename[SYSFS_PATH_MAX];
+       char filename[PATH_SIZE];
 
-       get_db_filename(udev, filename, SYSFS_PATH_MAX);
-       unlink(filename);
+       get_db_filename(devpath, filename, sizeof(filename));
+
+       if (parse_db_file(udev, filename) != 0)
+               return -1;
 
        return 0;
 }
 
-int udev_db_get_device_byname(struct udevice *udev, const char *name)
+int udev_db_search_name(char *devpath, size_t len, const char *name)
 {
-       struct dirent *ent;
        DIR *dir;
-       char filename[NAME_SIZE];
-       struct udevice db_udev;
 
        dir = opendir(udev_db_path);
        if (dir == NULL) {
-               dbg("unable to udev db '%s'", udev_db_path);
+               err("unable to open udev_db '%s'", udev_db_path);
                return -1;
        }
 
        while (1) {
+               struct dirent *ent;
+               char filename[PATH_SIZE];
+               char path[PATH_SIZE];
+               char nodename[PATH_SIZE];
+               char *bufline;
+               char *buf;
+               size_t bufsize;
+               size_t cur;
+               size_t count;
+
                ent = readdir(dir);
                if (ent == NULL || ent->d_name[0] == '\0')
                        break;
@@ -175,40 +216,120 @@ int udev_db_get_device_byname(struct udevice *udev, const char *name)
                if (ent->d_name[0] == '.')
                        continue;
 
-               snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name);
-               filename[NAME_SIZE-1] = '\0';
+               snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name);
+               filename[sizeof(filename)-1] = '\0';
+               dbg("looking at '%s'", filename);
 
-               memset(&db_udev, 0x00, sizeof(struct udevice));
-               if (parse_db_file(&db_udev, filename) == 0) {
-                       char *pos;
-                       int len;
+               if (file_map(filename, &buf, &bufsize) != 0) {
+                       err("unable to read db file '%s'", filename);
+                       continue;
+               }
 
-                       if (strncmp(name, db_udev.name, NAME_SIZE) == 0) {
-                               goto found;
+               cur = 0;
+               while (cur < bufsize) {
+                       count = buf_get_line(buf, bufsize, cur);
+                       bufline = &buf[cur];
+                       cur += count+1;
+
+                       switch(bufline[0]) {
+                       case 'P':
+                               if (count > sizeof(path))
+                                       count = sizeof(path);
+                               strlcpy(path, &bufline[2], count-1);
+                               break;
+                       case 'N':
+                       case 'S':
+                               if (count > sizeof(nodename))
+                                       count = sizeof(nodename);
+                               strlcpy(nodename, &bufline[2], count-1);
+                               dbg("compare '%s' '%s'", nodename, name);
+                               if (strcmp(nodename, name) == 0) {
+                                       strlcpy(devpath, path, len);
+                                       file_unmap(buf, bufsize);
+                                       closedir(dir);
+                                       return 0;
+                               }
+                               break;
+                       default:
+                               continue;
                        }
+               }
+               file_unmap(buf, bufsize);
+       }
 
-                       foreach_strpart(db_udev.symlink, " ", pos, len) {
-                               if (strncmp(name, pos, len) != 0)
-                                       continue;
+       closedir(dir);
+       return -1;
+}
 
-                               if (len == strlen(name))
-                                       goto found;
-                       }
+int udev_db_dump_names(int (*handler_function)(const char *path, const char *name))
+{
+       DIR *dir;
 
-               }
+       dir = opendir(udev_db_path);
+       if (dir == NULL) {
+               err("unable to open udev_db '%s'", udev_db_path);
+               return -1;
        }
 
-       closedir(dir);
+       while (1) {
+               struct dirent *ent;
+               char filename[PATH_SIZE];
+               char path[PATH_SIZE];
+               char nodename[PATH_SIZE];
+               char *bufline;
+               char *buf;
+               size_t bufsize;
+               size_t cur;
+               size_t count;
 
-       return -1;
+               ent = readdir(dir);
+               if (ent == NULL || ent->d_name[0] == '\0')
+                       break;
 
-found:
-       closedir(dir);
+               if (ent->d_name[0] == '.')
+                       continue;
 
-       strfieldcpy(udev->devpath, db_udev.devpath);
-       strfieldcpy(udev->name, db_udev.name);
-       strfieldcpy(udev->symlink, db_udev.symlink);
-       udev->partitions = db_udev.partitions;
+               snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name);
+               filename[sizeof(filename)-1] = '\0';
+               dbg("looking at '%s'", filename);
 
+               if (file_map(filename, &buf, &bufsize) != 0) {
+                       err("unable to read db file '%s'", filename);
+                       continue;
+               }
+
+               path[0] = '\0';
+               nodename[0] = '\0';
+               cur = 0;
+               while (cur < bufsize) {
+                       count = buf_get_line(buf, bufsize, cur);
+                       bufline = &buf[cur];
+                       cur += count+1;
+
+                       switch(bufline[0]) {
+                       case 'P':
+                               if (count > sizeof(path))
+                                       count = sizeof(path);
+                               strlcpy(path, &bufline[2], count-1);
+                               break;
+                       case 'N':
+                               if (count > sizeof(nodename))
+                                       count = sizeof(nodename);
+                               strlcpy(nodename, &bufline[2], count-1);
+                               break;
+                       default:
+                               continue;
+                       }
+               }
+               file_unmap(buf, bufsize);
+
+               if (path[0] == '\0' || nodename[0] == '\0')
+                       continue;
+
+               if (handler_function(path, nodename) != 0)
+                       break;
+       }
+
+       closedir(dir);
        return 0;
 }