X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7628f1560a56ef7065bedd89cb5b10bb358c4327..cad12f627670106269929565f075db42ca2e06c0:/chmod-option.diff diff --git a/chmod-option.diff b/chmod-option.diff index 3fb8615..7e22aeb 100644 --- a/chmod-option.diff +++ b/chmod-option.diff @@ -4,8 +4,8 @@ command before "make": make proto ---- Makefile.in 15 May 2004 00:48:11 -0000 1.101 -+++ Makefile.in 18 Jun 2004 17:22:08 -0000 +--- 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 \ main.o checksum.o match.o syscall.o log.o backup.o @@ -15,8 +15,8 @@ command before "make": OBJS3=progress.o pipe.o DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ chmod.c 18 Jun 2004 17:22:08 -0000 +--- orig/chmod.c 2004-06-18 17:22:08 ++++ chmod.c 2004-06-18 17:22:08 @@ -0,0 +1,184 @@ +#include "rsync.h" + @@ -202,26 +202,18 @@ command before "make": + } + return 0; +} ---- flist.c 18 Jun 2004 16:29:21 -0000 1.231 -+++ flist.c 18 Jun 2004 17:22:08 -0000 -@@ -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 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; +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: +@@ -869,7 +871,10 @@ skip_excludes: file->flags = flags; file->modtime = st.st_mtime; file->length = st.st_size; @@ -233,9 +225,9 @@ command before "make": file->uid = st.st_uid; file->gid = st.st_gid; ---- options.c 7 Jun 2004 22:05:22 -0000 1.156 -+++ options.c 18 Jun 2004 17:22:08 -0000 -@@ -124,6 +124,7 @@ char *log_format = NULL; +--- 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; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -243,16 +235,16 @@ command before "make": 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; +@@ -138,6 +139,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 modify_window_set; -@@ -245,6 +248,7 @@ void usage(enum logcode F) +@@ -253,6 +256,7 @@ void usage(enum logcode F) rprintf(F," -g, --group preserve group\n"); rprintf(F," -D, --devices preserve devices (root only)\n"); rprintf(F," -t, --times preserve times\n"); @@ -260,7 +252,7 @@ command before "make": 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[] +@@ -360,6 +364,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 }, @@ -268,8 +260,8 @@ 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 }, -@@ -730,6 +735,13 @@ int parse_arguments(int *argc, const cha - exit_cleanup(RERR_SYNTAX); +@@ -804,6 +809,13 @@ int parse_arguments(int *argc, const cha + return 0; } + if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) { @@ -282,7 +274,7 @@ command before "make": if (do_progress && !verbose) verbose = 1; -@@ -977,6 +989,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"; ---- rsync.yo 5 Jun 2004 16:16:30 -0000 1.171 -+++ rsync.yo 18 Jun 2004 17:22:09 -0000 -@@ -300,6 +300,7 @@ verb( +--- orig/rsync.yo 2004-09-20 05:10:48 ++++ rsync.yo 2004-07-03 20:13:41 +@@ -330,6 +330,7 @@ verb( -g, --group preserve group -D, --devices preserve devices (root only) -t, --times preserve times @@ -304,9 +296,9 @@ 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 -@@ -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. +@@ -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). +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. ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ testsuite/chmod.test 18 Jun 2004 17:22:09 -0000 +--- 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 +