19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.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_FAILURE,
29
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
30
30
#include <stdbool.h> /* bool, true, false */
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(),
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(),
38
37
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
38
FD_SET(), FD_ISSET(), FD_CLR */
40
39
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
40
WEXITSTATUS(), WTERMSIG(),
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
42
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
44
43
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, opendir(),
46
readdir(), closedir(), dirfd() */
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
fcntl(), setuid(), setgid(),
49
F_GETFD, F_SETFD, FD_CLOEXEC,
50
access(), pipe(), fork(), close()
51
dup2(), STDOUT_FILENO, _exit(),
52
execv(), write(), read(),
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()
54
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
56
#include <string.h> /* strsep, strlen(), asprintf(),
53
FD_CLOEXEC, openat(), scandirat(),
55
#include <string.h> /* strsep, strlen(), strsignal(),
56
strcmp(), strncmp() */
58
57
#include <errno.h> /* errno */
59
58
#include <argp.h> /* struct argp_option, struct
60
59
argp_state, struct argp,
376
416
.doc = "Group ID the plugins will run as", .group = 3 },
377
417
{ .name = "debug", .key = 132,
378
418
.doc = "Debug mode", .group = 4 },
419
{ .name = "plugin-helper-dir", .key = 133,
421
.doc = "Specify a different plugin helper directory",
424
* These reproduce what we would get without ARGP_NO_HELP
426
{ .name = "help", .key = '?',
427
.doc = "Give this help list", .group = -1 },
428
{ .name = "usage", .key = -3,
429
.doc = "Give a short usage message", .group = -1 },
430
{ .name = "version", .key = 'V',
431
.doc = "Print program version", .group = -1 },
382
error_t parse_opt(int key, char *arg, __attribute__((unused))
383
struct argp_state *state){
435
__attribute__((nonnull(3)))
436
error_t parse_opt(int key, char *arg, struct argp_state *state){
387
441
case 'g': /* --global-options */
389
443
char *plugin_option;
390
444
while((plugin_option = strsep(&arg, ",")) != NULL){
391
if(plugin_option[0] == '\0'){
394
445
if(not add_argument(getplugin(NULL), plugin_option)){
395
perror("add_argument");
396
return ARGP_ERR_UNKNOWN;
401
452
case 'G': /* --global-env */
405
if(not add_environment(getplugin(NULL), arg, true)){
406
perror("add_environment");
453
if(add_environment(getplugin(NULL), arg, true)){
409
457
case 'o': /* --options-for */
411
char *plugin_name = strsep(&arg, ":");
412
if(plugin_name[0] == '\0'){
416
while((plugin_option = strsep(&arg, ",")) != NULL){
417
if(not add_argument(getplugin(plugin_name), plugin_option)){
418
perror("add_argument");
419
return ARGP_ERR_UNKNOWN;
459
char *option_list = strchr(arg, ':');
460
if(option_list == NULL){
461
argp_error(state, "No colon in \"%s\"", arg);
468
argp_error(state, "Empty plugin name");
473
while((option = strsep(&option_list, ",")) != NULL){
474
if(not add_argument(getplugin(arg), option)){
424
481
case 'E': /* --env-for */
429
483
char *envdef = strchr(arg, ':');
430
484
if(envdef == NULL){
485
argp_error(state, "No colon in \"%s\"", arg);
434
if(not add_environment(getplugin(arg), envdef+1, true)){
435
perror("add_environment");
492
argp_error(state, "Empty plugin name");
496
if(add_environment(getplugin(arg), envdef, true)){
439
501
case 'd': /* --disable */
441
503
plugin *p = getplugin(arg);
443
return ARGP_ERR_UNKNOWN;
448
510
case 'e': /* --enable */
450
512
plugin *p = getplugin(arg);
452
return ARGP_ERR_UNKNOWN;
457
519
case 128: /* --plugin-dir */
459
521
plugindir = strdup(arg);
460
if(plugindir == NULL){
522
if(plugindir != NULL){
464
526
case 129: /* --config-file */
465
527
/* This is already done by parse_opt_config_file() */
467
529
case 130: /* --userid */
469
tmpmax = strtoimax(arg, &tmp, 10);
530
tmp_id = strtoimax(arg, &tmp, 10);
470
531
if(errno != 0 or tmp == arg or *tmp != '\0'
471
or tmpmax != (uid_t)tmpmax){
472
fprintf(stderr, "Bad user ID number: \"%s\", using %"
473
PRIdMAX "\n", arg, (intmax_t)uid);
532
or tmp_id != (uid_t)tmp_id){
533
argp_error(state, "Bad user ID number: \"%s\", using %"
534
PRIdMAX, arg, (intmax_t)uid);
478
540
case 131: /* --groupid */
480
tmpmax = strtoimax(arg, &tmp, 10);
541
tmp_id = strtoimax(arg, &tmp, 10);
481
542
if(errno != 0 or tmp == arg or *tmp != '\0'
482
or tmpmax != (gid_t)tmpmax){
483
fprintf(stderr, "Bad group ID number: \"%s\", using %"
484
PRIdMAX "\n", arg, (intmax_t)gid);
543
or tmp_id != (gid_t)tmp_id){
544
argp_error(state, "Bad group ID number: \"%s\", using %"
545
PRIdMAX, arg, (intmax_t)gid);
489
551
case 132: /* --debug */
554
case 133: /* --plugin-helper-dir */
555
free(pluginhelperdir);
556
pluginhelperdir = strdup(arg);
557
if(pluginhelperdir != NULL){
562
* These reproduce what we would get without ARGP_NO_HELP
564
case '?': /* --help */
565
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
566
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
567
case -3: /* --usage */
568
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
569
argp_state_help(state, state->out_stream,
570
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
571
case 'V': /* --version */
572
fprintf(state->out_stream, "%s\n", argp_program_version);
493
576
* When adding more options before this line, remember to also add a
494
577
* "case" to the "parse_opt_config_file" function below.
630
730
/* Check for harmful errors and go to fallback. Other errors might
631
731
not affect opening plugins */
632
732
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
634
exitstatus = EXIT_FAILURE;
733
error(0, errno, "fopen");
734
exitstatus = EX_OSERR;
638
/* If there was any arguments from configuration file,
639
pass them to parser as command arguments */
738
/* If there were any arguments from the configuration file, pass
739
them to parser as command line arguments */
640
740
if(custom_argv != NULL){
641
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
643
if(ret == ARGP_ERR_UNKNOWN){
644
fprintf(stderr, "Unknown error while parsing arguments\n");
645
exitstatus = EXIT_FAILURE;
741
ret = argp_parse(&argp, custom_argc, custom_argv,
742
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
750
error(0, errno, "argp_parse");
751
exitstatus = EX_OSERR;
754
exitstatus = EX_CONFIG;
650
759
/* Parse actual command line arguments, to let them override the
652
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
653
if(ret == ARGP_ERR_UNKNOWN){
654
fprintf(stderr, "Unknown error while parsing arguments\n");
655
exitstatus = EXIT_FAILURE;
761
ret = argp_parse(&argp, argc, argv,
762
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
770
error(0, errno, "argp_parse");
771
exitstatus = EX_OSERR;
774
exitstatus = EX_USAGE;
779
char *pluginhelperenv;
781
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
782
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
784
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
786
if(ret == -1 or not bret){
787
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
788
" environment variable to \"%s\" for all plugins\n",
789
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
792
free(pluginhelperenv);
673
/* Strip permissions down to nobody */
811
/* Work around Debian bug #633582:
812
<http://bugs.debian.org/633582> */
813
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
814
if(plugindir_fd == -1){
816
error(0, errno, "open(\"" PDIR "\")");
819
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
821
error(0, errno, "fstat");
823
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
824
ret = fchown(plugindir_fd, uid, gid);
826
error(0, errno, "fchown");
830
TEMP_FAILURE_RETRY(close(plugindir_fd));
834
/* Lower permissions */
837
error(0, errno, "setgid");
678
839
ret = setuid(uid);
683
if(plugindir == NULL){
686
dir = opendir(plugindir);
690
perror("Could not open plugin dir");
691
exitstatus = EXIT_FAILURE;
695
/* Set the FD_CLOEXEC flag on the directory, if possible */
841
error(0, errno, "setuid");
844
/* Open plugin directory with close_on_exec flag */
697
int dir_fd = dirfd(dir);
699
ret = set_cloexec_flag(dir_fd);
701
perror("set_cloexec_flag");
702
exitstatus = EXIT_FAILURE;
846
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
849
#else /* not O_CLOEXEC */
851
#endif /* not O_CLOEXEC */
854
error(0, errno, "Could not open plugin dir");
855
exitstatus = EX_UNAVAILABLE;
860
/* Set the FD_CLOEXEC flag on the directory */
861
ret = set_cloexec_flag(dir_fd);
863
error(0, errno, "set_cloexec_flag");
864
exitstatus = EX_OSERR;
867
#endif /* O_CLOEXEC */
870
int good_name(const struct dirent * const dirent){
871
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
872
"*.dpkg-old", "*.dpkg-bak",
873
"*.dpkg-divert", NULL };
875
#pragma GCC diagnostic push
876
#pragma GCC diagnostic ignored "-Wcast-qual"
878
for(const char **pat = (const char **)patterns;
879
*pat != NULL; pat++){
881
#pragma GCC diagnostic pop
883
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
886
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
887
" matching pattern %s\n", dirent->d_name, *pat);
896
#if __GLIBC_PREREQ(2, 15)
897
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
899
#else /* not __GLIBC_PREREQ(2, 15) */
900
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
901
&direntries, good_name, alphasort);
902
#endif /* not __GLIBC_PREREQ(2, 15) */
903
#else /* not __GLIBC__ */
904
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
905
&direntries, good_name, alphasort);
906
#endif /* not __GLIBC__ */
907
if(numplugins == -1){
908
error(0, errno, "Could not scan plugin dir");
910
exitstatus = EX_OSERR;
708
914
FD_ZERO(&rfds_all);
710
916
/* Read and execute any executable in the plugin directory*/
712
dirst = readdir(dir);
714
/* All directory entries have been processed */
718
exitstatus = EXIT_FAILURE;
724
d_name_len = strlen(dirst->d_name);
726
/* Ignore dotfiles, backup files and other junk */
728
bool bad_name = false;
730
const char const *bad_prefixes[] = { ".", "#", NULL };
732
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
735
".dpkg-divert", NULL };
736
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
737
size_t pre_len = strlen(*pre);
738
if((d_name_len >= pre_len)
739
and strncmp((dirst->d_name), *pre, pre_len) == 0){
741
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
742
" with bad prefix %s\n", dirst->d_name, *pre);
751
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
752
size_t suf_len = strlen(*suf);
753
if((d_name_len >= suf_len)
754
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
757
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
758
" with bad suffix %s\n", dirst->d_name, *suf);
771
if(plugindir == NULL){
772
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
774
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
917
for(int i = 0; i < numplugins; i++){
919
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
921
error(0, errno, "Could not open plugin");
781
ret = stat(filename, &st);
925
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
927
error(0, errno, "stat");
928
TEMP_FAILURE_RETRY(close(plugin_fd));
788
933
/* Ignore non-executable files */
789
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
934
if(not S_ISREG(st.st_mode)
935
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
791
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
792
" with bad type or mode\n", filename);
938
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
939
" with bad type or mode\n",
940
plugindir != NULL ? plugindir : PDIR,
941
direntries[i]->d_name);
943
TEMP_FAILURE_RETRY(close(plugin_fd));
798
plugin *p = getplugin(dirst->d_name);
948
plugin *p = getplugin(direntries[i]->d_name);
950
error(0, errno, "getplugin");
951
TEMP_FAILURE_RETRY(close(plugin_fd));
806
957
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
958
direntries[i]->d_name);
960
TEMP_FAILURE_RETRY(close(plugin_fd));
816
968
for(char **a = g->argv + 1; *a != NULL; a++){
817
969
if(not add_argument(p, *a)){
818
perror("add_argument");
970
error(0, errno, "add_argument");
821
973
/* Add global environment variables */
822
974
for(char **e = g->environ; *e != NULL; e++){
823
975
if(not add_environment(p, *e, false)){
824
perror("add_environment");
976
error(0, errno, "add_environment");
829
/* If this plugin has any environment variables, we will call
830
using execve and need to duplicate the environment from this
981
/* If this plugin has any environment variables, we need to
982
duplicate the environment from this process, too. */
832
983
if(p->environ[0] != NULL){
833
984
for(char **e = environ; *e != NULL; e++){
834
985
if(not add_environment(p, *e, false)){
835
perror("add_environment");
986
error(0, errno, "add_environment");
993
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
994
#else /* O_CLOEXEC */
995
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
996
#endif /* O_CLOEXEC */
844
exitstatus = EXIT_FAILURE;
998
error(0, errno, "pipe");
999
exitstatus = EX_OSERR;
1000
free(direntries[i]);
1003
if(pipefd[0] >= FD_SETSIZE){
1004
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
1006
TEMP_FAILURE_RETRY(close(pipefd[0]));
1007
TEMP_FAILURE_RETRY(close(pipefd[1]));
1008
exitstatus = EX_OSERR;
1009
free(direntries[i]);
847
1013
/* Ask OS to automatic close the pipe on exec */
848
1014
ret = set_cloexec_flag(pipefd[0]);
850
perror("set_cloexec_flag");
851
exitstatus = EXIT_FAILURE;
1016
error(0, errno, "set_cloexec_flag");
1017
TEMP_FAILURE_RETRY(close(pipefd[0]));
1018
TEMP_FAILURE_RETRY(close(pipefd[1]));
1019
exitstatus = EX_OSERR;
1020
free(direntries[i]);
854
1023
ret = set_cloexec_flag(pipefd[1]);
856
perror("set_cloexec_flag");
857
exitstatus = EXIT_FAILURE;
1025
error(0, errno, "set_cloexec_flag");
1026
TEMP_FAILURE_RETRY(close(pipefd[0]));
1027
TEMP_FAILURE_RETRY(close(pipefd[1]));
1028
exitstatus = EX_OSERR;
1029
free(direntries[i]);
1032
#endif /* not O_CLOEXEC */
860
1033
/* Block SIGCHLD until process is safely in process list */
861
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1035
&sigchld_action.sa_mask,
863
perror("sigprocmask");
864
exitstatus = EXIT_FAILURE;
1038
error(0, errno, "sigprocmask");
1039
exitstatus = EX_OSERR;
1040
free(direntries[i]);
867
1043
/* Starting a new process to be watched */
1047
} while(pid == -1 and errno == EINTR);
871
exitstatus = EXIT_FAILURE;
1049
error(0, errno, "fork");
1050
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1051
&sigchld_action.sa_mask, NULL));
1052
TEMP_FAILURE_RETRY(close(pipefd[0]));
1053
TEMP_FAILURE_RETRY(close(pipefd[1]));
1054
exitstatus = EX_OSERR;
1055
free(direntries[i]);
875
1059
/* this is the child process */
876
1060
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1062
error(0, errno, "sigaction");
881
1065
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
883
perror("sigprocmask");
1067
error(0, errno, "sigprocmask");
887
1071
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1073
error(0, errno, "dup2");
894
/* If dir has no file descriptor, we could not set FD_CLOEXEC
895
above and must now close it manually here. */
898
if(p->environ[0] == NULL){
899
if(execv(filename, p->argv) < 0){
904
if(execve(filename, p->argv, p->environ) < 0){
1077
if(fexecve(plugin_fd, p->argv,
1078
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1079
error(0, errno, "fexecve for %s/%s",
1080
plugindir != NULL ? plugindir : PDIR,
1081
direntries[i]->d_name);
911
1086
/* Parent process */
912
close(pipefd[1]); /* Close unused write end of pipe */
914
plugin *new_plugin = getplugin(dirst->d_name);
1087
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1089
TEMP_FAILURE_RETRY(close(plugin_fd));
1090
plugin *new_plugin = getplugin(direntries[i]->d_name);
915
1091
if(new_plugin == NULL){
917
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1092
error(0, errno, "getplugin");
1093
ret = (int)(TEMP_FAILURE_RETRY
1094
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
919
perror("sigprocmask");
1097
error(0, errno, "sigprocmask");
921
exitstatus = EXIT_FAILURE;
1099
exitstatus = EX_OSERR;
1100
free(direntries[i]);
1103
free(direntries[i]);
925
1105
new_plugin->pid = pid;
926
1106
new_plugin->fd = pipefd[0];
928
1108
/* Unblock SIGCHLD so signal handler can be run if this process
929
1109
has already completed */
930
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1110
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1111
&sigchld_action.sa_mask,
932
perror("sigprocmask");
933
exitstatus = EXIT_FAILURE;
1114
error(0, errno, "sigprocmask");
1115
exitstatus = EX_OSERR;
937
FD_SET(new_plugin->fd, &rfds_all);
1119
#if defined (__GNUC__) and defined (__GLIBC__)
1120
#if not __GLIBC_PREREQ(2, 16)
1121
#pragma GCC diagnostic push
1122
#pragma GCC diagnostic ignored "-Wsign-conversion"
1125
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1126
-Wconversion in GNU libc
1128
#if defined (__GNUC__) and defined (__GLIBC__)
1129
#if not __GLIBC_PREREQ(2, 16)
1130
#pragma GCC diagnostic pop
939
1134
if(maxfd < new_plugin->fd){
940
1135
maxfd = new_plugin->fd;
1141
TEMP_FAILURE_RETRY(close(dir_fd));
946
1143
free_plugin(getplugin(NULL));
948
1145
for(plugin *p = plugin_list; p != NULL; p = p->next){
1029
1243
bool bret = print_out_password(proc->buffer,
1030
1244
proc->buffer_length);
1032
perror("print_out_password");
1033
exitstatus = EXIT_FAILURE;
1246
error(0, errno, "print_out_password");
1247
exitstatus = EX_IOERR;
1038
1252
/* This process has not completed. Does it have any output? */
1039
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1253
#if defined (__GNUC__) and defined (__GLIBC__)
1254
#if not __GLIBC_PREREQ(2, 16)
1255
#pragma GCC diagnostic push
1256
#pragma GCC diagnostic ignored "-Wsign-conversion"
1259
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1265
#if defined (__GNUC__) and defined (__GLIBC__)
1266
#if not __GLIBC_PREREQ(2, 16)
1267
#pragma GCC diagnostic pop
1040
1270
/* This process had nothing to say at this time */
1041
1271
proc = proc->next;
1044
1274
/* Before reading, make the process' data buffer large enough */
1045
1275
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1046
proc->buffer = realloc(proc->buffer, proc->buffer_size
1047
+ (size_t) BUFFER_SIZE);
1048
if(proc->buffer == NULL){
1050
exitstatus = EXIT_FAILURE;
1276
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1277
+ (size_t) BUFFER_SIZE);
1278
if(new_buffer == NULL){
1279
error(0, errno, "malloc");
1280
exitstatus = EX_OSERR;
1283
proc->buffer = new_buffer;
1053
1284
proc->buffer_size += BUFFER_SIZE;
1055
1286
/* Read from the process */
1056
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1287
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1289
+ proc->buffer_length,
1059
1292
/* Read error from this process; ignore the error */
1060
1293
proc = proc->next;