[PATCH] wait_for_sysfs update for /class/firmware and /class/net/irda devices

[elogind.git] / udevdb.c

diff --git a/udevdb.c b/udevdb.c
index 40580e5a3b885550abd794258e3aaff9e96dd63e..a218b66179319f7f48b0db7f8df941f0f6af51d1 100644 (file)
--- a/udevdb.c
+++ b/udevdb.c
@@ -42,23 +42,27 @@
 #include "tdb/tdb.h"
 
 static TDB_CONTEXT *udevdb;
-
+sig_atomic_t gotalarm;
 
 int udevdb_add_dev(const char *path, const struct udevice *dev)
 {
        TDB_DATA key, data;
        char keystr[SYSFS_PATH_MAX];
 
+       if (udevdb == NULL)
+               return -1;
+
        if ((path == NULL) || (dev == NULL))
                return -ENODEV;
 
-       memset(keystr, 0, NAME_SIZE);
+       memset(keystr, 0, SYSFS_PATH_MAX);
        strfieldcpy(keystr, path);
        key.dptr = keystr;
        key.dsize = strlen(keystr) + 1;
 
        data.dptr = (void *)dev;
        data.dsize = UDEVICE_LEN;
+       dbg("store key '%s' for device '%s'", path, dev->name);
 
        return tdb_store(udevdb, key, data, TDB_REPLACE); 
 }
@@ -67,6 +71,9 @@ int udevdb_get_dev(const char *path, struct udevice *dev)
 {
        TDB_DATA key, data;
 
+       if (udevdb == NULL)
+               return -1;
+
        if (path == NULL)
                return -ENODEV;
 
@@ -87,6 +94,9 @@ int udevdb_delete_dev(const char *path)
        TDB_DATA key;
        char keystr[SYSFS_PATH_MAX];
 
+       if (udevdb == NULL)
+               return -1;
+
        if (path == NULL)
                return -EINVAL;
 
@@ -120,6 +130,8 @@ int udevdb_init(int init_flag)
        if (init_flag != UDEVDB_DEFAULT && init_flag != UDEVDB_INTERNAL)
                return -EINVAL;
 
+       tdb_set_lock_alarm(&gotalarm);
+
        udevdb = tdb_open(udev_db_filename, 0, init_flag, O_RDWR | O_CREAT, 0644);
        if (udevdb == NULL) {
                if (init_flag == UDEVDB_INTERNAL)
@@ -159,6 +171,9 @@ int udevdb_call_foreach(int (*user_record_handler) (char *path, struct udevice *
 {
        int retval = 0;
 
+       if (udevdb == NULL)
+               return -1;
+
        if (user_record_handler == NULL) {
                dbg("invalid user record handling function");
                return -EINVAL;