X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/62c9e6b3a54f147629497a2bc791acac60b5668b..ac1d2d338450eb005abf03002f5784097caf7e19:/rsync.c

diff --git a/rsync.c b/rsync.c
index cf310e9c..1eab8ab6 100644
--- a/rsync.c
+++ b/rsync.c
@@ -64,28 +64,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 +93,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;
@@ -143,15 +143,14 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 	if (preserve_times && !S_ISLNK(st->st_mode) &&
 	    cmp_modtime(st->st_mtime, file->modtime) != 0) {
 		/* don't complain about not setting times on directories
-		   because some filesystems can't do it */
+		 * because some filesystems can't do it */
 		if (set_modtime(fname,file->modtime) != 0 &&
 		    !S_ISDIR(st->st_mode)) {
 			rprintf(FERROR, "failed to set times on %s: %s\n",
 				full_fname(fname), strerror(errno));
 			return 0;
-		} else {
-			updated = 1;
 		}
+		updated = 1;
 	}
 
 	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
@@ -171,18 +170,18 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 			}
 		}
 		if (do_lchown(fname,
-			      change_uid?file->uid:st->st_uid,
-			      change_gid?file->gid:st->st_gid) != 0) {
+		    change_uid ? file->uid : st->st_uid,
+		    change_gid ? file->gid : st->st_gid) != 0) {
 			/* shouldn't have attempted to change uid or gid
-			     unless have the privilege */
+			 * unless have the privilege */
 			rprintf(FERROR, "%s %s failed: %s\n",
-				change_uid ? "chown" : "chgrp",
-				full_fname(fname), strerror(errno));
+			    change_uid ? "chown" : "chgrp",
+			    full_fname(fname), strerror(errno));
 			return 0;
 		}
 		/* a lchown had been done - we have to re-stat if the
-                   destination had the setuid or setgid bits set due
-                   to the side effect of the chown call */
+                 * destination had the setuid or setgid bits set due
+                 * to the side effect of the chown call */
 		if (st->st_mode & (S_ISUID | S_ISGID)) {
 			link_stat(fname, st);
 		}
@@ -238,7 +237,7 @@ 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));