X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Finhibit.c;h=0e5dce59258c47ae797a668af8dcc3d57be5ee6d;hp=208a0ce49b7201aee800468f60ae0a131e4bd6ed;hb=a60149bda6fb245c1ed2422a92027a7a0b1b40de;hpb=0fb0c56f5283a8a94560f595768a801c8240a9bd diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 208a0ce49..0e5dce592 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -20,24 +20,25 @@ ***/ #include -#include #include #include #include #include #include "sd-bus.h" - #include "bus-util.h" #include "bus-error.h" #include "util.h" #include "build.h" #include "strv.h" +#include "formats-util.h" +#include "process-util.h" +#include "signal-util.h" static const char* arg_what = "idle:sleep:shutdown"; static const char* arg_who = NULL; static const char* arg_why = "Unknown reason"; -static const char* arg_mode = "block"; +static const char* arg_mode = NULL; static enum { ACTION_INHIBIT, @@ -63,9 +64,9 @@ static int inhibit(sd_bus *bus, sd_bus_error *error) { r = sd_bus_message_read_basic(reply, SD_BUS_TYPE_UNIX_FD, &fd); if (r < 0) - return -EIO; + return r; - r = dup(fd); + r = fcntl(fd, F_DUPFD_CLOEXEC, 3); if (r < 0) return -errno; @@ -93,20 +94,22 @@ static int print_inhibitors(sd_bus *bus, sd_bus_error *error) { r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssuu)"); if (r < 0) - return -EIO; + return bus_log_parse_error(r); while ((r = sd_bus_message_read(reply, "(ssssuu)", &what, &who, &why, &mode, &uid, &pid)) > 0) { _cleanup_free_ char *comm = NULL, *u = NULL; + if (arg_mode && !streq(mode, arg_mode)) + continue; get_process_comm(pid, &comm); u = uid_to_name(uid); - printf(" Who: %s (UID %lu/%s, PID %lu/%s)\n" + printf(" Who: %s (UID "UID_FMT"/%s, PID "PID_FMT"/%s)\n" " What: %s\n" " Why: %s\n" " Mode: %s\n\n", - who, (unsigned long) uid, strna(u), (unsigned long) pid, strna(comm), + who, uid, strna(u), pid, strna(comm), what, why, mode); @@ -114,18 +117,17 @@ static int print_inhibitors(sd_bus *bus, sd_bus_error *error) { n++; } if (r < 0) - return -EIO; + return bus_log_parse_error(r); r = sd_bus_message_exit_container(reply); if (r < 0) - return -EIO; + return bus_log_parse_error(r); printf("%u inhibitors listed.\n", n); return 0; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] {COMMAND} ...\n\n" "Execute a process while inhibiting shutdown/sleep/idle.\n\n" " -h --help Show this help\n" @@ -137,10 +139,8 @@ static int help(void) { " --who=STRING A descriptive string who is inhibiting\n" " --why=STRING A descriptive string why is being inhibited\n" " --mode=MODE One of block or delay\n" - " --list List active inhibitors\n", - program_invocation_short_name); - - return 0; + " --list List active inhibitors\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { @@ -162,7 +162,7 @@ static int parse_argv(int argc, char *argv[]) { { "why", required_argument, NULL, ARG_WHY }, { "mode", required_argument, NULL, ARG_MODE }, { "list", no_argument, NULL, ARG_LIST }, - { NULL, 0, NULL, 0 } + {} }; int c; @@ -170,7 +170,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) switch (c) { @@ -203,13 +203,14 @@ static int parse_argv(int argc, char *argv[]) { arg_action = ACTION_LIST; break; - default: - log_error("Unknown option code %c", c); + case '?': return -EINVAL; + + default: + assert_not_reached("Unhandled option"); } - } - if (arg_action == ACTION_INHIBIT && argc == 1) + if (arg_action == ACTION_INHIBIT && optind == argc) arg_action = ACTION_LIST; else if (arg_action == ACTION_INHIBIT && optind >= argc) { @@ -221,21 +222,22 @@ static int parse_argv(int argc, char *argv[]) { } int main(int argc, char *argv[]) { - int r; - _cleanup_bus_unref_ sd_bus *bus = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - int fd = -1; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; + int r; log_parse_environment(); log_open(); r = parse_argv(argc, argv); - if (r <= 0) + if (r < 0) return EXIT_FAILURE; + if (r == 0) + return EXIT_SUCCESS; - r = sd_bus_open_system(&bus); + r = sd_bus_default_system(&bus); if (r < 0) { - log_error("Failed to connect to bus: %s", strerror(-r)); + log_error_errno(r, "Failed to connect to bus: %m"); return EXIT_FAILURE; } @@ -248,42 +250,43 @@ int main(int argc, char *argv[]) { } } else { - char *w = NULL; + _cleanup_close_ int fd = -1; + _cleanup_free_ char *w = NULL; pid_t pid; if (!arg_who) arg_who = w = strv_join(argv + optind, " "); - fd = inhibit(bus, &error); - free(w); + if (!arg_mode) + arg_mode = "block"; + fd = inhibit(bus, &error); if (fd < 0) { - log_error("Failed to inhibit: %s", bus_error_message(&error, -r)); + log_error("Failed to inhibit: %s", bus_error_message(&error, fd)); return EXIT_FAILURE; } pid = fork(); if (pid < 0) { - log_error("Failed to fork: %m"); + log_error_errno(errno, "Failed to fork: %m"); return EXIT_FAILURE; } if (pid == 0) { /* Child */ + (void) reset_all_signal_handlers(); + (void) reset_signal_mask(); + close_all_fds(NULL, 0); execvp(argv[optind], argv + optind); - log_error("Failed to execute %s: %m", argv[optind]); + log_error_errno(errno, "Failed to execute %s: %m", argv[optind]); _exit(EXIT_FAILURE); } - r = wait_for_terminate_and_warn(argv[optind], pid); - close(fd); - if (r < 0) - return EXIT_FAILURE; - else - return r; + r = wait_for_terminate_and_warn(argv[optind], pid, true); + return r < 0 ? EXIT_FAILURE : r; } return 0;