X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev.c;h=c698be6e466c3f7bf48d58a84018f9e0b28553ae;hb=f183b6ed766a18835d53dc1e36a4e98756ebd0b7;hp=09e1bec1bfb83e35fa8c4d24cfee796e206b5a81;hpb=a035bf274477689920bcac12792b28de9d35ab6c;p=elogind.git

diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 09e1bec1b..c698be6e4 100644
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -30,18 +28,19 @@
 
 #include "libudev.h"
 #include "libudev-private.h"
-#include "../udev.h"
 
 struct udev {
 	int refcount;
 	void (*log_fn)(struct udev *udev,
 		       int priority, const char *file, int line, const char *fn,
 		       const char *format, va_list args);
+	void *userdata;
 	char *sys_path;
 	char *dev_path;
 	char *rules_path;
+	struct udev_list_node properties_list;
 	int log_priority;
-	int run:1;
+	int run;
 };
 
 void udev_log(struct udev *udev,
@@ -66,6 +65,20 @@ static void log_stderr(struct udev *udev,
 	vfprintf(stderr, format, args);
 }
 
+void *udev_get_userdata(struct udev *udev)
+{
+	if (udev == NULL)
+		return NULL;
+	return udev->userdata;
+}
+
+void udev_set_userdata(struct udev *udev, void *userdata)
+{
+	if (udev == NULL)
+		return;
+	udev->userdata = userdata;
+}
+
 /**
  * udev_new:
  *
@@ -87,18 +100,14 @@ struct udev *udev_new(void)
 	if (udev == NULL)
 		return NULL;
 	memset(udev, 0x00, (sizeof(struct udev)));
-
-	sysfs_init();
-
-	/* defaults */
 	udev->refcount = 1;
 	udev->log_fn = log_stderr;
 	udev->log_priority = LOG_ERR;
+	udev_list_init(&udev->properties_list);
 	udev->run = 1;
 	udev->dev_path = strdup(UDEV_PREFIX "/dev");
 	udev->sys_path = strdup("/sys");
 	config_file = strdup(SYSCONFDIR "/udev/udev.conf");
-
 	if (udev->dev_path == NULL ||
 	    udev->sys_path == NULL ||
 	    config_file == NULL)
@@ -109,24 +118,25 @@ struct udev *udev_new(void)
 	if (env != NULL) {
 		free(udev->sys_path);
 		udev->sys_path = strdup(env);
-		remove_trailing_chars(udev->sys_path, '/');
+		util_remove_trailing_chars(udev->sys_path, '/');
+		udev_add_property(udev, "SYSFS_PATH", udev->sys_path);
 	}
 
 	env = getenv("UDEV_RUN");
-	if (env != NULL && !string_is_true(env))
+	if (env != NULL && strcmp(env, "0") == 0)
 		udev->run = 0;
 
 	env = getenv("UDEV_CONFIG_FILE");
 	if (env != NULL) {
 		free(config_file);
 		config_file = strdup(env);
-		remove_trailing_chars(config_file, '/');
+		util_remove_trailing_chars(config_file, '/');
 	}
 	if (config_file == NULL)
 		goto err;
 	f = fopen(config_file, "r");
 	if (f != NULL) {
-		char line[LINE_SIZE];
+		char line[UTIL_LINE_SIZE];
 		int line_nr = 0;
 
 		while (fgets(line, sizeof(line), f)) {
@@ -188,19 +198,19 @@ struct udev *udev_new(void)
 			}
 
 			if (strcasecmp(key, "udev_log") == 0) {
-				udev->log_priority = log_priority(val);
+				udev->log_priority = util_log_priority(val);
 				continue;
 			}
 			if (strcasecmp(key, "udev_root") == 0) {
 				free(udev->dev_path);
 				udev->dev_path = strdup(val);
-				remove_trailing_chars(udev->dev_path, '/');
+				util_remove_trailing_chars(udev->dev_path, '/');
 				continue;
 			}
 			if (strcasecmp(key, "udev_rules") == 0) {
 				free(udev->rules_path);
 				udev->rules_path = strdup(val);
-				remove_trailing_chars(udev->rules_path, '/');
+				util_remove_trailing_chars(udev->rules_path, '/');
 				continue;
 			}
 		}
@@ -211,16 +221,16 @@ struct udev *udev_new(void)
 	if (env != NULL) {
 		free(udev->dev_path);
 		udev->dev_path = strdup(env);
-		remove_trailing_chars(udev->dev_path, '/');
+		util_remove_trailing_chars(udev->dev_path, '/');
+		udev_add_property(udev, "UDEV_ROOT", udev->dev_path);
 	}
 
 	env = getenv("UDEV_LOG");
 	if (env != NULL)
-		udev->log_priority = log_priority(env);
+		udev_set_log_priority(udev, util_log_priority(env));
 
 	if (udev->dev_path == NULL || udev->sys_path == NULL)
 		goto err;
-
 	info(udev, "context %p created\n", udev);
 	info(udev, "log_priority=%d\n", udev->log_priority);
 	info(udev, "config_file='%s'\n", config_file);
@@ -228,7 +238,6 @@ struct udev *udev_new(void)
 	info(udev, "sys_path='%s'\n", udev->sys_path);
 	if (udev->rules_path != NULL)
 		info(udev, "rules_path='%s'\n", udev->rules_path);
-
 	free(config_file);
 	return udev;
 err:
@@ -269,7 +278,7 @@ void udev_unref(struct udev *udev)
 	udev->refcount--;
 	if (udev->refcount > 0)
 		return;
-	sysfs_cleanup();
+	udev_list_cleanup(udev, &udev->properties_list);
 	free(udev->dev_path);
 	free(udev->sys_path);
 	free(udev->rules_path);
@@ -282,8 +291,7 @@ void udev_unref(struct udev *udev)
  * @udev: udev library context
  * @log_fn: function to be called for logging messages
  *
- * The built-in logging, which writes to stderr if the
- * LIBUDEV_DEBUG environment variable is set, can be
+ * The built-in logging, which writes to stderr, it can be
  * overridden by a custom function, to plug log messages
  * into the users logging functionality.
  *
@@ -304,7 +312,11 @@ int udev_get_log_priority(struct udev *udev)
 
 void udev_set_log_priority(struct udev *udev, int priority)
 {
+	char num[32];
+
 	udev->log_priority = priority;
+	snprintf(num, sizeof(num), "%u", udev->log_priority);
+	udev_add_property(udev, "UDEV_LOG", num);
 }
 
 const char *udev_get_rules_path(struct udev *udev)
@@ -350,3 +362,22 @@ const char *udev_get_dev_path(struct udev *udev)
 		return NULL;
 	return udev->dev_path;
 }
+
+struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value)
+{
+	if (value == NULL) {
+		struct udev_list_entry *list_entry;
+
+		list_entry = udev_get_properties_list_entry(udev);
+		list_entry = udev_list_entry_get_by_name(list_entry, key);
+		if (list_entry != NULL)
+			udev_list_entry_remove(list_entry);
+		return NULL;
+	}
+	return udev_list_entry_add(udev, &udev->properties_list, key, value, 1, 0);
+}
+
+struct udev_list_entry *udev_get_properties_list_entry(struct udev *udev)
+{
+	return udev_list_get_entry(&udev->properties_list);
+}