X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c2b5407678c9d72dbed1e72760c4d36945d5ddd5..68207537326987e28d42ad3b2fe53bdb1ebcc781:/util.c

diff --git a/util.c b/util.c
index 50ad3478..dcb48f5c 100644
--- a/util.c
+++ b/util.c
@@ -33,6 +33,7 @@ extern int module_id;
 extern int modify_window;
 extern int relative_paths;
 extern int human_readable;
+extern mode_t orig_umask;
 extern char *partial_dir;
 extern struct filter_list_struct server_filter_list;
 
@@ -169,28 +170,43 @@ int set_modtime(char *fname, time_t modtime, mode_t mode)
 	}
 }
 
-/**
-   Create any necessary directories in fname. Unfortunately we don't know
-   what perms to give the directory when this is called so we need to rely
-   on the umask
-**/
-int create_directory_path(char *fname, int base_umask)
+/* This creates a new directory with default permissions.  Since there
+ * might be some directory-default permissions affecting this, we can't
+ * force the permissions directly using the original umask and mkdir(). */
+int mkdir_defmode(char *fname)
+{
+	int ret;
+
+	umask(orig_umask);
+	ret = do_mkdir(fname, ACCESSPERMS);
+	umask(0);
+
+	return ret;
+}
+
+/* Create any necessary directories in fname.  Any missing directories are
+ * created with default permissions. */
+int create_directory_path(char *fname)
 {
 	char *p;
+	int ret = 0;
 
 	while (*fname == '/')
 		fname++;
 	while (strncmp(fname, "./", 2) == 0)
 		fname += 2;
 
+	umask(orig_umask);
 	p = fname;
 	while ((p = strchr(p,'/')) != NULL) {
-		*p = 0;
-		do_mkdir(fname, 0777 & ~base_umask);
-		*p = '/';
-		p++;
+		*p = '\0';
+		if (do_mkdir(fname, ACCESSPERMS) < 0 && errno != EEXIST)
+		    ret = -1;
+		*p++ = '/';
 	}
-	return 0;
+	umask(0);
+
+	return ret;
 }
 
 /**
@@ -1074,7 +1090,7 @@ char *human_num(int64 num)
 
 	if (human_readable) {
 		char units = '\0';
-		int mult = human_readable == 1 ? 1024 : 1000;
+		int mult = human_readable == 1 ? 1000 : 1024;
 		double dnum = 0;
 		if (num > mult*mult*mult) {
 			dnum = (double)num / (mult*mult*mult);