indent -kr -i8

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 1372ed1..63073bd 100644 (file)
--- a/util.c
+++ b/util.c
@@ -2,7 +2,7 @@
     
     Copyright (C) 1996-2000 by Andrew Tridgell 
     Copyright (C) Paul Mackerras 1996
-    Copyright (C) 2001 by Martin Pool <mbp@samba.org>
+    Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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)
@@ -173,10 +173,7 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out)
                extern int am_sender;
                extern int am_server;
 
-               if (read_batch)
-                   am_sender = 0;
-               else
-                   am_sender = !am_sender;
+               am_sender = read_batch ? 0 : !am_sender;
                am_server = 1;          
 
                if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
@@ -275,7 +272,7 @@ int create_directory_path(char *fname)
 
    derived from GNU C's cccp.c.
 */
-static int full_write(int desc, char *ptr, int len)
+static int full_write(int desc, char *ptr, size_t len)
 {
        int total_written;
        
@@ -301,11 +298,11 @@ static int full_write(int desc, char *ptr, int len)
    for an error.  
 
    derived from GNU C's cccp.c. */
-static int safe_read(int desc, char *ptr, int len)
+static int safe_read(int desc, char *ptr, size_t len)
 {
        int n_chars;
  
-       if (len <= 0)
+       if (len == 0)
                return len;
  
 #ifdef EINTR
@@ -835,9 +832,9 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
 {
     int           pct  = (ofs == size) ? 100 : (int)((100.0*ofs)/size);
     unsigned long diff = msdiff(&start_time, now);
-    double        rate = diff ? ((ofs-start_ofs) / diff) * 1000.0/1024.0 : 0;
-    const char    *units, *rem_units;
-    double        remain = rate ? (size-ofs) / rate / 1000.0: 0.0;
+    double        rate = diff ? (double) (ofs-start_ofs) * 1000.0 / diff / 1024.0 : 0;
+    const char    *units;
+    double        remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0;
     int          remain_h, remain_m, remain_s;
 
     if (rate > 1024*1024) {