Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Got rid of fuzz.
[rsync/rsync-patches.git]
/
chmod-option.diff
diff --git
a/chmod-option.diff
b/chmod-option.diff
index
f6a80b1
..
f99e2d7
100644
(file)
--- a/
chmod-option.diff
+++ b/
chmod-option.diff
@@
-202,7
+202,7
@@
command before "make":
+ }
+ return 0;
+}
+ }
+ return 0;
+}
---- orig/flist.c 2004-07-1
5 02:21:10
+--- orig/flist.c 2004-07-1
7 15:20:05
+++ flist.c 2004-07-03 20:13:41
@@ -33,6 +33,7 @@ extern int verbose;
extern int do_progress;
+++ flist.c 2004-07-03 20:13:41
@@ -33,6 +33,7 @@ extern int verbose;
extern int do_progress;
@@
-233,9
+233,9
@@
command before "make":
file->uid = st.st_uid;
file->gid = st.st_gid;
file->uid = st.st_uid;
file->gid = st.st_gid;
---- orig/options.c 2004-0
7-16 20:07:2
2
+--- orig/options.c 2004-0
8-03 15:41:3
2
+++ options.c 2004-07-03 20:13:41
+++ options.c 2004-07-03 20:13:41
-@@ -12
5,6 +125
,7 @@ char *log_format = NULL;
+@@ -12
7,6 +127
,7 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
@@
-243,7
+243,7
@@
command before "make":
char backup_dir_buf[MAXPATHLEN];
int rsync_port = RSYNC_PORT;
int link_dest = 0;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = RSYNC_PORT;
int link_dest = 0;
-@@ -13
7,6 +138
,8 @@ int list_only = 0;
+@@ -13
9,6 +140
,8 @@ int list_only = 0;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
@@
-252,7
+252,7
@@
command before "make":
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int modify_window_set;
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int modify_window_set;
-@@ -25
1,6 +254
,7 @@ void usage(enum logcode F)
+@@ -25
4,6 +257
,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");
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
+260,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");
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");
-@@ -3
57,6 +361
,7 @@ static struct poptOption long_options[]
+@@ -3
61,6 +365
,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 },
{"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
+268,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 },
{"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 },
-@@ -
753,6 +758
,13 @@ int parse_arguments(int *argc, const cha
-
exit_cleanup(RERR_SYNTAX)
;
+@@ -
806,6 +811
,13 @@ int parse_arguments(int *argc, const cha
+
return 0
;
}
+ if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) {
}
+ if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) {
@@
-282,7
+282,7
@@
command before "make":
if (do_progress && !verbose)
verbose = 1;
if (do_progress && !verbose)
verbose = 1;
-@@ -10
07,6 +1019
,11 @@ void server_options(char **args,int *arg
+@@ -10
76,6 +1088
,11 @@ void server_options(char **args,int *arg
args[ac++] = compare_dest;
}
args[ac++] = compare_dest;
}
@@
-294,7
+294,7
@@
command before "make":
if (files_from && (!am_sender || remote_filesfrom_file)) {
if (remote_filesfrom_file) {
args[ac++] = "--files-from";
if (files_from && (!am_sender || remote_filesfrom_file)) {
if (remote_filesfrom_file) {
args[ac++] = "--files-from";
---- orig/rsync.yo 2004-0
7-16 20:07:23
+--- orig/rsync.yo 2004-0
8-03 15:34:32
+++ rsync.yo 2004-07-03 20:13:41
@@ -301,6 +301,7 @@ verb(
-g, --group preserve group
+++ rsync.yo 2004-07-03 20:13:41
@@ -301,6 +301,7 @@ verb(
-g, --group preserve group
@@
-304,7
+304,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
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-W, --whole-file copy whole files, no incremental checks
-@@ -5
64,6 +56
5,14 @@ cause the next transfer to behave as if
+@@ -5
74,6 +57
5,14 @@ cause the next transfer to behave as if
their checksums compared and show up in log messages even if they haven't
changed.
their checksums compared and show up in log messages even if they haven't
changed.
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff