chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-cap-list: always check libcap comes to the same names as we do, for the names...
[elogind.git]
/
src
/
rfkill
/
rfkill.c
diff --git
a/src/rfkill/rfkill.c
b/src/rfkill/rfkill.c
index 91536523b0b146c3eac8a0e747989e8ebbdabb17..5a90c778fb4033f2e25c1c24356b46efa1295b98 100644
(file)
--- a/
src/rfkill/rfkill.c
+++ b/
src/rfkill/rfkill.c
@@
-28,8
+28,8
@@
int main(int argc, char *argv[]) {
_cleanup_udev_unref_ struct udev *udev = NULL;
_cleanup_udev_device_unref_ struct udev_device *device = NULL;
int main(int argc, char *argv[]) {
_cleanup_udev_unref_ struct udev *udev = NULL;
_cleanup_udev_device_unref_ struct udev_device *device = NULL;
- _cleanup_free_ char *saved = NULL, *
ss = NULL, *escaped_name
= NULL;
- const char *
sysname, *name
;
+ _cleanup_free_ char *saved = NULL, *
escaped_type = NULL, *escaped_path_id
= NULL;
+ const char *
name, *type, *path_id
;
int r;
if (argc != 3) {
int r;
if (argc != 3) {
@@
-45,7
+45,7
@@
int main(int argc, char *argv[]) {
r = mkdir_p("/var/lib/systemd/rfkill", 0755);
if (r < 0) {
r = mkdir_p("/var/lib/systemd/rfkill", 0755);
if (r < 0) {
- log_error
("Failed to create rfkill directory: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to create rfkill directory: %m"
);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-55,49
+55,44
@@
int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
-
sysname = strchr(argv[2], ':'
);
- if (!
sysnam
e) {
- log_
error("Requires pair of subsystem and sysname for specifying rfkill device."
);
- return EXIT_
FAILURE
;
+
device = udev_device_new_from_subsystem_sysname(udev, "rfkill", argv[2]
);
+ if (!
devic
e) {
+ log_
debug_errno(errno, "Failed to get rfkill device '%s', ignoring: %m", argv[2]
);
+ return EXIT_
SUCCESS
;
}
}
-
ss = strndup(argv[2], sysname - argv[2]
);
- if (!
ss
) {
- log_
oom(
);
- return EXIT_
FAILURE
;
+
name = udev_device_get_sysattr_value(device, "name"
);
+ if (!
name
) {
+ log_
error("rfkill device has no name? Ignoring device."
);
+ return EXIT_
SUCCESS
;
}
}
-
sysname++
;
+
log_debug("Operating on rfkill device '%s'.", name)
;
- if (!streq(ss, "rfkill")) {
- log_error("Not a rfkill device: '%s:%s'", ss, sysname);
- return EXIT_FAILURE;
+ type = udev_device_get_sysattr_value(device, "type");
+ if (!type) {
+ log_error("rfkill device has no type? Ignoring device.");
+ return EXIT_SUCCESS;
}
}
- errno = 0;
- device = udev_device_new_from_subsystem_sysname(udev, ss, sysname);
- if (!device) {
- if (errno != 0)
- log_error("Failed to get rfkill device '%s:%s': %m", ss, sysname);
- else
- log_oom();
-
+ escaped_type = cescape(type);
+ if (!escaped_type) {
+ log_oom();
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- name = udev_device_get_sysattr_value(device, "name");
- if (!name) {
- log_error("rfkill device has no name?");
- return EXIT_FAILURE;
- }
+ path_id = udev_device_get_property_value(device, "ID_PATH");
+ if (path_id) {
+ escaped_path_id = cescape(path_id);
+ if (!escaped_path_id) {
+ log_oom();
+ return EXIT_FAILURE;
+ }
- escaped_name = cescape(name);
- if (!escaped_name) {
- log_oom();
- return EXIT_FAILURE;
- }
+ saved = strjoin("/var/lib/systemd/rfkill/", escaped_path_id, ":", escaped_type, NULL);
+ } else
+ saved = strjoin("/var/lib/systemd/rfkill/", escaped_type, NULL);
- saved = strjoin("/var/lib/systemd/rfkill/", escaped_name, NULL);
if (!saved) {
log_oom();
return EXIT_FAILURE;
if (!saved) {
log_oom();
return EXIT_FAILURE;
@@
-106,20
+101,21
@@
int main(int argc, char *argv[]) {
if (streq(argv[1], "load")) {
_cleanup_free_ char *value = NULL;
if (streq(argv[1], "load")) {
_cleanup_free_ char *value = NULL;
+ if (!shall_restore_state())
+ return EXIT_SUCCESS;
+
r = read_one_line_file(saved, &value);
r = read_one_line_file(saved, &value);
+ if (r == -ENOENT)
+ return EXIT_SUCCESS;
if (r < 0) {
if (r < 0) {
-
- if (r == -ENOENT)
- return EXIT_SUCCESS;
-
- log_error("Failed to read %s: %s", saved, strerror(-r));
+ log_error_errno(r, "Failed to read %s: %m", saved);
return EXIT_FAILURE;
}
r = udev_device_set_sysattr_value(device, "soft", value);
if (r < 0) {
return EXIT_FAILURE;
}
r = udev_device_set_sysattr_value(device, "soft", value);
if (r < 0) {
- log_
error("Failed to write system attribute: %s", strerror(-r)
);
- return EXIT_
FAILURE
;
+ log_
debug_errno(r, "Failed to write 'soft' attribute on rfkill device, ignoring: %m"
);
+ return EXIT_
SUCCESS
;
}
} else if (streq(argv[1], "save")) {
}
} else if (streq(argv[1], "save")) {
@@
-127,13
+123,13
@@
int main(int argc, char *argv[]) {
value = udev_device_get_sysattr_value(device, "soft");
if (!value) {
value = udev_device_get_sysattr_value(device, "soft");
if (!value) {
- log_
error("Failed to read system attribute: %s", strerror(-r)
);
- return EXIT_
FAILURE
;
+ log_
debug_errno(r, "Failed to read system attribute, ignoring device: %m"
);
+ return EXIT_
SUCCESS
;
}
r = write_string_file(saved, value);
if (r < 0) {
}
r = write_string_file(saved, value);
if (r < 0) {
- log_error
("Failed to write %s: %s", saved, strerror(-r)
);
+ log_error
_errno(r, "Failed to write %s: %m", saved
);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}