X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/82b2a31a46d7c94f951b96f61c9935198f0f53f1..d1fe65fc5e5f05bc8aba00bc232d00ebc72aa6ab:/main.c

diff --git a/main.c b/main.c
index 4f3729e8..d020e6c2 100644
--- a/main.c
+++ b/main.c
@@ -576,6 +576,10 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
 	if (!dest_path || list_only)
 		return NULL;
 
+	/* Treat an empty string as a copy into the current directory. */
+	if (!*dest_path)
+	    dest_path = ".";
+
 	if (daemon_filter_list.head) {
 		char *slash = strrchr(dest_path, '/');
 		if (slash && (slash[1] == '\0' || (slash[1] == '.' && slash[2] == '\0')))
@@ -639,7 +643,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
 			exit_cleanup(RERR_SYNTAX);
 		}
 
-		if (mkdir_defmode(dest_path) != 0) {
+		if (do_mkdir(dest_path, ACCESSPERMS) != 0) {
 			rsyserr(FERROR, errno, "mkdir %s failed",
 				full_fname(dest_path));
 			exit_cleanup(RERR_FILEIO);
@@ -1521,9 +1525,10 @@ int main(int argc,char *argv[])
 		exit_cleanup(RERR_SYNTAX);
 	}
 
-	/* we set a 0 umask so that correct file permissions can be
-	 * carried across */
-	orig_umask = umask(0);
+	/* Get the umask for use in permission calculations.  We no longer set
+	 * it to zero; that is ugly and pointless now that all the callers that
+	 * relied on it have been reeducated to work with default ACLs. */
+	umask(orig_umask = umask(0));
 
 #if defined CONFIG_LOCALE && defined HAVE_SETLOCALE
 	setlocale(LC_CTYPE, "");