if (data->devlink) {
const char *devlink;
- FOREACH_DEVICE_DEVLINK(device, devlink)
- if (path_equal(devlink, data->devlink))
+ FOREACH_DEVICE_DEVLINK(device, link)
+ if (path_equal(link, data->devlink))
goto found;
if (sd_device_get_devname(device, &devlink) >= 0 && path_equal(devlink, data->devlink))
return log_error_errno(r, "Failed to add %s subsystem match to monitor: %m", subsystem);
}
+ _cleanup_free_ char *desc = NULL;
+ const char *sysname = NULL;
+ if (device)
+ (void) sd_device_get_sysname(device, &sysname);
+
+ desc = strjoin(sysname ?: subsystem, devlink ? ":" : ":initialization", devlink);
+ if (desc)
+ (void) sd_device_monitor_set_description(monitor, desc);
+
r = sd_device_monitor_attach_event(monitor, event);
if (r < 0)
return log_error_errno(r, "Failed to attach event to device monitor: %m");
str += is_escaped;
if (str[0] != '"')
return -EINVAL;
- str++;
if (!is_escaped) {
/* unescape double quotation '\"'->'"' */
- for (i = j = str; *i != '"'; i++, j++) {
+ for (j = str, i = str + 1; *i != '"'; i++, j++) {
if (*i == '\0')
return -EINVAL;
if (i[0] == '\\' && i[1] == '"')
*j = *i;
}
j[0] = '\0';
+ /*
+ * The return value must be terminated by two subsequent NULs
+ * so it could be safely interpreted as nulstr.
+ */
+ j[1] = '\0';
} else {
_cleanup_free_ char *unescaped = NULL;
ssize_t l;
/* find the end position of value */
- for (i = str; *i != '"'; i++) {
+ for (i = str + 1; *i != '"'; i++) {
if (i[0] == '\\')
i++;
if (*i == '\0')
}
i[0] = '\0';
- l = cunescape_length(str, i - str, 0, &unescaped);
+ l = cunescape_length(str + 1, i - (str + 1), 0, &unescaped);
if (l < 0)
return l;
- assert(l <= i - str);
+ assert(l <= i - (str + 1));
memcpy(str, unescaped, l + 1);
+ /*
+ * The return value must be terminated by two subsequent NULs
+ * so it could be safely interpreted as nulstr.
+ */
+ str[l + 1] = '\0';
}
*ret_value = str;
}
int udev_queue_init(void) {
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
fd = inotify_init1(IN_CLOEXEC);
if (fd < 0)
return TAKE_FD(fd);
}
-static int device_is_power_sink(sd_device *device) {
- _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
- bool found_source = false, found_sink = false;
- sd_device *parent, *d;
- int r;
-
- assert(device);
-
- /* USB-C power supply device has two power roles: source or sink. See,
- * https://docs.kernel.org/admin-guide/abi-testing.html#abi-file-testing-sysfs-class-typec */
-
- r = sd_device_enumerator_new(&e);
- if (r < 0)
- return r;
-
- r = sd_device_enumerator_allow_uninitialized(e);
- if (r < 0)
- return r;
-
- r = sd_device_enumerator_add_match_subsystem(e, "typec", true);
- if (r < 0)
- return r;
-
- r = sd_device_get_parent(device, &parent);
- if (r < 0)
- return r;
-
- r = sd_device_enumerator_add_match_parent(e, parent);
- if (r < 0)
- return r;
-
- FOREACH_DEVICE(e, d) {
- const char *val;
-
- r = sd_device_get_sysattr_value(d, "power_role", &val);
- if (r < 0) {
- if (r != -ENOENT)
- log_device_debug_errno(d, r, "Failed to read 'power_role' sysfs attribute, ignoring: %m");
- continue;
- }
-
- if (strstr(val, "[source]")) {
- found_source = true;
- log_device_debug(d, "The USB type-C port is in power source mode.");
- } else if (strstr(val, "[sink]")) {
- found_sink = true;
- log_device_debug(d, "The USB type-C port is in power sink mode.");
- }
- }
-
- if (found_sink)
- log_device_debug(device, "The USB type-C device has at least one port in power sink mode.");
- else if (!found_source)
- log_device_debug(device, "The USB type-C device has no port in power source mode, assuming the device is in power sink mode.");
- else
- log_device_debug(device, "All USB type-C ports are in power source mode.");
-
- return found_sink || !found_source;
-}
-
-int on_ac_power(void) {
- _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
- bool found_ac_online = false, found_battery = false;
- sd_device *d;
- int r;
-
- r = sd_device_enumerator_new(&e);
- if (r < 0)
- return r;
-
- r = sd_device_enumerator_allow_uninitialized(e);
- if (r < 0)
- return r;
-
- r = sd_device_enumerator_add_match_subsystem(e, "power_supply", true);
- if (r < 0)
- return r;
-
- FOREACH_DEVICE(e, d) {
- /* See
- * https://github.com/torvalds/linux/blob/4eef766b7d4d88f0b984781bc1bcb574a6eafdc7/include/linux/power_supply.h#L176
- * for defined power source types. Also see:
- * https://docs.kernel.org/admin-guide/abi-testing.html#abi-file-testing-sysfs-class-power */
-
- const char *val;
- r = sd_device_get_sysattr_value(d, "type", &val);
- if (r < 0) {
- log_device_debug_errno(d, r, "Failed to read 'type' sysfs attribute, ignoring device: %m");
- continue;
- }
-
- /* Ignore USB-C power supply in source mode. See issue #21988. */
- if (streq(val, "USB")) {
- r = device_is_power_sink(d);
- if (r <= 0) {
- if (r < 0)
- log_device_debug_errno(d, r, "Failed to determine the current power role, ignoring device: %m");
- else
- log_device_debug(d, "USB power supply is in source mode, ignoring device.");
- continue;
- }
- }
-
- if (streq(val, "Battery")) {
- r = sd_device_get_sysattr_value(d, "scope", &val);
- if (r < 0) {
- if (r != -ENOENT)
- log_device_debug_errno(d, r, "Failed to read 'scope' sysfs attribute, ignoring: %m");
- } else if (streq(val, "Device")) {
- log_device_debug(d, "The power supply is a device battery, ignoring device.");
- continue;
- }
-
- found_battery = true;
- log_device_debug(d, "The power supply is battery.");
- continue;
- }
-
- r = device_get_sysattr_unsigned(d, "online", NULL);
- if (r < 0) {
- log_device_debug_errno(d, r, "Failed to query 'online' sysfs attribute, ignoring device: %m");
- continue;
- } else if (r > 0) /* At least 1 and 2 are defined as different types of 'online' */
- found_ac_online = true;
-
- log_device_debug(d, "The power supply is currently %s.", r > 0 ? "online" : "offline");
- }
-
- if (found_ac_online) {
- log_debug("Found at least one online non-battery power supply, system is running on AC.");
- return true;
- } else if (found_battery) {
- log_debug("Found battery and no online power sources, assuming system is running from battery.");
- return false;
- } else {
- log_debug("No power supply reported online and no battery, assuming system is running on AC.");
- return true;
- }
-}
-
bool udev_available(void) {
static int cache = -1;
projects / thirdparty / systemd.git / blobdiff