Updated to have latest sanitize_path() calling syntax.

diff --git a/compare-dest.diff b/compare-dest.diff
index 9732e5e..975edf5 100644 (file)
--- a/compare-dest.diff
+++ b/compare-dest.diff
@@ -82,8 +82,8 @@ Before compiling, be sure to run "make proto".
  
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
---- orig/options.c     2004-08-05 21:57:29
-+++ options.c  2004-08-10 05:26:53
+--- orig/options.c     2004-08-11 23:42:23
++++ options.c  2004-08-12 00:02:57
 @@ -114,12 +114,13 @@ int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -138,7 +138,7 @@ Before compiling, be sure to run "make proto".
 +                      }
 +                      arg = poptGetOptArg(pc);
 +                      if (sanitize_paths)
-+                              arg = sanitize_path(NULL, arg, "");
++                              arg = sanitize_path(NULL, arg, NULL, 0);
 +                      compare_dest[num_comp_dest++] = (char *)arg;
 +                      saw_compare_dest = 1;
 +                      break;
@@ -151,7 +151,7 @@ Before compiling, be sure to run "make proto".
 +                      }
 +                      arg = poptGetOptArg(pc);
 +                      if (sanitize_paths)
-+                              arg = sanitize_path(NULL, arg, "");
++                              arg = sanitize_path(NULL, arg, NULL, 0);
 +                      compare_dest[num_comp_dest++] = (char *)arg;
                        link_dest = 1;
                        break;
@@ -169,13 +169,13 @@ Before compiling, be sure to run "make proto".
                if (!files_from)
                        recurse = 1;
 @@ -733,8 +760,6 @@ int parse_arguments(int *argc, const cha
-                       tmpdir = sanitize_path(NULL, tmpdir, "");
+                       tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
                if (partial_dir)
-                       partial_dir = sanitize_path(NULL, partial_dir, "");
+                       partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
 -              if (compare_dest)
--                      compare_dest = sanitize_path(NULL, compare_dest, "");
+-                      compare_dest = sanitize_path(NULL, compare_dest, NULL, 0);
                if (backup_dir)
-                       backup_dir = sanitize_path(NULL, backup_dir, "");
+                       backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
                if (files_from)
 @@ -884,8 +909,8 @@ int parse_arguments(int *argc, const cha
   **/