chiark / gitweb /
[PATCH] add IGNORE rule type
[elogind.git] / udevdb.c
index 678ddd9..ca9e63c 100644 (file)
--- a/udevdb.c
+++ b/udevdb.c
@@ -24,6 +24,7 @@
 /*
  * udev database library
  */
+#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 
 static TDB_CONTEXT *udevdb;
 
-/**
- * busdb_record - bus and id are keys to look up name of device
- */
-struct busdb_record {
-       char name[NAME_SIZE];
-};
-
-/**
- * classdb_record - class name and class device name used as keys to find
- *     device name.
- */
-struct classdb_record {
-       char name[NAME_SIZE];
-};
-
-struct sysfsdb_record {
-       char name[PATH_SIZE];
-};
-
-/**
- * namedb_record - device name is key, remaining udevice info stored here.
- */
-struct namedb_record {
-       char sysfs_dev_path[PATH_SIZE];
-       char class_dev_name[NAME_SIZE];
-       char class_name[NAME_SIZE];
-       char bus[BUS_SIZE];
-       char id[ID_SIZE];
-       char driver[NAME_SIZE];
-       char type;
-       int major;
-       int minor;
-       mode_t mode;
-};
-
-/**
- * udevdb_close: close udev database
- */
-static void udevdb_close(void)
-{
-       if (udevdb != NULL) {
-               tdb_close(udevdb);
-               udevdb = NULL;
-       }
-}
-
-/**
- * udevdb_open: opens udev's database
- * @method: database can either be in memory - UDEVDB_INTERNAL - or
- *     written to a file with UDEVDB_DEFAULT.
- */
-static int udevdb_open(int method)
-{
-       udevdb = tdb_open(UDEV_CONFIG_DIR UDEV_DB, 0, method, O_RDWR | O_CREAT, 0644);
-       if (udevdb == NULL) {
-               if (method == UDEVDB_INTERNAL)
-                       dbg("Unable to initialize in-memory database");
-               else
-                       dbg("Unable to initialize database at %s", UDEV_CONFIG_DIR UDEV_DB);
-               return -EINVAL;
-       }
-       return 0;
-}
-
-/**
- * busdb_fetch
- */
-static struct busdb_record *busdb_fetch(const char *bus, const char *id)
-{
-       TDB_DATA key, data;
-       char keystr[BUS_SIZE+ID_SIZE+2]; 
-       struct busdb_record *rec = NULL;
-
-       if (bus == NULL || id == NULL)
-               return NULL; 
-       if (strlen(bus) >= BUS_SIZE || strlen(id) >= ID_SIZE)
-               return NULL;
-
-       memset(keystr, 0, (BUS_SIZE+ID_SIZE+2));
-       strcpy(keystr, bus);
-       strcat(keystr, UDEVDB_DEL);
-       strcat(keystr, id);
-
-       key.dptr = (void *)keystr;
-       key.dsize = strlen(keystr) + 1;
-
-       data = tdb_fetch(udevdb, key);
-       if (data.dptr == NULL || data.dsize == 0)
-               return NULL;
-
-       rec = (struct busdb_record *)malloc(sizeof(struct busdb_record));
-       if (rec == NULL) {
-               free(data.dptr);
-               return NULL;
-       }
-
-       memcpy(rec, data.dptr, sizeof(struct busdb_record));
-       free(data.dptr);
-
-       return rec;
-}
-
-/**
- * classdb_fetch
- */
-static struct classdb_record *classdb_fetch(const char *cls, 
-                                               const char *cls_dev)
-{
-       TDB_DATA key, data;
-       char keystr[NAME_SIZE+NAME_SIZE+2]; 
-       struct classdb_record *rec = NULL;
-
-       if (cls == NULL || cls_dev == NULL)
-               return NULL; 
-       if (strlen(cls) >= NAME_SIZE || strlen(cls_dev) >= NAME_SIZE)
-               return NULL;
-
-       memset(keystr, 0, (NAME_SIZE+NAME_SIZE+2));
-       strcpy(keystr, cls);
-       strcat(keystr, UDEVDB_DEL);
-       strcat(keystr, cls_dev);
-
-       key.dptr = (void *)keystr;
-       key.dsize = strlen(keystr) + 1;
-
-       data = tdb_fetch(udevdb, key);
-       if (data.dptr == NULL || data.dsize == 0)
-               return NULL;
-       
-       rec = (struct classdb_record *)malloc(sizeof(struct classdb_record));
-       if (rec == NULL) {
-               free(data.dptr);
-               return NULL;
-       }
-       
-       memcpy(rec, data.dptr, sizeof(struct classdb_record));
-       free(data.dptr);
-
-       return rec;
-}
 
-static struct sysfsdb_record *sysfsdb_fetch(const char *path)
+int udevdb_add_dev(const char *path, const struct udevice *dev)
 {
        TDB_DATA key, data;
-       char keystr[PATH_SIZE+2]; 
-       struct sysfsdb_record *rec = NULL;
+       char keystr[SYSFS_PATH_MAX];
 
-       if (strlen(path) >= PATH_SIZE)
-               return NULL;
+       if ((path == NULL) || (dev == NULL))
+               return -ENODEV;
 
-       memset(keystr, 0, sizeof(keystr));
+       memset(keystr, 0, NAME_SIZE);
        strcpy(keystr, path);
-
-       dbg("keystr = %s", keystr);
-
-       key.dptr = (void *)keystr;
+       key.dptr = keystr;
        key.dsize = strlen(keystr) + 1;
 
-       data = tdb_fetch(udevdb, key);
-       if (data.dptr == NULL || data.dsize == 0) {
-               dbg("tdb_fetch did not work :(");
-               return NULL;
-       }
-       
-       rec = (struct sysfsdb_record *)malloc(sizeof(struct sysfsdb_record));
-       if (rec == NULL) {
-               free(data.dptr);
-               return NULL;
-       }
+       data.dptr = (void *)dev;
+       data.dsize = sizeof(*dev);
        
-       memcpy(rec, data.dptr, sizeof(struct sysfsdb_record));
-       free(data.dptr);
-
-       return rec;
+       return tdb_store(udevdb, key, data, TDB_REPLACE); 
 }
 
-/**
- * namedb_fetch
- */
-static struct namedb_record *namedb_fetch(const char *name)
+int udevdb_get_dev(const char *path, struct udevice *dev)
 {
        TDB_DATA key, data;
-       char nm_keystr[NAME_SIZE]; 
-       struct namedb_record *nrec = NULL;
 
-       if (name == NULL)
-               return NULL; 
-       if (strlen(name) >= NAME_SIZE)
-               return NULL;
-
-       memset(nm_keystr, 0, NAME_SIZE);
-       strcpy(nm_keystr, name);
+       if (path == NULL)
+               return -ENODEV;
 
-       key.dptr = (void *)nm_keystr;
-       key.dsize = strlen(nm_keystr) + 1;
+       key.dptr = (void *)path;
+       key.dsize = strlen(path) + 1;
 
        data = tdb_fetch(udevdb, key);
        if (data.dptr == NULL || data.dsize == 0)
-               return NULL;
-
-       nrec = (struct namedb_record *)malloc(sizeof(struct namedb_record));
-       if (nrec == NULL) {
-               free(data.dptr);
-               return NULL;
-       }
-       
-       memcpy(nrec, data.dptr, sizeof(struct namedb_record));
-       free(data.dptr);
-
-       return nrec;
-}
-
-/**
- * busdb_store
- */
-static int busdb_store(const struct udevice *dev)
-{
-       TDB_DATA key, data;
-       char keystr[BUS_SIZE+ID_SIZE+2];
-       struct busdb_record rec;
-       int retval = 0;
-
-       if (dev == NULL)
-               return -1;
-
-       memset(keystr, 0, (BUS_SIZE+ID_SIZE+2));
-       strcpy(keystr, dev->bus_name);
-       strcat(keystr, UDEVDB_DEL);
-       strcat(keystr, dev->bus_id);
-
-       key.dptr = (void *)keystr;
-       key.dsize = strlen(keystr) + 1;
-       
-       strcpy(rec.name, dev->name);
-
-       data.dptr = (void *) &rec;
-       data.dsize = sizeof(rec);
-       
-       retval = tdb_store(udevdb, key, data, TDB_REPLACE); 
-       return retval;
-}
-
-/**
- * classdb_store
- */
-static int classdb_store(const struct udevice *dev)
-{
-       TDB_DATA key, data;
-       char keystr[NAME_SIZE+NAME_SIZE+2];
-       struct classdb_record rec;
-       int retval = 0;
-
-       if (dev == NULL)
-               return -1;
-
-       memset(keystr, 0, (NAME_SIZE+NAME_SIZE+2));
-       strcpy(keystr, dev->class_name);
-       strcat(keystr, UDEVDB_DEL);
-       strcat(keystr, dev->class_dev_name);
-
-       key.dptr = (void *)keystr;
-       key.dsize = strlen(keystr) + 1;
-       
-       strcpy(rec.name, dev->name);
-
-       data.dptr = (void *) &rec;
-       data.dsize = sizeof(rec);
-       
-       retval = tdb_store(udevdb, key, data, TDB_REPLACE); 
-       return retval;
-}
-
-static int sysfs_store(const char *path, const struct udevice *dev)
-{
-       TDB_DATA key, data;
-       char keystr[PATH_SIZE+2];
-       struct sysfsdb_record rec;
-       int retval = 0;
-
-       if (dev == NULL)
                return -ENODEV;
 
-       memset(keystr, 0, sizeof(keystr));
-       strcpy(keystr, path);
-       dbg("keystr = %s", keystr);
-
-       key.dptr = (void *)keystr;
-       key.dsize = strlen(keystr) + 1;
-       
-       strcpy(rec.name, dev->name);
-
-       data.dptr = (void *) &rec;
-       data.dsize = sizeof(rec);
-       
-       retval = tdb_store(udevdb, key, data, TDB_REPLACE); 
-       return retval;
-}
-
-/**
- * namedb_store
- */
-static int namedb_store(const struct udevice *dev)
-{
-       TDB_DATA key, data;
-       char keystr[NAME_SIZE];
-       struct namedb_record rec;
-       int retval = 0;
-
-       if (dev == NULL)
-               return -1;
-
-       memset(keystr, 0, NAME_SIZE);
-       strcpy(keystr, dev->name);
-
-       key.dptr = (void *)keystr;
-       key.dsize = strlen(keystr) + 1;
-       
-       strcpy(rec.sysfs_dev_path, dev->sysfs_dev_path);
-       strcpy(rec.bus, dev->bus_name);
-       strcpy(rec.id, dev->bus_id);
-       strcpy(rec.class_dev_name, dev->class_dev_name);
-       strcpy(rec.class_name, dev->class_name);
-       strcpy(rec.driver, dev->driver);
-       rec.type = dev->type;
-       rec.major = dev->major;
-       rec.minor = dev->minor;
-       rec.mode = dev->mode;
-
-       data.dptr = (void *) &rec;
-       data.dsize = sizeof(rec);
-       
-       retval = tdb_store(udevdb, key, data, TDB_REPLACE); 
-       return retval;
-}
-
-/**
- * busdb_delete
- */
-static int busdb_delete(const char *bus, const char *id)
-{
-       TDB_DATA key;
-       char keystr[BUS_SIZE+ID_SIZE+2]; 
-       int retval = 0;
-
-       if (bus == NULL || id == NULL)
-               return -1; 
-       if (strlen(bus) >= BUS_SIZE || strlen(id) >= ID_SIZE)
-               return -1;
-
-       memset(keystr, 0, (BUS_SIZE+ID_SIZE+2));
-       strcpy(keystr, bus);
-       strcat(keystr, UDEVDB_DEL);
-       strcat(keystr, id);
-
-       key.dptr = (void *)keystr;
-       key.dsize = strlen(keystr) + 1;
-
-       retval = tdb_delete(udevdb, key);
-       return retval;
-}
-
-/**
- * classdb_delete
- */
-static int classdb_delete(const char *cls, const char *cls_dev)
-{
-       TDB_DATA key;
-       char keystr[NAME_SIZE+NAME_SIZE+2]; 
-       int retval = 0;
-
-       if (cls == NULL || cls_dev == NULL)
-               return -1; 
-       if (strlen(cls) >= NAME_SIZE || strlen(cls_dev) >= NAME_SIZE)
-               return -1;
-
-       memset(keystr, 0, (NAME_SIZE+NAME_SIZE+2));
-       strcpy(keystr, cls);
-       strcat(keystr, UDEVDB_DEL);
-       strcat(keystr, cls_dev);
-
-       key.dptr = (void *)keystr;
-       key.dsize = strlen(keystr) + 1;
-
-       retval = tdb_delete(udevdb, key);
-       return retval;
+       memcpy(dev, data.dptr, sizeof(*dev));
+       return 0;
 }
 
-/**
- * namedb_delete
- */
-static int namedb_delete(const char *name)
+int udevdb_delete_dev(const char *path)
 {
        TDB_DATA key;
-       char keystr[NAME_SIZE]; 
-       int retval = 0;
+       char keystr[SYSFS_PATH_MAX];
 
-       if (name == NULL)
-               return -1; 
-       if (strlen(name) >= NAME_SIZE)
-               return -1;
+       if (path == NULL)
+               return -EINVAL;
 
-       memset(keystr, 0, NAME_SIZE);
-       strcpy(keystr, name);
+       memset(keystr, 0, sizeof(keystr));
+       strcpy(keystr, path);
 
-       key.dptr = (void *)keystr;
+       key.dptr = keystr;
        key.dsize = strlen(keystr) + 1;
 
-       retval = tdb_delete(udevdb, key);
-       return retval;
+       return tdb_delete(udevdb, key);
 }
 
 /**
- * udevdb_delete_udevice
+ * udevdb_exit: closes database
  */
-int udevdb_delete_udevice(const char *name)
+void udevdb_exit(void)
 {
-       struct namedb_record *nrec = NULL;
-
-       if (name == NULL)
-               return -1; 
-
-       nrec = namedb_fetch(name);
-       if (nrec == NULL)
-               return -1;
-
-       busdb_delete(nrec->bus, nrec->id);
-       classdb_delete(nrec->class_name, nrec->class_dev_name);
-       namedb_delete(name);
-       free(nrec);
-
-       return 0;
+       if (udevdb != NULL) {
+               tdb_close(udevdb);
+               udevdb = NULL;
+       }
 }
 
 /**
- * udevdb_add_device: adds class device to database
+ * udevdb_init: initializes database
+ * @init_flag: UDEVDB_INTERNAL - database stays in memory
+ *            UDEVDB_DEFAULT - database is written to a file
  */
-int udevdb_add_device(const char *device, const struct sysfs_class_device *class_dev, const char *name, char type, int major, int minor, int mode)
+int udevdb_init(int init_flag)
 {
-       struct udevice dbdev;
-
-       if (class_dev == NULL)
-               return -ENODEV;
+       if (init_flag != UDEVDB_DEFAULT && init_flag != UDEVDB_INTERNAL)
+               return -EINVAL;
 
-       memset(&dbdev, 0, sizeof(dbdev));
-       strncpy(dbdev.name, name, NAME_SIZE);
-       if (class_dev->sysdevice) {
-               strncpy(dbdev.sysfs_dev_path, class_dev->sysdevice->directory->path, PATH_SIZE);
-               strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE);
+       udevdb = tdb_open(udev_db_filename, 0, init_flag, O_RDWR | O_CREAT, 0644);
+       if (udevdb == NULL) {
+               if (init_flag == UDEVDB_INTERNAL)
+                       dbg("unable to initialize in-memory database");
+               else
+                       dbg("unable to initialize database at '%s'", udev_db_filename);
+               return -EINVAL;
        }
-       strncpy(dbdev.class_dev_name, class_dev->name, NAME_SIZE);
-//     if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE)) != 0)
-//             strcpy(dbdev.class_name, "unknown");
-       strcpy(dbdev.bus_name, "unknown");
-       if (class_dev->driver != NULL)
-               strncpy(dbdev.driver, class_dev->driver->name, NAME_SIZE);
-       else
-               strcpy(dbdev.driver, "unknown");
-       dbdev.type = type;
-       dbdev.major = major;
-       dbdev.minor = minor;
-       dbdev.mode = mode;
-       
-       if ((busdb_store(&dbdev)) != 0)
-               return -1;
-       if ((classdb_store(&dbdev)) != 0)
-               return -1;
-       if ((sysfs_store(device, &dbdev)) != 0)
-               return -1;
-       if ((namedb_store(&dbdev)) != 0)
-               return -1;
-
        return 0;
 }
 
 /**
- * udevdb_get_device: grab's device by name
+ * udevdb_open_ro: open database for reading
  */
-struct udevice *udevdb_get_udevice(const char *name)
+int udevdb_open_ro(void)
 {
-       struct namedb_record *nrec = NULL;
-       struct udevice *dev = NULL;
-
-       if (name == NULL)
-               return NULL; 
-
-       nrec = namedb_fetch(name);
-       if (nrec == NULL)
-               return NULL;
-
-       dev = (struct udevice *)malloc(sizeof(struct udevice));
-       if (dev == NULL) {
-               free(nrec);
-               return NULL;
+       udevdb = tdb_open(udev_db_filename, 0, 0, O_RDONLY, 0);
+       if (udevdb == NULL) {
+               dbg("unable to open database at '%s'", udev_db_filename);
+               return -EINVAL;
        }
-
-       strcpy(dev->name, name);
-       strcpy(dev->sysfs_dev_path, nrec->sysfs_dev_path);
-       strcpy(dev->class_dev_name, nrec->class_dev_name);
-       strcpy(dev->class_name, nrec->class_name);
-       strcpy(dev->bus_name, nrec->bus);
-       strcpy(dev->bus_id, nrec->id);
-       dev->type = nrec->type;
-       dev->major = nrec->major;
-       dev->minor = nrec->minor;
-       dev->mode = nrec->mode;
-
-       free(nrec);
-
-       return dev;
-}
-
-/**
- * udevdb_get_device_by_bus
- */
-struct udevice *udevdb_get_udevice_by_bus(const char *bus, const char *id)
-{
-       struct busdb_record *brec = NULL;
-       struct udevice *dev = NULL;
-
-       if (bus == NULL || id == NULL)
-               return NULL;
-
-       brec = busdb_fetch(bus, id);
-       if (brec == NULL)
-               return NULL;
-
-       dev = udevdb_get_udevice(brec->name);
-       free(brec);
-
-       return dev;
-}
-
-/**
- * udevdb_get_udevice_by_class
- */
-struct udevice *udevdb_get_udevice_by_class(const char *cls, 
-                                               const char *cls_dev)
-{
-       struct classdb_record *crec = NULL;
-       struct udevice *dev = NULL;
-
-       if (cls == NULL || cls_dev == NULL)
-               return NULL;
-
-       crec = classdb_fetch(cls, cls_dev);
-       if (crec == NULL)
-               return NULL;
-
-       dev = udevdb_get_udevice(crec->name);
-       free(crec);
-
-       return dev;
-}
-
-
-char *udevdb_get_udevice_by_sysfs(const char *path)
-{
-       struct sysfsdb_record *crec = NULL;
-//     struct udevice *dev = NULL;
-
-       if (path == NULL)
-               return NULL;
-
-       crec = sysfsdb_fetch(path);
-       if (crec == NULL)
-               return NULL;
-
-       // FIXME leak!!!
-       return crec->name;
-//     dev = udevdb_get_udevice(crec->name);
-//     free(crec);
-//
-//     return dev;
-}
-
-/**
- * udevdb_exit: closes database
- */
-void udevdb_exit(void)
-{
-       udevdb_close();
-}
-
-/**
- * udevdb_init: initializes database
- */
-int udevdb_init(int init_flag)
-{
-       if (init_flag != UDEVDB_DEFAULT && init_flag != UDEVDB_INTERNAL)
-               return -1;
-
-       return udevdb_open(init_flag);
+       return 0;
 }