simplified the logic of whether to skip a file or not. The -c

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index f961a5d..78022fb 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -30,6 +30,7 @@ extern int remote_version;
 
 extern char *backup_suffix;
 
+extern int whole_file;
 extern int block_size;
 extern int update_only;
 extern int make_backups;
@@ -200,7 +201,7 @@ static int set_perms(char *fname,struct file_struct *file,struct stat *st,
   if (dry_run) return 0;
 
   if (!st) {
-    if (lstat(fname,&st2) != 0) {
+    if (link_stat(fname,&st2) != 0) {
       fprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
       return 0;
     }
@@ -251,20 +252,43 @@ static int set_perms(char *fname,struct file_struct *file,struct stat *st,
 }
 
 
+/* choose whether to skip a particular file */
+static int skip_file(char *fname,
+                    struct file_struct *file, struct stat *st)
+{
+       if (st->st_size != file->length) {
+               return 0;
+       }
+       
+       /* if always checksum is set then we use the checksum instead 
+          of the file time to determine whether to sync */
+       if (always_checksum && S_ISREG(st->st_mode)) {
+               char sum[MD4_SUM_LENGTH];
+               file_checksum(fname,sum,st->st_size);
+               return (memcmp(sum,file->sum,csum_length) == 0);
+       }
+
+       if (ignore_times) {
+               return 0;
+       }
+
+       return (st->st_mtime == file->modtime);
+}
+
+
 void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 {  
   int fd;
   struct stat st;
   struct map_struct *buf;
   struct sum_struct *s;
-  char sum[MD4_SUM_LENGTH];
   int statret;
   struct file_struct *file = &flist->files[i];
 
   if (verbose > 2)
     fprintf(FERROR,"recv_generator(%s,%d)\n",fname,i);
 
-  statret = lstat(fname,&st);
+  statret = link_stat(fname,&st);
 
   if (S_ISDIR(file->mode)) {
     if (dry_run) return;
@@ -288,8 +312,8 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
     return;
   }
 
-#if SUPPORT_LINKS
   if (preserve_links && S_ISLNK(file->mode)) {
+#if SUPPORT_LINKS
     char lnk[MAXPATHLEN];
     int l;
     if (statret == 0) {
@@ -312,9 +336,9 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
        fprintf(FINFO,"%s -> %s\n",
                fname,file->link);
     }
+#endif
     return;
   }
-#endif
 
 #ifdef HAVE_MKNOD
   if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
@@ -387,14 +411,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
     return;
   }
 
-  if (always_checksum && S_ISREG(st.st_mode)) {
-    file_checksum(fname,sum,st.st_size);
-  }
-
-  if (st.st_size == file->length &&
-      ((!ignore_times && st.st_mtime == file->modtime) ||
-       (always_checksum && S_ISREG(st.st_mode) &&        
-       memcmp(sum,file->sum,csum_length) == 0))) {
+  if (skip_file(fname, file, &st)) {
     set_perms(fname,file,&st,1);
     return;
   }
@@ -404,11 +421,18 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
     return;
   }
 
+  if (whole_file) {
+    write_int(f_out,i);
+    send_sums(NULL,f_out);    
+    return;
+  }
+
   /* open the file */  
   fd = open(fname,O_RDONLY);
 
   if (fd == -1) {
     fprintf(FERROR,"failed to open %s : %s\n",fname,strerror(errno));
+    fprintf(FERROR,"skipping %s\n",fname);
     return;
   }
 
@@ -533,7 +557,6 @@ static void delete_one(struct file_struct *f)
 static void delete_files(struct file_list *flist)
 {
   struct file_list *local_file_list;
-  char *dot=".";
   int i, j;
   char *last_name=NULL;
 
@@ -566,9 +589,17 @@ static char *cleanup_fname = NULL;
 
 void exit_cleanup(int code)
 {
-  if (cleanup_fname)
-    unlink(cleanup_fname);
-  exit(code);
+       if (cleanup_fname)
+               unlink(cleanup_fname);
+       signal(SIGUSR1, SIG_IGN);
+       if (code) {
+#ifdef GETPGRP_VOID
+               kill(-getpgrp(), SIGUSR1);
+#else
+               kill(-getpgrp(getpid()), SIGUSR1);
+#endif
+       }
+       exit(code);
 }
 
 void sig_int(void)
@@ -656,6 +687,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       /* open tmp file */
       if (strlen(fname) > (MAXPATHLEN-8)) {
        fprintf(FERROR,"filename too long\n");
+       close(fd1);
        continue;
       }
       sprintf(fnametmp,"%s.XXXXXX",fname);
@@ -667,7 +699,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
        continue;
       }
       fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
-      if (relative_paths && errno == ENOENT && 
+      if (fd2 == -1 && relative_paths && errno == ENOENT && 
          create_directory_path(fnametmp) == 0) {
              fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
       }
@@ -787,6 +819,11 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
       if (file->dir) {
        strncpy(fname,file->dir,MAXPATHLEN-1);
        fname[MAXPATHLEN-1] = 0;
+      if (strlen(fname) == MAXPATHLEN-1) {
+        fprintf(FERROR, "send_files failed on long-named directory %s\n",
+                fname);
+        return -1;
+      }
        strcat(fname,"/");
       }
       strncat(fname,file->name,MAXPATHLEN-strlen(fname));
@@ -817,6 +854,7 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
       /* map the local file */
       if (fstat(fd,&st) != 0) {
        fprintf(FERROR,"fstat failed : %s\n",strerror(errno));
+       close(fd);
        return -1;
       }