19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
22
* Contact the authors at <mandos@recompile.se>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
27
27
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO, fclose() */
33
#include <sys/types.h> /* fstat(), struct stat, waitpid(),
34
WIFEXITED(), WEXITSTATUS(), wait(),
35
pid_t, uid_t, gid_t, getuid(),
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
37
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
38
39
FD_SET(), FD_ISSET(), FD_CLR */
39
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
40
WEXITSTATUS(), WTERMSIG(),
42
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
43
43
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* struct dirent, scandirat() */
45
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
46
FD_CLOEXEC, write(), STDOUT_FILENO,
47
struct stat, fstat(), close(),
48
setgid(), setuid(), S_ISREG(),
49
faccessat() pipe2(), fork(),
50
_exit(), dup2(), fexecve(), read()
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
readdir(), closedir(), dirfd() */
46
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
fcntl(), setuid(), setgid(),
48
F_GETFD, F_SETFD, FD_CLOEXEC,
49
access(), pipe(), fork(), close()
50
dup2(), STDOUT_FILENO, _exit(),
51
execv(), write(), read(),
52
53
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
53
FD_CLOEXEC, openat(), scandirat(),
55
#include <string.h> /* strsep, strlen(), strsignal(),
56
strcmp(), strncmp() */
55
#include <string.h> /* strsep, strlen(), asprintf() */
57
56
#include <errno.h> /* errno */
58
57
#include <argp.h> /* struct argp_option, struct
59
58
argp_state, struct argp,
414
369
.doc = "Group ID the plugins will run as", .group = 3 },
415
370
{ .name = "debug", .key = 132,
416
371
.doc = "Debug mode", .group = 4 },
418
* These reproduce what we would get without ARGP_NO_HELP
420
{ .name = "help", .key = '?',
421
.doc = "Give this help list", .group = -1 },
422
{ .name = "usage", .key = -3,
423
.doc = "Give a short usage message", .group = -1 },
424
{ .name = "version", .key = 'V',
425
.doc = "Print program version", .group = -1 },
429
__attribute__((nonnull(3)))
430
error_t parse_opt(int key, char *arg, struct argp_state *state){
375
error_t parse_opt(int key, char *arg, __attribute__((unused))
376
struct argp_state *state) {
435
378
case 'g': /* --global-options */
438
while((plugin_option = strsep(&arg, ",")) != NULL){
439
if(not add_argument(getplugin(NULL), plugin_option)){
381
while((p = strsep(&arg, ",")) != NULL){
385
if(not add_argument(getplugin(NULL), p)){
386
perror("add_argument");
387
return ARGP_ERR_UNKNOWN;
446
392
case 'G': /* --global-env */
447
if(add_environment(getplugin(NULL), arg, true)){
396
if(not add_environment(getplugin(NULL), arg, true)){
397
perror("add_environment");
451
400
case 'o': /* --options-for */
453
char *option_list = strchr(arg, ':');
454
if(option_list == NULL){
455
argp_error(state, "No colon in \"%s\"", arg);
462
argp_error(state, "Empty plugin name");
467
while((option = strsep(&option_list, ",")) != NULL){
468
if(not add_argument(getplugin(arg), option)){
402
char *p_name = strsep(&arg, ":");
403
if(p_name[0] == '\0' or arg == NULL){
406
char *opt = strsep(&arg, ":");
407
if(opt[0] == '\0' or opt == NULL){
411
while((p = strsep(&opt, ",")) != NULL){
415
if(not add_argument(getplugin(p_name), p)){
416
perror("add_argument");
417
return ARGP_ERR_UNKNOWN;
475
422
case 'E': /* --env-for */
477
427
char *envdef = strchr(arg, ':');
478
428
if(envdef == NULL){
479
argp_error(state, "No colon in \"%s\"", arg);
486
argp_error(state, "Empty plugin name");
490
if(add_environment(getplugin(arg), envdef, true)){
432
if(not add_environment(getplugin(arg), envdef+1, true)){
433
perror("add_environment");
495
437
case 'd': /* --disable */
497
439
plugin *p = getplugin(arg);
441
return ARGP_ERR_UNKNOWN;
504
446
case 'e': /* --enable */
506
448
plugin *p = getplugin(arg);
450
return ARGP_ERR_UNKNOWN;
513
455
case 128: /* --plugin-dir */
515
457
plugindir = strdup(arg);
516
if(plugindir != NULL){
458
if(plugindir == NULL){
520
462
case 129: /* --config-file */
521
463
/* This is already done by parse_opt_config_file() */
523
465
case 130: /* --userid */
524
tmp_id = strtoimax(arg, &tmp, 10);
525
if(errno != 0 or tmp == arg or *tmp != '\0'
526
or tmp_id != (uid_t)tmp_id){
527
argp_error(state, "Bad user ID number: \"%s\", using %"
528
PRIdMAX, arg, (intmax_t)uid);
466
/* In the GNU C library, uid_t is always unsigned int */
467
ret = sscanf(arg, "%u", &uid);
469
fprintf(stderr, "Bad user ID number: \"%s\", using %u\n", arg,
534
473
case 131: /* --groupid */
535
tmp_id = strtoimax(arg, &tmp, 10);
536
if(errno != 0 or tmp == arg or *tmp != '\0'
537
or tmp_id != (gid_t)tmp_id){
538
argp_error(state, "Bad group ID number: \"%s\", using %"
539
PRIdMAX, arg, (intmax_t)gid);
474
/* In the GNU C library, gid_t is always unsigned int */
475
ret = sscanf(arg, "%u", &gid);
477
fprintf(stderr, "Bad group ID number: \"%s\", using %u\n",
545
481
case 132: /* --debug */
549
* These reproduce what we would get without ARGP_NO_HELP
551
case '?': /* --help */
552
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
553
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
554
case -3: /* --usage */
555
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
556
argp_state_help(state, state->out_stream,
557
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
558
case 'V': /* --version */
559
fprintf(state->out_stream, "%s\n", argp_program_version);
563
485
* When adding more options before this line, remember to also add a
564
486
* "case" to the "parse_opt_config_file" function below.
679
591
new_arg = strdup(p);
680
592
if(new_arg == NULL){
681
error(0, errno, "strdup");
682
exitstatus = EX_OSERR;
594
exitstatus = EXIT_FAILURE;
687
599
custom_argc += 1;
689
char **new_argv = realloc(custom_argv, sizeof(char *)
692
if(new_argv == NULL){
693
error(0, errno, "realloc");
694
exitstatus = EX_OSERR;
699
custom_argv = new_argv;
600
custom_argv = realloc(custom_argv, sizeof(char *)
601
* ((unsigned int) custom_argc + 1));
602
if(custom_argv == NULL){
604
exitstatus = EXIT_FAILURE;
702
608
custom_argv[custom_argc-1] = new_arg;
703
custom_argv[custom_argc] = NULL;
609
custom_argv[custom_argc] = NULL;
707
ret = fclose(conffp);
708
} while(ret == EOF and errno == EINTR);
710
error(0, errno, "fclose");
711
exitstatus = EX_IOERR;
716
614
/* Check for harmful errors and go to fallback. Other errors might
717
615
not affect opening plugins */
718
616
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
719
error(0, errno, "fopen");
720
exitstatus = EX_OSERR;
618
exitstatus = EXIT_FAILURE;
724
/* If there were any arguments from the configuration file, pass
725
them to parser as command line arguments */
622
/* If there was any arguments from configuration file,
623
pass them to parser as command arguments */
726
624
if(custom_argv != NULL){
727
ret = argp_parse(&argp, custom_argc, custom_argv,
728
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
736
error(0, errno, "argp_parse");
737
exitstatus = EX_OSERR;
740
exitstatus = EX_CONFIG;
625
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
627
if(ret == ARGP_ERR_UNKNOWN){
628
fprintf(stderr, "Unknown error while parsing arguments\n");
629
exitstatus = EXIT_FAILURE;
745
634
/* Parse actual command line arguments, to let them override the
747
ret = argp_parse(&argp, argc, argv,
748
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
756
error(0, errno, "argp_parse");
757
exitstatus = EX_OSERR;
760
exitstatus = EX_USAGE;
636
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
637
if(ret == ARGP_ERR_UNKNOWN){
638
fprintf(stderr, "Unknown error while parsing arguments\n");
639
exitstatus = EXIT_FAILURE;
768
647
for(char **a = p->argv; *a != NULL; a++){
769
648
fprintf(stderr, "\tArg: %s\n", *a);
771
fprintf(stderr, "...and %d environment variables\n", p->envc);
650
fprintf(stderr, "...and %u environment variables\n", p->envc);
772
651
for(char **a = p->environ; *a != NULL; a++){
773
652
fprintf(stderr, "\t%s\n", *a);
779
/* Work around Debian bug #633582:
780
<http://bugs.debian.org/633582> */
781
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
782
if(plugindir_fd == -1){
784
error(0, errno, "open(\"" PDIR "\")");
787
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
789
error(0, errno, "fstat");
791
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
792
ret = fchown(plugindir_fd, uid, gid);
794
error(0, errno, "fchown");
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
802
/* Lower permissions */
805
error(0, errno, "setgid");
657
/* Strip permissions down to nobody */
807
658
ret = setuid(uid);
809
error(0, errno, "setuid");
812
/* Open plugin directory with close_on_exec flag */
667
if(plugindir == NULL){
670
dir = opendir(plugindir);
674
perror("Could not open plugin dir");
675
exitstatus = EXIT_FAILURE;
679
/* Set the FD_CLOEXEC flag on the directory, if possible */
814
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
817
#else /* not O_CLOEXEC */
819
#endif /* not O_CLOEXEC */
822
error(0, errno, "Could not open plugin dir");
823
exitstatus = EX_UNAVAILABLE;
828
/* Set the FD_CLOEXEC flag on the directory */
829
ret = set_cloexec_flag(dir_fd);
831
error(0, errno, "set_cloexec_flag");
832
exitstatus = EX_OSERR;
835
#endif /* O_CLOEXEC */
838
int good_name(const struct dirent * const dirent){
839
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
840
"*.dpkg-old", "*.dpkg-bak",
841
"*.dpkg-divert", NULL };
843
#pragma GCC diagnostic push
844
#pragma GCC diagnostic ignored "-Wcast-qual"
846
for(const char **pat = (const char **)patterns;
847
*pat != NULL; pat++){
849
#pragma GCC diagnostic pop
851
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
854
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
855
" matching pattern %s\n", dirent->d_name, *pat);
681
int dir_fd = dirfd(dir);
683
ret = set_cloexec_flag(dir_fd);
685
perror("set_cloexec_flag");
686
exitstatus = EXIT_FAILURE;
864
#if __GLIBC_PREREQ(2, 15)
865
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
867
#else /* not __GLIBC_PREREQ(2, 15) */
868
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
869
&direntries, good_name, alphasort);
870
#endif /* not __GLIBC_PREREQ(2, 15) */
871
#else /* not __GLIBC__ */
872
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
873
&direntries, good_name, alphasort);
874
#endif /* not __GLIBC__ */
875
if(numplugins == -1){
876
error(0, errno, "Could not scan plugin dir");
878
exitstatus = EX_OSERR;
882
692
FD_ZERO(&rfds_all);
884
694
/* Read and execute any executable in the plugin directory*/
885
for(int i = 0; i < numplugins; i++){
887
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
889
error(0, errno, "Could not open plugin");
696
dirst = readdir(dir);
698
/* All directory entries have been processed */
702
exitstatus = EXIT_FAILURE;
708
d_name_len = strlen(dirst->d_name);
710
/* Ignore dotfiles, backup files and other junk */
712
bool bad_name = false;
714
const char const *bad_prefixes[] = { ".", "#", NULL };
716
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
719
".dpkg-divert", NULL };
720
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
721
size_t pre_len = strlen(*pre);
722
if((d_name_len >= pre_len)
723
and strncmp((dirst->d_name), *pre, pre_len) == 0){
725
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
726
" with bad prefix %s\n", dirst->d_name, *pre);
735
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
736
size_t suf_len = strlen(*suf);
737
if((d_name_len >= suf_len)
738
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
741
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
742
" with bad suffix %s\n", dirst->d_name, *suf);
755
if(plugindir == NULL){
756
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
758
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
893
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
765
ret = stat(filename, &st);
895
error(0, errno, "stat");
896
TEMP_FAILURE_RETRY(close(plugin_fd));
901
772
/* Ignore non-executable files */
902
if(not S_ISREG(st.st_mode)
903
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
773
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
906
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
907
" with bad type or mode\n",
908
plugindir != NULL ? plugindir : PDIR,
909
direntries[i]->d_name);
775
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
776
" with bad type or mode\n", filename);
911
TEMP_FAILURE_RETRY(close(plugin_fd));
916
plugin *p = getplugin(direntries[i]->d_name);
782
plugin *p = getplugin(dirst->d_name);
918
error(0, errno, "getplugin");
919
TEMP_FAILURE_RETRY(close(plugin_fd));
925
790
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
926
direntries[i]->d_name);
928
TEMP_FAILURE_RETRY(close(plugin_fd));
936
800
for(char **a = g->argv + 1; *a != NULL; a++){
937
801
if(not add_argument(p, *a)){
938
error(0, errno, "add_argument");
802
perror("add_argument");
941
805
/* Add global environment variables */
942
806
for(char **e = g->environ; *e != NULL; e++){
943
807
if(not add_environment(p, *e, false)){
944
error(0, errno, "add_environment");
808
perror("add_environment");
949
/* If this plugin has any environment variables, we need to
950
duplicate the environment from this process, too. */
813
/* If this plugin has any environment variables, we will call
814
using execve and need to duplicate the environment from this
951
816
if(p->environ[0] != NULL){
952
817
for(char **e = environ; *e != NULL; e++){
953
818
if(not add_environment(p, *e, false)){
954
error(0, errno, "add_environment");
819
perror("add_environment");
961
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
962
#else /* O_CLOEXEC */
963
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
964
#endif /* O_CLOEXEC */
966
error(0, errno, "pipe");
967
exitstatus = EX_OSERR;
971
if(pipefd[0] >= FD_SETSIZE){
972
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
974
TEMP_FAILURE_RETRY(close(pipefd[0]));
975
TEMP_FAILURE_RETRY(close(pipefd[1]));
976
exitstatus = EX_OSERR;
828
exitstatus = EXIT_FAILURE;
981
831
/* Ask OS to automatic close the pipe on exec */
982
832
ret = set_cloexec_flag(pipefd[0]);
984
error(0, errno, "set_cloexec_flag");
985
TEMP_FAILURE_RETRY(close(pipefd[0]));
986
TEMP_FAILURE_RETRY(close(pipefd[1]));
987
exitstatus = EX_OSERR;
834
perror("set_cloexec_flag");
835
exitstatus = EXIT_FAILURE;
991
838
ret = set_cloexec_flag(pipefd[1]);
993
error(0, errno, "set_cloexec_flag");
994
TEMP_FAILURE_RETRY(close(pipefd[0]));
995
TEMP_FAILURE_RETRY(close(pipefd[1]));
996
exitstatus = EX_OSERR;
840
perror("set_cloexec_flag");
841
exitstatus = EXIT_FAILURE;
1000
#endif /* not O_CLOEXEC */
1001
844
/* Block SIGCHLD until process is safely in process list */
1002
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1003
&sigchld_action.sa_mask,
845
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1006
error(0, errno, "sigprocmask");
1007
exitstatus = EX_OSERR;
1008
free(direntries[i]);
847
perror("sigprocmask");
848
exitstatus = EXIT_FAILURE;
1011
851
/* Starting a new process to be watched */
1015
} while(pid == -1 and errno == EINTR);
1017
error(0, errno, "fork");
1018
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1019
&sigchld_action.sa_mask, NULL));
1020
TEMP_FAILURE_RETRY(close(pipefd[0]));
1021
TEMP_FAILURE_RETRY(close(pipefd[1]));
1022
exitstatus = EX_OSERR;
1023
free(direntries[i]);
855
exitstatus = EXIT_FAILURE;
1027
859
/* this is the child process */
1028
860
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1030
error(0, errno, "sigaction");
1033
865
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1035
error(0, errno, "sigprocmask");
867
perror("sigprocmask");
1039
871
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1041
error(0, errno, "dup2");
1045
if(fexecve(plugin_fd, p->argv,
1046
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1047
error(0, errno, "fexecve for %s/%s",
1048
plugindir != NULL ? plugindir : PDIR,
1049
direntries[i]->d_name);
878
/* If dir has no file descriptor, we could not set FD_CLOEXEC
879
above and must now close it manually here. */
882
if(p->environ[0] == NULL){
883
if(execv(filename, p->argv) < 0){
888
if(execve(filename, p->argv, p->environ) < 0){
1054
895
/* Parent process */
1055
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1057
TEMP_FAILURE_RETRY(close(plugin_fd));
1058
plugin *new_plugin = getplugin(direntries[i]->d_name);
896
close(pipefd[1]); /* Close unused write end of pipe */
898
plugin *new_plugin = getplugin(dirst->d_name);
1059
899
if(new_plugin == NULL){
1060
error(0, errno, "getplugin");
1061
ret = (int)(TEMP_FAILURE_RETRY
1062
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
901
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1065
error(0, errno, "sigprocmask");
903
perror("sigprocmask");
1067
exitstatus = EX_OSERR;
1068
free(direntries[i]);
905
exitstatus = EXIT_FAILURE;
1071
free(direntries[i]);
1073
909
new_plugin->pid = pid;
1074
910
new_plugin->fd = pipefd[0];
1076
912
/* Unblock SIGCHLD so signal handler can be run if this process
1077
913
has already completed */
1078
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1079
&sigchld_action.sa_mask,
914
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1082
error(0, errno, "sigprocmask");
1083
exitstatus = EX_OSERR;
916
perror("sigprocmask");
917
exitstatus = EXIT_FAILURE;
1087
#if defined (__GNUC__) and defined (__GLIBC__)
1088
#if not __GLIBC_PREREQ(2, 16)
1089
#pragma GCC diagnostic push
1090
#pragma GCC diagnostic ignored "-Wsign-conversion"
1093
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1094
-Wconversion in GNU libc
1096
#if defined (__GNUC__) and defined (__GLIBC__)
1097
#if not __GLIBC_PREREQ(2, 16)
1098
#pragma GCC diagnostic pop
921
FD_SET(new_plugin->fd, &rfds_all);
1102
923
if(maxfd < new_plugin->fd){
1103
924
maxfd = new_plugin->fd;
1109
TEMP_FAILURE_RETRY(close(dir_fd));
1111
free_plugin(getplugin(NULL));
1113
931
for(plugin *p = plugin_list; p != NULL; p = p->next){
1114
932
if(p->pid != 0){
1125
943
while(plugin_list){
1126
944
fd_set rfds = rfds_all;
1127
945
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1128
if(select_ret == -1 and errno != EINTR){
1129
error(0, errno, "select");
1130
exitstatus = EX_OSERR;
946
if(select_ret == -1){
948
exitstatus = EXIT_FAILURE;
1133
951
/* OK, now either a process completed, or something can be read
1134
952
from one of them */
1135
953
for(plugin *proc = plugin_list; proc != NULL;){
1136
954
/* Is this process completely done? */
1137
if(proc->completed and proc->eof){
955
if(proc->eof and proc->completed){
1138
956
/* Only accept the plugin output if it exited cleanly */
1139
957
if(not WIFEXITED(proc->status)
1140
958
or WEXITSTATUS(proc->status) != 0){
1141
959
/* Bad exit by plugin */
1144
962
if(WIFEXITED(proc->status)){
1145
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1146
" status %d\n", proc->name,
1147
(intmax_t) (proc->pid),
963
fprintf(stderr, "Plugin %u exited with status %d\n",
964
(unsigned int) (proc->pid),
1148
965
WEXITSTATUS(proc->status));
1149
} else if(WIFSIGNALED(proc->status)){
1150
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1151
" signal %d: %s\n", proc->name,
1152
(intmax_t) (proc->pid),
1153
WTERMSIG(proc->status),
1154
strsignal(WTERMSIG(proc->status)));
966
} else if(WIFSIGNALED(proc->status)) {
967
fprintf(stderr, "Plugin %u killed by signal %d\n",
968
(unsigned int) (proc->pid),
969
WTERMSIG(proc->status));
1155
970
} else if(WCOREDUMP(proc->status)){
1156
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1157
" core\n", proc->name, (intmax_t) (proc->pid));
971
fprintf(stderr, "Plugin %u dumped core\n",
972
(unsigned int) (proc->pid));
1161
976
/* Remove the plugin */
1162
#if defined (__GNUC__) and defined (__GLIBC__)
1163
#if not __GLIBC_PREREQ(2, 16)
1164
#pragma GCC diagnostic push
1165
#pragma GCC diagnostic ignored "-Wsign-conversion"
1168
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1169
-Wconversion in GNU libc
1171
#if defined (__GNUC__) and defined (__GLIBC__)
1172
#if not __GLIBC_PREREQ(2, 16)
1173
#pragma GCC diagnostic pop
977
FD_CLR(proc->fd, &rfds_all);
1177
979
/* Block signal while modifying process_list */
1178
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1180
&sigchld_action.sa_mask,
980
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1183
error(0, errno, "sigprocmask");
1184
exitstatus = EX_OSERR;
982
perror("sigprocmask");
983
exitstatus = EXIT_FAILURE;
1211
1009
bool bret = print_out_password(proc->buffer,
1212
1010
proc->buffer_length);
1214
error(0, errno, "print_out_password");
1215
exitstatus = EX_IOERR;
1012
perror("print_out_password");
1013
exitstatus = EXIT_FAILURE;
1220
1018
/* This process has not completed. Does it have any output? */
1221
#if defined (__GNUC__) and defined (__GLIBC__)
1222
#if not __GLIBC_PREREQ(2, 16)
1223
#pragma GCC diagnostic push
1224
#pragma GCC diagnostic ignored "-Wsign-conversion"
1227
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1233
#if defined (__GNUC__) and defined (__GLIBC__)
1234
#if not __GLIBC_PREREQ(2, 16)
1235
#pragma GCC diagnostic pop
1019
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1238
1020
/* This process had nothing to say at this time */
1239
1021
proc = proc->next;
1242
1024
/* Before reading, make the process' data buffer large enough */
1243
1025
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1244
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1245
+ (size_t) BUFFER_SIZE);
1246
if(new_buffer == NULL){
1247
error(0, errno, "malloc");
1248
exitstatus = EX_OSERR;
1026
proc->buffer = realloc(proc->buffer, proc->buffer_size
1027
+ (size_t) BUFFER_SIZE);
1028
if(proc->buffer == NULL){
1030
exitstatus = EXIT_FAILURE;
1251
proc->buffer = new_buffer;
1252
1033
proc->buffer_size += BUFFER_SIZE;
1254
1035
/* Read from the process */
1255
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1257
+ proc->buffer_length,
1036
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1260
1039
/* Read error from this process; ignore the error */
1261
1040
proc = proc->next;