summaryrefslogtreecommitdiffstats
path: root/src/xdg-autostart-generator/xdg-autostart-service.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-09-17 13:44:12 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-09-18 15:28:48 +0200
commitf7bc0c324a79fef806d92fabafb77c1e1d68b5b4 (patch)
treeacd9af5f8dea02b6a73427869583c94745b12890 /src/xdg-autostart-generator/xdg-autostart-service.c
parentAdd CLOSE_AND_REPLACE helper (diff)
downloadsystemd-f7bc0c324a79fef806d92fabafb77c1e1d68b5b4.tar.xz
systemd-f7bc0c324a79fef806d92fabafb77c1e1d68b5b4.zip
Rename find_binary to find_executable
"executable" is more correct than "binary", since scripts are OK too.
Diffstat (limited to 'src/xdg-autostart-generator/xdg-autostart-service.c')
-rw-r--r--src/xdg-autostart-generator/xdg-autostart-service.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c
index c6f39f25bd..0485c90fc9 100644
--- a/src/xdg-autostart-generator/xdg-autostart-service.c
+++ b/src/xdg-autostart-generator/xdg-autostart-service.c
@@ -405,7 +405,7 @@ int xdg_autostart_format_exec_start(
/* This is the executable, find it in $PATH */
first_arg = false;
- r = find_binary(c, &executable);
+ r = find_executable(c, &executable);
if (r < 0)
return log_info_errno(r, "Exec binary '%s' does not exist: %m", c);
@@ -481,7 +481,7 @@ static int xdg_autostart_generate_desktop_condition(
if (!isempty(condition)) {
_cleanup_free_ char *gnome_autostart_condition_path = NULL, *e_autostart_condition = NULL;
- r = find_binary(test_binary, &gnome_autostart_condition_path);
+ r = find_executable(test_binary, &gnome_autostart_condition_path);
if (r < 0) {
log_full_errno(r == -ENOENT ? LOG_INFO : LOG_WARNING, r,
"%s not found: %m", test_binary);
@@ -536,10 +536,10 @@ int xdg_autostart_service_generate_unit(
/*
* The TryExec key cannot be checked properly from the systemd unit,
- * it is trivial to check using find_binary though.
+ * it is trivial to check using find_executable though.
*/
if (service->try_exec) {
- r = find_binary(service->try_exec, NULL);
+ r = find_executable(service->try_exec, NULL);
if (r < 0) {
log_full_errno(r == -ENOENT ? LOG_INFO : LOG_WARNING, r,
"Not generating service for XDG autostart %s, could not find TryExec= binary %s: %m",