X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3a6a366fc5ac1f418446128de50b4f2a174399fc..71c4617611ca07d7c249faa2dfd2cfc5cb32b836:/rsync.c

diff --git a/rsync.c b/rsync.c
index 7dab5288..2ef416db 100644
--- a/rsync.c
+++ b/rsync.c
@@ -60,6 +60,75 @@ static void free_sums(struct sum_struct *s)
 }
 
 
+/*
+ * delete a file or directory. If force_delet is set then delete 
+ * recursively 
+ */
+static int delete_file(char *fname)
+{
+	DIR *d;
+	struct dirent *di;
+	char buf[MAXPATHLEN];
+	extern int force_delete;
+	struct stat st;
+	int ret;
+
+	if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
+
+#if SUPPORT_LINKS
+	ret = lstat(fname, &st);
+#else
+	ret = stat(fname, &st);
+#endif
+	if (ret) {
+		fprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
+		return -1;
+	}
+
+	if (!S_ISDIR(st.st_mode)) {
+		fprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno));
+		return -1;
+	}
+
+	if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
+	if (!force_delete || errno != ENOTEMPTY) {
+		fprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+		return -1;
+	}
+
+	/* now we do a recsursive delete on the directory ... */
+	d = opendir(fname);
+	if (!d) {
+		fprintf(FERROR,"opendir(%s): %s\n",
+			fname,strerror(errno));
+		return -1;
+	}
+
+	for (di=readdir(d); di; di=readdir(d)) {
+		if (strcmp(di->d_name,".")==0 ||
+		    strcmp(di->d_name,"..")==0)
+			continue;
+		strncpy(buf, fname, (MAXPATHLEN-strlen(di->d_name))-2);
+		strcat(buf, "/");
+		strcat(buf, di->d_name);
+		buf[MAXPATHLEN-1] = 0;
+		if (verbose > 0)
+			fprintf(FINFO,"deleting %s\n", buf);
+		if (delete_file(buf) != 0) {
+			closedir(d);
+			return -1;
+		}
+	}	
+
+	closedir(d);
+	
+	if (do_rmdir(fname) != 0) {
+		fprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+		return -1;
+	}
+
+	return 0;
+}
 
 /*
   send a sums struct down a fd
@@ -223,7 +292,7 @@ static int set_perms(char *fname,struct file_struct *file,struct stat *st,
   if (preserve_perms && !S_ISLNK(st->st_mode) &&
       st->st_mode != file->mode) {
     updated = 1;
-    if (chmod(fname,file->mode) != 0) {
+    if (do_chmod(fname,file->mode) != 0) {
       fprintf(FERROR,"failed to set permissions on %s : %s\n",
 	      fname,strerror(errno));
       return 0;
@@ -234,7 +303,7 @@ static int set_perms(char *fname,struct file_struct *file,struct stat *st,
   if ((am_root && preserve_uid && st->st_uid != file->uid) || 
       (preserve_gid && st->st_gid != file->gid)) {
     updated = 1;
-    if (lchown(fname,
+    if (do_lchown(fname,
 	       (am_root&&preserve_uid)?file->uid:-1,
 	       preserve_gid?file->gid:-1) != 0) {
       if (verbose>1 || preserve_uid)
@@ -304,7 +373,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
   if (S_ISDIR(file->mode)) {
     if (dry_run) return;
     if (statret == 0 && !S_ISDIR(st.st_mode)) {
-      if (unlink(fname) != 0) {
+      if (do_unlink(fname) != 0) {
 	fprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
 	return;
       }
@@ -337,8 +406,8 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 	}
       }
     }
-    if (!dry_run) unlink(fname);
-    if (!dry_run && symlink(file->link,fname) != 0) {
+    delete_file(fname);
+    if (do_symlink(file->link,fname) != 0) {
       fprintf(FERROR,"link %s -> %s : %s\n",
 	      fname,file->link,strerror(errno));
     } else {
@@ -356,12 +425,11 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
     if (statret != 0 || 
 	st.st_mode != file->mode ||
 	st.st_rdev != file->rdev) {	
-      if (!dry_run) unlink(fname);
+      delete_file(fname);
       if (verbose > 2)
 	fprintf(FERROR,"mknod(%s,0%o,0x%x)\n",
 		fname,(int)file->mode,(int)file->rdev);
-      if (!dry_run && 
-	  mknod(fname,file->mode,file->rdev) != 0) {
+      if (do_mknod(fname,file->mode,file->rdev) != 0) {
 	fprintf(FERROR,"mknod %s : %s\n",fname,strerror(errno));
       } else {
 	set_perms(fname,file,NULL,0);
@@ -398,15 +466,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
   }
 
   if (!S_ISREG(st.st_mode)) {
-    /* its not a regular file on the receiving end, but it is on the
-       sending end. If its a directory then skip it (too dangerous to
-       do a recursive deletion??) otherwise try to unlink it */
-    if (S_ISDIR(st.st_mode)) {
-      fprintf(FERROR,"ERROR: %s is a directory\n",fname);
-      return;
-    }
-    if (unlink(fname) != 0) {
-      fprintf(FERROR,"%s : not a regular file (generator)\n",fname);
+    if (delete_file(fname) != 0) {
       return;
     }
 
@@ -546,13 +606,13 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
 static void delete_one(struct file_struct *f)
 {
   if (!S_ISDIR(f->mode)) {
-    if (!dry_run && unlink(f_name(f)) != 0) {
+    if (do_unlink(f_name(f)) != 0) {
       fprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
     } else if (verbose) {
       fprintf(FERROR,"deleting %s\n",f_name(f));
     }
   } else {    
-    if (!dry_run && rmdir(f_name(f)) != 0) {
+    if (do_rmdir(f_name(f)) != 0) {
       if (errno != ENOTEMPTY)
 	fprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
     } else if (verbose) {
@@ -656,7 +716,7 @@ static char *cleanup_fname;
 void exit_cleanup(int code)
 {
 	if (cleanup_fname)
-		unlink(cleanup_fname);
+		do_unlink(cleanup_fname);
 	signal(SIGUSR1, SIG_IGN);
 	if (code) {
 		kill_all(SIGUSR1);
@@ -771,10 +831,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 	close(fd1);
 	continue;
       }
-      fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+      fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
       if (fd2 == -1 && relative_paths && errno == ENOENT && 
 	  create_directory_path(fnametmp) == 0) {
-	      fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+	      fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
       }
       if (fd2 == -1) {
 	fprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
@@ -825,11 +885,11 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 		      } else {
 			      set_perms(fname,file,NULL,0);
 		      }
-		      unlink(fnametmp);
+		      do_unlink(fnametmp);
 	      } else {
 		      fprintf(FERROR,"rename %s -> %s : %s\n",
 			      fnametmp,fname,strerror(errno));
-		      unlink(fnametmp);
+		      do_unlink(fnametmp);
 	      }
       } else {
 	      set_perms(fname,file,NULL,0);
@@ -869,17 +929,17 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 
 
 
-off_t send_files(struct file_list *flist,int f_out,int f_in)
+void send_files(struct file_list *flist,int f_out,int f_in)
 { 
   int fd;
   struct sum_struct *s;
   struct map_struct *buf;
   struct stat st;
   char fname[MAXPATHLEN];  
-  off_t total=0;
   int i;
   struct file_struct *file;
   int phase = 0;
+  int offset=0;
 
   if (verbose > 2)
     fprintf(FERROR,"send_files starting\n");
@@ -910,9 +970,10 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
 		  if (strlen(fname) == MAXPATHLEN-1) {
 			  fprintf(FERROR, "send_files failed on long-named directory %s\n",
 				  fname);
-			  return -1;
+			  return;
 		  }
 		  strcat(fname,"/");
+		  offset = strlen(file->basedir)+1;
 	  }
 	  strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
 	  
@@ -929,7 +990,7 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
 	  s = receive_sums(f_in);
 	  if (!s) {
 		  fprintf(FERROR,"receive_sums failed\n");
-		  return -1;
+		  return;
 	  }
 	  
 	  fd = open(fname,O_RDONLY);
@@ -945,7 +1006,7 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
 		  fprintf(FERROR,"fstat failed : %s\n",strerror(errno));
 		  free_sums(s);
 		  close(fd);
-		  return -1;
+		  return;
 	  }
 	  
 	  if (st.st_size > 0) {
@@ -968,7 +1029,7 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
 		  fprintf(FERROR,"calling match_sums %s\n",fname);
 	  
 	  if (!am_server && verbose)
-		  printf("%s\n",fname);
+		  printf("%s\n",fname+offset);
 	  
 	  match_sums(f_out,s,buf,st.st_size);
 	  write_flush(f_out);
@@ -980,8 +1041,6 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
 	  
 	  if (verbose > 2)
 		  fprintf(FERROR,"sender finished %s\n",fname);
-	  
-	  total += st.st_size;
   }
 
   if (verbose > 2)
@@ -991,8 +1050,6 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
 
   write_int(f_out,-1);
   write_flush(f_out);
-
-  return total;
 }