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(),
26
asprintf(), O_CLOEXEC */
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(),
31
#include <stdio.h> /* fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
33
#include <sys/types.h> /* DIR, fdopendir(), 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(),
42
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
43
44
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
45
46
readdir(), closedir(), dirfd() */
46
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
48
fcntl(), setuid(), setgid(),
48
49
F_GETFD, F_SETFD, FD_CLOEXEC,
49
50
access(), pipe(), fork(), close()
50
51
dup2(), STDOUT_FILENO, _exit(),
51
execv(), write(), read(),
52
execve(), write(), read(),
53
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
#include <string.h> /* strsep, strlen(), asprintf() */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
56
58
#include <errno.h> /* errno */
57
59
#include <argp.h> /* struct argp_option, struct
58
60
argp_state, struct argp,
98
106
/* Gets an existing plugin based on name,
99
107
or if none is found, creates a new one */
108
__attribute__((warn_unused_result))
100
109
static plugin *getplugin(char *name){
101
/* Check for exiting plugin with that name */
102
for (plugin *p = plugin_list; p != NULL; p = p->next){
103
if ((p->name == name)
104
or (p->name and name and (strcmp(p->name, name) == 0))){
110
/* Check for existing plugin with that name */
111
for(plugin *p = plugin_list; p != NULL; p = p->next){
113
or (p->name and name and (strcmp(p->name, name) == 0))){
108
117
/* Create a new plugin */
109
plugin *new_plugin = malloc(sizeof(plugin));
110
if (new_plugin == NULL){
118
plugin *new_plugin = NULL;
120
new_plugin = malloc(sizeof(plugin));
121
} while(new_plugin == NULL and errno == EINTR);
122
if(new_plugin == NULL){
113
125
char *copy_name = NULL;
114
126
if(name != NULL){
115
copy_name = strdup(name);
128
copy_name = strdup(name);
129
} while(copy_name == NULL and errno == EINTR);
116
130
if(copy_name == NULL){
121
*new_plugin = (plugin) { .name = copy_name,
124
.next = plugin_list };
138
*new_plugin = (plugin){ .name = copy_name,
141
.next = plugin_list };
126
new_plugin->argv = malloc(sizeof(char *) * 2);
127
if (new_plugin->argv == NULL){
144
new_plugin->argv = malloc(sizeof(char *) * 2);
145
} while(new_plugin->argv == NULL and errno == EINTR);
146
if(new_plugin->argv == NULL){
129
149
free(new_plugin);
132
153
new_plugin->argv[0] = copy_name;
133
154
new_plugin->argv[1] = NULL;
135
new_plugin->environ = malloc(sizeof(char *));
157
new_plugin->environ = malloc(sizeof(char *));
158
} while(new_plugin->environ == NULL and errno == EINTR);
136
159
if(new_plugin->environ == NULL){
138
162
free(new_plugin->argv);
139
163
free(new_plugin);
142
167
new_plugin->environ[0] = NULL;
369
413
.doc = "Group ID the plugins will run as", .group = 3 },
370
414
{ .name = "debug", .key = 132,
371
415
.doc = "Debug mode", .group = 4 },
417
* These reproduce what we would get without ARGP_NO_HELP
419
{ .name = "help", .key = '?',
420
.doc = "Give this help list", .group = -1 },
421
{ .name = "usage", .key = -3,
422
.doc = "Give a short usage message", .group = -1 },
423
{ .name = "version", .key = 'V',
424
.doc = "Print program version", .group = -1 },
375
error_t parse_opt (int key, char *arg, __attribute__((unused))
376
struct argp_state *state) {
428
__attribute__((nonnull(3)))
429
error_t parse_opt(int key, char *arg, struct argp_state *state){
378
434
case 'g': /* --global-options */
381
while((p = strsep(&arg, ",")) != NULL){
385
if(not add_argument(getplugin(NULL), p)){
386
perror("add_argument");
387
return ARGP_ERR_UNKNOWN;
437
while((plugin_option = strsep(&arg, ",")) != NULL){
438
if(not add_argument(getplugin(NULL), plugin_option)){
392
445
case 'G': /* --global-env */
396
if(not add_environment(getplugin(NULL), arg, true)){
397
perror("add_environment");
446
if(add_environment(getplugin(NULL), arg, true)){
400
450
case 'o': /* --options-for */
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;
452
char *option_list = strchr(arg, ':');
453
if(option_list == NULL){
454
argp_error(state, "No colon in \"%s\"", arg);
461
argp_error(state, "Empty plugin name");
466
while((option = strsep(&option_list, ",")) != NULL){
467
if(not add_argument(getplugin(arg), option)){
422
474
case 'E': /* --env-for */
427
476
char *envdef = strchr(arg, ':');
428
477
if(envdef == NULL){
478
argp_error(state, "No colon in \"%s\"", arg);
432
if(not add_environment(getplugin(arg), envdef+1, true)){
433
perror("add_environment");
485
argp_error(state, "Empty plugin name");
489
if(add_environment(getplugin(arg), envdef, true)){
437
494
case 'd': /* --disable */
439
496
plugin *p = getplugin(arg);
441
return ARGP_ERR_UNKNOWN;
446
503
case 'e': /* --enable */
448
505
plugin *p = getplugin(arg);
450
return ARGP_ERR_UNKNOWN;
455
512
case 128: /* --plugin-dir */
457
514
plugindir = strdup(arg);
458
if(plugindir == NULL){
515
if(plugindir != NULL){
462
519
case 129: /* --config-file */
463
520
/* This is already done by parse_opt_config_file() */
465
522
case 130: /* --userid */
466
uid = (uid_t)strtol(arg, NULL, 10);
523
tmp_id = strtoimax(arg, &tmp, 10);
524
if(errno != 0 or tmp == arg or *tmp != '\0'
525
or tmp_id != (uid_t)tmp_id){
526
argp_error(state, "Bad user ID number: \"%s\", using %"
527
PRIdMAX, arg, (intmax_t)uid);
468
533
case 131: /* --groupid */
469
gid = (gid_t)strtol(arg, NULL, 10);
534
tmp_id = strtoimax(arg, &tmp, 10);
535
if(errno != 0 or tmp == arg or *tmp != '\0'
536
or tmp_id != (gid_t)tmp_id){
537
argp_error(state, "Bad group ID number: \"%s\", using %"
538
PRIdMAX, arg, (intmax_t)gid);
471
544
case 132: /* --debug */
548
* These reproduce what we would get without ARGP_NO_HELP
550
case '?': /* --help */
551
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
552
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
553
case -3: /* --usage */
554
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
555
argp_state_help(state, state->out_stream,
556
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
557
case 'V': /* --version */
558
fprintf(state->out_stream, "%s\n", argp_program_version);
562
* When adding more options before this line, remember to also add a
563
* "case" to the "parse_opt_config_file" function below.
474
565
case ARGP_KEY_ARG:
475
566
/* Cryptsetup always passes an argument, which is an empty
476
567
string if "none" was specified in /etc/crypttab. So if
477
568
argument was empty, we ignore it silently. */
479
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
485
573
return ARGP_ERR_UNKNOWN;
575
return errno; /* Set to 0 at start */
490
578
/* This option parser is the same as parse_opt() above, except it
491
579
ignores everything but the --config-file option. */
492
error_t parse_opt_config_file (int key, char *arg,
493
__attribute__((unused))
494
struct argp_state *state) {
580
error_t parse_opt_config_file(int key, char *arg,
581
__attribute__((unused))
582
struct argp_state *state){
496
585
case 'g': /* --global-options */
497
586
case 'G': /* --global-env */
498
587
case 'o': /* --options-for */
577
678
new_arg = strdup(p);
578
679
if(new_arg == NULL){
580
exitstatus = EXIT_FAILURE;
680
error(0, errno, "strdup");
681
exitstatus = EX_OSERR;
585
686
custom_argc += 1;
586
custom_argv = realloc(custom_argv, sizeof(char *)
587
* ((unsigned int) custom_argc + 1));
588
if(custom_argv == NULL){
590
exitstatus = EXIT_FAILURE;
688
char **new_argv = realloc(custom_argv, sizeof(char *)
691
if(new_argv == NULL){
692
error(0, errno, "realloc");
693
exitstatus = EX_OSERR;
698
custom_argv = new_argv;
594
701
custom_argv[custom_argc-1] = new_arg;
595
custom_argv[custom_argc] = NULL;
702
custom_argv[custom_argc] = NULL;
706
ret = fclose(conffp);
707
} while(ret == EOF and errno == EINTR);
709
error(0, errno, "fclose");
710
exitstatus = EX_IOERR;
600
715
/* Check for harmful errors and go to fallback. Other errors might
601
716
not affect opening plugins */
602
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
604
exitstatus = EXIT_FAILURE;
717
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
718
error(0, errno, "fopen");
719
exitstatus = EX_OSERR;
608
/* If there was any arguments from configuration file,
609
pass them to parser as command arguments */
723
/* If there were any arguments from the configuration file, pass
724
them to parser as command line arguments */
610
725
if(custom_argv != NULL){
611
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
613
if (ret == ARGP_ERR_UNKNOWN){
614
fprintf(stderr, "Unknown error while parsing arguments\n");
615
exitstatus = EXIT_FAILURE;
726
ret = argp_parse(&argp, custom_argc, custom_argv,
727
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
735
error(0, errno, "argp_parse");
736
exitstatus = EX_OSERR;
739
exitstatus = EX_CONFIG;
620
744
/* Parse actual command line arguments, to let them override the
622
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
623
if (ret == ARGP_ERR_UNKNOWN){
624
fprintf(stderr, "Unknown error while parsing arguments\n");
625
exitstatus = EXIT_FAILURE;
746
ret = argp_parse(&argp, argc, argv,
747
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
755
error(0, errno, "argp_parse");
756
exitstatus = EX_OSERR;
759
exitstatus = EX_USAGE;
633
767
for(char **a = p->argv; *a != NULL; a++){
634
768
fprintf(stderr, "\tArg: %s\n", *a);
636
fprintf(stderr, "...and %u environment variables\n", p->envc);
770
fprintf(stderr, "...and %d environment variables\n", p->envc);
637
771
for(char **a = p->environ; *a != NULL; a++){
638
772
fprintf(stderr, "\t%s\n", *a);
643
/* Strip permissions down to nobody */
778
/* Work around Debian bug #633582:
779
<http://bugs.debian.org/633582> */
780
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
781
if(plugindir_fd == -1){
782
error(0, errno, "open(\"" PDIR "\")");
784
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
786
error(0, errno, "fstat");
788
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
789
ret = fchown(plugindir_fd, uid, gid);
791
error(0, errno, "fchown");
795
TEMP_FAILURE_RETRY(close(plugindir_fd));
799
/* Lower permissions */
802
error(0, errno, "setgid");
644
804
ret = setuid(uid);
653
if (plugindir == NULL){
656
dir = opendir(plugindir);
660
perror("Could not open plugin dir");
661
exitstatus = EXIT_FAILURE;
665
/* Set the FD_CLOEXEC flag on the directory, if possible */
806
error(0, errno, "setuid");
809
/* Open plugin directory with close_on_exec flag */
667
int dir_fd = dirfd(dir);
669
ret = set_cloexec_flag(dir_fd);
671
perror("set_cloexec_flag");
672
exitstatus = EXIT_FAILURE;
812
if(plugindir == NULL){
813
dir_fd = open(PDIR, O_RDONLY |
816
#else /* not O_CLOEXEC */
818
#endif /* not O_CLOEXEC */
821
dir_fd = open(plugindir, O_RDONLY |
824
#else /* not O_CLOEXEC */
826
#endif /* not O_CLOEXEC */
830
error(0, errno, "Could not open plugin dir");
831
exitstatus = EX_UNAVAILABLE;
836
/* Set the FD_CLOEXEC flag on the directory */
837
ret = set_cloexec_flag(dir_fd);
839
error(0, errno, "set_cloexec_flag");
840
TEMP_FAILURE_RETRY(close(dir_fd));
841
exitstatus = EX_OSERR;
844
#endif /* O_CLOEXEC */
846
dir = fdopendir(dir_fd);
848
error(0, errno, "Could not open plugin dir");
849
TEMP_FAILURE_RETRY(close(dir_fd));
850
exitstatus = EX_OSERR;
802
1001
if(p->environ[0] != NULL){
803
1002
for(char **e = environ; *e != NULL; e++){
804
1003
if(not add_environment(p, *e, false)){
805
perror("add_environment");
1004
error(0, errno, "add_environment");
814
exitstatus = EXIT_FAILURE;
1010
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
1012
error(0, errno, "pipe");
1013
exitstatus = EX_OSERR;
817
1016
/* Ask OS to automatic close the pipe on exec */
818
1017
ret = set_cloexec_flag(pipefd[0]);
820
perror("set_cloexec_flag");
821
exitstatus = EXIT_FAILURE;
1019
error(0, errno, "set_cloexec_flag");
1020
exitstatus = EX_OSERR;
824
1023
ret = set_cloexec_flag(pipefd[1]);
826
perror("set_cloexec_flag");
827
exitstatus = EXIT_FAILURE;
1025
error(0, errno, "set_cloexec_flag");
1026
exitstatus = EX_OSERR;
830
1029
/* Block SIGCHLD until process is safely in process list */
831
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1030
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1031
&sigchld_action.sa_mask,
833
perror("sigprocmask");
834
exitstatus = EXIT_FAILURE;
1034
error(0, errno, "sigprocmask");
1035
exitstatus = EX_OSERR;
837
1038
/* Starting a new process to be watched */
1042
} while(pid == -1 and errno == EINTR);
841
exitstatus = EXIT_FAILURE;
1044
error(0, errno, "fork");
1045
exitstatus = EX_OSERR;
845
1049
/* this is the child process */
846
1050
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1052
error(0, errno, "sigaction");
851
1055
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
853
perror("sigprocmask");
1057
error(0, errno, "sigprocmask");
857
1061
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1063
error(0, errno, "dup2");
863
1067
if(dirfd(dir) < 0){
865
1069
above and must now close it manually here. */
868
if(p->environ[0] == NULL){
869
if(execv(filename, p->argv) < 0){
874
if(execve(filename, p->argv, p->environ) < 0){
1072
if(execve(filename, p->argv,
1073
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1074
error(0, errno, "execve for %s", filename);
881
1079
/* Parent process */
882
close(pipefd[1]); /* Close unused write end of pipe */
1080
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
884
1083
plugin *new_plugin = getplugin(dirst->d_name);
885
if (new_plugin == NULL){
887
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1084
if(new_plugin == NULL){
1085
error(0, errno, "getplugin");
1086
ret = (int)(TEMP_FAILURE_RETRY
1087
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
889
perror("sigprocmask");
1090
error(0, errno, "sigprocmask");
891
exitstatus = EXIT_FAILURE;
1092
exitstatus = EX_OSERR;
898
1099
/* Unblock SIGCHLD so signal handler can be run if this process
899
1100
has already completed */
900
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1101
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1102
&sigchld_action.sa_mask,
902
perror("sigprocmask");
903
exitstatus = EXIT_FAILURE;
1105
error(0, errno, "sigprocmask");
1106
exitstatus = EX_OSERR;
907
FD_SET(new_plugin->fd, &rfds_all);
1110
#if defined (__GNUC__) and defined (__GLIBC__)
1111
#if not __GLIBC_PREREQ(2, 16)
1112
#pragma GCC diagnostic push
1113
#pragma GCC diagnostic ignored "-Wsign-conversion"
1116
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1117
-Wconversion in GNU libc
1119
#if defined (__GNUC__) and defined (__GLIBC__)
1120
#if not __GLIBC_PREREQ(2, 16)
1121
#pragma GCC diagnostic pop
909
if (maxfd < new_plugin->fd){
1125
if(maxfd < new_plugin->fd){
910
1126
maxfd = new_plugin->fd;
1130
TEMP_FAILURE_RETRY(closedir(dir));
1132
free_plugin(getplugin(NULL));
917
1134
for(plugin *p = plugin_list; p != NULL; p = p->next){
918
1135
if(p->pid != 0){
929
1146
while(plugin_list){
930
1147
fd_set rfds = rfds_all;
931
1148
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
932
if (select_ret == -1){
934
exitstatus = EXIT_FAILURE;
1149
if(select_ret == -1 and errno != EINTR){
1150
error(0, errno, "select");
1151
exitstatus = EX_OSERR;
937
1154
/* OK, now either a process completed, or something can be read
938
1155
from one of them */
939
1156
for(plugin *proc = plugin_list; proc != NULL;){
940
1157
/* Is this process completely done? */
941
if(proc->eof and proc->completed){
1158
if(proc->completed and proc->eof){
942
1159
/* Only accept the plugin output if it exited cleanly */
943
1160
if(not WIFEXITED(proc->status)
944
1161
or WEXITSTATUS(proc->status) != 0){
945
1162
/* Bad exit by plugin */
948
1165
if(WIFEXITED(proc->status)){
949
fprintf(stderr, "Plugin %u exited with status %d\n",
950
(unsigned int) (proc->pid),
1166
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1167
" status %d\n", proc->name,
1168
(intmax_t) (proc->pid),
951
1169
WEXITSTATUS(proc->status));
952
} else if(WIFSIGNALED(proc->status)) {
953
fprintf(stderr, "Plugin %u killed by signal %d\n",
954
(unsigned int) (proc->pid),
955
WTERMSIG(proc->status));
1170
} else if(WIFSIGNALED(proc->status)){
1171
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1172
" signal %d: %s\n", proc->name,
1173
(intmax_t) (proc->pid),
1174
WTERMSIG(proc->status),
1175
strsignal(WTERMSIG(proc->status)));
956
1176
} else if(WCOREDUMP(proc->status)){
957
fprintf(stderr, "Plugin %d dumped core\n",
958
(unsigned int) (proc->pid));
1177
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1178
" core\n", proc->name, (intmax_t) (proc->pid));
962
1182
/* Remove the plugin */
963
FD_CLR(proc->fd, &rfds_all);
1183
#if defined (__GNUC__) and defined (__GLIBC__)
1184
#if not __GLIBC_PREREQ(2, 16)
1185
#pragma GCC diagnostic push
1186
#pragma GCC diagnostic ignored "-Wsign-conversion"
1189
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1190
-Wconversion in GNU libc
1192
#if defined (__GNUC__) and defined (__GLIBC__)
1193
#if not __GLIBC_PREREQ(2, 16)
1194
#pragma GCC diagnostic pop
965
1198
/* Block signal while modifying process_list */
966
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1199
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1201
&sigchld_action.sa_mask,
968
perror("sigprocmask");
969
exitstatus = EXIT_FAILURE;
1204
error(0, errno, "sigprocmask");
1205
exitstatus = EX_OSERR;
995
1232
bool bret = print_out_password(proc->buffer,
996
1233
proc->buffer_length);
998
perror("print_out_password");
999
exitstatus = EXIT_FAILURE;
1235
error(0, errno, "print_out_password");
1236
exitstatus = EX_IOERR;
1004
1241
/* This process has not completed. Does it have any output? */
1005
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1242
#if defined (__GNUC__) and defined (__GLIBC__)
1243
#if not __GLIBC_PREREQ(2, 16)
1244
#pragma GCC diagnostic push
1245
#pragma GCC diagnostic ignored "-Wsign-conversion"
1248
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1254
#if defined (__GNUC__) and defined (__GLIBC__)
1255
#if not __GLIBC_PREREQ(2, 16)
1256
#pragma GCC diagnostic pop
1006
1259
/* This process had nothing to say at this time */
1007
1260
proc = proc->next;
1010
1263
/* Before reading, make the process' data buffer large enough */
1011
1264
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1012
proc->buffer = realloc(proc->buffer, proc->buffer_size
1013
+ (size_t) BUFFER_SIZE);
1014
if (proc->buffer == NULL){
1016
exitstatus = EXIT_FAILURE;
1265
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1266
+ (size_t) BUFFER_SIZE);
1267
if(new_buffer == NULL){
1268
error(0, errno, "malloc");
1269
exitstatus = EX_OSERR;
1272
proc->buffer = new_buffer;
1019
1273
proc->buffer_size += BUFFER_SIZE;
1021
1275
/* Read from the process */
1022
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1276
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1278
+ proc->buffer_length,
1025
1281
/* Read error from this process; ignore the error */
1026
1282
proc = proc->next;