From d89322c4467f4e393cdefb01cdb23f35b9394615 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 3 Jul 1996 06:24:34 +0000
Subject: [PATCH] - fixed file time bug - doc updates

---
 README    | 6 +++---
 flist.c   | 4 ++--
 io.c      | 6 +++---
 main.c    | 1 -
 version.h | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 6c157989..ff93c02f 100644
--- a/README
+++ b/README
@@ -44,10 +44,10 @@ Here is a brief description of available options:
 -C, --cvs-exclude        auto ignore files in the same way CVS does
     --delete             delete files that don't exist on the sending side
 -I, --ignore-times       don't exclude files that match length and time
+-z, --compress           compress file data
     --exclude FILE       exclude file FILE
     --exclude-from FILE  exclude files listed in FILE
     --suffix SUFFIX      override backup suffix
-    --csum-length LENGTH set the checksum length
     --version            print version number
 
 
@@ -57,8 +57,8 @@ SETUP
 Rsync uses rsh or ssh for communication. It does not need to be setuid
 and requires no special privilages for installation. It does not
 require a inetd entry or a daemon. You must, however, have a working
-rsh or ssh system. Using ssh is recommended for its security and
-compression features.
+rsh or ssh system. Using ssh is recommended for its security
+features. 
 
 To install rsync, first run the "configure" script. This will create a
 Makefile and config.h appropriate for your system. Then type
diff --git a/flist.c b/flist.c
index 38569aa1..ed001a2b 100644
--- a/flist.c
+++ b/flist.c
@@ -110,7 +110,7 @@ void send_file_entry_v11(struct file_struct *file,int f)
 
   if (l1 > 0) flags |= SAME_NAME;
   if (l2 > 255) flags |= LONG_NAME;
-    
+
   write_byte(f,flags);  
   if (flags & SAME_NAME)
     write_byte(f,l1);
@@ -165,7 +165,7 @@ void send_file_entry_v11(struct file_struct *file,int f)
 void receive_file_entry_v11(struct file_struct *file,
 			    unsigned char flags,int f)
 {
-  static mode_t last_time=0;
+  static time_t last_time=0;
   static mode_t last_mode=0;
   static dev_t last_rdev=0;
   static uid_t last_uid=0;
diff --git a/io.c b/io.c
index b25225ed..e7292df4 100644
--- a/io.c
+++ b/io.c
@@ -151,9 +151,9 @@ void read_buf(int f,char *buf,int len)
 
 unsigned char read_byte(int f)
 {
-  char c;
-  read_buf(f,&c,1);
-  return (unsigned char)c;
+  unsigned char c;
+  read_buf(f,(char *)&c,1);
+  return c;
 }
 
 
diff --git a/main.c b/main.c
index 7cef4344..44ad9640 100644
--- a/main.c
+++ b/main.c
@@ -405,7 +405,6 @@ static void usage(FILE *f)
   fprintf(f,"    --exclude FILE       exclude file FILE\n");
   fprintf(f,"    --exclude-from FILE  exclude files listed in FILE\n");
   fprintf(f,"    --suffix SUFFIX      override backup suffix\n");  
-  fprintf(f,"    --csum-length LENGTH set the checksum length\n");  
   fprintf(f,"    --version            print version number\n");  
 
   fprintf(f,"\n");
diff --git a/version.h b/version.h
index ebb734fb..2ed1b2ca 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "1.4.5"
+#define VERSION "1.5.0"
-- 
2.34.1