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
The patches for 3.0.1pre3.
[rsync/rsync-patches.git]
/
detect-renamed.diff
diff --git
a/detect-renamed.diff
b/detect-renamed.diff
index
78b14a7
..
e28ed1d
100644
(file)
--- a/
detect-renamed.diff
+++ b/
detect-renamed.diff
@@
-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 +301
,45 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
+@@ -2
87,6 +290
,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);
-@@ -225
1,6 +2293
,25 @@ struct file_list *recv_file_list(int f)
+@@ -225
9,6 +2301
,25 @@ struct file_list *recv_file_list(int f)
flist_sort_and_clean(flist, relative_paths);
flist_sort_and_clean(flist, relative_paths);
@@
-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;
+@@ -1764,8 +1916,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;
-@@ -214
3,6 +2301
,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -214
2,6 +2300
,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) {
-@@ -215
3,7 +2317
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -215
2,7 +2316
,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",
-@@ -219
2,7 +2356
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -219
1,7 +2355
,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));
}
-@@ -223
6,7 +2400
,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -223
5,7 +2399
,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)
@@
-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
-@@ -1
112,6 +1112
,32 @@ int handle_partial_dir(const char *fname, int create)
+@@ -1
096,6 +1096
,32 @@ int handle_partial_dir(const char *fname, int create)
return 1;
}
return 1;
}