chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: unify how we generate the prefix string when dumping unit state
[elogind.git]
/
src
/
libudev
/
libudev-device.c
diff --git
a/src/libudev/libudev-device.c
b/src/libudev/libudev-device.c
index 38144e3fbe64b694875160c14aa140534085ddf1..f26a4c44b559c55cffff79330dc4e5ce5af085cf 100644
(file)
--- a/
src/libudev/libudev-device.c
+++ b/
src/libudev/libudev-device.c
@@
-644,12
+644,16
@@
struct udev_device *udev_device_new(struct udev *udev)
struct udev_device *udev_device;
struct udev_list_entry *list_entry;
struct udev_device *udev_device;
struct udev_list_entry *list_entry;
- if (udev == NULL)
+ if (udev == NULL) {
+ errno = EINVAL;
return NULL;
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;
return NULL;
+ }
udev_device->refcount = 1;
udev_device->udev = udev;
udev_list_init(udev, &udev_device->devlinks_list, true);
udev_device->refcount = 1;
udev_device->udev = udev;
udev_list_init(udev, &udev_device->devlinks_list, true);
@@
-688,22
+692,30
@@
_public_ struct udev_device *udev_device_new_from_syspath(struct udev *udev, con
struct stat statbuf;
struct udev_device *udev_device;
struct stat statbuf;
struct udev_device *udev_device;
- if (udev == NULL)
+ if (udev == NULL) {
+ errno = EINVAL;
return NULL;
return NULL;
- if (syspath == NULL)
+ }
+
+ if (syspath == NULL) {
+ errno = EINVAL;
return NULL;
return NULL;
+ }
/* path starts in sys */
if (!startswith(syspath, "/sys")) {
udev_dbg(udev, "not in sys :%s\n", syspath);
/* path starts in sys */
if (!startswith(syspath, "/sys")) {
udev_dbg(udev, "not in sys :%s\n", syspath);
+ errno = EINVAL;
return NULL;
}
/* path is not a root directory */
subdir = syspath + strlen("/sys");
pos = strrchr(subdir, '/');
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;
return NULL;
+ }
/* resolve possible symlink to real path */
strscpy(path, sizeof(path), syspath);
/* resolve possible symlink to real path */
strscpy(path, sizeof(path), syspath);
@@
-757,8
+769,10
@@
_public_ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char
type_str = "block";
else if (type == 'c')
type_str = "char";
type_str = "block";
else if (type == 'c')
type_str = "char";
- else
+ else {
+ errno = EINVAL;
return NULL;
return NULL;
+ }
/* use /sys/dev/{block,char}/<maj>:<min> link */
snprintf(path, sizeof(path), "/sys/dev/%s/%u:%u",
/* use /sys/dev/{block,char}/<maj>:<min> link */
snprintf(path, sizeof(path), "/sys/dev/%s/%u:%u",
@@
-804,8
+818,10
@@
_public_ struct udev_device *udev_device_new_from_device_id(struct udev *udev, c
int ifindex;
ifindex = strtoul(&id[1], NULL, 10);
int ifindex;
ifindex = strtoul(&id[1], NULL, 10);
- if (ifindex <= 0)
+ if (ifindex <= 0) {
+ errno = EINVAL;
return NULL;
return NULL;
+ }
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0)
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0)
@@
-823,18
+839,24
@@
_public_ struct udev_device *udev_device_new_from_device_id(struct udev *udev, c
return NULL;
if (udev_device_get_ifindex(dev) == ifindex)
return dev;
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);
udev_device_unref(dev);
+ errno = ENODEV;
return NULL;
}
case '+':
strscpy(subsys, sizeof(subsys), &id[1]);
sysname = strchr(subsys, ':');
return NULL;
}
case '+':
strscpy(subsys, sizeof(subsys), &id[1]);
sysname = strchr(subsys, ':');
- if (sysname == NULL)
+ if (sysname == NULL) {
+ errno = EINVAL;
return NULL;
return NULL;
+ }
sysname[0] = '\0';
sysname = &sysname[1];
return udev_device_new_from_subsystem_sysname(udev, subsys, sysname);
default:
sysname[0] = '\0';
sysname = &sysname[1];
return udev_device_new_from_subsystem_sysname(udev, subsys, sysname);
default:
+ errno = EINVAL;
return NULL;
}
}
return NULL;
}
}
@@
-898,7
+920,9
@@
_public_ struct udev_device *udev_device_new_from_subsystem_sysname(struct udev
strscpyl(path, sizeof(path), "/sys/bus/", subsys, "/drivers/", driver, NULL);
if (stat(path, &statbuf) == 0)
goto found;
strscpyl(path, sizeof(path), "/sys/bus/", subsys, "/drivers/", driver, NULL);
if (stat(path, &statbuf) == 0)
goto found;
- }
+ } else
+ errno = EINVAL;
+
goto out;
}
goto out;
}
@@
-974,6
+998,8
@@
static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
if (udev_device_parent != NULL)
return udev_device_parent;
}
if (udev_device_parent != NULL)
return udev_device_parent;
}
+
+ errno = ENOENT;
return NULL;
}
return NULL;
}
@@
-997,8
+1023,10
@@
static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
**/
_public_ struct udev_device *udev_device_get_parent(struct udev_device *udev_device)
{
**/
_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;
return NULL;
+ }
if (!udev_device->parent_set) {
udev_device->parent_set = true;
udev_device->parent_device = device_new_from_parent(udev_device);
if (!udev_device->parent_set) {
udev_device->parent_set = true;
udev_device->parent_device = device_new_from_parent(udev_device);
@@
-1031,8
+1059,10
@@
_public_ struct udev_device *udev_device_get_parent_with_subsystem_devtype(struc
{
struct udev_device *parent;
{
struct udev_device *parent;
- if (subsystem == NULL)
+ if (subsystem == NULL) {
+ errno = EINVAL;
return NULL;
return NULL;
+ }
parent = udev_device_get_parent(udev_device);
while (parent != NULL) {
parent = udev_device_get_parent(udev_device);
while (parent != NULL) {
@@
-1049,6
+1079,10
@@
_public_ struct udev_device *udev_device_get_parent_with_subsystem_devtype(struc
}
parent = udev_device_get_parent(parent);
}
}
parent = udev_device_get_parent(parent);
}
+
+ if (!parent)
+ errno = ENOENT;
+
return parent;
}
return parent;
}
@@
-1341,7
+1375,7
@@
void udev_device_set_usec_initialized(struct udev_device *udev_device, usec_t us
char num[32];
udev_device->usec_initialized = usec_initialized;
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_add_property(udev_device, "USEC_INITIALIZED", num);
}