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
Fix alignment issue on 64-bit. Solution from Steve Ortiz.
[rsync/rsync-patches.git]
/
filter-attribute-mods.diff
diff --git
a/filter-attribute-mods.diff
b/filter-attribute-mods.diff
index
212a9bd
..
f7ceb0f
100644
(file)
--- a/
filter-attribute-mods.diff
+++ b/
filter-attribute-mods.diff
@@
-9,7
+9,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
24079e988fc31af4eba56cd2701fdc5a4154980d
+based-on:
a01e3b490eb36ccf9e704840e1b6683dab867550
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
@@
-238,7
+238,7
@@
diff --git a/exclude.c b/exclude.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -8
0,6 +80
,7 @@ extern struct chmod_mode_struct *chmod_modes;
+@@ -8
2,6 +82
,7 @@ extern struct chmod_mode_struct *chmod_modes;
extern filter_rule_list filter_list;
extern filter_rule_list daemon_filter_list;
extern filter_rule_list filter_list;
extern filter_rule_list daemon_filter_list;
@@
-246,7
+246,7
@@
diff --git a/flist.c b/flist.c
#ifdef ICONV_OPTION
extern int filesfrom_convert;
#ifdef ICONV_OPTION
extern int filesfrom_convert;
-@@ -28
2,7 +283
,8 @@ static inline int path_is_daemon_excluded(char *path, int ignore_filename)
+@@ -28
4,7 +285
,8 @@ static inline int path_is_daemon_excluded(char *path, int ignore_filename)
/* This function is used to check if a file should be included/excluded
* from the list of files based on its name and type etc. The value of
/* This function is used to check if a file should be included/excluded
* from the list of files based on its name and type etc. The value of
@@
-256,7
+256,7
@@
diff --git a/flist.c b/flist.c
static int is_excluded(const char *fname, int is_dir, int filter_level)
{
#if 0 /* This currently never happens, so avoid a useless compare. */
static int is_excluded(const char *fname, int is_dir, int filter_level)
{
#if 0 /* This currently never happens, so avoid a useless compare. */
-@@ -29
1,6 +293
,8 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
+@@ -29
3,6 +295
,8 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
#endif
if (is_daemon_excluded(fname, is_dir))
return 1;
#endif
if (is_daemon_excluded(fname, is_dir))
return 1;
@@
-265,7
+265,7
@@
diff --git a/flist.c b/flist.c
if (filter_level != ALL_FILTERS)
return 0;
if (filter_list.head
if (filter_level != ALL_FILTERS)
return 0;
if (filter_list.head
-@@ -11
69,7 +1173
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -11
71,7 +1175
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
} else if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
/* See if file is excluded before reporting an error. */
} else if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
/* See if file is excluded before reporting an error. */
@@
-274,7
+274,7
@@
diff --git a/flist.c b/flist.c
&& (is_excluded(thisname, 0, filter_level)
|| is_excluded(thisname, 1, filter_level))) {
if (ignore_perishable && save_errno != ENOENT)
&& (is_excluded(thisname, 0, filter_level)
|| is_excluded(thisname, 1, filter_level))) {
if (ignore_perishable && save_errno != ENOENT)
-@@ -121
4,6 +1218
,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -121
6,6 +1220
,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
if (filter_level == NO_FILTERS)
goto skip_filters;
if (filter_level == NO_FILTERS)
goto skip_filters;
@@
-287,7
+287,7
@@
diff --git a/flist.c b/flist.c
if (S_ISDIR(st.st_mode)) {
if (!xfer_dirs) {
if (S_ISDIR(st.st_mode)) {
if (!xfer_dirs) {
-@@ -141
4,12 +1424
,23 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+@@ -141
6,12 +1426
,23 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
int flags, int filter_level)
{
struct file_struct *file;
int flags, int filter_level)
{
struct file_struct *file;
@@
-312,7
+312,7
@@
diff --git a/flist.c b/flist.c
file->mode = tweak_mode(file->mode, chmod_modes);
if (f >= 0) {
file->mode = tweak_mode(file->mode, chmod_modes);
if (f >= 0) {
-@@ -2
285,7 +2306
,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -2
300,7 +2321
,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
struct file_struct *file;
file = send_file_name(f, flist, fbuf, &st,
FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags,
struct file_struct *file;
file = send_file_name(f, flist, fbuf, &st,
FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags,
@@
-321,7
+321,7
@@
diff --git a/flist.c b/flist.c
if (!file)
continue;
if (inc_recurse) {
if (!file)
continue;
if (inc_recurse) {
-@@ -2
299,7 +2320
,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -2
314,7 +2335
,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
} else
send_if_directory(f, flist, file, fbuf, len, flags);
} else
} else
send_if_directory(f, flist, file, fbuf, len, flags);
} else
@@
-395,7
+395,7
@@
diff --git a/rsync.yo b/rsync.yo
See the bf(--perms) and bf(--executability) options for how the resulting
permission value can be applied to the files in the transfer.
See the bf(--perms) and bf(--executability) options for how the resulting
permission value can be applied to the files in the transfer.
-@@ -18
32,6 +1834
,10 @@ be omitted, but if USER is empty, a leading colon must be supplied.
+@@ -18
46,6 +1848
,10 @@ be omitted, but if USER is empty, a leading colon must be supplied.
If you specify "--chown=foo:bar, this is exactly the same as specifying
"--usermap=*:foo --groupmap=*:bar", only easier.
If you specify "--chown=foo:bar, this is exactly the same as specifying
"--usermap=*:foo --groupmap=*:bar", only easier.
@@
-406,7
+406,7
@@
diff --git a/rsync.yo b/rsync.yo
dit(bf(--timeout=TIMEOUT)) This option allows you to set a maximum I/O
timeout in seconds. If no data is transferred for the specified time
then rsync will exit. The default is 0, which means no timeout.
dit(bf(--timeout=TIMEOUT)) This option allows you to set a maximum I/O
timeout in seconds. If no data is transferred for the specified time
then rsync will exit. The default is 0, which means no timeout.
-@@ -26
57,6 +2663
,15 @@ itemization(
+@@ -26
71,6 +2677
,15 @@ itemization(
option's default rules that exclude things like "CVS" and "*.o" are
marked as perishable, and will not prevent a directory that was removed
on the source from being deleted on the destination.
option's default rules that exclude things like "CVS" and "*.o" are
marked as perishable, and will not prevent a directory that was removed
on the source from being deleted on the destination.
@@
-422,7
+422,7
@@
diff --git a/rsync.yo b/rsync.yo
)
manpagesection(MERGE-FILE FILTER RULES)
)
manpagesection(MERGE-FILE FILTER RULES)
-@@ -27
18,6 +2733
,12 @@ itemization(
+@@ -27
32,6 +2747
,12 @@ itemization(
a rule prefix such as bf(hide)).
)
a rule prefix such as bf(hide)).
)