X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev.c;h=c2c5025b9eb0d170e7e6536771a967862bccadc3;hp=3bcafcd9a6955be02e0c4a4e9d9e0735a7c300df;hb=13ddea815496b32bd0ae0a648cdc50af28d69bb1;hpb=b21b95d7222f32940c8e9462c361e45041c9f7d6

diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 3bcafcd9a..c2c5025b9 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>
@@ -33,18 +31,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;
 	int log_priority;
 #ifdef USE_SELINUX
+	int selinux_initialized;
 	int selinux_enabled;
 	security_context_t selinux_prev_scontext;
 #endif
@@ -89,12 +88,29 @@ static void selinux_init(struct udev *udev)
 			udev->selinux_prev_scontext = NULL;
 		}
 	}
+	udev->selinux_initialized = 1;
 #endif
 }
 
+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;
+}
+
 static void selinux_exit(struct udev *udev)
 {
 #ifdef USE_SELINUX
+	if (!udev->selinux_initialized)
+		return;
 	if (udev->selinux_enabled) {
 		freecon(udev->selinux_prev_scontext);
 		udev->selinux_prev_scontext = NULL;
@@ -105,6 +121,8 @@ static void selinux_exit(struct udev *udev)
 void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode)
 {
 #ifdef USE_SELINUX
+	if (!udev->selinux_initialized)
+		selinux_init(udev);
 	if (udev->selinux_enabled) {
 		security_context_t scontext = NULL;
 
@@ -113,7 +131,7 @@ void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int
 			return;
 		} 
 		if (lsetfilecon(file, scontext) < 0)
-			err(udev, "setfilecon %s failed: %s\n", file, strerror(errno));
+			err(udev, "setfilecon %s failed: %m\n", file);
 		freecon(scontext);
 	}
 #endif
@@ -122,6 +140,8 @@ void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int
 void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode)
 {
 #ifdef USE_SELINUX
+	if (!udev->selinux_initialized)
+		selinux_init(udev);
 	if (udev->selinux_enabled) {
 		security_context_t scontext = NULL;
 
@@ -130,7 +150,7 @@ void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned i
 			return;
 		}
 		if (setfscreatecon(scontext) < 0)
-			err(udev, "setfscreatecon %s failed: %s\n", file, strerror(errno));
+			err(udev, "setfscreatecon %s failed: %m\n", file);
 		freecon(scontext);
 	}
 #endif
@@ -139,9 +159,11 @@ void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned i
 void udev_selinux_resetfscreatecon(struct udev *udev)
 {
 #ifdef USE_SELINUX
+	if (!udev->selinux_initialized)
+		selinux_init(udev);
 	if (udev->selinux_enabled) {
 		if (setfscreatecon(udev->selinux_prev_scontext) < 0)
-			err(udev, "setfscreatecon failed: %s\n", strerror(errno));
+			err(udev, "setfscreatecon failed: %m\n");
 	}
 #endif
 }
@@ -184,24 +206,24 @@ 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, '/');
 	}
 
 	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)) {
@@ -263,19 +285,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;
 			}
 		}
@@ -286,16 +308,15 @@ 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, '/');
 	}
 
 	env = getenv("UDEV_LOG");
 	if (env != NULL)
-		udev->log_priority = log_priority(env);
+		udev->log_priority = util_log_priority(env);
 
 	if (udev->dev_path == NULL || udev->sys_path == NULL)
 		goto err;
-	selinux_init(udev);
 	info(udev, "context %p created\n", udev);
 	info(udev, "log_priority=%d\n", udev->log_priority);
 	info(udev, "config_file='%s'\n", config_file);
@@ -356,8 +377,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.
  *