Patch from Jos Backus -- Fix breakage from dev_t to DEV64_T in batch

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 6deb22f..5554d00 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
@@ -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 : 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) {