extern int recurse;
extern int relative_paths;
extern int sanitize_paths;
+extern int curr_dir_depth;
extern int module_id;
extern int rsync_port;
extern int whole_file;
extern char *batch_name;
int local_server = 0;
-int startdir_depth = 0;
mode_t orig_umask = 0;
struct file_list *the_file_list;
* it and use mode 1. If there is something other than a directory
* at the destination path, we must be transferring one file
* (anything at the destination will be overwritten). */
- if (do_stat(dest_path, &st) == 0) {
+ if (safe_stat(dest_path, &st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (!push_dir(dest_path)) {
rsyserr(FERROR, errno, "push_dir#1 %s failed",
full_fname(dest_path));
exit_cleanup(RERR_FILESELECT);
}
- if (sanitize_paths)
- startdir_depth = count_dir_elements(dest_path);
return NULL;
}
if (flist->count > 1) {
full_fname(dest_path));
exit_cleanup(RERR_FILESELECT);
}
- if (sanitize_paths)
- startdir_depth = count_dir_elements(dest_path);
return NULL;
}
full_fname(dest_path));
exit_cleanup(RERR_FILESELECT);
}
- if (sanitize_paths)
- startdir_depth = count_dir_elements(dest_path);
*cp = '/';
return cp + 1;
if (sanitize_paths) {
char **dir;
for (dir = basis_dir; *dir; dir++)
- *dir = sanitize_path(NULL, *dir, NULL, startdir_depth);
+ *dir = sanitize_path(NULL, *dir, NULL, curr_dir_depth, NULL);
}
exit_code = do_recv(f_in,f_out,flist,local_name);