dropped the "const" from the return value of safe_fname() because

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 735173d..b20cdb6 100644 (file)
--- a/util.c
+++ b/util.c
@@ -882,7 +882,7 @@ int pop_dir(char *dir)
  * empty line.  This function can return only MAX_SAFE_NAMES values at a
  * time!  The returned value can be longer than MAXPATHLEN (because we
  * may be trying to output an error about a too-long filename)! */
-const char *safe_fname(const char *fname)
+char *safe_fname(const char *fname)
 {
 #define MAX_SAFE_NAMES 4
        static char fbuf[MAX_SAFE_NAMES][MAXPATHLEN*2];
@@ -1251,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