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
Some temporary code for 2.6.4pre3 compatibility (which can be
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
a43cfb0
..
ab0e151
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-245,7
+245,8
@@
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 and --backup options */
+ * This is used in conjunction with the --temp-dir, --backup, and
+ * --copy-dest 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;
@@
-1250,11
+1251,11
@@
const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr)
break;
s_len = fn_len - (s - fn);
fn_len = s - fn;
break;
s_len = fn_len - (s - fn);
fn_len = s - fn;
- if (s_len ==
3
) {
+ if (s_len ==
4
) {
if (strcmp(s+1, "bak") == 0
|| strcmp(s+1, "old") == 0)
continue;
if (strcmp(s+1, "bak") == 0
|| strcmp(s+1, "old") == 0)
continue;
- } else if (s_len ==
4
) {
+ } else if (s_len ==
5
) {
if (strcmp(s+1, "orig") == 0)
continue;
} else if (s_len > 2 && had_tilde
if (strcmp(s+1, "orig") == 0)
continue;
} else if (s_len > 2 && had_tilde