chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-device: ensure update_properties_buf() is a noop on failure
[elogind.git]
/
src
/
libelogind
/
sd-device
/
sd-device.c
diff --git
a/src/libelogind/sd-device/sd-device.c
b/src/libelogind/sd-device/sd-device.c
index 7a7b323f3ce61ab4d57668cb454f55a724f504a7..97da4a8eea0d33a981439ed82f450e5377680b0c 100644
(file)
--- a/
src/libelogind/sd-device/sd-device.c
+++ b/
src/libelogind/sd-device/sd-device.c
@@
-500,6
+500,8
@@
int device_read_uevent_file(sd_device *device) {
if (device->uevent_loaded || device->sealed)
return 0;
if (device->uevent_loaded || device->sealed)
return 0;
+ device->uevent_loaded = true;
+
r = sd_device_get_syspath(device, &syspath);
if (r < 0)
return r;
r = sd_device_get_syspath(device, &syspath);
if (r < 0)
return r;
@@
-510,6
+512,9
@@
int device_read_uevent_file(sd_device *device) {
if (r == -EACCES)
/* empty uevent files may be write-only */
return 0;
if (r == -EACCES)
/* empty uevent files may be write-only */
return 0;
+ else if (r == -ENOENT)
+ /* some devices may not have uevent files, see set_syspath() */
+ return 0;
else if (r < 0) {
log_debug("sd-device: failed to read uevent file '%s': %s", path, strerror(-r));
return r;
else if (r < 0) {
log_debug("sd-device: failed to read uevent file '%s': %s", path, strerror(-r));
return r;
@@
-567,8
+572,6
@@
int device_read_uevent_file(sd_device *device) {
log_debug("sd-device: could not set 'MAJOR=%s' or 'MINOR=%s' from '%s': %s", major, minor, path, strerror(-r));
}
log_debug("sd-device: could not set 'MAJOR=%s' or 'MINOR=%s' from '%s': %s", major, minor, path, strerror(-r));
}
- device->uevent_loaded = true;
-
return 0;
}
return 0;
}
@@
-1190,12
+1193,12
@@
int device_get_id_filename(sd_device *device, const char **ret) {
streq(subsystem, "block") ? 'b' : 'c',
major(devnum), minor(devnum));
if (r < 0)
streq(subsystem, "block") ? 'b' : 'c',
major(devnum), minor(devnum));
if (r < 0)
- return -
errno
;
+ return -
ENOMEM
;
} else if (ifindex > 0) {
/* use netdev ifindex -- n3 */
r = asprintf(&id, "n%u", ifindex);
if (r < 0)
} else if (ifindex > 0) {
/* use netdev ifindex -- n3 */
r = asprintf(&id, "n%u", ifindex);
if (r < 0)
- return -
errno
;
+ return -
ENOMEM
;
} else {
/* use $subsys:$sysname -- pci:0000:00:1f.2
* sysname() has '!' translated, get it from devpath
} else {
/* use $subsys:$sysname -- pci:0000:00:1f.2
* sysname() has '!' translated, get it from devpath
@@
-1208,7
+1211,7
@@
int device_get_id_filename(sd_device *device, const char **ret) {
r = asprintf(&id, "+%s:%s", subsystem, sysname);
if (r < 0)
r = asprintf(&id, "+%s:%s", subsystem, sysname);
if (r < 0)
- return -
errno
;
+ return -
ENOMEM
;
}
device->id_filename = id;
}
device->id_filename = id;
@@
-1220,7
+1223,7
@@
int device_get_id_filename(sd_device *device, const char **ret) {
return 0;
}
return 0;
}
-
static int device_read_db(sd_device *devi
ce) {
+
int device_read_db_aux(sd_device *device, bool for
ce) {
_cleanup_free_ char *db = NULL;
char *path;
const char *id, *value;
_cleanup_free_ char *db = NULL;
char *path;
const char *id, *value;
@@
-1237,9
+1240,11
@@
static int device_read_db(sd_device *device) {
INVALID_LINE,
} state = PRE_KEY;
INVALID_LINE,
} state = PRE_KEY;
- if (device->db_loaded ||
device->sealed
)
+ if (device->db_loaded ||
(!force && device->sealed)
)
return 0;
return 0;
+ device->db_loaded = true;
+
r = device_get_id_filename(device, &id);
if (r < 0)
return r;
r = device_get_id_filename(device, &id);
if (r < 0)
return r;
@@
-1308,11
+1313,13
@@
static int device_read_db(sd_device *device) {
}
}
}
}
- device->db_loaded = true;
-
return 0;
}
return 0;
}
+static int device_read_db(sd_device *device) {
+ return device_read_db_aux(device, false);
+}
+
_public_ int sd_device_get_is_initialized(sd_device *device, int *initialized) {
int r;
_public_ int sd_device_get_is_initialized(sd_device *device, int *initialized) {
int r;