Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Changed --keep-dirs (-k) into --dirs (-d).
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
79050d3
..
1e1c9db
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-130,15
+130,15
@@
void overflow(char *str)
int set_modtime(char *fname, time_t modtime)
{
int set_modtime(char *fname, time_t modtime)
{
- if (dry_run)
- return 0;
-
if (verbose > 2) {
rprintf(FINFO, "set modtime of %s to (%ld) %s",
fname, (long)modtime,
asctime(localtime(&modtime)));
}
if (verbose > 2) {
rprintf(FINFO, "set modtime of %s to (%ld) %s",
fname, (long)modtime,
asctime(localtime(&modtime)));
}
+ if (dry_run)
+ return 0;
+
{
#ifdef HAVE_UTIMBUF
struct utimbuf tbuf;
{
#ifdef HAVE_UTIMBUF
struct utimbuf tbuf;
@@
-197,7
+197,7
@@
int create_directory_path(char *fname, int base_umask)
*
* Derived from GNU C's cccp.c.
*/
*
* 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;
{
int total_written;
@@
-245,7
+245,7
@@
static int safe_read(int desc, char *ptr, size_t len)
/** Copy a file.
*
/** 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;
int copy_file(char *source, char *dest, mode_t mode)
{
int ifd;
@@
-730,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).
*
* 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:
*
* We also clean the path in a manner similar to clean_fname() but with a
* few differences:
@@
-990,11
+990,7
@@
int handle_partial_dir(const char *fname, int create)
dir = partial_fname;
if (create) {
STRUCT_STAT st;
dir = partial_fname;
if (create) {
STRUCT_STAT st;
-#if SUPPORT_LINKS
int statret = do_lstat(dir, &st);
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;
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (do_unlink(dir) < 0)
return 0;