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,
416
375
.doc = "Group ID the plugins will run as", .group = 3 },
417
376
{ .name = "debug", .key = 132,
418
377
.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 },
435
__attribute__((nonnull(3)))
436
error_t parse_opt(int key, char *arg, struct argp_state *state){
381
error_t parse_opt(int key, char *arg, __attribute__((unused))
382
struct argp_state *state){
441
385
case 'g': /* --global-options */
443
387
char *plugin_option;
444
388
while((plugin_option = strsep(&arg, ",")) != NULL){
389
if(plugin_option[0] == '\0'){
445
392
if(not add_argument(getplugin(NULL), plugin_option)){
393
perror("add_argument");
394
return ARGP_ERR_UNKNOWN;
452
399
case 'G': /* --global-env */
453
if(add_environment(getplugin(NULL), arg, true)){
403
if(not add_environment(getplugin(NULL), arg, true)){
404
perror("add_environment");
457
407
case 'o': /* --options-for */
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)){
409
char *plugin_name = strsep(&arg, ":");
410
if(plugin_name[0] == '\0'){
414
while((plugin_option = strsep(&arg, ",")) != NULL){
415
if(not add_argument(getplugin(plugin_name), plugin_option)){
416
perror("add_argument");
417
return ARGP_ERR_UNKNOWN;
481
422
case 'E': /* --env-for */
483
427
char *envdef = strchr(arg, ':');
484
428
if(envdef == NULL){
485
argp_error(state, "No colon in \"%s\"", arg);
492
argp_error(state, "Empty plugin name");
496
if(add_environment(getplugin(arg), envdef, true)){
432
if(not add_environment(getplugin(arg), envdef+1, true)){
433
perror("add_environment");
501
437
case 'd': /* --disable */
503
439
plugin *p = getplugin(arg);
441
return ARGP_ERR_UNKNOWN;
510
446
case 'e': /* --enable */
512
448
plugin *p = getplugin(arg);
450
return ARGP_ERR_UNKNOWN;
519
455
case 128: /* --plugin-dir */
521
457
plugindir = strdup(arg);
522
if(plugindir != NULL){
458
if(plugindir == NULL){
526
462
case 129: /* --config-file */
527
463
/* This is already done by parse_opt_config_file() */
529
465
case 130: /* --userid */
530
tmp_id = strtoimax(arg, &tmp, 10);
467
tmpmax = strtoimax(arg, &tmp, 10);
531
468
if(errno != 0 or tmp == arg or *tmp != '\0'
532
or tmp_id != (uid_t)tmp_id){
533
argp_error(state, "Bad user ID number: \"%s\", using %"
534
PRIdMAX, arg, (intmax_t)uid);
469
or tmpmax != (uid_t)tmpmax){
470
fprintf(stderr, "Bad user ID number: \"%s\", using %"
471
PRIdMAX "\n", arg, (intmax_t)uid);
540
476
case 131: /* --groupid */
541
tmp_id = strtoimax(arg, &tmp, 10);
478
tmpmax = strtoimax(arg, &tmp, 10);
542
479
if(errno != 0 or tmp == arg or *tmp != '\0'
543
or tmp_id != (gid_t)tmp_id){
544
argp_error(state, "Bad group ID number: \"%s\", using %"
545
PRIdMAX, arg, (intmax_t)gid);
480
or tmpmax != (gid_t)tmpmax){
481
fprintf(stderr, "Bad group ID number: \"%s\", using %"
482
PRIdMAX "\n", arg, (intmax_t)gid);
551
487
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);
576
491
* When adding more options before this line, remember to also add a
577
492
* "case" to the "parse_opt_config_file" function below.
693
597
new_arg = strdup(p);
694
598
if(new_arg == NULL){
695
error(0, errno, "strdup");
696
exitstatus = EX_OSERR;
600
exitstatus = EXIT_FAILURE;
701
605
custom_argc += 1;
703
char **new_argv = realloc(custom_argv, sizeof(char *)
704
* ((size_t)custom_argc + 1));
705
if(new_argv == NULL){
706
error(0, errno, "realloc");
707
exitstatus = EX_OSERR;
712
custom_argv = new_argv;
606
custom_argv = realloc(custom_argv, sizeof(char *)
607
* ((unsigned int) custom_argc + 1));
608
if(custom_argv == NULL){
610
exitstatus = EXIT_FAILURE;
715
614
custom_argv[custom_argc-1] = new_arg;
716
615
custom_argv[custom_argc] = NULL;
720
ret = fclose(conffp);
721
} while(ret == EOF and errno == EINTR);
723
error(0, errno, "fclose");
724
exitstatus = EX_IOERR;
729
620
/* Check for harmful errors and go to fallback. Other errors might
730
621
not affect opening plugins */
731
622
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
732
error(0, errno, "fopen");
733
exitstatus = EX_OSERR;
624
exitstatus = EXIT_FAILURE;
737
/* If there were any arguments from the configuration file, pass
738
them to parser as command line arguments */
628
/* If there was any arguments from configuration file,
629
pass them to parser as command arguments */
739
630
if(custom_argv != NULL){
740
ret = argp_parse(&argp, custom_argc, custom_argv,
741
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
749
error(0, errno, "argp_parse");
750
exitstatus = EX_OSERR;
753
exitstatus = EX_CONFIG;
631
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
633
if(ret == ARGP_ERR_UNKNOWN){
634
fprintf(stderr, "Unknown error while parsing arguments\n");
635
exitstatus = EXIT_FAILURE;
758
640
/* Parse actual command line arguments, to let them override the
760
ret = argp_parse(&argp, argc, argv,
761
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
769
error(0, errno, "argp_parse");
770
exitstatus = EX_OSERR;
773
exitstatus = EX_USAGE;
778
char *pluginhelperenv;
780
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
781
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
783
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
785
if(ret == -1 or not bret){
786
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
787
" environment variable to \"%s\" for all plugins\n",
788
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
791
free(pluginhelperenv);
642
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
643
if(ret == ARGP_ERR_UNKNOWN){
644
fprintf(stderr, "Unknown error while parsing arguments\n");
645
exitstatus = EXIT_FAILURE;
810
/* Work around Debian bug #633582:
811
<http://bugs.debian.org/633582> */
812
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
813
if(plugindir_fd == -1){
815
error(0, errno, "open(\"" PDIR "\")");
818
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
820
error(0, errno, "fstat");
822
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
823
ret = fchown(plugindir_fd, uid, gid);
825
error(0, errno, "fchown");
833
/* Lower permissions */
663
/* Strip permissions down to nobody */
836
error(0, errno, "setgid");
838
668
ret = setuid(uid);
840
error(0, errno, "setuid");
843
/* Open plugin directory with close_on_exec flag */
673
if(plugindir == NULL){
676
dir = opendir(plugindir);
680
perror("Could not open plugin dir");
681
exitstatus = EXIT_FAILURE;
685
/* Set the FD_CLOEXEC flag on the directory, if possible */
845
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
848
#else /* not O_CLOEXEC */
850
#endif /* not O_CLOEXEC */
853
error(0, errno, "Could not open plugin dir");
854
exitstatus = EX_UNAVAILABLE;
859
/* Set the FD_CLOEXEC flag on the directory */
860
ret = set_cloexec_flag(dir_fd);
862
error(0, errno, "set_cloexec_flag");
863
exitstatus = EX_OSERR;
866
#endif /* O_CLOEXEC */
869
int good_name(const struct dirent * const dirent){
870
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
871
"*.dpkg-old", "*.dpkg-bak",
872
"*.dpkg-divert", NULL };
874
#pragma GCC diagnostic push
875
#pragma GCC diagnostic ignored "-Wcast-qual"
877
for(const char **pat = (const char **)patterns;
878
*pat != NULL; pat++){
880
#pragma GCC diagnostic pop
882
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
885
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
886
" matching pattern %s\n", dirent->d_name, *pat);
687
int dir_fd = dirfd(dir);
689
ret = set_cloexec_flag(dir_fd);
691
perror("set_cloexec_flag");
692
exitstatus = EXIT_FAILURE;
895
#if __GLIBC_PREREQ(2, 15)
896
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
898
#else /* not __GLIBC_PREREQ(2, 15) */
899
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
900
&direntries, good_name, alphasort);
901
#endif /* not __GLIBC_PREREQ(2, 15) */
902
#else /* not __GLIBC__ */
903
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
904
&direntries, good_name, alphasort);
905
#endif /* not __GLIBC__ */
906
if(numplugins == -1){
907
error(0, errno, "Could not scan plugin dir");
909
exitstatus = EX_OSERR;
913
698
FD_ZERO(&rfds_all);
915
700
/* Read and execute any executable in the plugin directory*/
916
for(int i = 0; i < numplugins; i++){
918
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
920
error(0, errno, "Could not open plugin");
702
dirst = readdir(dir);
704
/* All directory entries have been processed */
708
exitstatus = EXIT_FAILURE;
714
d_name_len = strlen(dirst->d_name);
716
/* Ignore dotfiles, backup files and other junk */
718
bool bad_name = false;
720
const char const *bad_prefixes[] = { ".", "#", NULL };
722
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
725
".dpkg-divert", NULL };
726
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
727
size_t pre_len = strlen(*pre);
728
if((d_name_len >= pre_len)
729
and strncmp((dirst->d_name), *pre, pre_len) == 0){
731
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
732
" with bad prefix %s\n", dirst->d_name, *pre);
741
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
742
size_t suf_len = strlen(*suf);
743
if((d_name_len >= suf_len)
744
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
747
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
748
" with bad suffix %s\n", dirst->d_name, *suf);
761
if(plugindir == NULL){
762
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
764
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
924
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
771
ret = stat(filename, &st);
926
error(0, errno, "stat");
932
778
/* Ignore non-executable files */
933
if(not S_ISREG(st.st_mode)
934
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
779
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
937
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
938
" with bad type or mode\n",
939
plugindir != NULL ? plugindir : PDIR,
940
direntries[i]->d_name);
781
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
782
" with bad type or mode\n", filename);
947
plugin *p = getplugin(direntries[i]->d_name);
788
plugin *p = getplugin(dirst->d_name);
949
error(0, errno, "getplugin");
956
796
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
957
direntries[i]->d_name);
967
806
for(char **a = g->argv + 1; *a != NULL; a++){
968
807
if(not add_argument(p, *a)){
969
error(0, errno, "add_argument");
808
perror("add_argument");
972
811
/* Add global environment variables */
973
812
for(char **e = g->environ; *e != NULL; e++){
974
813
if(not add_environment(p, *e, false)){
975
error(0, errno, "add_environment");
814
perror("add_environment");
980
/* If this plugin has any environment variables, we need to
981
duplicate the environment from this process, too. */
819
/* If this plugin has any environment variables, we will call
820
using execve and need to duplicate the environment from this
982
822
if(p->environ[0] != NULL){
983
823
for(char **e = environ; *e != NULL; e++){
984
824
if(not add_environment(p, *e, false)){
985
error(0, errno, "add_environment");
825
perror("add_environment");
992
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
993
#else /* O_CLOEXEC */
994
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
995
#endif /* O_CLOEXEC */
997
error(0, errno, "pipe");
998
exitstatus = EX_OSERR;
1002
if(pipefd[0] >= FD_SETSIZE){
1003
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
1007
exitstatus = EX_OSERR;
1008
free(direntries[i]);
834
exitstatus = EXIT_FAILURE;
1012
837
/* Ask OS to automatic close the pipe on exec */
1013
838
ret = set_cloexec_flag(pipefd[0]);
1015
error(0, errno, "set_cloexec_flag");
1018
exitstatus = EX_OSERR;
1019
free(direntries[i]);
840
perror("set_cloexec_flag");
841
exitstatus = EXIT_FAILURE;
1022
844
ret = set_cloexec_flag(pipefd[1]);
1024
error(0, errno, "set_cloexec_flag");
1027
exitstatus = EX_OSERR;
1028
free(direntries[i]);
846
perror("set_cloexec_flag");
847
exitstatus = EXIT_FAILURE;
1031
#endif /* not O_CLOEXEC */
1032
850
/* Block SIGCHLD until process is safely in process list */
1033
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1034
&sigchld_action.sa_mask,
851
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1037
error(0, errno, "sigprocmask");
1038
exitstatus = EX_OSERR;
1039
free(direntries[i]);
853
perror("sigprocmask");
854
exitstatus = EXIT_FAILURE;
1042
857
/* Starting a new process to be watched */
1046
} while(pid == -1 and errno == EINTR);
1048
error(0, errno, "fork");
1049
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1050
&sigchld_action.sa_mask, NULL));
1053
exitstatus = EX_OSERR;
1054
free(direntries[i]);
861
exitstatus = EXIT_FAILURE;
1058
865
/* this is the child process */
1059
866
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1061
error(0, errno, "sigaction");
1064
871
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1066
error(0, errno, "sigprocmask");
873
perror("sigprocmask");
1070
877
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1072
error(0, errno, "dup2");
1076
if(fexecve(plugin_fd, p->argv,
1077
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1078
error(0, errno, "fexecve for %s/%s",
1079
plugindir != NULL ? plugindir : PDIR,
1080
direntries[i]->d_name);
884
/* If dir has no file descriptor, we could not set FD_CLOEXEC
885
above and must now close it manually here. */
888
if(p->environ[0] == NULL){
889
if(execv(filename, p->argv) < 0){
894
if(execve(filename, p->argv, p->environ) < 0){
1085
901
/* Parent process */
1086
902
close(pipefd[1]); /* Close unused write end of pipe */
1088
plugin *new_plugin = getplugin(direntries[i]->d_name);
904
plugin *new_plugin = getplugin(dirst->d_name);
1089
905
if(new_plugin == NULL){
1090
error(0, errno, "getplugin");
1091
ret = (int)(TEMP_FAILURE_RETRY
1092
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
907
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1095
error(0, errno, "sigprocmask");
909
perror("sigprocmask");
1097
exitstatus = EX_OSERR;
1098
free(direntries[i]);
911
exitstatus = EXIT_FAILURE;
1101
free(direntries[i]);
1103
915
new_plugin->pid = pid;
1104
916
new_plugin->fd = pipefd[0];
1106
918
/* Unblock SIGCHLD so signal handler can be run if this process
1107
919
has already completed */
1108
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1109
&sigchld_action.sa_mask,
920
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1112
error(0, errno, "sigprocmask");
1113
exitstatus = EX_OSERR;
922
perror("sigprocmask");
923
exitstatus = EXIT_FAILURE;
1117
#if defined (__GNUC__) and defined (__GLIBC__)
1118
#if not __GLIBC_PREREQ(2, 16)
1119
#pragma GCC diagnostic push
1120
#pragma GCC diagnostic ignored "-Wsign-conversion"
1123
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1124
-Wconversion in GNU libc
1126
#if defined (__GNUC__) and defined (__GLIBC__)
1127
#if not __GLIBC_PREREQ(2, 16)
1128
#pragma GCC diagnostic pop
927
FD_SET(new_plugin->fd, &rfds_all);
1132
929
if(maxfd < new_plugin->fd){
1133
930
maxfd = new_plugin->fd;
1141
936
free_plugin(getplugin(NULL));
1143
938
for(plugin *p = plugin_list; p != NULL; p = p->next){
1241
1018
bool bret = print_out_password(proc->buffer,
1242
1019
proc->buffer_length);
1244
error(0, errno, "print_out_password");
1245
exitstatus = EX_IOERR;
1021
perror("print_out_password");
1022
exitstatus = EXIT_FAILURE;
1250
1027
/* This process has not completed. Does it have any output? */
1251
#if defined (__GNUC__) and defined (__GLIBC__)
1252
#if not __GLIBC_PREREQ(2, 16)
1253
#pragma GCC diagnostic push
1254
#pragma GCC diagnostic ignored "-Wsign-conversion"
1257
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1263
#if defined (__GNUC__) and defined (__GLIBC__)
1264
#if not __GLIBC_PREREQ(2, 16)
1265
#pragma GCC diagnostic pop
1028
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1268
1029
/* This process had nothing to say at this time */
1269
1030
proc = proc->next;
1272
1033
/* Before reading, make the process' data buffer large enough */
1273
1034
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1274
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1275
+ (size_t) BUFFER_SIZE);
1276
if(new_buffer == NULL){
1277
error(0, errno, "malloc");
1278
exitstatus = EX_OSERR;
1035
proc->buffer = realloc(proc->buffer, proc->buffer_size
1036
+ (size_t) BUFFER_SIZE);
1037
if(proc->buffer == NULL){
1039
exitstatus = EXIT_FAILURE;
1281
proc->buffer = new_buffer;
1282
1042
proc->buffer_size += BUFFER_SIZE;
1284
1044
/* Read from the process */
1285
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1287
+ proc->buffer_length,
1045
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1290
1048
/* Read error from this process; ignore the error */
1291
1049
proc = proc->next;