X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bc83274ad67fe65b3bd42691e46111bf2b5a41dd..96b7b48efa86bf3fa164d85532dc8bf520d80531:/util.c diff --git a/util.c b/util.c index a43cfb0b..ab0e151b 100644 --- a/util.c +++ b/util.c @@ -245,7 +245,8 @@ static int safe_read(int desc, char *ptr, size_t len) /** 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; @@ -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; - if (s_len == 3) { + if (s_len == 4) { 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