chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev: udev_device_get_devname -> udev_device_get_devnode
[elogind.git]
/
udev
/
lib
/
libudev-monitor.c
diff --git
a/udev/lib/libudev-monitor.c
b/udev/lib/libudev-monitor.c
index 3e1731e38223948b9f99503ee65f99f3ba54227b..0dc8e10cbc68fa38d57ba43e2f30f544ab4fc3cc 100644
(file)
--- a/
udev/lib/libudev-monitor.c
+++ b/
udev/lib/libudev-monitor.c
@@
-17,8
+17,6
@@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* 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 <stdio.h>
#include <stdlib.h>
#include <stddef.h>
@@
-33,7
+31,6
@@
#include "libudev.h"
#include "libudev-private.h"
#include "libudev.h"
#include "libudev-private.h"
-#include "../udev.h"
struct udev_monitor {
struct udev *udev;
struct udev_monitor {
struct udev *udev;
@@
-303,7
+300,11
@@
struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
bufpos += keylen + 1;
if (strncmp(key, "DEVPATH=", 8) == 0) {
bufpos += keylen + 1;
if (strncmp(key, "DEVPATH=", 8) == 0) {
- device_set_devpath(udev_device, &key[8]);
+ char path[UTIL_PATH_SIZE];
+
+ util_strlcpy(path, udev_get_sys_path(udev_monitor->udev), sizeof(path));
+ util_strlcat(path, &key[8], sizeof(path));
+ device_set_syspath(udev_device, path);
} else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
device_set_subsystem(udev_device, &key[10]);
} else if (strncmp(key, "DEVNAME=", 8) == 0) {
} else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
device_set_subsystem(udev_device, &key[10]);
} else if (strncmp(key, "DEVNAME=", 8) == 0) {
@@
-337,7
+338,9
@@
struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
} else if (strncmp(key, "TIMEOUT=", 8) == 0) {
device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
}
} else if (strncmp(key, "TIMEOUT=", 8) == 0) {
device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
}
- device_add_property(udev_device, key);
+ if (strncmp(key, "PHYSDEV", 7) == 0)
+ continue;
+ device_add_property_from_string(udev_device, key);
}
device_set_devnum(udev_device, makedev(maj, min));
}
device_set_devnum(udev_device, makedev(maj, min));