X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a174e1ed0fa38aa556f07988b330af3692a639e8..4ecc9e6b64f568f5ca6e98448c953d95c68bb3a3:/rsync.c

diff --git a/rsync.c b/rsync.c
index f1004919..5d50746e 100644
--- a/rsync.c
+++ b/rsync.c
@@ -25,6 +25,7 @@
 extern int verbose;
 extern int dry_run;
 extern int preserve_times;
+extern int preserve_dir_times;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
@@ -64,28 +65,28 @@ int delete_file(char *fname)
 #else
 	ret = do_stat(fname, &st);
 #endif
-	if (ret) {
+	if (ret)
 		return -1;
-	}
 
 	if (!S_ISDIR(st.st_mode)) {
-		if (robust_unlink(fname) == 0 || errno == ENOENT) return 0;
+		if (robust_unlink(fname) == 0 || errno == ENOENT)
+			return 0;
 		rprintf(FERROR, "delete_file: unlink %s failed: %s\n",
 			full_fname(fname), strerror(errno));
 		return -1;
 	}
 
-	if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
-	if (!force_delete || !recurse ||
-	    (errno != ENOTEMPTY && errno != EEXIST)) {
+	if (do_rmdir(fname) == 0 || errno == ENOENT)
+		return 0;
+	if (!force_delete || !recurse
+	    || (errno != ENOTEMPTY && errno != EEXIST)) {
 		rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
 			full_fname(fname), strerror(errno));
 		return -1;
 	}
 
 	/* now we do a recsursive delete on the directory ... */
-	d = opendir(fname);
-	if (!d) {
+	if (!(d = opendir(fname))) {
 		rprintf(FERROR, "delete_file: opendir %s failed: %s\n",
 			full_fname(fname), strerror(errno));
 		return -1;
@@ -93,12 +94,12 @@ int delete_file(char *fname)
 
 	for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
 		char *dname = d_name(di);
-		if (strcmp(dname,".") == 0
-		    || strcmp(dname,"..") == 0)
+		if (dname[0] == '.' && (dname[1] == '\0'
+		    || (dname[1] == '.' && dname[2] == '\0')))
 			continue;
 		pathjoin(buf, sizeof buf, fname, dname);
 		if (verbose > 0)
-			rprintf(FINFO,"deleting %s\n", buf);
+			rprintf(FINFO, "deleting %s\n", buf);
 		if (delete_file(buf) != 0) {
 			closedir(d);
 			return -1;
@@ -123,7 +124,7 @@ int delete_file(char *fname)
 }
 
 int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
-		int report)
+	      int flags)
 {
 	int updated = 0;
 	STRUCT_STAT st2;
@@ -140,8 +141,10 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		st = &st2;
 	}
 
-	if (preserve_times && !S_ISLNK(st->st_mode) &&
-	    cmp_modtime(st->st_mtime, file->modtime) != 0) {
+	if (!preserve_times || S_ISLNK(st->st_mode))
+		flags |= PERMS_SKIP_TIME;
+	if (!(flags & PERMS_SKIP_TIME)
+	    && cmp_modtime(st->st_mtime, file->modtime) != 0) {
 		/* don't complain about not setting times on directories
 		 * because some filesystems can't do it */
 		if (set_modtime(fname,file->modtime) != 0 &&
@@ -201,7 +204,7 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 	}
 #endif
 
-	if (verbose > 1 && report) {
+	if (verbose > 1 && flags & PERMS_REPORT) {
 		if (updated)
 			rprintf(FINFO,"%s\n",fname);
 		else
@@ -228,7 +231,8 @@ void sig_int(void)
 
 /* finish off a file transfer, renaming the file and setting the permissions
    and ownership */
-void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
+void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
+		     int ok_to_set_time)
 {
 	int ret;
 
@@ -237,13 +241,14 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
 
 	/* move tmp file over real file */
 	ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
-	if (ret != 0) {
+	if (ret < 0) {
 		rprintf(FERROR, "%s %s -> \"%s\": %s\n",
 		    ret == -2 ? "copy" : "rename",
 		    full_fname(fnametmp), fname, strerror(errno));
 		do_unlink(fnametmp);
 	} else {
-		set_perms(fname,file,NULL,0);
+		set_perms(fname, file, NULL,
+			  ok_to_set_time ? 0 : PERMS_SKIP_TIME);
 	}
 }