X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev.c;h=3f7d0e547e61a774f5ff4c07d00dd2d97ac235cd;hb=98f10a9e2ada5d72a0c39b94a5b59d9da4f28753;hp=a8a8a5ac3a7e42629f642af2e2125ab26ef29281;hpb=4cf23685101ff9e1a15f47cb0da49a6ec10b8e27;p=elogind.git
diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index a8a8a5ac3..3f7d0e547 100644
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -17,8 +17,6 @@
* along with this program. If not, see .
*/
-#include "config.h"
-
#include
#include
#include
@@ -26,18 +24,22 @@
#include
#include
#include
-#include
-#include
+#include
#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;
+ int run;
};
void udev_log(struct udev *udev,
@@ -46,6 +48,9 @@ void udev_log(struct udev *udev,
{
va_list args;
+ if (priority > udev->log_priority)
+ return;
+
va_start(args, format);
udev->log_fn(udev, priority, file, line, fn, format, args);
va_end(args);
@@ -55,32 +60,23 @@ static void log_stderr(struct udev *udev,
int priority, const char *file, int line, const char *fn,
const char *format, va_list args)
{
- static int log = -1;
-
- if (log == -1) {
- if (getenv("LIBUDEV_DEBUG") != NULL)
- log = 1;
- else
- log = 0;
- }
-
- if (log == 1) {
- fprintf(stderr, "libudev: %s: ", fn);
- vfprintf(stderr, format, args);
- }
+ fprintf(stderr, "libudev: %s: ", fn);
+ vfprintf(stderr, format, args);
}
-/* glue to udev logging, needed until udev logging code is "fixed" */
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
+void *udev_get_userdata(struct udev *udev)
{
- va_list args;
+ if (udev == NULL)
+ return NULL;
+ return udev->userdata;
+}
- va_start(args, format);
- log_stderr(NULL, priority, NULL, 0, "", format, args);
- va_end(args);
+void udev_set_userdata(struct udev *udev, void *userdata)
+{
+ if (udev == NULL)
+ return;
+ udev->userdata = userdata;
}
-#endif
/**
* udev_new:
@@ -95,6 +91,9 @@ void log_message(int priority, const char *format, ...)
struct udev *udev_new(void)
{
struct udev *udev;
+ const char *env;
+ char *config_file;
+ FILE *f;
udev = malloc(sizeof(struct udev));
if (udev == NULL)
@@ -102,10 +101,146 @@ struct udev *udev_new(void)
memset(udev, 0x00, (sizeof(struct udev)));
udev->refcount = 1;
udev->log_fn = log_stderr;
- udev_config_init();
- sysfs_init();
- log_info(udev, "context %p created\n", udev);
+ udev->log_priority = LOG_ERR;
+ 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)
+ goto err;
+
+ /* settings by environment and config file */
+ env = getenv("SYSFS_PATH");
+ if (env != NULL) {
+ free(udev->sys_path);
+ udev->sys_path = strdup(env);
+ util_remove_trailing_chars(udev->sys_path, '/');
+ }
+
+ env = getenv("UDEV_RUN");
+ 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);
+ util_remove_trailing_chars(config_file, '/');
+ }
+ if (config_file == NULL)
+ goto err;
+ f = fopen(config_file, "r");
+ if (f != NULL) {
+ char line[UTIL_LINE_SIZE];
+ int line_nr = 0;
+
+ while (fgets(line, sizeof(line), f)) {
+ size_t len;
+ char *key;
+ char *val;
+
+ line_nr++;
+
+ /* find key */
+ key = line;
+ while (isspace(key[0]))
+ key++;
+
+ /* comment or empty line */
+ if (key[0] == '#' || key[0] == '\0')
+ continue;
+
+ /* split key/value */
+ val = strchr(key, '=');
+ if (val == NULL) {
+ err(udev, "missing = in '%s'[%i], skip line\n", config_file, line_nr);
+ continue;
+ }
+ val[0] = '\0';
+ val++;
+
+ /* find value */
+ while (isspace(val[0]))
+ val++;
+
+ /* terminate key */
+ len = strlen(key);
+ if (len == 0)
+ continue;
+ while (isspace(key[len-1]))
+ len--;
+ key[len] = '\0';
+
+ /* terminate value */
+ len = strlen(val);
+ if (len == 0)
+ continue;
+ while (isspace(val[len-1]))
+ len--;
+ val[len] = '\0';
+
+ if (len == 0)
+ continue;
+
+ /* unquote */
+ if (val[0] == '"' || val[0] == '\'') {
+ if (val[len-1] != val[0]) {
+ err(udev, "inconsistent quoting in '%s'[%i], skip line\n", config_file, line_nr);
+ continue;
+ }
+ val[len-1] = '\0';
+ val++;
+ }
+
+ if (strcasecmp(key, "udev_log") == 0) {
+ udev->log_priority = util_log_priority(val);
+ continue;
+ }
+ if (strcasecmp(key, "udev_root") == 0) {
+ free(udev->dev_path);
+ udev->dev_path = strdup(val);
+ util_remove_trailing_chars(udev->dev_path, '/');
+ continue;
+ }
+ if (strcasecmp(key, "udev_rules") == 0) {
+ free(udev->rules_path);
+ udev->rules_path = strdup(val);
+ util_remove_trailing_chars(udev->rules_path, '/');
+ continue;
+ }
+ }
+ fclose(f);
+ }
+
+ env = getenv("UDEV_ROOT");
+ if (env != NULL) {
+ free(udev->dev_path);
+ udev->dev_path = strdup(env);
+ util_remove_trailing_chars(udev->dev_path, '/');
+ }
+
+ env = getenv("UDEV_LOG");
+ if (env != NULL)
+ udev->log_priority = 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);
+ info(udev, "dev_path='%s'\n", udev->dev_path);
+ 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:
+ free(config_file);
+ err(udev, "context creation failed\n");
+ udev_unref(udev);
+ return NULL;
}
/**
@@ -139,8 +274,10 @@ void udev_unref(struct udev *udev)
udev->refcount--;
if (udev->refcount > 0)
return;
- sysfs_cleanup();
- log_info(udev, "context %p released\n", udev);
+ free(udev->dev_path);
+ free(udev->sys_path);
+ free(udev->rules_path);
+ info(udev, "context %p released\n", udev);
free(udev);
}
@@ -149,8 +286,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.
*
@@ -161,7 +297,27 @@ void udev_set_log_fn(struct udev *udev,
const char *format, va_list args))
{
udev->log_fn = log_fn;
- log_info(udev, "custom logging function %p registered\n", udev);
+ info(udev, "custom logging function %p registered\n", udev);
+}
+
+int udev_get_log_priority(struct udev *udev)
+{
+ return udev->log_priority;
+}
+
+void udev_set_log_priority(struct udev *udev, int priority)
+{
+ udev->log_priority = priority;
+}
+
+const char *udev_get_rules_path(struct udev *udev)
+{
+ return udev->rules_path;
+}
+
+int udev_get_run(struct udev *udev)
+{
+ return udev->run;
}
/**
@@ -178,7 +334,7 @@ const char *udev_get_sys_path(struct udev *udev)
{
if (udev == NULL)
return NULL;
- return sysfs_path;
+ return udev->sys_path;
}
/**
@@ -195,5 +351,5 @@ const char *udev_get_dev_path(struct udev *udev)
{
if (udev == NULL)
return NULL;
- return udev_root;
+ return udev->dev_path;
}