extern int preserve_specials;
extern int preserve_links;
extern int preserve_hard_links;
-extern int orig_umask;
extern int safe_symlinks;
/* make a complete pathname for backup file */
}
if (*p == '/') {
*p = '\0';
- if (do_mkdir(fullpath, 0777 & ~orig_umask) == 0)
+ if (mkdir_defmode(fullpath) == 0)
break;
if (errno != ENOENT) {
rsyserr(FERROR, errno,
p += strlen(p);
if (p == end)
break;
- if (do_mkdir(fullpath, 0777 & ~orig_umask) < 0) {
+ if (mkdir_defmode(fullpath) < 0) {
rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
full_fname(fullpath));
goto failure;
/* robustly move a file, creating new directory structures if necessary */
static int robust_move(char *src, char *dst)
{
- if (robust_rename(src, dst, 0755) < 0 && (errno != ENOENT
- || make_bak_dir(dst) < 0 || robust_rename(src, dst, 0755) < 0))
+ if (robust_rename(src, dst, NULL, 0755) < 0
+ && (errno != ENOENT || make_bak_dir(dst) < 0
+ || robust_rename(src, dst, NULL, 0755) < 0))
return -1;
return 0;
}