Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a problem when --crtimes was combined with --hard-links.
[rsync/rsync-patches.git]
/
detect-renamed.diff
diff --git
a/detect-renamed.diff
b/detect-renamed.diff
index
78b14a7
..
a58066d
100644
(file)
--- a/
detect-renamed.diff
+++ b/
detect-renamed.diff
@@
-43,7
+43,7
@@
diff --git a/compat.c b/compat.c
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
-@@ -1
17,6 +118
,7 @@ void set_allow_inc_recurse(void)
+@@ -1
20,6 +121
,7 @@ void set_allow_inc_recurse(void)
allow_inc_recurse = 0;
else if (!am_sender
&& (delete_before || delete_after
allow_inc_recurse = 0;
else if (!am_sender
&& (delete_before || delete_after
@@
-62,7
+62,7
@@
diff --git a/flist.c b/flist.c
extern int protocol_version;
extern int sanitize_paths;
extern int munge_symlinks;
extern int protocol_version;
extern int sanitize_paths;
extern int munge_symlinks;
-@@ -12
0,6 +121
,8 @@ static int64 tmp_dev, tmp_ino;
+@@ -12
1,6 +122
,8 @@ static int64 tmp_dev, tmp_ino;
#endif
static char tmp_sum[MAX_DIGEST_LEN];
#endif
static char tmp_sum[MAX_DIGEST_LEN];
@@
-71,7
+71,7
@@
diff --git a/flist.c b/flist.c
static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
static int dir_count = 0;
static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
static int dir_count = 0;
-@@ -2
98,6 +30
1,45 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
+@@ -2
88,6 +29
1,45 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
return 0;
}
return 0;
}
@@
-117,7
+117,7
@@
diff --git a/flist.c b/flist.c
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
-@@ -2
251,6 +2293
,25 @@ struct file_list *recv_file_list(int f)
+@@ -2
357,6 +2399
,25 @@ struct file_list *recv_file_list(int f)
flist_sort_and_clean(flist, relative_paths);
flist_sort_and_clean(flist, relative_paths);
@@
-458,7
+458,7
@@
diff --git a/generator.c b/generator.c
if (do_progress && !am_server)
rprintf(FINFO, " \r");
if (do_progress && !am_server)
rprintf(FINFO, " \r");
-@@ -12
13,6 +1361
,7 @@ static void list_file_entry(struct file_struct *f)
+@@ -12
26,6 +1374
,7 @@ static void list_file_entry(struct file_struct *f)
}
}
}
}
@@
-466,7
+466,7
@@
diff --git a/generator.c b/generator.c
static int phase = 0;
static int dflt_perms;
static int phase = 0;
static int dflt_perms;
-@@ -1
484,9 +1633
,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1
502,9 +1651
,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
else if (delete_during && f_out != -1 && !phase
&& !(file->flags & FLAG_MISSING_DIR)) {
}
else if (delete_during && f_out != -1 && !phase
&& !(file->flags & FLAG_MISSING_DIR)) {
@@
-480,9
+480,9
@@
diff --git a/generator.c b/generator.c
+ delete_during < 0 ? DEL_NO_DELETIONS : 0);
+ } else
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
+ delete_during < 0 ? DEL_NO_DELETIONS : 0);
+ } else
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
-
}
}
-@@ -1765,8 +1917,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ goto cleanup;
+@@ -1782,8 +1934,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
goto cleanup;
}
#endif
goto cleanup;
}
#endif
@@
-498,7
+498,7
@@
diff --git a/generator.c b/generator.c
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
-@@ -21
43,6 +2301
,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -21
84,6 +2342
,12 @@ void generate_files(int f_out, const char *local_name)
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
@@
-511,7
+511,7
@@
diff --git a/generator.c b/generator.c
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
-@@ -21
53,7 +2317
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -21
94,7 +2358
,7 @@ void generate_files(int f_out, const char *local_name)
}
do_progress = 0;
}
do_progress = 0;
@@
-520,7
+520,7
@@
diff --git a/generator.c b/generator.c
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -2
192,7 +2356
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2
236,7 +2400
,7 @@ void generate_files(int f_out, const char *local_name)
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
@@
-529,7
+529,7
@@
diff --git a/generator.c b/generator.c
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
-@@ -22
36,7 +2400
,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -22
83,7 +2447
,21 @@ void generate_files(int f_out, const char *local_name)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
@@
-596,7
+596,7
@@
diff --git a/options.c b/options.c
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
-@@ -19
45,6 +1949
,8 @@ void server_options(char **args, int *argc_p)
+@@ -19
59,6 +1963
,8 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
@@
-616,7
+616,7
@@
diff --git a/rsync.yo b/rsync.yo
--compare-dest=DIR also compare received files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
--compare-dest=DIR also compare received files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
-@@ -14
74,6 +1475
,21 @@ Note that the use of the bf(--delete) option might get rid of any potential
+@@ -14
87,6 +1488
,21 @@ Note that the use of the bf(--delete) option might get rid of any potential
fuzzy-match files, so either use bf(--delete-after) or specify some
filename exclusions if you need to prevent this.
fuzzy-match files, so either use bf(--delete-after) or specify some
filename exclusions if you need to prevent this.
@@
-641,7
+641,7
@@
diff --git a/rsync.yo b/rsync.yo
diff --git a/util.c b/util.c
--- a/util.c
+++ b/util.c
diff --git a/util.c b/util.c
--- a/util.c
+++ b/util.c
-@@ -11
12,6 +1112
,32 @@ int handle_partial_dir(const char *fname, int create)
+@@ -11
29,6 +1129
,32 @@ int handle_partial_dir(const char *fname, int create)
return 1;
}
return 1;
}