shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

sd-device: use delete_trailing_chars()

Browse Source 
Also, this drops trailing '\r' from sysattr value set in
sd_device_set_sysattr_value().
This commit is contained in:
Yu Watanabe 2021-02-18 23:06:31 +09:00
parent 23ff570ba8
commit 2a394d0bf2
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libsystemd/sd-device/sd-device.c
View File

@ -1916,16 +1916,13 @@ _public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr,
/* skip non-readable files */
return -EPERM;
} else {
size_t size;
/* read attribute value */
r = read_full_virtual_file(path, &value, &size);
r = read_full_virtual_file(path, &value, NULL);
if (r < 0)
return r;
/* drop trailing newlines */
while (size > 0 && value[--size] == '\n')
value[size] = '\0';
delete_trailing_chars(value, "\n");
}
r = device_cache_sysattr_value(device, sysattr, value);
@ -1972,7 +1969,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
len = strlen(_value);
/* drop trailing newlines */
while (len > 0 && _value[len - 1] == '\n')
while (len > 0 && strchr(NEWLINE, _value[len - 1]))
len --;
/* value length is limited to 4k */