mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-05-24 23:05:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

The create_directory_path() function no longer takes a base_umask

Browse Source 
arg.
This commit is contained in:
Wayne Davison
2006-02-24 01:56:21 +00:00
parent a41d110647
commit 904e5af128
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
generator.c
View File

@@ -81,7 +81,6 @@ extern int link_dest;
extern int whole_file;
extern int list_only;
extern int read_batch;
extern int orig_umask;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
extern int max_delete;
@@ -834,7 +833,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs && stat(dn, &st) < 0
&& create_directory_path(fname, orig_umask) < 0) {
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(dn));
@@ -896,7 +895,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
|| create_directory_path(fname, orig_umask) < 0
|| create_directory_path(fname) < 0
|| (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",

3
receiver.c
View File

@@ -44,7 +44,6 @@ extern int cleanup_got_literal;
extern int remove_sent_files;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
@@ -580,7 +579,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
* because their information should have been previously
* transferred, but that may not be the case with -R */
if (fd2 == -1 && relative_paths && errno == ENOENT
&& create_directory_path(fnametmp, orig_umask) == 0) {
&& create_directory_path(fnametmp) == 0) {
/* Get back to name with XXXXXX in it. */
get_tmpname(fnametmp, fname);
fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);