summaryrefslogtreecommitdiff
path: root/src/util.c
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2006-10-30 22:27:04 +0100
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2006-10-30 22:27:04 +0100
commitf8fb82ba705f6314d502b8efc8f03ecd16b8bed8 (patch)
treeb36fdf1b869751f5a0eabf762d2b9af8d8673a8c /src/util.c
parent3065ecc1e1c44770ecad9e4bf29c4b71f0a2bc52 (diff)
more reindent
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c82
1 files changed, 41 insertions, 41 deletions
diff --git a/src/util.c b/src/util.c
index df3126d..7a31712 100644
--- a/src/util.c
+++ b/src/util.c
@@ -12,48 +12,48 @@
FILE *
pexecvp(const char *file, char *const argv[], pid_t *pid, char *type) {
- FILE *iop;
- int pdes[2];
+ FILE *iop;
+ int pdes[2];
- if (pipe(pdes) < 0) {
- return NULL;
- }
-
- *pid = vfork();
+ if (pipe(pdes) < 0) {
+ return NULL;
+ }
- if (*pid == -1) {
- perror("vfork");
- close(pdes[0]);
- close(pdes[1]);
- return NULL;
- } else if (*pid == 0) {
- /* child */
-
- if (*type == 'r') {
- close(pdes[0]);
- if (pdes[1] != STDOUT_FILENO) {
- dup2(pdes[1], STDOUT_FILENO);
- close(pdes[1]);
- }
- } else {
- close(pdes[1]);
- if (pdes[0] != STDIN_FILENO) {
- dup2(pdes[0], STDIN_FILENO);
- close(pdes[0]);
- }
- }
+ *pid = vfork();
- execvp(file, argv);
- exit(127);
- } else {
- /* parent */
- if (*type == 'r') {
- iop = fdopen(pdes[0], "r");
- close(pdes[1]);
- } else {
- iop = fdopen(pdes[1], "w");
- close(pdes[0]);
- }
- return iop;
- }
+ if (*pid == -1) {
+ perror("vfork");
+ close(pdes[0]);
+ close(pdes[1]);
+ return NULL;
+ } else if (*pid == 0) {
+ /* child */
+
+ if (*type == 'r') {
+ close(pdes[0]);
+ if (pdes[1] != STDOUT_FILENO) {
+ dup2(pdes[1], STDOUT_FILENO);
+ close(pdes[1]);
+ }
+ } else {
+ close(pdes[1]);
+ if (pdes[0] != STDIN_FILENO) {
+ dup2(pdes[0], STDIN_FILENO);
+ close(pdes[0]);
+ }
+ }
+
+ execvp(file, argv);
+ exit(127);
+ } else {
+ /* parent */
+ if (*type == 'r') {
+ iop = fdopen(pdes[0], "r");
+ close(pdes[1]);
+ } else {
+ iop = fdopen(pdes[1], "w");
+ close(pdes[0]);
+ }
+ return iop;
+ }
}