udev_monitor->udev = udev;
udev_monitor->sun.sun_family = AF_LOCAL;
- if (udev_monitor->sun.sun_path[0] == '@') {
+ if (socket_path[0] == '@') {
/* translate leading '@' to abstract namespace */
util_strlcpy(udev_monitor->sun.sun_path, socket_path, sizeof(udev_monitor->sun.sun_path));
udev_monitor->sun.sun_path[0] = '\0';
udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(socket_path);
- } else if (stat(udev_monitor->sun.sun_path, &statbuf) == 0 && S_ISSOCK(statbuf.st_mode)) {
+ } else if (stat(socket_path, &statbuf) == 0 && S_ISSOCK(statbuf.st_mode)) {
/* existing socket file */
util_strlcpy(udev_monitor->sun.sun_path, socket_path, sizeof(udev_monitor->sun.sun_path));
udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(socket_path);
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
char buf[4096];
size_t bufpos;
+ int devpath_set = 0;
int maj = 0;
int min = 0;
util_strlcpy(path, udev_get_sys_path(udev_monitor->udev), sizeof(path));
util_strlcat(path, &key[8], sizeof(path));
udev_device_set_syspath(udev_device, path);
+ devpath_set = 1;
} else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
udev_device_set_subsystem(udev_device, &key[10]);
} else if (strncmp(key, "DEVNAME=", 8) == 0) {
udev_device_set_devnode(udev_device, &key[8]);
} else if (strncmp(key, "DEVLINKS=", 9) == 0) {
- char *slink = &key[9];
- char *next = strchr(slink, ' ');
+ char devlinks[UTIL_PATH_SIZE];
+ char *slink;
+ char *next;
+ util_strlcpy(devlinks, &key[9], sizeof(devlinks));
+ slink = devlinks;
+ next = strchr(slink, ' ');
while (next != NULL) {
next[0] = '\0';
udev_device_add_devlink(udev_device, slink);
continue;
udev_device_add_property_from_string(udev_device, key);
}
+ if (!devpath_set) {
+ udev_device_unref(udev_device);
+ return NULL;
+ }
udev_device_set_devnum(udev_device, makedev(maj, min));
-
udev_device_set_info_loaded(udev_device);
return udev_device;
}
bufpos = snprintf(buf, sizeof(buf), "%s@%s", action, udev_device_get_devpath(udev_device));
bufpos++;
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
- bufpos += util_strlcpy(&buf[bufpos],
- udev_list_entry_get_name(list_entry),
- sizeof(buf) - bufpos);
+ bufpos += snprintf(&buf[bufpos], sizeof(buf) - bufpos, "%s=%s",
+ udev_list_entry_get_name(list_entry),
+ udev_list_entry_get_value(list_entry));
bufpos++;
}
count = sendto(udev_monitor->sock,