indent -kr -i8

diff --git a/util.c b/util.c
index 5554d00..63073bd 100644 (file)
--- a/util.c
+++ b/util.c
@@ -94,59 +94,59 @@ int fd_pair(int fd[2])
    used to cope with badly broken rsh implementations like the one on
    solaris.
  */
-pid_t piped_child(char **command,int *f_in,int *f_out)
+pid_t piped_child(char **command, int *f_in, int *f_out)
 {
-  pid_t pid;
-  int to_child_pipe[2];
-  int from_child_pipe[2];
-  extern int blocking_io;
-
-  if (fd_pair(to_child_pipe) < 0 ||
-      fd_pair(from_child_pipe) < 0) {
-    rprintf(FERROR,"pipe: %s\n",strerror(errno));
-    exit_cleanup(RERR_IPC);
-  }
-
-
-  pid = do_fork();
-  if (pid == -1) {
-    rprintf(FERROR,"fork: %s\n",strerror(errno));
-    exit_cleanup(RERR_IPC);
-  }
-
-  if (pid == 0)
-    {
-      extern int orig_umask;
-      if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
-         close(to_child_pipe[1]) < 0 ||
-         close(from_child_pipe[0]) < 0 ||
-         dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
-       rprintf(FERROR,"Failed to dup/close : %s\n",strerror(errno));
-       exit_cleanup(RERR_IPC);
-      }
-      if (to_child_pipe[0] != STDIN_FILENO) close(to_child_pipe[0]);
-      if (from_child_pipe[1] != STDOUT_FILENO) close(from_child_pipe[1]);
-      umask(orig_umask);
-      set_blocking(STDIN_FILENO);
-      if (blocking_io) {
-       set_blocking(STDOUT_FILENO);
-      }
-      execvp(command[0], command);
-      rprintf(FERROR,"Failed to exec %s : %s\n",
-             command[0],strerror(errno));
-      exit_cleanup(RERR_IPC);
-    }
+       pid_t pid;
+       int to_child_pipe[2];
+       int from_child_pipe[2];
+       extern int blocking_io;
 
-  if (close(from_child_pipe[1]) < 0 ||
-      close(to_child_pipe[0]) < 0) {
-    rprintf(FERROR,"Failed to close : %s\n",strerror(errno));   
-    exit_cleanup(RERR_IPC);
-  }
+       if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
+               rprintf(FERROR, "pipe: %s\n", strerror(errno));
+               exit_cleanup(RERR_IPC);
+       }
 
-  *f_in = from_child_pipe[0];
-  *f_out = to_child_pipe[1];
 
-  return pid;
+       pid = do_fork();
+       if (pid == -1) {
+               rprintf(FERROR, "fork: %s\n", strerror(errno));
+               exit_cleanup(RERR_IPC);
+       }
+
+       if (pid == 0) {
+               extern int orig_umask;
+               if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
+                   close(to_child_pipe[1]) < 0 ||
+                   close(from_child_pipe[0]) < 0 ||
+                   dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
+                       rprintf(FERROR, "Failed to dup/close : %s\n",
+                               strerror(errno));
+                       exit_cleanup(RERR_IPC);
+               }
+               if (to_child_pipe[0] != STDIN_FILENO)
+                       close(to_child_pipe[0]);
+               if (from_child_pipe[1] != STDOUT_FILENO)
+                       close(from_child_pipe[1]);
+               umask(orig_umask);
+               set_blocking(STDIN_FILENO);
+               if (blocking_io) {
+                       set_blocking(STDOUT_FILENO);
+               }
+               execvp(command[0], command);
+               rprintf(FERROR, "Failed to exec %s : %s\n",
+                       command[0], strerror(errno));
+               exit_cleanup(RERR_IPC);
+       }
+
+       if (close(from_child_pipe[1]) < 0 || close(to_child_pipe[0]) < 0) {
+               rprintf(FERROR, "Failed to close : %s\n", strerror(errno));
+               exit_cleanup(RERR_IPC);
+       }
+
+       *f_in = from_child_pipe[0];
+       *f_out = to_child_pipe[1];
+
+       return pid;
 }
 
 pid_t local_child(int argc, char **argv,int *f_in,int *f_out)