extern char *backup_suffix;
extern char *backup_dir;
-/* make a complete pathname for backup file */
-char *get_backup_name(const char *fname)
-{
- if (backup_dir) {
- if (stringjoin(backup_dir_buf + backup_dir_len, backup_dir_remainder,
- fname, backup_suffix, NULL) < backup_dir_remainder)
- return backup_dir_buf;
- } else {
- if (stringjoin(backup_dir_buf, MAXPATHLEN,
- fname, backup_suffix, NULL) < MAXPATHLEN)
- return backup_dir_buf;
- }
-
- rprintf(FERROR, "backup filename too long\n");
- return NULL;
-}
-
-/****************************************************************************
-Create a directory given an absolute path, perms based upon another directory
-path
-****************************************************************************/
-int make_bak_dir(const char *fullpath)
+/* Create a backup path from the given fname, putting the result into
+ * backup_dir_buf. Any new directories (compared to the prior backup
+ * path) are ensured to exist as directories, replacing anything else
+ * that may be in the way (e.g. a symlink). */
+static BOOL copy_valid_path(const char *fname)
{
- char fbuf[MAXPATHLEN], *rel, *end, *p;
- struct file_struct *file;
- int len = backup_dir_len;
+ const char *f;
+ int flags;
+ BOOL ret = True;
stat_x sx;
+ char *b, *rel = backup_dir_buf + backup_dir_len, *name = rel;
- while (*fullpath == '.' && fullpath[1] == '/') {
- fullpath += 2;
- len -= 2;
+ for (f = fname, b = rel; *f && *f == *b; f++, b++) {
+ if (*b == '/')
+ name = b + 1;
}
- if (strlcpy(fbuf, fullpath, sizeof fbuf) >= sizeof fbuf)
- return -1;
+ if (stringjoin(rel, backup_dir_remainder, fname, backup_suffix, NULL) >= backup_dir_remainder) {
+ rprintf(FERROR, "backup filename too long\n");
+ *name = '\0';
+ return False;
+ }
- rel = fbuf + len;
- end = p = rel + strlen(rel);
+ for ( ; ; name = b + 1) {
+ if ((b = strchr(name, '/')) == NULL)
+ return True;
+ *b = '\0';
- /* Try to find an existing dir, starting from the deepest dir. */
- while (1) {
- if (--p == fbuf)
- return -1;
- if (*p == '/') {
- *p = '\0';
- if (mkdir_defmode(fbuf) == 0)
+ if (do_lstat(backup_dir_buf, &sx.st) < 0) {
+ if (errno == ENOENT)
break;
- if (errno != ENOENT) {
- rsyserr(FERROR, errno,
- "make_bak_dir mkdir %s failed",
- full_fname(fbuf));
- return -1;
- }
+ rsyserr(FERROR, errno, "backup lstat %s failed", backup_dir_buf);
+ *name = '\0';
+ return False;
+ }
+ if (!S_ISDIR(sx.st.st_mode)) {
+ flags = get_del_for_flag(sx.st.st_mode) | DEL_FOR_BACKUP | DEL_RECURSE;
+ if (delete_item(backup_dir_buf, sx.st.st_mode, flags) == 0)
+ break;
+ *name = '\0';
+ return False;
}
+
+ *b = '/';
}
- /* Make all the dirs that we didn't find on the way here. */
- while (1) {
- if (p >= rel) {
- /* Try to transfer the directory settings of the
- * actual dir that the files are coming from. */
- init_stat_x(&sx);
- if (x_stat(rel, &sx.st, NULL) < 0) {
- rsyserr(FERROR, errno,
- "make_bak_dir stat %s failed",
- full_fname(rel));
- } else {
- if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
- continue;
+ init_stat_x(&sx);
+
+ for ( ; b; name = b + 1, b = strchr(name, '/')) {
+ *b = '\0';
+
+ if (mkdir_defmode(backup_dir_buf) < 0) {
+ rsyserr(FERROR, errno, "backup mkdir %s failed", backup_dir_buf);
+ *name = '\0';
+ ret = False;
+ break;
+ }
+
+ /* Try to transfer the directory settings of the actual dir
+ * that the files are coming from. */
+ if (x_stat(rel, &sx.st, NULL) < 0)
+ rsyserr(FERROR, errno, "backup stat %s failed", full_fname(rel));
+ else {
+ struct file_struct *file;
+ if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
+ continue;
#ifdef SUPPORT_ACLS
- if (preserve_acls && !S_ISLNK(file->mode)) {
- get_acl(rel, &sx);
- cache_tmp_acl(file, &sx);
- free_acl(&sx);
- }
+ if (preserve_acls && !S_ISLNK(file->mode)) {
+ get_acl(rel, &sx);
+ cache_tmp_acl(file, &sx);
+ free_acl(&sx);
+ }
#endif
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs) {
- get_xattr(rel, &sx);
- cache_tmp_xattr(file, &sx);
- free_xattr(&sx);
- }
+ if (preserve_xattrs) {
+ get_xattr(rel, &sx);
+ cache_tmp_xattr(file, &sx);
+ free_xattr(&sx);
+ }
#endif
- set_file_attrs(fbuf, file, NULL, NULL, 0);
- unmake_file(file);
+ set_file_attrs(backup_dir_buf, file, NULL, NULL, 0);
+ unmake_file(file);
+ }
+
+ *b = '/';
+ }
+
#ifdef SUPPORT_ACLS
- uncache_tmp_acls();
+ uncache_tmp_acls();
#endif
#ifdef SUPPORT_XATTRS
- uncache_tmp_xattrs();
+ uncache_tmp_xattrs();
#endif
- }
- }
- *p = '/';
- p += strlen(p);
- if (p == end)
- break;
- if (mkdir_defmode(fbuf) < 0) {
- rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
- full_fname(fbuf));
- return -1;
- }
+
+ return ret;
+}
+
+/* Make a complete pathname for backup file and verify any new path elements. */
+char *get_backup_name(const char *fname)
+{
+ if (backup_dir) {
+ /* copy fname into backup_dir_buf while validating the dirs. */
+ if (copy_valid_path(fname))
+ return backup_dir_buf;
+ return NULL;
+ } else {
+ if (stringjoin(backup_dir_buf, MAXPATHLEN,
+ fname, backup_suffix, NULL) < MAXPATHLEN)
+ return backup_dir_buf;
}
- return 0;
+ rprintf(FERROR, "backup filename too long\n");
+ return NULL;
}
/* Has same return codes as make_backup(). */
if (IS_SPECIAL(stp->st_mode) || IS_DEVICE(stp->st_mode))
return 0; /* Use copy code. */
#endif
- if (do_link(from, to) == 0)
+ if (do_link(from, to) == 0) {
+ if (DEBUG_GTE(BACKUP, 1))
+ rprintf(FINFO, "make_backup: HLINK %s successful.\n", from);
return 2;
+ }
/* We prefer to rename a regular file rather than copy it. */
if (!S_ISREG(stp->st_mode) || errno == EEXIST || errno == EISDIR)
return 0;
* dir, rename() might return success but do nothing! */
robust_unlink(from); /* Just in case... */
}
+ if (DEBUG_GTE(BACKUP, 1))
+ rprintf(FINFO, "make_backup: RENAME %s successful.\n", from);
return 1;
}
return 0;
}
if ((ret = link_or_rename(fname, buf, prefer_rename, &sx.st)) != 0)
goto success;
- } else if (backup_dir && errno == ENOENT) {
- /* If the backup dir is missing, try again after making it. */
- if (make_bak_dir(buf) != 0)
- return 0;
- if ((ret = link_or_rename(fname, buf, prefer_rename, &sx.st)) != 0)
- goto success;
}
/* Fall back to making a copy. */
/* Check to see if this is a device file, or link */
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
|| (preserve_specials && IS_SPECIAL(file->mode))) {
- int save_errno;
- if (do_mknod(buf, file->mode, sx.st.st_rdev) < 0) {
- save_errno = errno ? errno : EINVAL; /* 0 paranoia */
- if (errno == ENOENT && make_bak_dir(buf) == 0) {
- if (do_mknod(buf, file->mode, sx.st.st_rdev) < 0)
- save_errno = errno ? errno : save_errno;
- else
- save_errno = 0;
- }
- if (save_errno) {
- rsyserr(FERROR, save_errno, "mknod %s failed",
- full_fname(buf));
- }
- } else
- save_errno = 0;
- if (DEBUG_GTE(BACKUP, 1) && save_errno == 0) {
- rprintf(FINFO, "make_backup: DEVICE %s successful.\n",
- fname);
- }
- ret = 2;
- }
-
- if (!ret && S_ISDIR(file->mode)) {
- int ret_code;
- /* make an empty directory */
- if (do_mkdir(buf, file->mode) < 0) {
- int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
- if (errno == ENOENT && make_bak_dir(buf) == 0) {
- if (do_mkdir(buf, file->mode) < 0)
- save_errno = errno ? errno : save_errno;
- else
- save_errno = 0;
- }
- if (save_errno) {
- rsyserr(FINFO, save_errno, "mkdir %s failed",
- full_fname(buf));
- }
- }
-
- ret_code = do_rmdir(fname);
- if (DEBUG_GTE(BACKUP, 1)) {
- rprintf(FINFO, "make_backup: RMDIR %s returns %i\n",
- full_fname(fname), ret_code);
- }
+ if (do_mknod(buf, file->mode, sx.st.st_rdev) < 0)
+ rsyserr(FERROR, errno, "mknod %s failed", full_fname(buf));
+ else if (DEBUG_GTE(BACKUP, 1))
+ rprintf(FINFO, "make_backup: DEVICE %s successful.\n", fname);
ret = 2;
}
}
ret = 2;
} else {
- if (do_symlink(sl, buf) < 0) {
- int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
- if (errno == ENOENT && make_bak_dir(buf) == 0) {
- if (do_symlink(sl, buf) < 0)
- save_errno = errno ? errno : save_errno;
- else
- save_errno = 0;
- }
- if (save_errno) {
- rsyserr(FERROR, save_errno, "link %s -> \"%s\"",
- full_fname(buf), sl);
- }
- }
+ if (do_symlink(sl, buf) < 0)
+ rsyserr(FERROR, errno, "link %s -> \"%s\"", full_fname(buf), sl);
+ else if (DEBUG_GTE(BACKUP, 1))
+ rprintf(FINFO, "make_backup: SYMLINK %s successful.\n", fname);
ret = 2;
}
}
#endif
if (!ret && !S_ISREG(file->mode)) {
- rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
- fname);
+ rprintf(FINFO, "make_bak: skipping non-regular file %s\n", fname);
unmake_file(file);
#ifdef SUPPORT_ACLS
uncache_tmp_acls();
/* Copy to backup tree if a file. */
if (!ret) {
- if (copy_file(fname, buf, -1, file->mode, 1) < 0) {
+ if (copy_file(fname, buf, -1, file->mode) < 0) {
rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
full_fname(fname), buf);
unmake_file(file);
#endif
return 0;
}
+ if (DEBUG_GTE(BACKUP, 1))
+ rprintf(FINFO, "make_backup: COPY %s successful.\n", fname);
ret = 2;
}
#endif
success:
- if (INFO_GTE(BACKUP, 1)) {
- rprintf(FINFO, "backed up %s to %s\n",
- fname, buf);
- }
+ if (INFO_GTE(BACKUP, 1))
+ rprintf(FINFO, "backed up %s to %s\n", fname, buf);
return ret;
}
copy_to = buf;
}
cleanup_set(copy_to, NULL, NULL, -1, -1);
- if (copy_file(src, copy_to, fd_w, file->mode, 0) < 0) {
+ if (copy_file(src, copy_to, fd_w, file->mode) < 0) {
if (INFO_GTE(COPY, 1)) {
rsyserr(FINFO, errno, "copy_file %s => %s",
full_fname(src), copy_to);
&& do_stat(dn, &sx.st) < 0) {
if (dry_run)
goto parent_is_dry_missing;
- if (create_directory_path(fname) < 0) {
+ if (make_path(fname, MKP_DROP_NAME | MKP_SKIP_SLASH) < 0) {
rsyserr(FERROR_XFER, errno,
"recv_generator: mkdir %s failed",
full_fname(dn));
}
if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
- || create_directory_path(fname) < 0
- || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
+ || make_path(fname, MKP_DROP_NAME | MKP_SKIP_SLASH) < 0
+ || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
rsyserr(FERROR_XFER, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
goto cleanup;
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
goto pretend_missing;
- if (copy_file(fname, backupptr, -1, back_file->mode, 1) < 0) {
+ if (copy_file(fname, backupptr, -1, back_file->mode) < 0) {
unmake_file(back_file);
back_file = NULL;
goto cleanup;
goto cleanup;
}
if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
- int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
- if (errno == ENOENT && make_bak_dir(backupptr) == 0) {
- if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0)
- save_errno = errno ? errno : save_errno;
- else
- save_errno = 0;
- }
- if (save_errno) {
- rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(backupptr));
- unmake_file(back_file);
- back_file = NULL;
- close(fd);
- goto cleanup;
- }
+ rsyserr(FERROR_XFER, errno, "open %s", full_fname(backupptr));
+ unmake_file(back_file);
+ back_file = NULL;
+ close(fd);
+ goto cleanup;
}
fnamecmp_type = FNAMECMP_BACKUP;
}
}
/* Create any necessary directories in fname. Any missing directories are
- * created with default permissions. */
-int create_directory_path(char *fname)
+ * created with default permissions. Returns < 0 on error, or the number
+ * of directories created. */
+int make_path(char *fname, int flags)
{
- char *p;
+ char *end, *p;
int ret = 0;
- while (*fname == '/')
- fname++;
- while (strncmp(fname, "./", 2) == 0)
+ if (flags & MKP_SKIP_SLASH) {
+ while (*fname == '/')
+ fname++;
+ }
+
+ while (*fname == '.' && fname[1] == '/')
fname += 2;
- umask(orig_umask);
- p = fname;
- while ((p = strchr(p,'/')) != NULL) {
- *p = '\0';
- if (do_mkdir(fname, ACCESSPERMS) < 0 && errno != EEXIST)
- ret = -1;
- *p++ = '/';
+ if (flags & MKP_DROP_NAME) {
+ end = strrchr(fname, '/');
+ if (!end)
+ return 0;
+ *end = '\0';
+ } else
+ end = fname + strlen(fname);
+
+ umask(orig_umask); /* NOTE: don't return before setting this back to 0! */
+
+ /* Try to find an existing dir, starting from the deepest dir. */
+ for (p = end; ; ) {
+ if (do_mkdir(fname, ACCESSPERMS) == 0) {
+ ret++;
+ break;
+ }
+ if (errno != ENOENT) {
+ if (errno != EEXIST)
+ ret = -ret - 1;
+ break;
+ }
+ while (1) {
+ if (p == fname) {
+ ret = -ret - 1;
+ goto double_break;
+ }
+ if (*--p == '/') {
+ if (p == fname) {
+ ret = -ret - 1; /* impossible... */
+ goto double_break;
+ }
+ *p = '\0';
+ break;
+ }
+ }
+ }
+ double_break:
+
+ /* Make all the dirs that we didn't find on the way here. */
+ while (p != end) {
+ *p = '/';
+ p += strlen(p);
+ if (ret < 0) /* Skip mkdir on error, but keep restoring the path. */
+ continue;
+ if (do_mkdir(fname, ACCESSPERMS) < 0)
+ ret = -ret - 1;
+ else
+ ret++;
}
+
umask(0);
+ if (flags & MKP_DROP_NAME)
+ *end = '/';
+
return ret;
}
*
* This is used in conjunction with the --temp-dir, --backup, and
* --copy-dest options. */
-int copy_file(const char *source, const char *dest, int ofd,
- mode_t mode, int create_bak_dir)
+int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
{
int ifd;
char buf[1024 * 8];
}
if ((ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0) {
- int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
- if (create_bak_dir && errno == ENOENT && make_bak_dir(dest) == 0) {
- if ((ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0)
- save_errno = errno ? errno : save_errno;
- else
- save_errno = 0;
- }
- if (save_errno) {
- rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(dest));
- close(ifd);
- errno = save_errno;
- return -1;
- }
+ int save_errno = errno;
+ rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(dest));
+ close(ifd);
+ errno = save_errno;
+ return -1;
}
}
return -2;
to = partialptr;
}
- if (copy_file(from, to, -1, mode, 0) != 0)
+ if (copy_file(from, to, -1, mode) != 0)
return -2;
do_unlink(from);
return 1;
Matt McCutchen's Web Site / rsync / rsync.git / commitdiff