X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/13bed3ddd0403dc8941696ca63d3e17a1d8676c3..efd0f7d14cffebffe0e9a1a689a284c0516bc331:/chmod-option.diff

diff --git a/chmod-option.diff b/chmod-option.diff
index f8e9d57..614df78 100644
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -4,7 +4,7 @@ command before "make":
     make proto
 
 
---- orig/Makefile.in	2004-05-15 00:53:53
+--- orig/Makefile.in	2004-11-03 11:56:03
 +++ 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,26 +202,18 @@ command before "make":
 +	}
 +	return 0;
 +}
---- orig/flist.c	2004-06-18 16:23:07
-+++ 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;
-@@ -67,6 +68,8 @@ extern int list_only;
- extern int read_batch;
- extern int write_batch;
+--- orig/flist.c	2005-02-14 02:45:10
++++ flist.c	2004-09-18 01:51:11
+@@ -68,6 +68,8 @@ extern int max_delete;
+ extern int orig_umask;
+ extern int list_only;
  
 +extern struct chmod_mode_struct *chmod_modes;
 +
- extern struct exclude_list_struct exclude_list;
- extern struct exclude_list_struct server_exclude_list;
- extern struct exclude_list_struct local_exclude_list;
-@@ -868,7 +871,10 @@ skip_excludes:
+ extern struct filter_list_struct filter_list;
+ extern struct filter_list_struct server_filter_list;
+ 
+@@ -886,7 +888,10 @@ skip_filters:
  	file->flags = flags;
  	file->modtime = st.st_mtime;
  	file->length = st.st_size;
@@ -233,43 +225,43 @@ command before "make":
  	file->uid = st.st_uid;
  	file->gid = st.st_gid;
  
---- orig/options.c	2004-06-20 19:30:00
-+++ options.c	2004-07-03 20:13:41
-@@ -124,6 +124,7 @@ char *log_format = NULL;
+--- orig/options.c	2005-02-16 15:35:53
++++ options.c	2005-02-16 15:38:40
+@@ -132,6 +132,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
 +char *chmod_mode = NULL;
  char backup_dir_buf[MAXPATHLEN];
- int rsync_port = RSYNC_PORT;
- int link_dest = 0;
-@@ -137,6 +138,8 @@ int list_only = 0;
- #define MAX_BATCH_PREFIX_LEN 256	/* Must be less than MAXPATHLEN-13 */
- char *batch_prefix = NULL;
+ int rsync_port = 0;
+ int compare_dest = 0;
+@@ -149,6 +150,8 @@ int list_only = 0;
+ #define MAX_BATCH_NAME_LEN 256	/* Must be less than MAXPATHLEN-13 */
+ char *batch_name = NULL;
  
 +struct chmod_mode_struct *chmod_modes = NULL;
 +
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
+ static int F_option_cnt = 0;
  static int modify_window_set;
- 
-@@ -245,6 +248,7 @@ void usage(enum logcode F)
-   rprintf(F," -g, --group                 preserve group\n");
+@@ -276,6 +279,7 @@ void usage(enum logcode F)
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
+   rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
 +  rprintf(F,"     --chmod=CHMOD           change destination permissions\n");
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
-   rprintf(F," -W, --whole-file            copy whole files, no incremental checks\n");
-@@ -350,6 +354,7 @@ static struct poptOption long_options[] 
+   rprintf(F," -W, --whole-file            copy files whole (without rsync algorithm)\n");
+@@ -394,6 +398,7 @@ static struct poptOption long_options[] 
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
 +  {"chmod",            0,  POPT_ARG_STRING, &chmod_mode, 0, 0, 0 },
    {"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 },
-@@ -730,6 +735,13 @@ int parse_arguments(int *argc, const cha
- 		exit_cleanup(RERR_SYNTAX);
+   {"omit-dir-times",  'O', POPT_ARG_NONE,   &omit_dir_times, 0, 0, 0 },
+@@ -1058,6 +1063,13 @@ int parse_arguments(int *argc, const cha
+ 		return 0;
  	}
  
 +	if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) {
@@ -279,11 +271,11 @@ command before "make":
 +		return 0;
 +	}
 +
- 	if (do_progress && !verbose)
- 		verbose = 1;
- 
-@@ -977,6 +989,11 @@ void server_options(char **args,int *arg
- 		args[ac++] = compare_dest;
+ 	if (log_format) {
+ 		if (strstr(log_format, "%i") != NULL)
+ 			itemize_changes = 1;
+@@ -1392,6 +1404,11 @@ void server_options(char **args,int *arg
+ 		}
  	}
  
 +	if (chmod_mode && !am_sender) {
@@ -294,19 +286,19 @@ command before "make":
  	if (files_from && (!am_sender || remote_filesfrom_file)) {
  		if (remote_filesfrom_file) {
  			args[ac++] = "--files-from";
---- orig/rsync.yo	2004-06-17 06:32:00
-+++ rsync.yo	2004-07-03 20:13:41
-@@ -300,6 +300,7 @@ verb(
-  -g, --group                 preserve group
+--- orig/rsync.yo	2005-02-16 15:35:54
++++ rsync.yo	2005-01-24 01:48:43
+@@ -322,6 +322,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)
   -t, --times                 preserve times
+  -O, --omit-dir-times        omit directories when preserving times
 +     --chmod=CHMOD           change destination permissions
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
-  -W, --whole-file            copy whole files, no incremental checks
-@@ -552,6 +553,14 @@ cause the next transfer to behave as if 
- their checksums compared and show up in log messages even if they haven't
- changed.
+  -W, --whole-file            copy files whole (without rsync algorithm)
+@@ -644,6 +645,14 @@ dit(bf(-O, --omit-dir-times)) This tells
+ it is preserving modification times (see bf(--times)).  If NFS is sharing
+ the directories on the receiving side, it is a good idea to use bf(-O).
  
 +dit(bf(--chmod)) This options tells rsync to apply the listed "chmod" pattern
 +to the permission of the files on the destination.  In addition to the normal
@@ -319,8 +311,8 @@ command before "make":
  dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
  instead it will just report the actions it would have taken.
  
---- orig/testsuite/chmod.test	2004-06-18 17:22:09
-+++ testsuite/chmod.test	2004-06-18 17:22:09
+--- orig/testsuite/chmod-option.test	2004-06-18 17:22:09
++++ testsuite/chmod-option.test	2004-06-18 17:22:09
 @@ -0,0 +1,43 @@
 +#! /bin/sh
 +