diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-04-21 14:41:13 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 08:07:33 +0100 |
| commit | ce7df9fb79cd1b48dfa9ddf8662a2f9ed2884eb3 (patch) | |
| tree | e1f99b8c928fe8c9cf5d38220fa65b2b8c960454 /src/libelogind | |
| parent | 5c338de6761aa3b3285a3f507f2517dd7dd3e9a6 (diff) | |
sd-device: set_syspath - return ENODEV when passed something that is not a device
Diffstat (limited to 'src/libelogind')
| -rw-r--r-- | src/libelogind/sd-device/sd-device.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libelogind/sd-device/sd-device.c b/src/libelogind/sd-device/sd-device.c index 2e30b85ad..7a7b323f3 100644 --- a/src/libelogind/sd-device/sd-device.c +++ b/src/libelogind/sd-device/sd-device.c @@ -184,15 +184,17 @@ int device_set_syspath(sd_device *device, const char *_syspath, bool verify) { path = strjoina(syspath, "/uevent"); r = access(path, F_OK); if (r < 0) { + if (errno == ENOENT) + /* this is not a valid device */ + return -ENODEV; + log_debug("sd-device: %s does not have an uevent file: %m", syspath); return -errno; } } else { /* everything else just just needs to be a directory */ - if (!is_dir(syspath, false)) { - log_debug("sd-device: %s is not a directory", syspath); - return -EINVAL; - } + if (!is_dir(syspath, false)) + return -ENODEV; } } else { syspath = strdup(_syspath); |