libudev: device_init() -> device_new()

[elogind.git] / udev / lib / libudev-monitor.c

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index 60f7bc29e504fa041a58223d29aa71ee6803ac3c..751f19ae9235c582b9032f181eed28a63a5bbd1e 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/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -85,7 +83,7 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
 
        udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (udev_monitor->sock == -1) {
-               err(udev, "error getting socket: %s\n", strerror(errno));
+               err(udev, "error getting socket: %m\n");
                free(udev_monitor);
                return NULL;
        }
@@ -108,7 +106,7 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
 
        udev_monitor->sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
        if (udev_monitor->sock == -1) {
-               err(udev, "error getting socket: %s\n", strerror(errno));
+               err(udev, "error getting socket: %m\n");
                free(udev_monitor);
                return NULL;
        }
@@ -129,14 +127,14 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
        if (udev_monitor->snl.nl_family != 0) {
                err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->snl, sizeof(struct sockaddr_nl));
                if (err < 0) {
-                       err(udev_monitor->udev, "bind failed: %s\n", strerror(errno));
+                       err(udev_monitor->udev, "bind failed: %m\n");
                        return err;
                }
                info(udev_monitor->udev, "monitor %p listening on netlink\n", udev_monitor);
        } else if (udev_monitor->sun.sun_family != 0) {
                err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
                if (err < 0) {
-                       err(udev_monitor->udev, "bind failed: %s\n", strerror(errno));
+                       err(udev_monitor->udev, "bind failed: %m\n");
                        return err;
                }
                /* enable receiving of the sender credentials */
@@ -286,7 +284,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
                return NULL;
        }
 
-       udev_device = device_init(udev_monitor->udev);
+       udev_device = device_new(udev_monitor->udev);
        if (udev_device == NULL) {
                return NULL;
        }
@@ -302,11 +300,15 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
                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) {
-                       device_set_devname(udev_device, &key[8]);
+                       device_set_devnode(udev_device, &key[8]);
                } else if (strncmp(key, "DEVLINKS=", 9) == 0) {
                        char *slink = &key[9];
                        char *next = strchr(slink, ' ');
@@ -336,9 +338,12 @@ 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));
                }
-               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_info_loaded(udev_device);
        return udev_device;
 }