X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6574b4f7d938a90a158ba31c03942f8170452df4..e3cd198f8ea1ca022c222e7ed949658eaf6cddc9:/rsync.c

diff --git a/rsync.c b/rsync.c
index 790631fe..80bc59a1 100644
--- 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;
@@ -147,7 +148,6 @@ static struct sum_struct *receive_sums(int f)
   struct sum_struct *s;
   int i;
   off_t offset = 0;
-  int block_len;
 
   s = (struct sum_struct *)malloc(sizeof(*s));
   if (!s) out_of_memory("receive_sums");
@@ -161,8 +161,6 @@ static struct sum_struct *receive_sums(int f)
     fprintf(FERROR,"count=%d n=%d rem=%d\n",
 	    s->count,s->n,s->remainder);
 
-  block_len = s->n;
-
   if (s->count == 0) 
     return(s);
 
@@ -203,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;
     }
@@ -267,7 +265,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
   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;
@@ -291,8 +289,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) {
@@ -315,9 +313,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)) {
@@ -407,6 +405,12 @@ 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);
 
@@ -530,23 +534,37 @@ static void delete_one(struct file_struct *f)
 }
 
 
+/* this deletes any files on the receiving side that are not present
+   on the sending side. For version 1.6.4 I have changed the behaviour
+   to match more closely what most people seem to expect of this option */
 static void delete_files(struct file_list *flist)
 {
   struct file_list *local_file_list;
-  char *dot=".";
-  int i;
+  int i, j;
+  char *last_name=NULL;
 
   if (cvs_exclude)
     add_cvs_excludes();
 
-  if (!(local_file_list = send_file_list(-1,1,&dot)))
-    return;
-
-  for (i=local_file_list->count-1;i>=0;i--) {
-    if (!local_file_list->files[i].name) continue;
-    if (-1 == flist_find(flist,&local_file_list->files[i])) {
-      delete_one(&local_file_list->files[i]);
-    }    
+  for (j=0;j<flist->count;j++) {
+	  if (!S_ISDIR(flist->files[j].mode)) continue;
+	  if (strcmp(flist->files[j].name,".")==0) continue;
+	  if (last_name &&
+	      flist->files[j].name[strlen(last_name)] == '/' &&
+	      strncmp(flist->files[j].name,last_name, strlen(last_name))==0)
+		  continue;
+	  last_name = flist->files[j].name;
+	  if (!(local_file_list = send_file_list(-1,1,&last_name)))
+		  continue;
+	  if (verbose > 1)
+		  fprintf(FINFO,"deleting in %s\n", last_name);
+
+	  for (i=local_file_list->count-1;i>=0;i--) {
+		  if (!local_file_list->files[i].name) continue;
+		  if (-1 == flist_find(flist,&local_file_list->files[i])) {
+			  delete_one(&local_file_list->files[i]);
+		  }    
+	  }
   }
 }
 
@@ -554,9 +572,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)
@@ -642,6 +668,11 @@ 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);
       if (NULL == mktemp(fnametmp)) {
 	fprintf(FERROR,"mktemp %s failed\n",fnametmp);
@@ -651,7 +682,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);
       }
@@ -682,6 +713,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 
       if (make_backups) {
 	char fnamebak[MAXPATHLEN];
+	if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) {
+		fprintf(FERROR,"backup filename too long\n");
+		continue;
+	}
 	sprintf(fnamebak,"%s%s",fname,backup_suffix);
 	if (rename(fname,fnamebak) != 0 && errno != ENOENT) {
 	  fprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
@@ -709,16 +744,16 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       }
     }
 
+  if (preserve_hard_links)
+	  do_hard_links(flist);
+
   /* now we need to fix any directory permissions that were 
      modified during the transfer */
-  if (!am_root) {
-    for (i = 0; i < flist->count; i++) {
-      struct file_struct *file = &flist->files[i];
-      if (!file->name || !S_ISDIR(file->mode)) continue;
-      recv_generator(file->name,flist,i,-1);
-    }
+  for (i = 0; i < flist->count; i++) {
+	  struct file_struct *file = &flist->files[i];
+	  if (!file->name || !S_ISDIR(file->mode)) continue;
+	  recv_generator(file->name,flist,i,-1);
   }
-  
 
   if (verbose > 2)
     fprintf(FERROR,"recv_files finished\n");
@@ -765,10 +800,11 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
 
       fname[0] = 0;
       if (file->dir) {
-	strcpy(fname,file->dir);
+	strncpy(fname,file->dir,MAXPATHLEN-1);
+	fname[MAXPATHLEN-1] = 0;
 	strcat(fname,"/");
       }
-      strcat(fname,file->name);
+      strncat(fname,file->name,MAXPATHLEN-strlen(fname));
 
       if (verbose > 2) 
 	fprintf(FERROR,"send_files(%d,%s)\n",i,fname);
@@ -796,6 +832,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;
       }