X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevdb.c;h=c4e064fc115d4414ef21cbbbc44403ed4570e7bc;hp=b75bf8048f1dd3633dea0844bfa7faae5f585018;hb=7b1cbec91a51a8d8f1546935d942744b0f5a274e;hpb=5840bc63e2029d22682d8de77dc8fcc4da1b436c

diff --git a/udevdb.c b/udevdb.c
index b75bf8048..c4e064fc1 100644
--- 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>
@@ -34,6 +35,7 @@
 
 #include "udev_version.h"
 #include "udev.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "tdb/tdb.h"
@@ -54,36 +56,29 @@ int udevdb_add_dev(const char *path, const struct udevice *dev)
 	strcpy(keystr, path);
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
-	
+
 	data.dptr = (void *)dev;
 	data.dsize = sizeof(*dev);
 	
 	return tdb_store(udevdb, key, data, TDB_REPLACE); 
 }
 
-struct udevice *udevdb_get_dev(const char *path)
+int udevdb_get_dev(const char *path, struct udevice *dev)
 {
 	TDB_DATA key, data;
-	struct udevice *dev;
 
 	if (path == NULL)
-		return NULL;
+		return -ENODEV;
 
 	key.dptr = (void *)path;
 	key.dsize = strlen(path) + 1;
 
 	data = tdb_fetch(udevdb, key);
 	if (data.dptr == NULL || data.dsize == 0)
-		return NULL;
+		return -ENODEV;
 
-	dev = malloc(sizeof(*dev));
-	if (dev == NULL)
-		goto exit;
-	
 	memcpy(dev, data.dptr, sizeof(*dev));
-exit:
-	free(data.dptr);
-	return dev;
+	return 0;
 }
 
 int udevdb_delete_dev(const char *path)
@@ -99,7 +94,7 @@ int udevdb_delete_dev(const char *path)
 
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
-	
+
 	return tdb_delete(udevdb, key);
 }
 
@@ -116,21 +111,94 @@ void udevdb_exit(void)
 
 /**
  * udevdb_init: initializes database
- * @init_flag: database can either be in memory - UDEVDB_INTERNAL - or
- *	written to a file with UDEVDB_DEFAULT.
+ * @init_flag: UDEVDB_INTERNAL - database stays in memory
+ *	       UDEVDB_DEFAULT - database is written to a file
  */
 int udevdb_init(int init_flag)
 {
 	if (init_flag != UDEVDB_DEFAULT && init_flag != UDEVDB_INTERNAL)
 		return -EINVAL;
 
-	udevdb = tdb_open(UDEV_CONFIG_DIR UDEV_DB, 0, init_flag, O_RDWR | O_CREAT, 0644);
+	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");
+			dbg("unable to initialize in-memory database");
 		else
-			dbg("Unable to initialize database at %s", UDEV_CONFIG_DIR UDEV_DB);
+			dbg("unable to initialize database at '%s'", udev_db_filename);
+		return -EACCES;
+	}
+	return 0;
+}
+
+/**
+ * udevdb_open_ro: open database for reading
+ */
+int udevdb_open_ro(void)
+{
+	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 -EACCES;
+	}
+	return 0;
+}
+
+static int (*user_record_callback) (char *path, struct udevice *dev);
+
+static int traverse_callback(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
+{
+	return user_record_callback((char*) key.dptr, (struct udevice*) dbuf.dptr);
+}
+
+/**
+ * udevdb_call_foreach: dumps whole database by passing record data to user function
+ * @user_record_handler: user function called for every record in the database
+ */
+int udevdb_call_foreach(int (*user_record_handler) (char *path, struct udevice *dev))
+{
+	int retval = 0;
+
+	if (user_record_handler == NULL) {
+		dbg("invalid user record handling function");
 		return -EINVAL;
 	}
+	user_record_callback = user_record_handler;
+	retval = tdb_traverse(udevdb, traverse_callback, NULL);
+	if (retval < 0)
+		return -ENODEV;
+	else
+		return 0;
+}
+
+static struct udevice *find_dev;
+static char *find_path;
+static const char *find_name;
+static int find_found;
+
+static int find_device_by_name(char *path, struct udevice *dev)
+{
+	if (strncmp(dev->name, find_name, sizeof(dev->name)) == 0) {
+		memcpy(find_dev, dev, sizeof(*find_dev));
+		strncpy(find_path, path, NAME_SIZE);
+		find_found = 1;
+		/* stop search */
+		return 1;
+	}
 	return 0;
 }
+
+/**
+ * udevdb_get_dev_byname: search device with given name by traversing the whole database
+ */
+int udevdb_get_dev_byname(const char *name, char *path, struct udevice *dev)
+{
+	find_found = 0;
+	find_path = path;
+	find_dev = dev;
+	find_name = name;
+	udevdb_call_foreach(find_device_by_name);
+	if (find_found == 1)
+		return 0;
+	else
+		return -1;
+}