summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 94e5622)
raw | patch | inline | side by side (parent: 94e5622)
author | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 26 Aug 2015 21:28:50 +0000 (23:28 +0200) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 26 Aug 2015 21:28:50 +0000 (23:28 +0200) |
src/exec.c | patch | blob | history |
diff --git a/src/exec.c b/src/exec.c
index a90563346f70673857a7588330eb9568774f5751..0445b14a91f879bdfccb2cd44024586741ce5888 100755 (executable)
--- a/src/exec.c
+++ b/src/exec.c
sigprocmask (SIG_SETMASK, &ss, /* old mask = */ NULL);
} /* }}} void reset_signal_mask */
-static void close_pipe(int fd_pipe[2])
-{
- if(fd_pipe[0] != -1) {
- close(fd_pipe[0]);
- }
-
- if(fd_pipe[1] != -1) {
- close(fd_pipe[1]);
- }
-}
-
-static int create_pipe(int fd_pipe[2])
+static int create_pipe (int fd_pipe[2]) /* {{{ */
{
char errbuf[1024];
int status;
}
return 0;
-}
+} /* }}} int create_pipe */
+
+static void close_pipe (int fd_pipe[2]) /* {{{ */
+{
+ if (fd_pipe[0] != -1)
+ close (fd_pipe[0]);
+
+ if (fd_pipe[1] != -1)
+ close (fd_pipe[1]);
+} /* }}} void close_pipe */
/*
* Creates three pipes (one for reading, one for writing and one for errors),
@@ -407,9 +405,10 @@ static int fork_child (program_list_t *pl, int *fd_in, int *fd_out, int *fd_err)
if (pl->pid != 0)
return (-1);
- if(create_pipe(fd_pipe_in) == -1 || create_pipe(fd_pipe_out) == -1 || create_pipe(fd_pipe_err) == -1) {
+ if ((create_pipe(fd_pipe_in) == -1)
+ || (create_pipe(fd_pipe_out) == -1)
+ || (create_pipe(fd_pipe_err) == -1))
goto failed;
- }
sp_ptr = NULL;
status = getpwnam_r (pl->user, &sp, nambuf, sizeof (nambuf), &sp_ptr);