From bf97a42ac16ac031cddc6d67eff2db9e9a6e221f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 23 Sep 2014 01:56:07 +0200 Subject: m + rename the command orphan-reaper and exec to reapd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/orphan-reaper.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/reapd.c | 89 ++++++--------------------------------------- 2 files changed, 112 insertions(+), 79 deletions(-) create mode 100644 src/orphan-reaper.c (limited to 'src') diff --git a/src/orphan-reaper.c b/src/orphan-reaper.c new file mode 100644 index 0000000..7115583 --- /dev/null +++ b/src/orphan-reaper.c @@ -0,0 +1,102 @@ +/** + * orphan-reaper — Place subreapers in your process tree to keep it structured + * Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include +#include +#include +#include +#include + + + +static void usage(void) +{ + printf("USAGE: orphan-reaper [--fatal] [--] \n"); + printf("\n"); + printf("Unless `--fatal` is used, the program will run \n"); + printf("even if the process cound not be marked as a child subreaper.\n"); + printf("\n"); +} + + +int main(int argc, char** argv) +{ + int i, j, fatal = 0; + char** exec_argv; + pid_t pid; + + if ((argc < 2) || !strcmp(argv[1], "--help")) + return usage(), argc < 2 ? 1 : 0; + + for (i = 1; i < argc; i++) + if (!strcmp(argv[i], "--fatal")) + fatal = 1; + else if (!strcmp(argv[i], "--")) + { + i++; + break; + } + else if (strstr(argv[i], "-") == argv[i]) + return usage(), 1; + else + break; + + if (i == argc) + return usage(), 1; + + exec_argv = malloc((argc - i + 1) * sizeof(char*)); + if (exec_argv == NULL) + return perror(*argv), 2; + exec_argv[argc - i] = NULL; + for (j = 0; i < argc; j++, i++) + exec_argv[j] = argv[i]; + + if (access(LIBEXECDIR "/reapd", X_OK) < 0) + goto pfail; + + if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0) + goto error; + + pid = fork(); + if (pid == -1) + goto error; + else if (pid == 0) + goto exec; + else + { + exec_argv[0] = LIBEXECDIR "/reapd"; + exec_argv[1] = NULL; + execvp(*exec_argv, exec_argv); + goto pfail; + } + + exec: + (void) prctl(PR_SET_CHILD_SUBREAPER, 0); + execvp(*exec_argv, exec_argv); + pfail: + perror(*argv); + fail: + free(exec_argv); + return 2; + + error: + perror(*argv); + if (fatal) + goto fail; + goto exec; +} + diff --git a/src/reapd.c b/src/reapd.c index 5ffecd5..be74690 100644 --- a/src/reapd.c +++ b/src/reapd.c @@ -15,94 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include -#include -#include -#include +#include #include #include -#include - - - -static void usage(void) -{ - printf("USAGE: reapd [--fatal] [--] \n"); - printf("\n"); - printf("Unless `--fatal` is used, the program will run \n"); - printf("even if the process cound not be marked as a child subreaper.\n"); - printf("\n"); -} +#include +#include int main(int argc, char** argv) { - int i, j, r, fatal = 0; - char** exec_argv; pid_t pid; + (void) argc; - if ((argc < 2) || !strcmp(argv[1], "--help")) - return usage(), argc < 2 ? 1 : 0; - - for (i = 1; i < argc; i++) - if (!strcmp(argv[i], "--fatal")) - fatal = 1; - else if (!strcmp(argv[i], "--")) + for (;;) + if (pid = wait(NULL), pid == -1) { - i++; - break; + if (errno == ECHILD) + return 0; + else if (errno != EINTR) + return perror(*argv), 2; } - else if (strstr(argv[i], "-") == argv[i]) - return usage(), 1; - else - break; - - if (i == argc) - return usage(), 1; - - exec_argv = malloc((argc - i + 1) * sizeof(char*)); - if (exec_argv == NULL) - return perror(*argv), 2; - exec_argv[argc - i] = NULL; - for (j = 0; i < argc; j++, i++) - exec_argv[j] = argv[i]; - - r = prctl(PR_SET_CHILD_SUBREAPER, 1); - if (r < 0) - goto error; - - pid = fork(); - if (pid == -1) - goto error; - - if (pid == 0) - goto exec; - else - { - free(exec_argv); - for (;;) - if (pid = wait(NULL), pid == -1) - { - if (errno == ECHILD) - return 0; - else if (errno != EINTR) - return perror(*argv), 2; - } - } - - exec: - (void) prctl(PR_SET_CHILD_SUBREAPER, 0); - execvp(*exec_argv, exec_argv); - perror(*argv); - fail: - free(exec_argv); - return 2; - - error: - perror(*argv); - if (fatal) - goto fail; - goto exec; } -- cgit v1.2.3-70-g09d2