return udev_device->devnum;
}
-static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
+int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
{
char num[32];
f = fopen(dbfile, "re");
if (f == NULL) {
- udev_dbg(udev_device->udev, "no db file to read %s: %m\n", dbfile);
+ log_debug("no db file to read %s: %m", dbfile);
return -errno;
}
+
+ /* devices with a database entry are initialized */
udev_device->is_initialized = true;
while (fgets(line, sizeof(line), f)) {
}
fclose(f);
- udev_dbg(udev_device->udev, "device %p filled with db file data\n", udev_device);
+ log_debug("device %p filled with db file data", udev_device);
return 0;
}
struct udev_device *udev_device_new(struct udev *udev)
{
struct udev_device *udev_device;
- struct udev_list_entry *list_entry;
- if (udev == NULL)
+ if (udev == NULL) {
+ errno = EINVAL;
return NULL;
+ }
- udev_device = calloc(1, sizeof(struct udev_device));
- if (udev_device == NULL)
+ udev_device = new0(struct udev_device, 1);
+ if (udev_device == NULL) {
+ errno = ENOMEM;
return NULL;
+ }
udev_device->refcount = 1;
udev_device->udev = udev;
udev_list_init(udev, &udev_device->devlinks_list, true);
udev_list_init(udev, &udev_device->sysattr_list, false);
udev_list_init(udev, &udev_device->tags_list, true);
udev_device->watch_handle = -1;
- /* copy global properties */
- udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
- udev_device_add_property(udev_device,
- udev_list_entry_get_name(list_entry),
- udev_list_entry_get_value(list_entry));
+
return udev_device;
}
struct stat statbuf;
struct udev_device *udev_device;
- if (udev == NULL)
+ if (udev == NULL) {
+ errno = EINVAL;
return NULL;
- if (syspath == NULL)
+ }
+
+ if (syspath == NULL) {
+ errno = EINVAL;
return NULL;
+ }
/* path starts in sys */
if (!startswith(syspath, "/sys")) {
- udev_dbg(udev, "not in sys :%s\n", syspath);
+ log_debug("not in sys :%s", syspath);
+ errno = EINVAL;
return NULL;
}
/* path is not a root directory */
subdir = syspath + strlen("/sys");
pos = strrchr(subdir, '/');
- if (pos == NULL || pos[1] == '\0' || pos < &subdir[2])
+ if (pos == NULL || pos[1] == '\0' || pos < &subdir[2]) {
+ errno = EINVAL;
return NULL;
+ }
/* resolve possible symlink to real path */
strscpy(path, sizeof(path), syspath);
return NULL;
udev_device_set_syspath(udev_device, path);
- udev_dbg(udev, "device %p has devpath '%s'\n", udev_device, udev_device_get_devpath(udev_device));
+ log_debug("device %p has devpath '%s'", udev_device, udev_device_get_devpath(udev_device));
return udev_device;
}
type_str = "block";
else if (type == 'c')
type_str = "char";
- else
+ else {
+ errno = EINVAL;
return NULL;
+ }
/* use /sys/dev/{block,char}/<maj>:<min> link */
snprintf(path, sizeof(path), "/sys/dev/%s/%u:%u",
int ifindex;
ifindex = strtoul(&id[1], NULL, 10);
- if (ifindex <= 0)
+ if (ifindex <= 0) {
+ errno = EINVAL;
return NULL;
+ }
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0)
return NULL;
- memset(&ifr, 0x00, sizeof(struct ifreq));
+ memzero(&ifr, sizeof(struct ifreq));
ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) != 0) {
close(sk);
return NULL;
if (udev_device_get_ifindex(dev) == ifindex)
return dev;
+
+ /* this is racy, so we may end up with the wrong device */
udev_device_unref(dev);
+ errno = ENODEV;
return NULL;
}
case '+':
strscpy(subsys, sizeof(subsys), &id[1]);
sysname = strchr(subsys, ':');
- if (sysname == NULL)
+ if (sysname == NULL) {
+ errno = EINVAL;
return NULL;
+ }
sysname[0] = '\0';
sysname = &sysname[1];
return udev_device_new_from_subsystem_sysname(udev, subsys, sysname);
default:
+ errno = EINVAL;
return NULL;
}
}
strscpyl(path, sizeof(path), "/sys/bus/", subsys, "/drivers/", driver, NULL);
if (stat(path, &statbuf) == 0)
goto found;
- }
+ } else
+ errno = EINVAL;
+
goto out;
}
udev_device_add_property_from_string_parse(udev_device, environ[i]);
if (udev_device_add_property_from_string_parse_finish(udev_device) < 0) {
- udev_dbg(udev, "missing values, invalid device\n");
+ log_debug("missing values, invalid device");
udev_device_unref(udev_device);
udev_device = NULL;
}
if (udev_device_parent != NULL)
return udev_device_parent;
}
+
+ errno = ENOENT;
return NULL;
}
* Find the next parent device, and fill in information from the sys
* device and the udev database entry.
*
- * The returned the device is not referenced. It is attached to the
- * child device, and will be cleaned up when the child device
- * is cleaned up.
+ * Returned device is not referenced. It is attached to the child
+ * device, and will be cleaned up when the child device is cleaned up.
*
* It is not necessarily just the upper level directory, empty or not
* recognized sys directories are ignored.
**/
_public_ struct udev_device *udev_device_get_parent(struct udev_device *udev_device)
{
- if (udev_device == NULL)
+ if (udev_device == NULL) {
+ errno = EINVAL;
return NULL;
+ }
if (!udev_device->parent_set) {
udev_device->parent_set = true;
udev_device->parent_device = device_new_from_parent(udev_device);
* If devtype is #NULL, only subsystem is checked, and any devtype will
* match.
*
- * The returned the device is not referenced. It is attached to the
- * child device, and will be cleaned up when the child device
- * is cleaned up.
+ * Returned device is not referenced. It is attached to the child
+ * device, and will be cleaned up when the child device is cleaned up.
*
* It can be called as many times as needed, without caring about
* references.
{
struct udev_device *parent;
- if (subsystem == NULL)
+ if (subsystem == NULL) {
+ errno = EINVAL;
return NULL;
+ }
parent = udev_device_get_parent(udev_device);
while (parent != NULL) {
}
parent = udev_device_get_parent(parent);
}
+
+ if (!parent)
+ errno = ENOENT;
+
return parent;
}
char num[32];
udev_device->usec_initialized = usec_initialized;
- snprintf(num, sizeof(num), "%llu", (unsigned long long)usec_initialized);
+ snprintf(num, sizeof(num), USEC_FMT, usec_initialized);
udev_device_add_property(udev_device, "USEC_INITIALIZED", num);
}
udev_device->is_initialized = true;
}
+static bool is_valid_tag(const char *tag)
+{
+ return !strchr(tag, ':') && !strchr(tag, ' ');
+}
+
int udev_device_add_tag(struct udev_device *udev_device, const char *tag)
{
- if (strchr(tag, ':') != NULL || strchr(tag, ' ') != NULL)
+ if (!is_valid_tag(tag))
return -EINVAL;
udev_device->tags_uptodate = false;
if (udev_list_entry_add(&udev_device->tags_list, tag, NULL) != NULL)
return -ENOMEM;
}
+void udev_device_remove_tag(struct udev_device *udev_device, const char *tag)
+{
+ struct udev_list_entry *e;
+
+ if (!is_valid_tag(tag))
+ return;
+ e = udev_list_get_entry(&udev_device->tags_list);
+ e = udev_list_entry_get_by_name(e, tag);
+ if (e) {
+ udev_device->tags_uptodate = false;
+ udev_list_entry_delete(e);
+ }
+}
+
void udev_device_cleanup_tags_list(struct udev_device *udev_device)
{
udev_device->tags_uptodate = false;