- improved filename packing

- fixed sunos EAGAIN bug

diff --git a/.cvsignore b/.cvsignore
index 1390d90..74ca656 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -44,6 +44,9 @@ rsync-1.1
 rsync-1.1.tar.gz
 rsync-1.2
 rsync-1.2.tar.gz
+rsync-1.3
+rsync-1.4
+rsync-1.4.tar.gz
 rsync-ERSION
 rsync.aux
 rsync.dvi

diff --git a/Makefile.in b/Makefile.in
index a436642..36e4180 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,7 @@ SHELL=/bin/sh
 
 LIBOBJ=lib/getopt.o lib/fnmatch.o 
 OBJS1=rsync.o exclude.o util.o md4.o main.o checksum.o match.o 
-OBJS=$(OBJS1) flist.o io.o $(LIBOBJ)
+OBJS=$(OBJS1) flist.o io.o compat.o $(LIBOBJ)
 
 .c.o:
        $(CC) $(CFLAGS) -c $*.c -o $*.o

diff --git a/compat.c b/compat.c
new file mode 100644 (file)
index 0000000..2b72f9b
--- /dev/null
+++ b/compat.c
@@ -0,0 +1,191 @@
+/* 
+   Copyright (C) Andrew Tridgell 1996
+   Copyright (C) Paul Mackerras 1996
+   
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/* compatability routines for older rsync protocol versions */
+
+#include "rsync.h"
+
+extern int preserve_links;
+extern int preserve_perms;
+extern int preserve_devices;
+extern int preserve_uid;
+extern int preserve_gid;
+extern int preserve_times;
+extern int always_checksum;
+
+
+extern int remote_version;
+
+ void (*send_file_entry)(struct file_struct *file,int f) = NULL;
+ void (*receive_file_entry)(struct file_struct *file,
+                           unsigned char flags,int f) = NULL;
+
+
+void send_file_entry_v10(struct file_struct *file,int f)
+{
+  unsigned char flags;
+  static mode_t last_mode=0;
+  static dev_t last_dev=0;
+  static uid_t last_uid=0;
+  static gid_t last_gid=0;
+  static char lastdir[MAXPATHLEN]="";
+  char *p=NULL;
+
+  if (f == -1) return;
+
+  if (!file) {
+    write_byte(f,0);
+    return;
+  }
+
+  flags = FILE_VALID;
+
+  if (file->mode == last_mode) flags |= SAME_MODE;
+  if (file->dev == last_dev) flags |= SAME_DEV;
+  if (file->uid == last_uid) flags |= SAME_UID;
+  if (file->gid == last_gid) flags |= SAME_GID;
+    
+  if (strncmp(file->name,lastdir,strlen(lastdir)) == 0) {
+    flags |= SAME_DIR;
+    p = file->name + strlen(lastdir);
+  } else {
+    p = file->name;
+  }
+
+  write_byte(f,flags);
+  if (flags & SAME_DIR)
+    write_byte(f,strlen(p));
+  else
+    write_int(f,strlen(p));
+  write_buf(f,p,strlen(p));
+  write_int(f,(int)file->modtime);
+  write_int(f,(int)file->length);
+  if (!(flags & SAME_MODE))
+    write_int(f,(int)file->mode);
+  if (preserve_uid && !(flags & SAME_UID))
+    write_int(f,(int)file->uid);
+  if (preserve_gid && !(flags & SAME_GID))
+    write_int(f,(int)file->gid);
+  if (preserve_devices && IS_DEVICE(file->mode) && !(flags & SAME_DEV))
+    write_int(f,(int)file->dev);
+
+#if SUPPORT_LINKS
+  if (preserve_links && S_ISLNK(file->mode)) {
+    write_int(f,strlen(file->link));
+    write_buf(f,file->link,strlen(file->link));
+  }
+#endif
+
+  if (always_checksum) {
+    write_buf(f,file->sum,SUM_LENGTH);
+  }       
+
+  last_mode = file->mode;
+  last_dev = file->dev;
+  last_uid = file->uid;
+  last_gid = file->gid;
+  p = strrchr(file->name,'/');
+  if (p) {
+    int l = (int)(p - file->name) + 1;
+    strncpy(lastdir,file->name,l);
+    lastdir[l] = 0;
+  } else {
+    strcpy(lastdir,"");
+  }
+}
+
+
+
+void receive_file_entry_v10(struct file_struct *file,
+                           unsigned char flags,int f)
+{
+  static mode_t last_mode=0;
+  static dev_t last_dev=0;
+  static uid_t last_uid=0;
+  static gid_t last_gid=0;
+  static char lastdir[MAXPATHLEN]="";
+  char *p=NULL;
+  int l1,l2;
+
+  if (flags & SAME_DIR) {
+    l1 = read_byte(f);
+    l2 = strlen(lastdir);
+  } else {
+    l1 = read_int(f);
+    l2 = 0;
+  }
+
+  file->name = (char *)malloc(l1+l2+1);
+  if (!file->name) out_of_memory("receive_file_entry");
+
+  strncpy(file->name,lastdir,l2);
+  read_buf(f,file->name+l2,l1);
+  file->name[l1+l2] = 0;
+
+  file->modtime = (time_t)read_int(f);
+  file->length = (off_t)read_int(f);
+  file->mode = (flags & SAME_MODE) ? last_mode : (mode_t)read_int(f);
+  if (preserve_uid)
+    file->uid = (flags & SAME_UID) ? last_uid : (uid_t)read_int(f);
+  if (preserve_gid)
+    file->gid = (flags & SAME_GID) ? last_gid : (gid_t)read_int(f);
+  if (preserve_devices && IS_DEVICE(file->mode))
+    file->dev = (flags & SAME_DEV) ? last_dev : (dev_t)read_int(f);
+
+#if SUPPORT_LINKS
+  if (preserve_links && S_ISLNK(file->mode)) {
+    int l = read_int(f);
+    file->link = (char *)malloc(l+1);
+    if (!file->link) out_of_memory("receive_file_entry");
+    read_buf(f,file->link,l);
+    file->link[l] = 0;
+  }
+#endif
+  
+  if (always_checksum)
+    read_buf(f,file->sum,SUM_LENGTH);
+  
+  last_mode = file->mode;
+  last_dev = file->dev;
+  last_uid = file->uid;
+  last_gid = file->gid;
+  p = strrchr(file->name,'/');
+  if (p) {
+    int l = (int)(p - file->name) + 1;
+    strncpy(lastdir,file->name,l);
+    lastdir[l] = 0;
+  } else {
+    strcpy(lastdir,"");
+  }
+}
+
+
+
+
+void setup_protocol(void)
+{
+  if (remote_version == 10) {
+    send_file_entry = send_file_entry_v10;
+    receive_file_entry = receive_file_entry_v10;
+  } else {
+    send_file_entry = send_file_entry_v11;
+    receive_file_entry = receive_file_entry_v11;
+  }
+}
+

diff --git a/flist.c b/flist.c
index dd348c9..43d5533 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -71,22 +71,21 @@ static void send_directory(int f,struct file_list *flist,char *dir);
 
 static char *flist_dir = NULL;
 
-#define FILE_VALID 1
-#define SAME_MODE (1<<1)
-#define SAME_DEV (1<<2)
-#define SAME_UID (1<<3)
-#define SAME_GID (1<<4)
-#define SAME_DIR (1<<5)
-
-static void send_file_entry(struct file_struct *file,int f)
+extern void (*send_file_entry)(struct file_struct *file,int f);
+extern void (*receive_file_entry)(struct file_struct *file,
+                                 unsigned char flags,int f);
+
+
+void send_file_entry_v11(struct file_struct *file,int f)
 {
   unsigned char flags;
+  static time_t last_time=0;
   static mode_t last_mode=0;
   static dev_t last_dev=0;
   static uid_t last_uid=0;
   static gid_t last_gid=0;
-  static char lastdir[MAXPATHLEN]="";
-  char *p=NULL;
+  static char lastname[MAXPATHLEN]="";
+  int l1,l2;
 
   if (f == -1) return;
 
@@ -101,22 +100,26 @@ static void send_file_entry(struct file_struct *file,int f)
   if (file->dev == last_dev) flags |= SAME_DEV;
   if (file->uid == last_uid) flags |= SAME_UID;
   if (file->gid == last_gid) flags |= SAME_GID;
-    
-  if (strncmp(file->name,lastdir,strlen(lastdir)) == 0) {
-    flags |= SAME_DIR;
-    p = file->name + strlen(lastdir);
-  } else {
-    p = file->name;
-  }
+  if (file->modtime == last_time) flags |= SAME_TIME;
 
-  write_byte(f,flags);
-  if (flags & SAME_DIR)
-    write_byte(f,strlen(p));
+  for (l1=0;lastname[l1] && file->name[l1] == lastname[l1];l1++) ;
+  l2 = strlen(file->name) - l1;
+
+  if (l1 > 0) flags |= SAME_NAME;
+  if (l2 > 255) flags |= LONG_NAME;
+    
+  write_byte(f,flags);  
+  if (flags & SAME_NAME)
+    write_byte(f,l1);
+  if (flags & LONG_NAME)
+    write_int(f,l2);
   else
-    write_int(f,strlen(p));
-  write_buf(f,p,strlen(p));
-  write_int(f,(int)file->modtime);
+    write_byte(f,l2);
+  write_buf(f,file->name+l1,l2);
+
   write_int(f,(int)file->length);
+  if (!(flags & SAME_TIME))
+    write_int(f,(int)file->modtime);
   if (!(flags & SAME_MODE))
     write_int(f,(int)file->mode);
   if (preserve_uid && !(flags & SAME_UID))
@@ -141,46 +144,42 @@ static void send_file_entry(struct file_struct *file,int f)
   last_dev = file->dev;
   last_uid = file->uid;
   last_gid = file->gid;
-  p = strrchr(file->name,'/');
-  if (p) {
-    int l = (int)(p - file->name) + 1;
-    strncpy(lastdir,file->name,l);
-    lastdir[l] = 0;
-  } else {
-    strcpy(lastdir,"");
-  }
+  last_time = file->modtime;
+
+  strcpy(lastname,file->name);
+  lastname[255] = 0;
 }
 
 
 
-static void receive_file_entry(struct file_struct *file,
-                              unsigned char flags,int f)
+void receive_file_entry_v11(struct file_struct *file,
+                           unsigned char flags,int f)
 {
+  static mode_t last_time=0;
   static mode_t last_mode=0;
   static dev_t last_dev=0;
   static uid_t last_uid=0;
   static gid_t last_gid=0;
-  static char lastdir[MAXPATHLEN]="";
-  char *p=NULL;
-  int l1,l2;
+  static char lastname[MAXPATHLEN]="";
+  int l1=0,l2=0;
 
-  if (flags & SAME_DIR) {
+  if (flags & SAME_NAME)
     l1 = read_byte(f);
-    l2 = strlen(lastdir);
-  } else {
-    l1 = read_int(f);
-    l2 = 0;
-  }
+  
+  if (flags & LONG_NAME)
+    l2 = read_int(f);
+  else
+    l2 = read_byte(f);
 
   file->name = (char *)malloc(l1+l2+1);
   if (!file->name) out_of_memory("receive_file_entry");
 
-  strncpy(file->name,lastdir,l2);
-  read_buf(f,file->name+l2,l1);
+  strncpy(file->name,lastname,l1);
+  read_buf(f,file->name+l1,l2);
   file->name[l1+l2] = 0;
 
-  file->modtime = (time_t)read_int(f);
   file->length = (off_t)read_int(f);
+  file->modtime = (flags & SAME_TIME) ? last_time : (time_t)read_int(f);
   file->mode = (flags & SAME_MODE) ? last_mode : (mode_t)read_int(f);
   if (preserve_uid)
     file->uid = (flags & SAME_UID) ? last_uid : (uid_t)read_int(f);
@@ -206,17 +205,14 @@ static void receive_file_entry(struct file_struct *file,
   last_dev = file->dev;
   last_uid = file->uid;
   last_gid = file->gid;
-  p = strrchr(file->name,'/');
-  if (p) {
-    int l = (int)(p - file->name) + 1;
-    strncpy(lastdir,file->name,l);
-    lastdir[l] = 0;
-  } else {
-    strcpy(lastdir,"");
-  }
+  last_time = file->modtime;
+
+  strcpy(lastname,file->name);
+  lastname[255] = 0;
 }
 
 
+
 static struct file_struct *make_file(int recurse,char *fname)
 {
   static struct file_struct file;

diff --git a/io.c b/io.c
index fda04dd..b7d27e6 100644 (file)
--- a/io.c
+++ b/io.c
@@ -103,7 +103,8 @@ static int readfd(int fd,char *buffer,int N)
        read_buffer_p += ret;
        read_buffer_len -= ret;
       } else {
-       ret = read(fd,buffer + total,N - total);
+       if ((ret = read(fd,buffer + total,N - total)) == -1)
+         return -1;
       }
 
       if (ret <= 0)
@@ -116,10 +117,12 @@ static int readfd(int fd,char *buffer,int N)
 
 int read_int(int f)
 {
+  int ret;
   char b[4];
-  if (readfd(f,b,4) != 4) {
+  if ((ret=readfd(f,b,4)) != 4) {
     if (verbose > 1) 
-      fprintf(stderr,"Error reading %d bytes : %s\n",4,strerror(errno));
+      fprintf(stderr,"Error reading %d bytes : %s\n",
+             4,ret==-1?strerror(errno):"EOF");
     exit(1);
   }
   total_read += 4;
@@ -128,9 +131,11 @@ int read_int(int f)
 
 void read_buf(int f,char *buf,int len)
 {
-  if (readfd(f,buf,len) != len) {
+  int ret;
+  if ((ret=readfd(f,buf,len)) != len) {
     if (verbose > 1) 
-      fprintf(stderr,"Error reading %d bytes : %s\n",len,strerror(errno));
+      fprintf(stderr,"Error reading %d bytes : %s\n",
+             len,ret==-1?strerror(errno):"EOF");
     exit(1);
   }
   total_read += len;
@@ -179,8 +184,8 @@ static int writefd(int fd,char *buf,int len)
 
     if (ret == 0) return total;
 
-    if (ret == -1 && errno != EWOULDBLOCK) 
-      return total?total:-1;
+    if (ret == -1 && !(errno == EWOULDBLOCK || errno == EAGAIN)) 
+      return -1;
 
     if (ret == -1) {
       read_check(buffer_f_in);
@@ -202,10 +207,12 @@ static int writefd(int fd,char *buf,int len)
 
 void write_int(int f,int x)
 {
+  int ret;
   char b[4];
   SIVAL(b,0,x);
-  if (writefd(f,b,4) != 4) {
-    fprintf(stderr,"write_int failed : %s\n",strerror(errno));
+  if ((ret=writefd(f,b,4)) != 4) {
+    fprintf(stderr,"write_int failed : %s\n",
+           ret==-1?strerror(errno):"EOF");
     exit(1);
   }
   total_written += 4;
@@ -213,8 +220,10 @@ void write_int(int f,int x)
 
 void write_buf(int f,char *buf,int len)
 {
-  if (writefd(f,buf,len) != len) {
-    fprintf(stderr,"write_buf failed : %s\n",strerror(errno));
+  int ret;
+  if ((ret=writefd(f,buf,len)) != len) {
+    fprintf(stderr,"write_buf failed : %s\n",
+           ret==-1?strerror(errno):"EOF");
     exit(1);
   }
   total_written += len;

diff --git a/main.c b/main.c
index 3cd2a13..0af90e5 100644 (file)
--- a/main.c
+++ b/main.c
@@ -43,6 +43,7 @@ int local_server=0;
 int ignore_times=0;
 int delete_mode=0;
 int one_file_system=0;
+int remote_version=0;
 
 int am_server = 0;
 static int sender = 0;
@@ -581,14 +582,16 @@ int main(int argc,char *argv[])
       verbose = MAX(verbose,1);
 
     if (am_server) {
-      int version = read_int(STDIN_FILENO);
-      if (version < MIN_PROTOCOL_VERSION) {
+      remote_version = read_int(STDIN_FILENO);
+      if (remote_version < MIN_PROTOCOL_VERSION) {
        fprintf(stderr,"protocol version mismatch %d %d\n",
-               version,PROTOCOL_VERSION);
+               remote_version,PROTOCOL_VERSION);
        exit(1);
       }
       write_int(STDOUT_FILENO,PROTOCOL_VERSION);
       write_flush(STDOUT_FILENO);
+
+      setup_protocol();
        
       if (sender) {
        recv_exclude_list(STDIN_FILENO);
@@ -665,13 +668,15 @@ int main(int argc,char *argv[])
     write_int(f_out,PROTOCOL_VERSION);
     write_flush(f_out);
     {
-      int version = read_int(f_in);
-      if (version < MIN_PROTOCOL_VERSION) {
+      remote_version = read_int(f_in);
+      if (remote_version < MIN_PROTOCOL_VERSION) {
        fprintf(stderr,"protocol version mismatch\n");
        exit(1);
       }        
     }
 
+    setup_protocol();
+
     if (verbose > 3) 
       fprintf(stderr,"parent=%d child=%d sender=%d recurse=%d\n",
              (int)getpid(),pid,sender,recurse);

diff --git a/rsync.c b/rsync.c
index ec23c9e..570dfef 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -450,8 +450,9 @@ static void delete_files(struct file_list *flist)
   char *dot=".";
   int i;
 
-  if (!am_server && cvs_exclude)
+  if (cvs_exclude)
     add_cvs_excludes();
+
   if (!(local_file_list = send_file_list(-1,recurse,1,&dot)))
     return;
 

diff --git a/rsync.h b/rsync.h
index 9c326e1..79ccc66 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -23,8 +23,18 @@
 #define RSYNC_NAME "rsync"
 #define BACKUP_SUFFIX "~"
 
+#define FILE_VALID 1
+#define SAME_MODE (1<<1)
+#define SAME_DEV (1<<2)
+#define SAME_UID (1<<3)
+#define SAME_GID (1<<4)
+#define SAME_DIR (1<<5)
+#define SAME_NAME SAME_DIR
+#define LONG_NAME (1<<6)
+#define SAME_TIME (1<<7)
+
 /* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 10
+#define PROTOCOL_VERSION 11
 #define MIN_PROTOCOL_VERSION 10
 
 /* block size to write files in */

diff --git a/version.h b/version.h
index ad34f8d..276f7ba 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "1.4"
+#define VERSION "1.4.1"