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> /* DIR, fdopendir(), fstat(), struct
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
35
35
WEXITSTATUS(), wait(), pid_t,
36
36
uid_t, gid_t, getuid(), getgid(),
38
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
39
FD_SET(), FD_ISSET(), FD_CLR */
40
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS(), WTERMSIG(),
43
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
43
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
46
45
readdir(), closedir(), dirfd() */
47
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
48
FD_CLOEXEC, write(), STDOUT_FILENO,
49
struct stat, fstat(), close(),
50
setgid(), setuid(), S_ISREG(),
51
faccessat() pipe(), fork(),
52
_exit(), dup2(), fexecve(), read()
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(),
54
53
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
FD_CLOEXEC, openat() */
56
#include <string.h> /* strsep, strlen(), strsignal(),
57
strcmp(), strncmp() */
55
#include <string.h> /* strsep, strlen(), asprintf() */
58
56
#include <errno.h> /* errno */
59
57
#include <argp.h> /* struct argp_option, struct
60
58
argp_state, struct argp,
64
62
#include <signal.h> /* struct sigaction, sigemptyset(),
65
63
sigaddset(), sigaction(),
66
64
sigprocmask(), SIG_BLOCK, SIGCHLD,
67
SIG_UNBLOCK, kill(), sig_atomic_t
65
SIG_UNBLOCK, kill() */
69
66
#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() */
75
#include <fnmatch.h> /* fnmatch() */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
77
69
#define BUFFER_SIZE 256
414
374
.doc = "Group ID the plugins will run as", .group = 3 },
415
375
{ .name = "debug", .key = 132,
416
376
.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){
380
error_t parse_opt(int key, char *arg, __attribute__((unused))
381
struct argp_state *state){
435
383
case 'g': /* --global-options */
438
while((plugin_option = strsep(&arg, ",")) != NULL){
439
if(not add_argument(getplugin(NULL), plugin_option)){
386
while((p = strsep(&arg, ",")) != NULL){
390
if(not add_argument(getplugin(NULL), p)){
391
perror("add_argument");
392
return ARGP_ERR_UNKNOWN;
446
397
case 'G': /* --global-env */
447
if(add_environment(getplugin(NULL), arg, true)){
401
if(not add_environment(getplugin(NULL), arg, true)){
402
perror("add_environment");
451
405
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)){
407
char *p_name = strsep(&arg, ":");
408
if(p_name[0] == '\0' or arg == NULL){
411
char *opt = strsep(&arg, ":");
412
if(opt[0] == '\0' or opt == NULL){
416
while((p = strsep(&opt, ",")) != NULL){
420
if(not add_argument(getplugin(p_name), p)){
421
perror("add_argument");
422
return ARGP_ERR_UNKNOWN;
475
427
case 'E': /* --env-for */
477
432
char *envdef = strchr(arg, ':');
478
433
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)){
437
if(not add_environment(getplugin(arg), envdef+1, true)){
438
perror("add_environment");
495
442
case 'd': /* --disable */
497
444
plugin *p = getplugin(arg);
446
return ARGP_ERR_UNKNOWN;
504
451
case 'e': /* --enable */
506
453
plugin *p = getplugin(arg);
455
return ARGP_ERR_UNKNOWN;
513
460
case 128: /* --plugin-dir */
515
462
plugindir = strdup(arg);
516
if(plugindir != NULL){
463
if(plugindir == NULL){
520
467
case 129: /* --config-file */
521
468
/* This is already done by parse_opt_config_file() */
523
470
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);
471
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
472
if(ret < 1 or tmpmax != (uid_t)tmpmax
473
or arg[numchars] != '\0'){
474
fprintf(stderr, "Bad user ID number: \"%s\", using %"
475
PRIdMAX "\n", arg, (intmax_t)uid);
534
480
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);
481
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
482
if(ret < 1 or tmpmax != (gid_t)tmpmax
483
or arg[numchars] != '\0'){
484
fprintf(stderr, "Bad group ID number: \"%s\", using %"
485
PRIdMAX "\n", arg, (intmax_t)gid);
545
490
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
494
* When adding more options before this line, remember to also add a
564
495
* "case" to the "parse_opt_config_file" function below.
679
600
new_arg = strdup(p);
680
601
if(new_arg == NULL){
681
error(0, errno, "strdup");
682
exitstatus = EX_OSERR;
603
exitstatus = EXIT_FAILURE;
687
608
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;
609
custom_argv = realloc(custom_argv, sizeof(char *)
610
* ((unsigned int) custom_argc + 1));
611
if(custom_argv == NULL){
613
exitstatus = EXIT_FAILURE;
702
617
custom_argv[custom_argc-1] = new_arg;
703
custom_argv[custom_argc] = NULL;
618
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
623
/* Check for harmful errors and go to fallback. Other errors might
717
624
not affect opening plugins */
718
625
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
719
error(0, errno, "fopen");
720
exitstatus = EX_OSERR;
627
exitstatus = EXIT_FAILURE;
724
/* If there were any arguments from the configuration file, pass
725
them to parser as command line arguments */
631
/* If there was any arguments from configuration file,
632
pass them to parser as command arguments */
726
633
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;
634
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
636
if(ret == ARGP_ERR_UNKNOWN){
637
fprintf(stderr, "Unknown error while parsing arguments\n");
638
exitstatus = EXIT_FAILURE;
745
643
/* 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;
645
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
646
if(ret == ARGP_ERR_UNKNOWN){
647
fprintf(stderr, "Unknown error while parsing arguments\n");
648
exitstatus = EXIT_FAILURE;
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 */
666
/* Strip permissions down to nobody */
805
error(0, errno, "setgid");
807
671
ret = setuid(uid);
809
error(0, errno, "setuid");
812
/* Open plugin directory with close_on_exec flag */
676
if(plugindir == NULL){
679
dir = opendir(plugindir);
683
perror("Could not open plugin dir");
684
exitstatus = EXIT_FAILURE;
688
/* 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
TEMP_FAILURE_RETRY(close(dir_fd));
833
exitstatus = EX_OSERR;
836
#endif /* O_CLOEXEC */
838
dir = fdopendir(dir_fd);
840
error(0, errno, "Could not open plugin dir");
841
TEMP_FAILURE_RETRY(close(dir_fd));
842
exitstatus = EX_OSERR;
690
int dir_fd = dirfd(dir);
692
ret = set_cloexec_flag(dir_fd);
694
perror("set_cloexec_flag");
695
exitstatus = EXIT_FAILURE;
849
703
/* Read and execute any executable in the plugin directory*/
852
dirst = readdir(dir);
853
} while(dirst == NULL and errno == EINTR);
705
dirst = readdir(dir);
855
707
/* All directory entries have been processed */
856
708
if(dirst == NULL){
857
709
if(errno == EBADF){
858
error(0, errno, "readdir");
859
exitstatus = EX_IOERR;
711
exitstatus = EXIT_FAILURE;
717
d_name_len = strlen(dirst->d_name);
865
719
/* Ignore dotfiles, backup files and other junk */
867
721
bool bad_name = false;
868
const char * const patterns[] = { ".*", "#*#", "*~",
869
"*.dpkg-new", "*.dpkg-old",
870
"*.dpkg-bak", "*.dpkg-divert",
873
#pragma GCC diagnostic push
874
#pragma GCC diagnostic ignored "-Wcast-qual"
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
879
#pragma GCC diagnostic pop
881
if(fnmatch(*pat, dirst->d_name,
882
FNM_FILE_NAME | FNM_PERIOD) != FNM_NOMATCH){
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
885
" matching pattern %s\n", dirst->d_name, *pat);
896
int plugin_fd = openat(dir_fd, dirst->d_name, O_RDONLY |
899
#else /* not O_CLOEXEC */
901
#endif /* not O_CLOEXEC */
904
error(0, errno, "Could not open plugin");
908
/* Set the FD_CLOEXEC flag on the plugin FD */
909
ret = set_cloexec_flag(plugin_fd);
723
const char const *bad_prefixes[] = { ".", "#", NULL };
725
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
728
".dpkg-divert", NULL };
729
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
730
size_t pre_len = strlen(*pre);
731
if((d_name_len >= pre_len)
732
and strncmp((dirst->d_name), *pre, pre_len) == 0){
734
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
735
" with bad prefix %s\n", dirst->d_name, *pre);
744
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
745
size_t suf_len = strlen(*suf);
746
if((d_name_len >= suf_len)
747
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
750
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
751
" with bad suffix %s\n", dirst->d_name, *suf);
764
if(plugindir == NULL){
765
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
767
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
911
error(0, errno, "set_cloexec_flag");
912
TEMP_FAILURE_RETRY(close(plugin_fd));
915
#endif /* O_CLOEXEC */
916
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
774
ret = stat(filename, &st);
918
error(0, errno, "stat");
919
TEMP_FAILURE_RETRY(close(plugin_fd));
923
781
/* Ignore non-executable files */
924
if(not S_ISREG(st.st_mode)
925
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, dirst->d_name, X_OK,
782
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
928
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
929
" with bad type or mode\n",
930
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
784
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
785
" with bad type or mode\n", filename);
932
TEMP_FAILURE_RETRY(close(plugin_fd));
936
791
plugin *p = getplugin(dirst->d_name);
938
error(0, errno, "getplugin");
939
TEMP_FAILURE_RETRY(close(plugin_fd));
954
809
for(char **a = g->argv + 1; *a != NULL; a++){
955
810
if(not add_argument(p, *a)){
956
error(0, errno, "add_argument");
811
perror("add_argument");
959
814
/* Add global environment variables */
960
815
for(char **e = g->environ; *e != NULL; e++){
961
816
if(not add_environment(p, *e, false)){
962
error(0, errno, "add_environment");
817
perror("add_environment");
967
/* If this plugin has any environment variables, we need to
968
duplicate the environment from this process, too. */
822
/* If this plugin has any environment variables, we will call
823
using execve and need to duplicate the environment from this
969
825
if(p->environ[0] != NULL){
970
826
for(char **e = environ; *e != NULL; e++){
971
827
if(not add_environment(p, *e, false)){
972
error(0, errno, "add_environment");
828
perror("add_environment");
978
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
980
error(0, errno, "pipe");
981
exitstatus = EX_OSERR;
837
exitstatus = EXIT_FAILURE;
984
840
/* Ask OS to automatic close the pipe on exec */
985
841
ret = set_cloexec_flag(pipefd[0]);
987
error(0, errno, "set_cloexec_flag");
988
TEMP_FAILURE_RETRY(close(pipefd[0]));
989
TEMP_FAILURE_RETRY(close(pipefd[1]));
990
exitstatus = EX_OSERR;
843
perror("set_cloexec_flag");
844
exitstatus = EXIT_FAILURE;
993
847
ret = set_cloexec_flag(pipefd[1]);
995
error(0, errno, "set_cloexec_flag");
996
TEMP_FAILURE_RETRY(close(pipefd[0]));
997
TEMP_FAILURE_RETRY(close(pipefd[1]));
998
exitstatus = EX_OSERR;
849
perror("set_cloexec_flag");
850
exitstatus = EXIT_FAILURE;
1001
853
/* Block SIGCHLD until process is safely in process list */
1002
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1003
&sigchld_action.sa_mask,
854
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1006
error(0, errno, "sigprocmask");
1007
exitstatus = EX_OSERR;
856
perror("sigprocmask");
857
exitstatus = EXIT_FAILURE;
1010
860
/* Starting a new process to be watched */
1014
} while(pid == -1 and errno == EINTR);
1016
error(0, errno, "fork");
1017
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1018
&sigchld_action.sa_mask, NULL));
1019
TEMP_FAILURE_RETRY(close(pipefd[0]));
1020
TEMP_FAILURE_RETRY(close(pipefd[1]));
1021
exitstatus = EX_OSERR;
864
exitstatus = EXIT_FAILURE;
1025
868
/* this is the child process */
1026
869
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1028
error(0, errno, "sigaction");
1031
874
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1033
error(0, errno, "sigprocmask");
876
perror("sigprocmask");
1037
880
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1039
error(0, errno, "dup2");
1043
886
if(dirfd(dir) < 0){
1045
888
above and must now close it manually here. */
1048
if(fexecve(plugin_fd, p->argv,
1049
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1050
error(0, errno, "fexecve for %s/%s",
1051
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
891
if(p->environ[0] == NULL){
892
if(execv(filename, p->argv) < 0){
897
if(execve(filename, p->argv, p->environ) < 0){
1056
904
/* Parent process */
1057
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1059
TEMP_FAILURE_RETRY(close(plugin_fd));
905
close(pipefd[1]); /* Close unused write end of pipe */
1060
907
plugin *new_plugin = getplugin(dirst->d_name);
1061
908
if(new_plugin == NULL){
1062
error(0, errno, "getplugin");
1063
ret = (int)(TEMP_FAILURE_RETRY
1064
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
910
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1067
error(0, errno, "sigprocmask");
912
perror("sigprocmask");
1069
exitstatus = EX_OSERR;
914
exitstatus = EXIT_FAILURE;
1076
921
/* Unblock SIGCHLD so signal handler can be run if this process
1077
922
has already completed */
1078
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1079
&sigchld_action.sa_mask,
923
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1082
error(0, errno, "sigprocmask");
1083
exitstatus = EX_OSERR;
925
perror("sigprocmask");
926
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
930
FD_SET(new_plugin->fd, &rfds_all);
1102
932
if(maxfd < new_plugin->fd){
1103
933
maxfd = new_plugin->fd;
1107
TEMP_FAILURE_RETRY(closedir(dir));
1109
free_plugin(getplugin(NULL));
1111
940
for(plugin *p = plugin_list; p != NULL; p = p->next){
1112
941
if(p->pid != 0){
1209
1020
bool bret = print_out_password(proc->buffer,
1210
1021
proc->buffer_length);
1212
error(0, errno, "print_out_password");
1213
exitstatus = EX_IOERR;
1023
perror("print_out_password");
1024
exitstatus = EXIT_FAILURE;
1218
1029
/* This process has not completed. Does it have any output? */
1219
#if defined (__GNUC__) and defined (__GLIBC__)
1220
#if not __GLIBC_PREREQ(2, 16)
1221
#pragma GCC diagnostic push
1222
#pragma GCC diagnostic ignored "-Wsign-conversion"
1225
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1231
#if defined (__GNUC__) and defined (__GLIBC__)
1232
#if not __GLIBC_PREREQ(2, 16)
1233
#pragma GCC diagnostic pop
1030
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1236
1031
/* This process had nothing to say at this time */
1237
1032
proc = proc->next;
1240
1035
/* Before reading, make the process' data buffer large enough */
1241
1036
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1242
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1243
+ (size_t) BUFFER_SIZE);
1244
if(new_buffer == NULL){
1245
error(0, errno, "malloc");
1246
exitstatus = EX_OSERR;
1037
proc->buffer = realloc(proc->buffer, proc->buffer_size
1038
+ (size_t) BUFFER_SIZE);
1039
if(proc->buffer == NULL){
1041
exitstatus = EXIT_FAILURE;
1249
proc->buffer = new_buffer;
1250
1044
proc->buffer_size += BUFFER_SIZE;
1252
1046
/* Read from the process */
1253
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1255
+ proc->buffer_length,
1047
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1258
1050
/* Read error from this process; ignore the error */
1259
1051
proc = proc->next;