To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 237.7.248
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.248
- Committer: Teddy Hogeborn
- Date: 2014-06-14 02:52:31 UTC
- mto: (237.7.272 trunk)
- mto: This revision was merged to the branch mainline in revision 317.
- Revision ID: teddy@recompile.se-20140614025231-xpairrn1olkfgsek
plugin-runner: Do not leak file descriptors on certain errors.
* plugin-runner.c (main): If set_cloexec_flag fails, close pipe FD's.
* plugin-runner.c (main): If set_cloexec_flag fails, close pipe FD's.
- files added:
- initramfs-tools-hook-conf
- files removed:
- bugs.xml
- debian/tests
- dracut-module
- plugin-helpers
- files modified:
- .bzrignore
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2018 Teddy Hogeborn
6
* Copyright © 2008-2018 Björn Påhlsson
7
*
8
* This file is part of Mandos.
9
*
10
* Mandos is free software: you can redistribute it and/or modify it
11
* under the terms of the GNU General Public License as published by
12
* the Free Software Foundation, either version 3 of the License, or
13
* (at your option) any later version.
14
*
15
* Mandos is distributed in the hope that it will be useful, but
5
* Copyright © 2008-2014 Teddy Hogeborn
6
* Copyright © 2008-2014 Björn Påhlsson
7
*
8
* This program is free software: you can redistribute it and/or
9
* modify it under the terms of the GNU General Public License as
10
* published by the Free Software Foundation, either version 3 of the
11
* License, or (at your option) any later version.
12
*
13
* This program is distributed in the hope that it will be useful, but
16
14
* WITHOUT ANY WARRANTY; without even the implied warranty of
17
15
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18
16
* General Public License for more details.
19
17
*
20
18
* You should have received a copy of the GNU General Public License
21
* along with Mandos. If not, see <http://www.gnu.org/licenses/>.
19
* along with this program. If not, see
20
* <http://www.gnu.org/licenses/>.
22
21
*
23
22
* Contact the authors at <mandos@recompile.se>.
24
23
*/
25
24
26
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
27
O_CLOEXEC, pipe2() */
26
O_CLOEXEC */
28
27
#include <stddef.h> /* size_t, NULL */
29
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
30
29
realloc() */
31
30
#include <stdbool.h> /* bool, true, false */
32
31
#include <stdio.h> /* fileno(), fprintf(),
33
32
stderr, STDOUT_FILENO, fclose() */
34
#include <sys/types.h> /* fstat(), struct stat, waitpid(),
35
WIFEXITED(), WEXITSTATUS(), wait(),
36
pid_t, uid_t, gid_t, getuid(),
37
getgid() */
33
#include <sys/types.h> /* DIR, fdopendir(), fstat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
37
dirfd() */
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() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
42
43
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
43
44
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* struct dirent, scandirat() */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
readdir(), closedir(), dirfd() */
45
47
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
46
48
FD_CLOEXEC, write(), STDOUT_FILENO,
47
49
struct stat, fstat(), close(),
48
50
setgid(), setuid(), S_ISREG(),
49
faccessat() pipe2(), fork(),
51
faccessat() pipe(), fork(),
50
52
_exit(), dup2(), fexecve(), read()
51
53
*/
52
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
53
FD_CLOEXEC, openat(), scandirat(),
54
pipe2() */
55
FD_CLOEXEC, openat() */
55
56
#include <string.h> /* strsep, strlen(), strsignal(),
56
57
strcmp(), strncmp() */
57
58
#include <errno.h> /* errno */
76
77
#define BUFFER_SIZE 256
77
78
78
79
#define PDIR "/lib/mandos/plugins.d"
79
#define PHDIR "/lib/mandos/plugin-helpers"
80
80
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
81
81
82
82
const char *argp_program_version = "plugin-runner " VERSION;
241
241
return add_to_char_array(def, &(p->environ), &(p->envc));
242
242
}
243
243
244
#ifndef O_CLOEXEC
245
244
/*
246
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
247
246
* Descriptor Flags".
258
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
259
258
ret | FD_CLOEXEC));
260
259
}
261
#endif /* not O_CLOEXEC */
262
260
263
261
264
262
/* Mark processes as completed when they exit, and save their exit
313
311
__attribute__((nonnull))
314
312
static void free_plugin(plugin *plugin_node){
315
313
316
for(char **arg = (plugin_node->argv)+1; *arg != NULL; arg++){
314
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
317
315
free(*arg);
318
316
}
319
free(plugin_node->name);
320
317
free(plugin_node->argv);
321
318
for(char **env = plugin_node->environ; *env != NULL; env++){
322
319
free(*env);
349
346
350
347
int main(int argc, char *argv[]){
351
348
char *plugindir = NULL;
352
char *pluginhelperdir = NULL;
353
349
char *argfile = NULL;
354
350
FILE *conffp;
355
struct dirent **direntries = NULL;
351
DIR *dir = NULL;
352
struct dirent *dirst;
356
353
struct stat st;
357
354
fd_set rfds_all;
358
355
int ret, maxfd = 0;
366
363
.sa_flags = SA_NOCLDSTOP };
367
364
char **custom_argv = NULL;
368
365
int custom_argc = 0;
369
int dir_fd = -1;
366
int dir_fd;
370
367
371
368
/* Establish a signal handler */
372
369
sigemptyset(&sigchld_action.sa_mask);
417
414
.doc = "Group ID the plugins will run as", .group = 3 },
418
415
{ .name = "debug", .key = 132,
419
416
.doc = "Debug mode", .group = 4 },
420
{ .name = "plugin-helper-dir", .key = 133,
421
.arg = "DIRECTORY",
422
.doc = "Specify a different plugin helper directory",
423
.group = 2 },
424
417
/*
425
418
* These reproduce what we would get without ARGP_NO_HELP
426
419
*/
552
545
case 132: /* --debug */
553
546
debug = true;
554
547
break;
555
case 133: /* --plugin-helper-dir */
556
free(pluginhelperdir);
557
pluginhelperdir = strdup(arg);
558
if(pluginhelperdir != NULL){
559
errno = 0;
560
}
561
break;
562
548
/*
563
549
* These reproduce what we would get without ARGP_NO_HELP
564
550
*/
565
551
case '?': /* --help */
566
552
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
567
553
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
568
__builtin_unreachable();
569
554
case -3: /* --usage */
570
555
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
571
556
argp_state_help(state, state->out_stream,
572
557
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
573
__builtin_unreachable();
574
558
case 'V': /* --version */
575
559
fprintf(state->out_stream, "%s\n", argp_program_version);
576
560
exit(EXIT_SUCCESS);
586
570
if(arg[0] == '\0'){
587
571
break;
588
572
}
589
#if __GNUC__ >= 7
590
__attribute__((fallthrough));
591
#else
592
/* FALLTHROUGH */
593
#endif
594
573
default:
595
574
return ARGP_ERR_UNKNOWN;
596
575
}
622
601
case 130: /* --userid */
623
602
case 131: /* --groupid */
624
603
case 132: /* --debug */
625
case 133: /* --plugin-helper-dir */
626
604
case '?': /* --help */
627
605
case -3: /* --usage */
628
606
case 'V': /* --version */
709
687
custom_argc += 1;
710
688
{
711
689
char **new_argv = realloc(custom_argv, sizeof(char *)
712
* ((size_t)custom_argc + 1));
690
* ((unsigned int)
691
custom_argc + 1));
713
692
if(new_argv == NULL){
714
693
error(0, errno, "realloc");
715
694
exitstatus = EX_OSERR;
782
761
goto fallback;
783
762
}
784
763
785
{
786
char *pluginhelperenv;
787
bool bret = true;
788
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
789
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
790
if(ret != -1){
791
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
792
}
793
if(ret == -1 or not bret){
794
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
795
" environment variable to \"%s\" for all plugins\n",
796
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
797
}
798
if(ret != -1){
799
free(pluginhelperenv);
800
}
801
}
802
803
764
if(debug){
804
for(plugin *p = plugin_list; p != NULL; p = p->next){
765
for(plugin *p = plugin_list; p != NULL; p=p->next){
805
766
fprintf(stderr, "Plugin: %s has %d arguments\n",
806
767
p->name ? p->name : "Global", p->argc - 1);
807
768
for(char **a = p->argv; *a != NULL; a++){
816
777
817
778
if(getuid() == 0){
818
779
/* Work around Debian bug #633582:
819
<https://bugs.debian.org/633582> */
780
<http://bugs.debian.org/633582> */
820
781
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
821
782
if(plugindir_fd == -1){
822
783
if(errno != ENOENT){
834
795
}
835
796
}
836
797
}
837
close(plugindir_fd);
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
838
799
}
839
800
}
840
801
868
829
ret = set_cloexec_flag(dir_fd);
869
830
if(ret < 0){
870
831
error(0, errno, "set_cloexec_flag");
832
TEMP_FAILURE_RETRY(close(dir_fd));
871
833
exitstatus = EX_OSERR;
872
834
goto fallback;
873
835
}
874
836
#endif /* O_CLOEXEC */
837
838
dir = fdopendir(dir_fd);
839
if(dir == NULL){
840
error(0, errno, "Could not open plugin dir");
841
TEMP_FAILURE_RETRY(close(dir_fd));
842
exitstatus = EX_OSERR;
843
goto fallback;
844
}
875
845
}
876
846
877
int good_name(const struct dirent * const dirent){
878
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
879
"*.dpkg-old", "*.dpkg-bak",
880
"*.dpkg-divert", NULL };
847
FD_ZERO(&rfds_all);
848
849
/* Read and execute any executable in the plugin directory*/
850
while(true){
851
do {
852
dirst = readdir(dir);
853
} while(dirst == NULL and errno == EINTR);
854
855
/* All directory entries have been processed */
856
if(dirst == NULL){
857
if(errno == EBADF){
858
error(0, errno, "readdir");
859
exitstatus = EX_IOERR;
860
goto fallback;
861
}
862
break;
863
}
864
865
/* Ignore dotfiles, backup files and other junk */
866
{
867
bool bad_name = false;
868
const char * const patterns[] = { ".*", "#*#", "*~",
869
"*.dpkg-new", "*.dpkg-old",
870
"*.dpkg-bak", "*.dpkg-divert",
871
NULL };
881
872
#ifdef __GNUC__
882
873
#pragma GCC diagnostic push
883
874
#pragma GCC diagnostic ignored "-Wcast-qual"
884
875
#endif
885
for(const char **pat = (const char **)patterns;
886
*pat != NULL; pat++){
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
887
878
#ifdef __GNUC__
888
879
#pragma GCC diagnostic pop
889
880
#endif
890
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
891
!= FNM_NOMATCH){
892
if(debug){
881
if(fnmatch(*pat, dirst->d_name,
882
FNM_FILE_NAME | FNM_PERIOD) != FNM_NOMATCH){
883
if(debug){
893
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
894
" matching pattern %s\n", dirent->d_name, *pat);
885
" matching pattern %s\n", dirst->d_name, *pat);
886
}
887
bad_name = true;
888
break;
895
889
}
896
return 0;
890
}
891
if(bad_name){
892
continue;
897
893
}
898
894
}
899
return 1;
900
}
901
902
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
903
alphasort);
904
if(numplugins == -1){
905
error(0, errno, "Could not scan plugin dir");
906
direntries = NULL;
907
exitstatus = EX_OSERR;
908
goto fallback;
909
}
910
911
FD_ZERO(&rfds_all);
912
913
/* Read and execute any executable in the plugin directory*/
914
for(int i = 0; i < numplugins; i++){
915
895
916
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
896
int plugin_fd = openat(dir_fd, dirst->d_name, O_RDONLY |
897
#ifdef O_CLOEXEC
898
O_CLOEXEC
899
#else /* not O_CLOEXEC */
900
0
901
#endif /* not O_CLOEXEC */
902
);
917
903
if(plugin_fd == -1){
918
904
error(0, errno, "Could not open plugin");
919
free(direntries[i]);
920
continue;
921
}
905
continue;
906
}
907
#ifndef O_CLOEXEC
908
/* Set the FD_CLOEXEC flag on the plugin FD */
909
ret = set_cloexec_flag(plugin_fd);
910
if(ret < 0){
911
error(0, errno, "set_cloexec_flag");
912
TEMP_FAILURE_RETRY(close(plugin_fd));
913
continue;
914
}
915
#endif /* O_CLOEXEC */
922
916
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
923
917
if(ret == -1){
924
918
error(0, errno, "stat");
925
close(plugin_fd);
926
free(direntries[i]);
919
TEMP_FAILURE_RETRY(close(plugin_fd));
927
920
continue;
928
921
}
929
922
930
923
/* Ignore non-executable files */
931
924
if(not S_ISREG(st.st_mode)
932
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
933
X_OK, 0)) != 0)){
925
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, dirst->d_name, X_OK,
926
0)) != 0)){
934
927
if(debug){
935
928
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
936
929
" with bad type or mode\n",
937
plugindir != NULL ? plugindir : PDIR,
938
direntries[i]->d_name);
930
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
939
931
}
940
close(plugin_fd);
941
free(direntries[i]);
932
TEMP_FAILURE_RETRY(close(plugin_fd));
942
933
continue;
943
934
}
944
935
945
plugin *p = getplugin(direntries[i]->d_name);
936
plugin *p = getplugin(dirst->d_name);
946
937
if(p == NULL){
947
938
error(0, errno, "getplugin");
948
close(plugin_fd);
949
free(direntries[i]);
939
TEMP_FAILURE_RETRY(close(plugin_fd));
950
940
continue;
951
941
}
952
942
if(p->disabled){
953
943
if(debug){
954
944
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
955
direntries[i]->d_name);
945
dirst->d_name);
956
946
}
957
close(plugin_fd);
958
free(direntries[i]);
947
TEMP_FAILURE_RETRY(close(plugin_fd));
959
948
continue;
960
949
}
961
950
{
986
975
}
987
976
988
977
int pipefd[2];
989
#ifndef O_CLOEXEC
990
978
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
991
#else /* O_CLOEXEC */
992
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
993
#endif /* O_CLOEXEC */
994
979
if(ret == -1){
995
980
error(0, errno, "pipe");
996
981
exitstatus = EX_OSERR;
997
free(direntries[i]);
998
goto fallback;
999
}
1000
if(pipefd[0] >= FD_SETSIZE){
1001
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
1002
FD_SETSIZE);
1003
close(pipefd[0]);
1004
close(pipefd[1]);
1005
exitstatus = EX_OSERR;
1006
free(direntries[i]);
1007
goto fallback;
1008
}
1009
#ifndef O_CLOEXEC
982
goto fallback;
983
}
1010
984
/* Ask OS to automatic close the pipe on exec */
1011
985
ret = set_cloexec_flag(pipefd[0]);
1012
986
if(ret < 0){
1013
987
error(0, errno, "set_cloexec_flag");
1014
close(pipefd[0]);
1015
close(pipefd[1]);
988
TEMP_FAILURE_RETRY(close(pipefd[0]));
989
TEMP_FAILURE_RETRY(close(pipefd[1]));
1016
990
exitstatus = EX_OSERR;
1017
free(direntries[i]);
1018
991
goto fallback;
1019
992
}
1020
993
ret = set_cloexec_flag(pipefd[1]);
1021
994
if(ret < 0){
1022
995
error(0, errno, "set_cloexec_flag");
1023
close(pipefd[0]);
1024
close(pipefd[1]);
996
TEMP_FAILURE_RETRY(close(pipefd[0]));
997
TEMP_FAILURE_RETRY(close(pipefd[1]));
1025
998
exitstatus = EX_OSERR;
1026
free(direntries[i]);
1027
999
goto fallback;
1028
1000
}
1029
#endif /* not O_CLOEXEC */
1030
1001
/* Block SIGCHLD until process is safely in process list */
1031
1002
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1032
1003
&sigchld_action.sa_mask,
1034
1005
if(ret < 0){
1035
1006
error(0, errno, "sigprocmask");
1036
1007
exitstatus = EX_OSERR;
1037
free(direntries[i]);
1038
1008
goto fallback;
1039
1009
}
1040
1010
/* Starting a new process to be watched */
1044
1014
} while(pid == -1 and errno == EINTR);
1045
1015
if(pid == -1){
1046
1016
error(0, errno, "fork");
1047
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1048
&sigchld_action.sa_mask, NULL));
1049
close(pipefd[0]);
1050
close(pipefd[1]);
1051
1017
exitstatus = EX_OSERR;
1052
free(direntries[i]);
1053
1018
goto fallback;
1054
1019
}
1055
1020
if(pid == 0){
1071
1036
_exit(EX_OSERR);
1072
1037
}
1073
1038
1039
if(dirfd(dir) < 0){
1040
/* If dir has no file descriptor, we could not set FD_CLOEXEC
1041
above and must now close it manually here. */
1042
closedir(dir);
1043
}
1074
1044
if(fexecve(plugin_fd, p->argv,
1075
1045
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1076
1046
error(0, errno, "fexecve for %s/%s",
1077
plugindir != NULL ? plugindir : PDIR,
1078
direntries[i]->d_name);
1047
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
1079
1048
_exit(EX_OSERR);
1080
1049
}
1081
1050
/* no return */
1082
1051
}
1083
1052
/* Parent process */
1084
close(pipefd[1]); /* Close unused write end of pipe */
1085
close(plugin_fd);
1086
plugin *new_plugin = getplugin(direntries[i]->d_name);
1053
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1054
pipe */
1055
TEMP_FAILURE_RETRY(close(plugin_fd));
1056
plugin *new_plugin = getplugin(dirst->d_name);
1087
1057
if(new_plugin == NULL){
1088
1058
error(0, errno, "getplugin");
1089
1059
ret = (int)(TEMP_FAILURE_RETRY
1093
1063
error(0, errno, "sigprocmask");
1094
1064
}
1095
1065
exitstatus = EX_OSERR;
1096
free(direntries[i]);
1097
1066
goto fallback;
1098
1067
}
1099
free(direntries[i]);
1100
1068
1101
1069
new_plugin->pid = pid;
1102
1070
new_plugin->fd = pipefd[0];
1103
1104
if(debug){
1105
fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1106
new_plugin->name, (intmax_t) (new_plugin->pid));
1107
}
1108
1071
1109
1072
/* Unblock SIGCHLD so signal handler can be run if this process
1110
1073
has already completed */
1111
1074
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1117
1080
goto fallback;
1118
1081
}
1119
1082
1120
FD_SET(new_plugin->fd, &rfds_all);
1083
#if defined (__GNUC__) and defined (__GLIBC__)
1084
#if not __GLIBC_PREREQ(2, 16)
1085
#pragma GCC diagnostic push
1086
#pragma GCC diagnostic ignored "-Wsign-conversion"
1087
#endif
1088
#endif
1089
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1090
-Wconversion in GNU libc
1091
before 2.16 */
1092
#if defined (__GNUC__) and defined (__GLIBC__)
1093
#if not __GLIBC_PREREQ(2, 16)
1094
#pragma GCC diagnostic pop
1095
#endif
1096
#endif
1121
1097
1122
1098
if(maxfd < new_plugin->fd){
1123
1099
maxfd = new_plugin->fd;
1124
1100
}
1125
1101
}
1126
1102
1127
free(direntries);
1128
direntries = NULL;
1129
close(dir_fd);
1130
dir_fd = -1;
1103
TEMP_FAILURE_RETRY(closedir(dir));
1104
dir = NULL;
1131
1105
free_plugin(getplugin(NULL));
1132
1106
1133
1107
for(plugin *p = plugin_list; p != NULL; p = p->next){
1172
1146
(intmax_t) (proc->pid),
1173
1147
WTERMSIG(proc->status),
1174
1148
strsignal(WTERMSIG(proc->status)));
1149
} else if(WCOREDUMP(proc->status)){
1150
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1151
" core\n", proc->name, (intmax_t) (proc->pid));
1175
1152
}
1176
1153
}
1177
1154
1178
1155
/* Remove the plugin */
1179
FD_CLR(proc->fd, &rfds_all);
1156
#if defined (__GNUC__) and defined (__GLIBC__)
1157
#if not __GLIBC_PREREQ(2, 16)
1158
#pragma GCC diagnostic push
1159
#pragma GCC diagnostic ignored "-Wsign-conversion"
1160
#endif
1161
#endif
1162
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1163
-Wconversion in GNU libc
1164
before 2.16 */
1165
#if defined (__GNUC__) and defined (__GLIBC__)
1166
#if not __GLIBC_PREREQ(2, 16)
1167
#pragma GCC diagnostic pop
1168
#endif
1169
#endif
1180
1170
1181
1171
/* Block signal while modifying process_list */
1182
1172
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1222
1212
}
1223
1213
1224
1214
/* This process has not completed. Does it have any output? */
1225
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1215
#if defined (__GNUC__) and defined (__GLIBC__)
1216
#if not __GLIBC_PREREQ(2, 16)
1217
#pragma GCC diagnostic push
1218
#pragma GCC diagnostic ignored "-Wsign-conversion"
1219
#endif
1220
#endif
1221
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1222
warning from
1223
-Wconversion
1224
in GNU libc
1225
before
1226
2.16 */
1227
#if defined (__GNUC__) and defined (__GLIBC__)
1228
#if not __GLIBC_PREREQ(2, 16)
1229
#pragma GCC diagnostic pop
1230
#endif
1231
#endif
1226
1232
/* This process had nothing to say at this time */
1227
1233
proc = proc->next;
1228
1234
continue;
1295
1301
free(custom_argv);
1296
1302
}
1297
1303
1298
free(direntries);
1299
1300
if(dir_fd != -1){
1301
close(dir_fd);
1304
if(dir != NULL){
1305
closedir(dir);
1302
1306
}
1303
1307
1304
1308
/* Kill the processes */
1324
1328
free_plugin_list();
1325
1329
1326
1330
free(plugindir);
1327
free(pluginhelperdir);
1328
1331
free(argfile);
1329
1332
1330
1333
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0