18
19
* along with this program. If not, see
19
20
* <http://www.gnu.org/licenses/>.
21
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
24
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf(), O_CLOEXEC */
26
27
#include <stddef.h> /* size_t, NULL */
27
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
28
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
30
#include <stdbool.h> /* bool, true, false */
30
#include <stdio.h> /* perror, popen(), fileno(),
31
fprintf(), stderr, STDOUT_FILENO */
32
#include <sys/types.h> /* DIR, opendir(), stat(), struct
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
33
34
stat, waitpid(), WIFEXITED(),
34
35
WEXITSTATUS(), wait(), pid_t,
35
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(),
41
WEXITSTATUS(), WTERMSIG(),
41
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
42
44
#include <iso646.h> /* and, or, not */
43
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
44
46
readdir(), closedir(), dirfd() */
45
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
46
48
fcntl(), setuid(), setgid(),
47
49
F_GETFD, F_SETFD, FD_CLOEXEC,
48
50
access(), pipe(), fork(), close()
49
dup2, STDOUT_FILENO, _exit(),
51
dup2(), STDOUT_FILENO, _exit(),
50
52
execv(), write(), read(),
52
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
#include <string.h> /* strsep, strlen(), asprintf() */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
55
58
#include <errno.h> /* errno */
56
59
#include <argp.h> /* struct argp_option, struct
57
60
argp_state, struct argp,
61
64
#include <signal.h> /* struct sigaction, sigemptyset(),
62
65
sigaddset(), sigaction(),
63
66
sigprocmask(), SIG_BLOCK, SIGCHLD,
64
SIG_UNBLOCK, kill() */
67
SIG_UNBLOCK, kill(), sig_atomic_t
65
69
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
#include <errno.h> /* errno */
74
#include <error.h> /* error() */
67
76
#define BUFFER_SIZE 256
69
78
#define PDIR "/lib/mandos/plugins.d"
70
79
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
72
const char *argp_program_version = "plugin-runner 1.0";
73
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
81
const char *argp_program_version = "plugin-runner " VERSION;
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
77
84
typedef struct plugin{
78
85
char *name; /* can be NULL or any plugin name */
99
106
/* Gets an existing plugin based on name,
100
107
or if none is found, creates a new one */
101
108
static plugin *getplugin(char *name){
102
/* Check for exiting plugin with that name */
103
for (plugin *p = plugin_list; p != NULL; p = p->next){
104
if ((p->name == name)
105
or (p->name and name and (strcmp(p->name, name) == 0))){
109
/* Check for existing plugin with that name */
110
for(plugin *p = plugin_list; p != NULL; p = p->next){
112
or (p->name and name and (strcmp(p->name, name) == 0))){
109
116
/* Create a new plugin */
110
plugin *new_plugin = malloc(sizeof(plugin));
111
if (new_plugin == NULL){
117
plugin *new_plugin = NULL;
119
new_plugin = malloc(sizeof(plugin));
120
} while(new_plugin == NULL and errno == EINTR);
121
if(new_plugin == NULL){
114
124
char *copy_name = NULL;
115
125
if(name != NULL){
116
copy_name = strdup(name);
127
copy_name = strdup(name);
128
} while(copy_name == NULL and errno == EINTR);
117
129
if(copy_name == NULL){
122
*new_plugin = (plugin) { .name = copy_name,
125
.next = plugin_list };
137
*new_plugin = (plugin){ .name = copy_name,
140
.next = plugin_list };
127
new_plugin->argv = malloc(sizeof(char *) * 2);
128
if (new_plugin->argv == NULL){
143
new_plugin->argv = malloc(sizeof(char *) * 2);
144
} while(new_plugin->argv == NULL and errno == EINTR);
145
if(new_plugin->argv == NULL){
130
148
free(new_plugin);
133
152
new_plugin->argv[0] = copy_name;
134
153
new_plugin->argv[1] = NULL;
136
new_plugin->environ = malloc(sizeof(char *));
156
new_plugin->environ = malloc(sizeof(char *));
157
} while(new_plugin->environ == NULL and errno == EINTR);
137
158
if(new_plugin->environ == NULL){
139
161
free(new_plugin->argv);
140
162
free(new_plugin);
143
166
new_plugin->environ[0] = NULL;
370
409
.doc = "Group ID the plugins will run as", .group = 3 },
371
410
{ .name = "debug", .key = 132,
372
411
.doc = "Debug mode", .group = 4 },
413
* These reproduce what we would get without ARGP_NO_HELP
415
{ .name = "help", .key = '?',
416
.doc = "Give this help list", .group = -1 },
417
{ .name = "usage", .key = -3,
418
.doc = "Give a short usage message", .group = -1 },
419
{ .name = "version", .key = 'V',
420
.doc = "Print program version", .group = -1 },
376
error_t parse_opt (int key, char *arg, __attribute__((unused))
377
struct argp_state *state) {
424
__attribute__((nonnull(3)))
425
error_t parse_opt(int key, char *arg, struct argp_state *state){
379
430
case 'g': /* --global-options */
382
while((p = strsep(&arg, ",")) != NULL){
386
if(not add_argument(getplugin(NULL), p)){
387
perror("add_argument");
388
return ARGP_ERR_UNKNOWN;
433
while((plugin_option = strsep(&arg, ",")) != NULL){
434
if(not add_argument(getplugin(NULL), plugin_option)){
393
440
case 'G': /* --global-env */
398
char *envdef = strdup(arg);
402
if(not add_environment(getplugin(NULL), envdef, true)){
403
perror("add_environment");
441
add_environment(getplugin(NULL), arg, true);
407
443
case 'o': /* --options-for */
409
char *p_name = strsep(&arg, ":");
410
if(p_name[0] == '\0' or arg == NULL){
413
char *opt = strsep(&arg, ":");
414
if(opt[0] == '\0' or opt == NULL){
418
while((p = strsep(&opt, ",")) != NULL){
422
if(not add_argument(getplugin(p_name), p)){
423
perror("add_argument");
424
return ARGP_ERR_UNKNOWN;
445
char *option_list = strchr(arg, ':');
446
if(option_list == NULL){
447
argp_error(state, "No colon in \"%s\"", arg);
454
argp_error(state, "Empty plugin name");
459
while((option = strsep(&option_list, ",")) != NULL){
460
if(not add_argument(getplugin(arg), option)){
429
466
case 'E': /* --env-for */
434
468
char *envdef = strchr(arg, ':');
435
469
if(envdef == NULL){
438
char *p_name = strndup(arg, (size_t) (envdef-arg));
470
argp_error(state, "No colon in \"%s\"", arg);
443
if(not add_environment(getplugin(p_name), envdef, true)){
444
perror("add_environment");
477
argp_error(state, "Empty plugin name");
481
add_environment(getplugin(arg), envdef, true);
448
484
case 'd': /* --disable */
450
486
plugin *p = getplugin(arg);
452
return ARGP_ERR_UNKNOWN;
457
492
case 'e': /* --enable */
459
494
plugin *p = getplugin(arg);
461
return ARGP_ERR_UNKNOWN;
466
500
case 128: /* --plugin-dir */
467
502
plugindir = strdup(arg);
468
if(plugindir == NULL){
472
504
case 129: /* --config-file */
473
505
/* This is already done by parse_opt_config_file() */
475
507
case 130: /* --userid */
476
uid = (uid_t)strtol(arg, NULL, 10);
508
tmp_id = strtoimax(arg, &tmp, 10);
509
if(errno != 0 or tmp == arg or *tmp != '\0'
510
or tmp_id != (uid_t)tmp_id){
511
argp_error(state, "Bad user ID number: \"%s\", using %"
512
PRIdMAX, arg, (intmax_t)uid);
478
517
case 131: /* --groupid */
479
gid = (gid_t)strtol(arg, NULL, 10);
518
tmp_id = strtoimax(arg, &tmp, 10);
519
if(errno != 0 or tmp == arg or *tmp != '\0'
520
or tmp_id != (gid_t)tmp_id){
521
argp_error(state, "Bad group ID number: \"%s\", using %"
522
PRIdMAX, arg, (intmax_t)gid);
481
527
case 132: /* --debug */
531
* These reproduce what we would get without ARGP_NO_HELP
533
case '?': /* --help */
534
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
535
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
536
case -3: /* --usage */
537
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
538
argp_state_help(state, state->out_stream,
539
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
540
case 'V': /* --version */
541
fprintf(state->out_stream, "%s\n", argp_program_version);
545
* When adding more options before this line, remember to also add a
546
* "case" to the "parse_opt_config_file" function below.
484
548
case ARGP_KEY_ARG:
485
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
549
/* Cryptsetup always passes an argument, which is an empty
550
string if "none" was specified in /etc/crypttab. So if
551
argument was empty, we ignore it silently. */
490
556
return ARGP_ERR_UNKNOWN;
558
return errno; /* Set to 0 at start */
495
561
/* This option parser is the same as parse_opt() above, except it
496
562
ignores everything but the --config-file option. */
497
error_t parse_opt_config_file (int key, char *arg,
498
__attribute__((unused))
499
struct argp_state *state) {
563
error_t parse_opt_config_file(int key, char *arg,
564
__attribute__((unused))
565
struct argp_state *state){
501
568
case 'g': /* --global-options */
502
569
case 'G': /* --global-env */
503
570
case 'o': /* --options-for */
591
667
custom_argv = realloc(custom_argv, sizeof(char *)
592
668
* ((unsigned int) custom_argc + 1));
593
669
if(custom_argv == NULL){
595
exitstatus = EXIT_FAILURE;
670
error(0, errno, "realloc");
671
exitstatus = EX_OSERR;
599
675
custom_argv[custom_argc-1] = new_arg;
600
custom_argv[custom_argc] = NULL;
676
custom_argv[custom_argc] = NULL;
680
ret = fclose(conffp);
681
} while(ret == EOF and errno == EINTR);
683
error(0, errno, "fclose");
684
exitstatus = EX_IOERR;
605
689
/* Check for harmful errors and go to fallback. Other errors might
606
690
not affect opening plugins */
607
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
609
exitstatus = EXIT_FAILURE;
691
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
692
error(0, errno, "fopen");
693
exitstatus = EX_OSERR;
613
/* If there was any arguments from configuration file,
614
pass them to parser as command arguments */
697
/* If there were any arguments from the configuration file, pass
698
them to parser as command line arguments */
615
699
if(custom_argv != NULL){
616
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
618
if (ret == ARGP_ERR_UNKNOWN){
619
fprintf(stderr, "Unknown error while parsing arguments\n");
620
exitstatus = EXIT_FAILURE;
700
ret = argp_parse(&argp, custom_argc, custom_argv,
701
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
709
error(0, errno, "argp_parse");
710
exitstatus = EX_OSERR;
713
exitstatus = EX_CONFIG;
625
718
/* Parse actual command line arguments, to let them override the
627
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
628
if (ret == ARGP_ERR_UNKNOWN){
629
fprintf(stderr, "Unknown error while parsing arguments\n");
630
exitstatus = EXIT_FAILURE;
720
ret = argp_parse(&argp, argc, argv,
721
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
729
error(0, errno, "argp_parse");
730
exitstatus = EX_OSERR;
733
exitstatus = EX_USAGE;
638
741
for(char **a = p->argv; *a != NULL; a++){
639
742
fprintf(stderr, "\tArg: %s\n", *a);
641
fprintf(stderr, "...and %u environment variables\n", p->envc);
744
fprintf(stderr, "...and %d environment variables\n", p->envc);
642
745
for(char **a = p->environ; *a != NULL; a++){
643
746
fprintf(stderr, "\t%s\n", *a);
648
/* Strip permissions down to nobody */
752
/* Work around Debian bug #633582:
753
<http://bugs.debian.org/633582> */
754
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
755
if(plugindir_fd == -1){
756
error(0, errno, "open");
758
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
760
error(0, errno, "fstat");
762
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
763
ret = fchown(plugindir_fd, uid, gid);
765
error(0, errno, "fchown");
769
TEMP_FAILURE_RETRY(close(plugindir_fd));
773
/* Lower permissions */
776
error(0, errno, "setgid");
649
778
ret = setuid(uid);
658
if (plugindir == NULL){
661
dir = opendir(plugindir);
665
perror("Could not open plugin dir");
666
exitstatus = EXIT_FAILURE;
670
/* Set the FD_CLOEXEC flag on the directory, if possible */
780
error(0, errno, "setuid");
783
/* Open plugin directory with close_on_exec flag */
672
int dir_fd = dirfd(dir);
674
ret = set_cloexec_flag(dir_fd);
676
perror("set_cloexec_flag");
677
exitstatus = EXIT_FAILURE;
786
if(plugindir == NULL){
787
dir_fd = open(PDIR, O_RDONLY |
790
#else /* not O_CLOEXEC */
792
#endif /* not O_CLOEXEC */
795
dir_fd = open(plugindir, O_RDONLY |
798
#else /* not O_CLOEXEC */
800
#endif /* not O_CLOEXEC */
804
error(0, errno, "Could not open plugin dir");
805
exitstatus = EX_UNAVAILABLE;
810
/* Set the FD_CLOEXEC flag on the directory */
811
ret = set_cloexec_flag(dir_fd);
813
error(0, errno, "set_cloexec_flag");
814
TEMP_FAILURE_RETRY(close(dir_fd));
815
exitstatus = EX_OSERR;
818
#endif /* O_CLOEXEC */
820
dir = fdopendir(dir_fd);
822
error(0, errno, "Could not open plugin dir");
823
TEMP_FAILURE_RETRY(close(dir_fd));
824
exitstatus = EX_OSERR;
806
959
if(p->environ[0] != NULL){
807
960
for(char **e = environ; *e != NULL; e++){
808
961
if(not add_environment(p, *e, false)){
809
perror("add_environment");
962
error(0, errno, "add_environment");
818
exitstatus = EXIT_FAILURE;
968
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
970
error(0, errno, "pipe");
971
exitstatus = EX_OSERR;
821
974
/* Ask OS to automatic close the pipe on exec */
822
975
ret = set_cloexec_flag(pipefd[0]);
824
perror("set_cloexec_flag");
825
exitstatus = EXIT_FAILURE;
977
error(0, errno, "set_cloexec_flag");
978
exitstatus = EX_OSERR;
828
981
ret = set_cloexec_flag(pipefd[1]);
830
perror("set_cloexec_flag");
831
exitstatus = EXIT_FAILURE;
983
error(0, errno, "set_cloexec_flag");
984
exitstatus = EX_OSERR;
834
987
/* Block SIGCHLD until process is safely in process list */
835
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
988
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
989
&sigchld_action.sa_mask,
837
perror("sigprocmask");
838
exitstatus = EXIT_FAILURE;
992
error(0, errno, "sigprocmask");
993
exitstatus = EX_OSERR;
841
996
/* Starting a new process to be watched */
1000
} while(pid == -1 and errno == EINTR);
845
exitstatus = EXIT_FAILURE;
1002
error(0, errno, "fork");
1003
exitstatus = EX_OSERR;
849
1007
/* this is the child process */
850
1008
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1010
error(0, errno, "sigaction");
855
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1013
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
857
perror("sigprocmask");
1015
error(0, errno, "sigprocmask");
861
1019
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1021
error(0, errno, "dup2");
867
1025
if(dirfd(dir) < 0){
902
1063
/* Unblock SIGCHLD so signal handler can be run if this process
903
1064
has already completed */
904
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1065
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1066
&sigchld_action.sa_mask,
906
perror("sigprocmask");
907
exitstatus = EXIT_FAILURE;
1069
error(0, errno, "sigprocmask");
1070
exitstatus = EX_OSERR;
911
FD_SET(new_plugin->fd, &rfds_all);
1074
#if defined (__GNUC__) and defined (__GLIBC__)
1075
#if not __GLIBC_PREREQ(2, 16)
1076
#pragma GCC diagnostic push
1077
#pragma GCC diagnostic ignored "-Wsign-conversion"
1080
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1081
-Wconversion in GNU libc
1083
#if defined (__GNUC__) and defined (__GLIBC__)
1084
#if not __GLIBC_PREREQ(2, 16)
1085
#pragma GCC diagnostic pop
913
if (maxfd < new_plugin->fd){
1089
if(maxfd < new_plugin->fd){
914
1090
maxfd = new_plugin->fd;
1094
TEMP_FAILURE_RETRY(closedir(dir));
1096
free_plugin(getplugin(NULL));
922
1098
for(plugin *p = plugin_list; p != NULL; p = p->next){
923
1099
if(p->pid != 0){
929
1105
free_plugin_list();
933
1109
/* Main loop while running plugins exist */
934
1110
while(plugin_list){
935
1111
fd_set rfds = rfds_all;
936
1112
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
937
if (select_ret == -1){
939
exitstatus = EXIT_FAILURE;
1113
if(select_ret == -1 and errno != EINTR){
1114
error(0, errno, "select");
1115
exitstatus = EX_OSERR;
942
1118
/* OK, now either a process completed, or something can be read
943
1119
from one of them */
944
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
1120
for(plugin *proc = plugin_list; proc != NULL;){
945
1121
/* Is this process completely done? */
946
if(proc->eof and proc->completed){
1122
if(proc->completed and proc->eof){
947
1123
/* Only accept the plugin output if it exited cleanly */
948
1124
if(not WIFEXITED(proc->status)
949
1125
or WEXITSTATUS(proc->status) != 0){
950
1126
/* Bad exit by plugin */
953
1129
if(WIFEXITED(proc->status)){
954
fprintf(stderr, "Plugin %u exited with status %d\n",
955
(unsigned int) (proc->pid),
1130
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1131
" status %d\n", proc->name,
1132
(intmax_t) (proc->pid),
956
1133
WEXITSTATUS(proc->status));
957
} else if(WIFSIGNALED(proc->status)) {
958
fprintf(stderr, "Plugin %u killed by signal %d\n",
959
(unsigned int) (proc->pid),
960
WTERMSIG(proc->status));
1134
} else if(WIFSIGNALED(proc->status)){
1135
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1136
" signal %d: %s\n", proc->name,
1137
(intmax_t) (proc->pid),
1138
WTERMSIG(proc->status),
1139
strsignal(WTERMSIG(proc->status)));
961
1140
} else if(WCOREDUMP(proc->status)){
962
fprintf(stderr, "Plugin %d dumped core\n",
963
(unsigned int) (proc->pid));
1141
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1142
" core\n", proc->name, (intmax_t) (proc->pid));
967
1146
/* Remove the plugin */
968
FD_CLR(proc->fd, &rfds_all);
1147
#if defined (__GNUC__) and defined (__GLIBC__)
1148
#if not __GLIBC_PREREQ(2, 16)
1149
#pragma GCC diagnostic push
1150
#pragma GCC diagnostic ignored "-Wsign-conversion"
1153
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1154
-Wconversion in GNU libc
1156
#if defined (__GNUC__) and defined (__GLIBC__)
1157
#if not __GLIBC_PREREQ(2, 16)
1158
#pragma GCC diagnostic pop
970
1162
/* Block signal while modifying process_list */
971
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1163
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1165
&sigchld_action.sa_mask,
973
perror("sigprocmask");
974
exitstatus = EXIT_FAILURE;
1168
error(0, errno, "sigprocmask");
1169
exitstatus = EX_OSERR;
1173
plugin *next_plugin = proc->next;
977
1174
free_plugin(proc);
978
1177
/* We are done modifying process list, so unblock signal */
979
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
1178
ret = (int)(TEMP_FAILURE_RETRY
1179
(sigprocmask(SIG_UNBLOCK,
1180
&sigchld_action.sa_mask, NULL)));
982
perror("sigprocmask");
983
exitstatus = EXIT_FAILURE;
1182
error(0, errno, "sigprocmask");
1183
exitstatus = EX_OSERR;
987
1187
if(plugin_list == NULL){
993
1194
/* This process exited nicely, so print its buffer */
995
1196
bool bret = print_out_password(proc->buffer,
996
1197
proc->buffer_length);
998
perror("print_out_password");
999
exitstatus = EXIT_FAILURE;
1199
error(0, errno, "print_out_password");
1200
exitstatus = EX_IOERR;
1004
1205
/* This process has not completed. Does it have any output? */
1005
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1206
#if defined (__GNUC__) and defined (__GLIBC__)
1207
#if not __GLIBC_PREREQ(2, 16)
1208
#pragma GCC diagnostic push
1209
#pragma GCC diagnostic ignored "-Wsign-conversion"
1212
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1218
#if defined (__GNUC__) and defined (__GLIBC__)
1219
#if not __GLIBC_PREREQ(2, 16)
1220
#pragma GCC diagnostic pop
1006
1223
/* This process had nothing to say at this time */
1009
1227
/* Before reading, make the process' data buffer large enough */
1010
1228
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1011
1229
proc->buffer = realloc(proc->buffer, proc->buffer_size
1012
1230
+ (size_t) BUFFER_SIZE);
1013
if (proc->buffer == NULL){
1015
exitstatus = EXIT_FAILURE;
1231
if(proc->buffer == NULL){
1232
error(0, errno, "malloc");
1233
exitstatus = EX_OSERR;
1018
1236
proc->buffer_size += BUFFER_SIZE;
1020
1238
/* Read from the process */
1021
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1239
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1241
+ proc->buffer_length,
1024
1244
/* Read error from this process; ignore the error */
1029
1250
proc->eof = true;
1031
proc->buffer_length += (size_t) ret;
1252
proc->buffer_length += (size_t) sret;
1039
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1260
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1261
and exitstatus != EX_OK)){
1040
1262
/* Fallback if all plugins failed, none are found or an error