Need to make sure that the destination file doesn't exist before we

[rsync/rsync-patches.git] / chmod-option.diff

diff --git a/chmod-option.diff b/chmod-option.diff
index 1e2a910..7e22aeb 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -4,7 +4,7 @@ command before "make":
     make proto
 
 
---- orig/Makefile.in   2004-08-09 21:07:09
+--- orig/Makefile.in   2004-08-13 07:18:58
 +++ Makefile.in        2004-07-03 20:13:41
 @@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
@@ -202,17 +202,9 @@ command before "make":
 +      }
 +      return 0;
 +}
---- orig/flist.c       2004-08-11 23:42:23
-+++ flist.c    2004-07-03 20:13:41
-@@ -33,6 +33,7 @@ extern int verbose;
- extern int do_progress;
- extern int am_root;
- extern int am_server;
-+extern int am_sender;
- extern int am_daemon;
- extern int always_checksum;
- extern int module_id;
-@@ -64,6 +65,8 @@ extern int delete_excluded;
+--- orig/flist.c       2004-09-21 09:40:27
++++ flist.c    2004-09-18 01:51:11
+@@ -65,6 +65,8 @@ extern int delete_excluded;
  extern int orig_umask;
  extern int list_only;
  
@@ -221,7 +213,7 @@ command before "make":
  extern struct exclude_list_struct exclude_list;
  extern struct exclude_list_struct server_exclude_list;
  extern struct exclude_list_struct local_exclude_list;
-@@ -867,7 +870,10 @@ skip_excludes:
+@@ -869,7 +871,10 @@ skip_excludes:
        file->flags = flags;
        file->modtime = st.st_mtime;
        file->length = st.st_size;
@@ -233,7 +225,7 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2004-08-11 23:42:23
+--- orig/options.c     2004-09-20 05:10:48
 +++ options.c  2004-07-03 20:13:41
 @@ -126,6 +126,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -268,7 +260,7 @@ command before "make":
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
-@@ -808,6 +813,13 @@ int parse_arguments(int *argc, const cha
+@@ -804,6 +809,13 @@ int parse_arguments(int *argc, const cha
                return 0;
        }
  
@@ -282,7 +274,7 @@ command before "make":
        if (do_progress && !verbose)
                verbose = 1;
  
-@@ -1078,6 +1090,11 @@ void server_options(char **args,int *arg
+@@ -1083,6 +1095,11 @@ void server_options(char **args,int *arg
                args[ac++] = compare_dest;
        }
  
@@ -294,9 +286,9 @@ command before "make":
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";
---- orig/rsync.yo      2004-08-11 17:26:27
+--- orig/rsync.yo      2004-09-20 05:10:48
 +++ rsync.yo   2004-07-03 20:13:41
-@@ -301,6 +301,7 @@ verb(
+@@ -330,6 +330,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
   -t, --times                 preserve times
@@ -304,7 +296,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -574,6 +575,14 @@ cause the next transfer to behave as if 
+@@ -603,6 +604,14 @@ cause the next transfer to behave as if 
  updated (though the rsync algorithm will make the update fairly efficient
  if the files haven't actually changed, you're much better off using -t).