X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b92693daba3105b797aafb25bbb07ef2df727338..018b28328c7ac0f4f99739d7dff13aa2f32b853d:/util.c diff --git a/util.c b/util.c index e18f9919..99a3a5dd 100644 --- a/util.c +++ b/util.c @@ -197,7 +197,7 @@ int create_directory_path(char *fname, int base_umask) * * Derived from GNU C's cccp.c. */ -static int full_write(int desc, char *ptr, size_t len) +int full_write(int desc, char *ptr, size_t len) { int total_written; @@ -245,7 +245,7 @@ static int safe_read(int desc, char *ptr, size_t len) /** Copy a file. * - * This is used in conjunction with the --temp-dir option */ + * This is used in conjunction with the --temp-dir and --backup options */ int copy_file(char *source, char *dest, mode_t mode) { int ifd; @@ -704,9 +704,7 @@ unsigned int clean_fname(char *name, BOOL collapse_dot_dot) f += 2; continue; } - *t++ = *f++; - *t++ = *f++; - limit = t; + limit = t + 2; } } while (*f && (*t++ = *f++) != '/') {} @@ -732,8 +730,8 @@ unsigned int clean_fname(char *name, BOOL collapse_dot_dot) * The rootdir string contains a value to use in place of a leading slash. * Specify NULL to get the default of lp_path(module_id). * - * If depth is > 0, it is a count of how many '..'s to allow at the start - * of the path. + * If depth is >= 0, it is a count of how many '..'s to allow at the start + * of the path. Use -1 to allow unlimited depth. * * We also clean the path in a manner similar to clean_fname() but with a * few differences: @@ -992,11 +990,7 @@ int handle_partial_dir(const char *fname, int create) dir = partial_fname; if (create) { STRUCT_STAT st; -#if SUPPORT_LINKS int statret = do_lstat(dir, &st); -#else - int statret = do_stat(dir, &st); -#endif if (statret == 0 && !S_ISDIR(st.st_mode)) { if (do_unlink(dir) < 0) return 0;