* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <errno.h>
#include <string.h>
#include <ctype.h>
-#ifdef USE_SELINUX
-#include <selinux/selinux.h>
-#endif
#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;
-#ifdef USE_SELINUX
- int selinux_enabled;
- security_context_t selinux_prev_scontext;
-#endif
- int run:1;
+ int run;
};
void udev_log(struct udev *udev,
vfprintf(stderr, format, args);
}
-static void selinux_init(struct udev *udev)
-{
-#ifdef USE_SELINUX
- /*
- * record the present security context, for file-creation
- * restoration creation purposes.
- */
- udev->selinux_enabled = (is_selinux_enabled() > 0);
- if (udev->selinux_enabled) {
- matchpathcon_init_prefix(NULL, udev_get_dev_path(udev));
- if (getfscreatecon(&udev->selinux_prev_scontext) < 0) {
- err(udev, "getfscreatecon failed\n");
- udev->selinux_prev_scontext = NULL;
- }
- }
-#endif
-}
-
-static void selinux_exit(struct udev *udev)
-{
-#ifdef USE_SELINUX
- if (udev->selinux_enabled) {
- freecon(udev->selinux_prev_scontext);
- udev->selinux_prev_scontext = NULL;
- }
-#endif
-}
-
-void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode)
-{
-#ifdef USE_SELINUX
- if (udev->selinux_enabled) {
- security_context_t scontext = NULL;
-
- if (matchpathcon(file, mode, &scontext) < 0) {
- err(udev, "matchpathcon(%s) failed\n", file);
- return;
- }
- if (lsetfilecon(file, scontext) < 0)
- err(udev, "setfilecon %s failed: %s\n", file, strerror(errno));
- freecon(scontext);
- }
-#endif
-}
-
-void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode)
+void *udev_get_userdata(struct udev *udev)
{
-#ifdef USE_SELINUX
- if (udev->selinux_enabled) {
- security_context_t scontext = NULL;
-
- if (matchpathcon(file, mode, &scontext) < 0) {
- err(udev, "matchpathcon(%s) failed\n", file);
- return;
- }
- if (setfscreatecon(scontext) < 0)
- err(udev, "setfscreatecon %s failed: %s\n", file, strerror(errno));
- freecon(scontext);
- }
-#endif
+ if (udev == NULL)
+ return NULL;
+ return udev->userdata;
}
-void udev_selinux_resetfscreatecon(struct udev *udev)
+void udev_set_userdata(struct udev *udev, void *userdata)
{
-#ifdef USE_SELINUX
- if (udev->selinux_enabled) {
- if (setfscreatecon(udev->selinux_prev_scontext) < 0)
- err(udev, "setfscreatecon failed: %s\n", strerror(errno));
- }
-#endif
+ if (udev == NULL)
+ return;
+ udev->userdata = userdata;
}
/**
* Create udev library context.
*
* The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev library context.
+ * release the resources of the udev library context.
*
* Returns: a new udev library context
**/
char *config_file;
FILE *f;
- udev = malloc(sizeof(struct udev));
+ udev = calloc(1, sizeof(struct udev));
if (udev == NULL)
return NULL;
- memset(udev, 0x00, (sizeof(struct udev)));
-
- selinux_init(udev);
- sysfs_init();
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)
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)) {
}
if (strcasecmp(key, "udev_log") == 0) {
- udev->log_priority = log_priority(val);
+ udev_set_log_priority(udev, 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;
}
}
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);
- info(udev, "dev_path='%s'\n", udev->dev_path);
- info(udev, "sys_path='%s'\n", udev->sys_path);
+ dbg(udev, "context %p created\n", udev);
+ dbg(udev, "log_priority=%d\n", udev->log_priority);
+ dbg(udev, "config_file='%s'\n", config_file);
+ dbg(udev, "dev_path='%s'\n", udev->dev_path);
+ dbg(udev, "sys_path='%s'\n", udev->sys_path);
if (udev->rules_path != NULL)
- info(udev, "rules_path='%s'\n", udev->rules_path);
-
+ dbg(udev, "rules_path='%s'\n", udev->rules_path);
free(config_file);
return udev;
err:
* @udev: udev library context
*
* Drop a reference of the udev library context. If the refcount
- * reaches zero, the ressources of the context will be released.
+ * reaches zero, the resources of the context will be released.
*
**/
void udev_unref(struct udev *udev)
udev->refcount--;
if (udev->refcount > 0)
return;
- sysfs_cleanup();
- selinux_exit(udev);
+ udev_list_cleanup_entries(udev, &udev->properties_list);
free(udev->dev_path);
free(udev->sys_path);
free(udev->rules_path);
- info(udev, "context %p released\n", udev);
+ dbg(udev, "context %p released\n", udev);
free(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 writes to stderr. It can be
* overridden by a custom function, to plug log messages
- * into the users logging functionality.
+ * into the users' logging functionality.
*
**/
void udev_set_log_fn(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)
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_delete(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);
+}
~ianmdlvl / elogind.git / blobdiff