chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: remove remaining selinux labeling for file in /run
[elogind.git]
/
src
/
libudev
/
libudev-device-private.c
diff --git
a/src/libudev/libudev-device-private.c
b/src/libudev/libudev-device-private.c
index 91fd06c0259a61c277b513d3da9ae20c56204c6a..234773662bb2b8e0cc0fe07b67b1b7ce270ccc58 100644
(file)
--- a/
src/libudev/libudev-device-private.c
+++ b/
src/libudev/libudev-device-private.c
@@
-25,18
+25,17
@@
static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
{
const char *id;
static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
{
const char *id;
- struct udev *udev = udev_device_get_udev(dev);
char filename[UTIL_PATH_SIZE];
id = udev_device_get_id_filename(dev);
if (id == NULL)
return;
char filename[UTIL_PATH_SIZE];
id = udev_device_get_id_filename(dev);
if (id == NULL)
return;
- util_strscpyl(filename, sizeof(filename),
udev_get_run_path(udev), "
/tags/", tag, "/", id, NULL);
+ util_strscpyl(filename, sizeof(filename),
TEST_PREFIX "/run/udev
/tags/", tag, "/", id, NULL);
if (add) {
int fd;
if (add) {
int fd;
-
util_create_path(udev, filename
);
+
mkdir_parents(filename, 0755
);
fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
if (fd >= 0)
close(fd);
fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
if (fd >= 0)
close(fd);
@@
-60,7
+59,7
@@
int udev_device_tag_index(struct udev_device *dev, struct udev_device *dev_old,
udev_list_entry_foreach(list_entry_current, udev_device_get_tags_list_entry(dev)) {
const char *tag = udev_list_entry_get_name(list_entry_current);
udev_list_entry_foreach(list_entry_current, udev_device_get_tags_list_entry(dev)) {
const char *tag = udev_list_entry_get_name(list_entry_current);
- if (str
cmp(tag, tag_old) == 0
) {
+ if (str
eq(tag, tag_old)
) {
found = true;
break;
}
found = true;
break;
}
@@
-96,9
+95,9
@@
static bool device_has_info(struct udev_device *udev_device)
int udev_device_update_db(struct udev_device *udev_device)
{
int udev_device_update_db(struct udev_device *udev_device)
{
+ struct udev *udev = udev_device_get_udev(udev_device);
bool has_info;
const char *id;
bool has_info;
const char *id;
- struct udev *udev = udev_device_get_udev(udev_device);
char filename[UTIL_PATH_SIZE];
char filename_tmp[UTIL_PATH_SIZE];
FILE *f;
char filename[UTIL_PATH_SIZE];
char filename_tmp[UTIL_PATH_SIZE];
FILE *f;
@@
-108,7
+107,7
@@
int udev_device_update_db(struct udev_device *udev_device)
return -1;
has_info = device_has_info(udev_device);
return -1;
has_info = device_has_info(udev_device);
- util_strscpyl(filename, sizeof(filename),
udev_get_run_path(udev), "
/data/", id, NULL);
+ util_strscpyl(filename, sizeof(filename),
TEST_PREFIX "/run/udev
/data/", id, NULL);
/* do not store anything for otherwise empty devices */
if (!has_info &&
/* do not store anything for otherwise empty devices */
if (!has_info &&
@@
-120,10
+119,10
@@
int udev_device_update_db(struct udev_device *udev_device)
/* write a database file */
util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
/* write a database file */
util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
-
util_create_path(udev, filename_tmp
);
+
mkdir_parents(filename_tmp, 0755
);
f = fopen(filename_tmp, "we");
if (f == NULL) {
f = fopen(filename_tmp, "we");
if (f == NULL) {
- err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
+
udev_
err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
return -1;
}
return -1;
}
@@
-138,10
+137,8
@@
int udev_device_update_db(struct udev_device *udev_device)
struct udev_list_entry *list_entry;
if (major(udev_device_get_devnum(udev_device)) > 0) {
struct udev_list_entry *list_entry;
if (major(udev_device_get_devnum(udev_device)) > 0) {
- size_t devlen = strlen(udev_get_dev_path(udev))+1;
-
udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(udev_device))
udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(udev_device))
- fprintf(f, "S:%s\n",
&udev_list_entry_get_name(list_entry)[devlen]
);
+ fprintf(f, "S:%s\n",
udev_list_entry_get_name(list_entry) + strlen(TEST_PREFIX "/dev/")
);
if (udev_device_get_devlink_priority(udev_device) != 0)
fprintf(f, "L:%i\n", udev_device_get_devlink_priority(udev_device));
if (udev_device_get_watch_handle(udev_device) >= 0)
if (udev_device_get_devlink_priority(udev_device) != 0)
fprintf(f, "L:%i\n", udev_device_get_devlink_priority(udev_device));
if (udev_device_get_watch_handle(udev_device) >= 0)
@@
-165,7
+162,7
@@
int udev_device_update_db(struct udev_device *udev_device)
fclose(f);
rename(filename_tmp, filename);
fclose(f);
rename(filename_tmp, filename);
- dbg(udev, "created %s file '%s' for '%s'\n", has_info ? "db" : "empty",
+
udev_
dbg(udev, "created %s file '%s' for '%s'\n", has_info ? "db" : "empty",
filename, udev_device_get_devpath(udev_device));
return 0;
}
filename, udev_device_get_devpath(udev_device));
return 0;
}
@@
-173,13
+170,12
@@
int udev_device_update_db(struct udev_device *udev_device)
int udev_device_delete_db(struct udev_device *udev_device)
{
const char *id;
int udev_device_delete_db(struct udev_device *udev_device)
{
const char *id;
- struct udev *udev = udev_device_get_udev(udev_device);
char filename[UTIL_PATH_SIZE];
id = udev_device_get_id_filename(udev_device);
if (id == NULL)
return -1;
char filename[UTIL_PATH_SIZE];
id = udev_device_get_id_filename(udev_device);
if (id == NULL)
return -1;
- util_strscpyl(filename, sizeof(filename),
udev_get_run_path(udev), "
/data/", id, NULL);
+ util_strscpyl(filename, sizeof(filename),
TEST_PREFIX "/run/udev
/data/", id, NULL);
unlink(filename);
return 0;
}
unlink(filename);
return 0;
}