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(),
26
asprintf(), O_CLOEXEC */
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(),
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
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
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
46
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
47
fcntl(), setuid(), setgid(),
49
48
F_GETFD, F_SETFD, FD_CLOEXEC,
50
49
access(), pipe(), fork(), close()
51
50
dup2(), STDOUT_FILENO, _exit(),
52
execve(), write(), read(),
51
execv(), write(), read(),
54
53
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), 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,
117
109
/* Create a new plugin */
118
plugin *new_plugin = NULL;
120
new_plugin = malloc(sizeof(plugin));
121
} while(new_plugin == NULL and errno == EINTR);
110
plugin *new_plugin = malloc(sizeof(plugin));
122
111
if(new_plugin == NULL){
125
114
char *copy_name = NULL;
126
115
if(name != NULL){
128
copy_name = strdup(name);
129
} while(copy_name == NULL and errno == EINTR);
116
copy_name = strdup(name);
130
117
if(copy_name == NULL){
132
118
free(new_plugin);
138
*new_plugin = (plugin){ .name = copy_name,
141
.next = plugin_list };
123
*new_plugin = (plugin) { .name = copy_name,
126
.next = plugin_list };
144
new_plugin->argv = malloc(sizeof(char *) * 2);
145
} while(new_plugin->argv == NULL and errno == EINTR);
128
new_plugin->argv = malloc(sizeof(char *) * 2);
146
129
if(new_plugin->argv == NULL){
149
131
free(new_plugin);
153
134
new_plugin->argv[0] = copy_name;
154
135
new_plugin->argv[1] = NULL;
157
new_plugin->environ = malloc(sizeof(char *));
158
} while(new_plugin->environ == NULL and errno == EINTR);
137
new_plugin->environ = malloc(sizeof(char *));
159
138
if(new_plugin->environ == NULL){
162
140
free(new_plugin->argv);
163
141
free(new_plugin);
167
144
new_plugin->environ[0] = NULL;
413
372
.doc = "Group ID the plugins will run as", .group = 3 },
414
373
{ .name = "debug", .key = 132,
415
374
.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 },
428
__attribute__((nonnull(3)))
429
error_t parse_opt(int key, char *arg, struct argp_state *state){
378
error_t parse_opt(int key, char *arg, __attribute__((unused))
379
struct argp_state *state) {
434
381
case 'g': /* --global-options */
437
while((plugin_option = strsep(&arg, ",")) != NULL){
438
if(not add_argument(getplugin(NULL), plugin_option)){
384
while((p = strsep(&arg, ",")) != NULL){
388
if(not add_argument(getplugin(NULL), p)){
389
perror("add_argument");
390
return ARGP_ERR_UNKNOWN;
445
395
case 'G': /* --global-env */
446
if(add_environment(getplugin(NULL), arg, true)){
399
if(not add_environment(getplugin(NULL), arg, true)){
400
perror("add_environment");
450
403
case 'o': /* --options-for */
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)){
405
char *p_name = strsep(&arg, ":");
406
if(p_name[0] == '\0' or arg == NULL){
409
char *opt = strsep(&arg, ":");
410
if(opt[0] == '\0' or opt == NULL){
414
while((p = strsep(&opt, ",")) != NULL){
418
if(not add_argument(getplugin(p_name), p)){
419
perror("add_argument");
420
return ARGP_ERR_UNKNOWN;
474
425
case 'E': /* --env-for */
476
430
char *envdef = strchr(arg, ':');
477
431
if(envdef == NULL){
478
argp_error(state, "No colon in \"%s\"", arg);
485
argp_error(state, "Empty plugin name");
489
if(add_environment(getplugin(arg), envdef, true)){
435
if(not add_environment(getplugin(arg), envdef+1, true)){
436
perror("add_environment");
494
440
case 'd': /* --disable */
496
442
plugin *p = getplugin(arg);
444
return ARGP_ERR_UNKNOWN;
503
449
case 'e': /* --enable */
505
451
plugin *p = getplugin(arg);
453
return ARGP_ERR_UNKNOWN;
512
458
case 128: /* --plugin-dir */
514
460
plugindir = strdup(arg);
515
if(plugindir != NULL){
461
if(plugindir == NULL){
519
465
case 129: /* --config-file */
520
466
/* This is already done by parse_opt_config_file() */
522
468
case 130: /* --userid */
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);
469
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
470
if(ret < 1 or tmpmax != (uid_t)tmpmax
471
or arg[numchars] != '\0'){
472
fprintf(stderr, "Bad user ID number: \"%s\", using %"
473
PRIdMAX "\n", arg, (intmax_t)uid);
533
478
case 131: /* --groupid */
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);
479
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
480
if(ret < 1 or tmpmax != (gid_t)tmpmax
481
or arg[numchars] != '\0'){
482
fprintf(stderr, "Bad group ID number: \"%s\", using %"
483
PRIdMAX "\n", arg, (intmax_t)gid);
544
488
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
492
* When adding more options before this line, remember to also add a
563
493
* "case" to the "parse_opt_config_file" function below.
678
598
new_arg = strdup(p);
679
599
if(new_arg == NULL){
680
error(0, errno, "strdup");
681
exitstatus = EX_OSERR;
601
exitstatus = EXIT_FAILURE;
686
606
custom_argc += 1;
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;
607
custom_argv = realloc(custom_argv, sizeof(char *)
608
* ((unsigned int) custom_argc + 1));
609
if(custom_argv == NULL){
611
exitstatus = EXIT_FAILURE;
701
615
custom_argv[custom_argc-1] = new_arg;
702
custom_argv[custom_argc] = NULL;
616
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;
715
621
/* Check for harmful errors and go to fallback. Other errors might
716
622
not affect opening plugins */
717
623
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
718
error(0, errno, "fopen");
719
exitstatus = EX_OSERR;
625
exitstatus = EXIT_FAILURE;
723
/* If there were any arguments from the configuration file, pass
724
them to parser as command line arguments */
629
/* If there was any arguments from configuration file,
630
pass them to parser as command arguments */
725
631
if(custom_argv != NULL){
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;
632
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
634
if(ret == ARGP_ERR_UNKNOWN){
635
fprintf(stderr, "Unknown error while parsing arguments\n");
636
exitstatus = EXIT_FAILURE;
744
641
/* Parse actual command line arguments, to let them override the
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;
643
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
644
if(ret == ARGP_ERR_UNKNOWN){
645
fprintf(stderr, "Unknown error while parsing arguments\n");
646
exitstatus = EXIT_FAILURE;
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");
664
/* Strip permissions down to nobody */
804
665
ret = setuid(uid);
806
error(0, errno, "setuid");
809
/* Open plugin directory with close_on_exec flag */
674
if(plugindir == NULL){
677
dir = opendir(plugindir);
681
perror("Could not open plugin dir");
682
exitstatus = EXIT_FAILURE;
686
/* Set the FD_CLOEXEC flag on the directory, if possible */
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;
688
int dir_fd = dirfd(dir);
690
ret = set_cloexec_flag(dir_fd);
692
perror("set_cloexec_flag");
693
exitstatus = EXIT_FAILURE;
936
762
if(plugindir == NULL){
937
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
763
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
940
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
765
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
945
error(0, errno, "asprintf");
949
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
772
ret = stat(filename, &st);
951
error(0, errno, "stat");
956
779
/* Ignore non-executable files */
957
if(not S_ISREG(st.st_mode)
958
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
780
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
960
782
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
961
783
" with bad type or mode\n", filename);
1001
823
if(p->environ[0] != NULL){
1002
824
for(char **e = environ; *e != NULL; e++){
1003
825
if(not add_environment(p, *e, false)){
1004
error(0, errno, "add_environment");
826
perror("add_environment");
1010
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
1012
error(0, errno, "pipe");
1013
exitstatus = EX_OSERR;
835
exitstatus = EXIT_FAILURE;
1016
838
/* Ask OS to automatic close the pipe on exec */
1017
839
ret = set_cloexec_flag(pipefd[0]);
1019
error(0, errno, "set_cloexec_flag");
1020
exitstatus = EX_OSERR;
841
perror("set_cloexec_flag");
842
exitstatus = EXIT_FAILURE;
1023
845
ret = set_cloexec_flag(pipefd[1]);
1025
error(0, errno, "set_cloexec_flag");
1026
exitstatus = EX_OSERR;
847
perror("set_cloexec_flag");
848
exitstatus = EXIT_FAILURE;
1029
851
/* Block SIGCHLD until process is safely in process list */
1030
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1031
&sigchld_action.sa_mask,
852
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1034
error(0, errno, "sigprocmask");
1035
exitstatus = EX_OSERR;
854
perror("sigprocmask");
855
exitstatus = EXIT_FAILURE;
1038
858
/* Starting a new process to be watched */
1042
} while(pid == -1 and errno == EINTR);
1044
error(0, errno, "fork");
1045
exitstatus = EX_OSERR;
862
exitstatus = EXIT_FAILURE;
1049
866
/* this is the child process */
1050
867
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1052
error(0, errno, "sigaction");
1055
872
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1057
error(0, errno, "sigprocmask");
874
perror("sigprocmask");
1061
878
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1063
error(0, errno, "dup2");
1067
884
if(dirfd(dir) < 0){
1069
886
above and must now close it manually here. */
1072
if(execve(filename, p->argv,
1073
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1074
error(0, errno, "execve for %s", filename);
889
if(p->environ[0] == NULL){
890
if(execv(filename, p->argv) < 0){
895
if(execve(filename, p->argv, p->environ) < 0){
1079
902
/* Parent process */
1080
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
903
close(pipefd[1]); /* Close unused write end of pipe */
1083
905
plugin *new_plugin = getplugin(dirst->d_name);
1084
906
if(new_plugin == NULL){
1085
error(0, errno, "getplugin");
1086
ret = (int)(TEMP_FAILURE_RETRY
1087
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
908
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1090
error(0, errno, "sigprocmask");
910
perror("sigprocmask");
1092
exitstatus = EX_OSERR;
912
exitstatus = EXIT_FAILURE;
1099
919
/* Unblock SIGCHLD so signal handler can be run if this process
1100
920
has already completed */
1101
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1102
&sigchld_action.sa_mask,
921
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1105
error(0, errno, "sigprocmask");
1106
exitstatus = EX_OSERR;
923
perror("sigprocmask");
924
exitstatus = EXIT_FAILURE;
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
928
FD_SET(new_plugin->fd, &rfds_all);
1125
930
if(maxfd < new_plugin->fd){
1126
931
maxfd = new_plugin->fd;
1130
TEMP_FAILURE_RETRY(closedir(dir));
1132
free_plugin(getplugin(NULL));
1134
938
for(plugin *p = plugin_list; p != NULL; p = p->next){
1135
939
if(p->pid != 0){
1146
950
while(plugin_list){
1147
951
fd_set rfds = rfds_all;
1148
952
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1149
if(select_ret == -1 and errno != EINTR){
1150
error(0, errno, "select");
1151
exitstatus = EX_OSERR;
953
if(select_ret == -1){
955
exitstatus = EXIT_FAILURE;
1154
958
/* OK, now either a process completed, or something can be read
1155
959
from one of them */
1156
960
for(plugin *proc = plugin_list; proc != NULL;){
1157
961
/* Is this process completely done? */
1158
if(proc->completed and proc->eof){
962
if(proc->eof and proc->completed){
1159
963
/* Only accept the plugin output if it exited cleanly */
1160
964
if(not WIFEXITED(proc->status)
1161
965
or WEXITSTATUS(proc->status) != 0){
1162
966
/* Bad exit by plugin */
1165
969
if(WIFEXITED(proc->status)){
1166
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1167
" status %d\n", proc->name,
1168
(intmax_t) (proc->pid),
970
fprintf(stderr, "Plugin %" PRIdMAX " exited with status"
971
" %d\n", (intmax_t) (proc->pid),
1169
972
WEXITSTATUS(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)));
973
} else if(WIFSIGNALED(proc->status)) {
974
fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"
975
" %d\n", (intmax_t) (proc->pid),
976
WTERMSIG(proc->status));
1176
977
} else if(WCOREDUMP(proc->status)){
1177
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1178
" core\n", proc->name, (intmax_t) (proc->pid));
978
fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",
979
(intmax_t) (proc->pid));
1182
983
/* Remove the plugin */
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
984
FD_CLR(proc->fd, &rfds_all);
1198
986
/* Block signal while modifying process_list */
1199
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1201
&sigchld_action.sa_mask,
987
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1204
error(0, errno, "sigprocmask");
1205
exitstatus = EX_OSERR;
989
perror("sigprocmask");
990
exitstatus = EXIT_FAILURE;
1232
1016
bool bret = print_out_password(proc->buffer,
1233
1017
proc->buffer_length);
1235
error(0, errno, "print_out_password");
1236
exitstatus = EX_IOERR;
1019
perror("print_out_password");
1020
exitstatus = EXIT_FAILURE;
1241
1025
/* This process has not completed. Does it have any output? */
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
1026
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1259
1027
/* This process had nothing to say at this time */
1260
1028
proc = proc->next;
1263
1031
/* Before reading, make the process' data buffer large enough */
1264
1032
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
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;
1033
proc->buffer = realloc(proc->buffer, proc->buffer_size
1034
+ (size_t) BUFFER_SIZE);
1035
if(proc->buffer == NULL){
1037
exitstatus = EXIT_FAILURE;
1272
proc->buffer = new_buffer;
1273
1040
proc->buffer_size += BUFFER_SIZE;
1275
1042
/* Read from the process */
1276
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1278
+ proc->buffer_length,
1043
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1281
1046
/* Read error from this process; ignore the error */
1282
1047
proc = proc->next;