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
Use "use warnings" rather than -w on the #! line.
[rsync/rsync-patches.git]
/
checksum-xattr.diff
diff --git
a/checksum-xattr.diff
b/checksum-xattr.diff
index
f571d7f
..
bd6d3de
100644
(file)
--- a/
checksum-xattr.diff
+++ b/
checksum-xattr.diff
@@
-11,7
+11,7
@@
To use this patch, run these commands for a successful build:
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
-@@ -12
39,7 +1239
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -12
86,7 +1286
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
memcpy(bp + basename_len, linkname, linkname_len);
#endif
memcpy(bp + basename_len, linkname, linkname_len);
#endif
@@
-24,7
+24,7
@@
diff --git a/flist.c b/flist.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -7
18,7 +718
,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+@@ -7
24,7 +724
,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
of the file time to determine whether to sync */
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MAX_DIGEST_LEN];
of the file time to determine whether to sync */
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MAX_DIGEST_LEN];
@@
-38,9
+38,10
@@
diff --git a/support/xsums b/support/xsums
new file mode 100644
--- /dev/null
+++ b/support/xsums
new file mode 100644
--- /dev/null
+++ b/support/xsums
-@@ -0,0 +1,11
8
@@
-+#!/usr/bin/perl
-w
+@@ -0,0 +1,11
9
@@
++#!/usr/bin/perl
+use strict;
+use strict;
++use warnings;
+
+use Getopt::Long;
+use Cwd qw(abs_path cwd);
+
+use Getopt::Long;
+use Cwd qw(abs_path cwd);
@@
-191,7
+192,7
@@
diff --git a/xattrs.c b/xattrs.c
continue;
}
continue;
}
-@@ -8
44,6 +85
2,39 @@ int del_def_xattr_acl(const char *fname)
+@@ -8
94,6 +90
2,39 @@ int del_def_xattr_acl(const char *fname)
}
#endif
}
#endif
@@
-202,7
+203,7
@@
diff --git a/xattrs.c b/xattrs.c
+ char buf[256];
+ uint32 file_length, mtime;
+ int len;
+ char buf[256];
+ uint32 file_length, mtime;
+ int len;
-+
++
+ len = sys_lgetxattr(fname, mdattr, buf, sizeof buf);
+ if (len < 0) {
+ if (errno == ENOTSUP || errno == ENOATTR)
+ len = sys_lgetxattr(fname, mdattr, buf, sizeof buf);
+ if (len < 0) {
+ if (errno == ENOTSUP || errno == ENOATTR)