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 the (unneeded) ./prepare_source instructions.
[rsync/rsync-patches.git]
/
acls.diff
diff --git
a/acls.diff
b/acls.diff
index
b7ea4a3
..
94a7cd0
100644
(file)
--- a/
acls.diff
+++ b/
acls.diff
@@
-1742,7
+1742,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
- if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
+ if (set_file_attrs(fname, file, statret ? NULL : &sx, 0)
}
- if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
+ if (set_file_attrs(fname, file, statret ? NULL : &sx, 0)
- && verbose && code && f_out != -1)
+ && verbose && code
!= FNONE
&& f_out != -1)
rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
@@
-1795,7
+1795,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
statret = -1;
} else if (basis_dir[0] != NULL) {
if (try_dests_non(file, fname, ndx, itemizing,
statret = -1;
} else if (basis_dir[0] != NULL) {
if (try_dests_non(file, fname, ndx, itemizing,
-@@ -101
4,7 +1066
,7 @@ static void recv_generator(char *fname,
+@@ -101
5,7 +1067
,7 @@ static void recv_generator(char *fname,
}
}
if (preserve_hard_links && file->link_u.links
}
}
if (preserve_hard_links && file->link_u.links
@@
-1804,7
+1804,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
itemizing, code, HL_SKIP))
return;
if (do_symlink(file->u.link,fname) != 0) {
itemizing, code, HL_SKIP))
return;
if (do_symlink(file->u.link,fname) != 0) {
-@@ -102
3,7 +1075
,7 @@ static void recv_generator(char *fname,
+@@ -102
4,7 +1076
,7 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
@@
-1812,9
+1812,9
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ itemize(file, ndx, statret, &sx,
ITEM_LOCAL_CHANGE, 0, NULL);
}
+ itemize(file, ndx, statret, &sx,
ITEM_LOCAL_CHANGE, 0, NULL);
}
- if (code && verbose) {
-@@ -105
4,18 +1106
,22 @@ static void recv_generator(char *fname,
-
itemizing = code = 0
;
+ if (code
!= FNONE
&& verbose) {
+@@ -105
6,18 +1108
,22 @@ static void recv_generator(char *fname,
+
code = FNONE
;
}
}
+#ifdef SUPPORT_ACLS
}
}
+#ifdef SUPPORT_ACLS
@@
-1844,7
+1844,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-@@ -10
78,7 +1134
,7 @@ static void recv_generator(char *fname,
+@@ -10
80,7 +1136
,7 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
@@
-1852,8
+1852,8
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ itemize(file, ndx, statret, &sx,
ITEM_LOCAL_CHANGE, 0, NULL);
}
+ itemize(file, ndx, statret, &sx,
ITEM_LOCAL_CHANGE, 0, NULL);
}
- if (code && verbose)
-@@ -109
2,14 +1148
,14 @@ static void recv_generator(char *fname,
+ if (code
!= FNONE
&& verbose)
+@@ -109
4,14 +1150
,14 @@ static void recv_generator(char *fname,
}
} else {
if (itemizing)
}
} else {
if (itemizing)
@@
-1871,7
+1871,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (!S_ISREG(file->mode)) {
}
if (!S_ISREG(file->mode)) {
-@@ -113
3,7 +1189
,7 @@ static void recv_generator(char *fname,
+@@ -113
5,7 +1191
,7 @@ static void recv_generator(char *fname,
}
if (update_only && statret == 0
}
if (update_only && statret == 0
@@
-1880,7
+1880,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
-@@ -114
2,20 +1198
,20 @@ static void recv_generator(char *fname,
+@@ -114
4,20 +1200
,20 @@ static void recv_generator(char *fname,
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
@@
-1905,7
+1905,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (j >= 0) {
fnamecmp = fnamecmpbuf;
}
if (j >= 0) {
fnamecmp = fnamecmpbuf;
-@@ -116
5,7 +1221
,7 @@ static void recv_generator(char *fname,
+@@ -116
7,7 +1223
,7 @@ static void recv_generator(char *fname,
}
real_ret = statret;
}
real_ret = statret;
@@
-1914,7
+1914,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
&& link_stat(partialptr, &partial_st, 0) == 0
if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
&& link_stat(partialptr, &partial_st, 0) == 0
-@@ -118
4,7 +1240
,7 @@ static void recv_generator(char *fname,
+@@ -118
6,7 +1242
,7 @@ static void recv_generator(char *fname,
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
fname, fnamecmpbuf);
}
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
fname, fnamecmpbuf);
}
@@
-1923,7
+1923,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
-@@ -119
3,7 +1249
,7 @@ static void recv_generator(char *fname,
+@@ -119
5,7 +1251
,7 @@ static void recv_generator(char *fname,
if (statret != 0) {
if (preserve_hard_links && file->link_u.links
if (statret != 0) {
if (preserve_hard_links && file->link_u.links
@@
-1932,7
+1932,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
-@@ -120
3,39 +1259
,52 @@ static void recv_generator(char *fname,
+@@ -120
5,39 +1261
,52 @@ static void recv_generator(char *fname,
return;
}
return;
}
@@
-1992,7
+1992,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
-@@ -12
59,17 +1328
,21 @@ static void recv_generator(char *fname,
+@@ -12
61,17 +1330
,21 @@ static void recv_generator(char *fname,
pretend_missing:
/* pretend the file didn't exist */
if (preserve_hard_links && file->link_u.links
pretend_missing:
/* pretend the file didn't exist */
if (preserve_hard_links && file->link_u.links
@@
-2017,7
+2017,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
}
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
-@@ -128
0,7 +1353
,7 @@ static void recv_generator(char *fname,
+@@ -128
2,7 +1355
,7 @@ static void recv_generator(char *fname,
full_fname(backupptr));
free(back_file);
close(fd);
full_fname(backupptr));
free(back_file);
close(fd);
@@
-2026,7
+2026,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if ((f_copy = do_open(backupptr,
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
}
if ((f_copy = do_open(backupptr,
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
-@@ -12
88,14 +1361
,14 @@ static void recv_generator(char *fname,
+@@ -12
90,14 +1363
,14 @@ static void recv_generator(char *fname,
full_fname(backupptr));
free(back_file);
close(fd);
full_fname(backupptr));
free(back_file);
close(fd);
@@
-2043,7
+2043,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (verbose > 2)
}
if (verbose > 2)
-@@ -131
3,24 +1386
,32 @@ static void recv_generator(char *fname,
+@@ -131
5,24 +1388
,32 @@ static void recv_generator(char *fname,
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
@@
-2081,7
+2081,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (f_copy >= 0) {
close(f_copy);
if (f_copy >= 0) {
close(f_copy);
-@@ -134
3,6 +1424
,13 @@ static void recv_generator(char *fname,
+@@ -134
5,6 +1426
,13 @@ static void recv_generator(char *fname,
}
close(fd);
}
close(fd);
@@
-2095,7
+2095,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
void generate_files(int f_out, struct file_list *flist, char *local_name)
}
void generate_files(int f_out, struct file_list *flist, char *local_name)
-@@ -140
2,6 +1490
,8 @@ void generate_files(int f_out, struct fi
+@@ -140
4,6 +1492
,8 @@ void generate_files(int f_out, struct fi
* notice that and let us know via the redo pipe (or its closing). */
ignore_timeout = 1;
* notice that and let us know via the redo pipe (or its closing). */
ignore_timeout = 1;
@@
-2160,10
+2160,10
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
statret = 1;
- st = &st3;
+ sxp->st = st3;
statret = 1;
- st = &st3;
+ sxp->st = st3;
- if (verbose < 2 || !stdout_format_has_i)
- itemizing =
code =
0;
-
break
;
-@@ -22
3,12 +228
,16 @@ int hard_link_check(struct file_struct *
+ if (verbose < 2 || !stdout_format_has_i)
{
+ itemizing = 0;
+
code = FNONE
;
+@@ -22
5,12 +230
,16 @@ int hard_link_check(struct file_struct *
if (!unchanged_file(cmpbuf, file, &st3))
continue;
statret = 1;
if (!unchanged_file(cmpbuf, file, &st3))
continue;
statret = 1;
@@
-2183,7
+2183,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
toname, &st2, itemizing, code);
if (remove_source_files == 1 && do_xfers) {
char numbuf[4];
toname, &st2, itemizing, code);
if (remove_source_files == 1 && do_xfers) {
char numbuf[4];
-@@ -24
6,7 +255
,7 @@ int hard_link_check(struct file_struct *
+@@ -24
8,7 +257
,7 @@ int hard_link_check(struct file_struct *
#ifdef SUPPORT_HARD_LINKS
int hard_link_one(struct file_struct *file, int ndx, char *fname,
#ifdef SUPPORT_HARD_LINKS
int hard_link_one(struct file_struct *file, int ndx, char *fname,
@@
-2192,7
+2192,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
int itemizing, enum logcode code)
{
if (do_link(toname, fname)) {
int itemizing, enum logcode code)
{
if (do_link(toname, fname)) {
-@@ -26
2,7 +271
,11 @@ int hard_link_one(struct file_struct *fi
+@@ -26
4,7 +273
,11 @@ int hard_link_one(struct file_struct *fi
}
if (itemizing) {
}
if (itemizing) {
@@
-2205,7
+2205,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
terse ? "" : toname);
}
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
terse ? "" : toname);
}
-@@ -2
79,11 +292
,12 @@ void hard_link_cluster(struct file_struc
+@@ -2
81,11 +294
,12 @@ void hard_link_cluster(struct file_struc
#ifdef SUPPORT_HARD_LINKS
char hlink1[MAXPATHLEN];
char *hlink2;
#ifdef SUPPORT_HARD_LINKS
char hlink1[MAXPATHLEN];
char *hlink2;
@@
-2220,7
+2220,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
return;
if (!(file->flags & FLAG_HLINK_TOL)) {
while (!(file->flags & FLAG_HLINK_EOL)) {
return;
if (!(file->flags & FLAG_HLINK_TOL)) {
while (!(file->flags & FLAG_HLINK_EOL)) {
-@@ -29
7,9 +311
,13 @@ void hard_link_cluster(struct file_struc
+@@ -29
9,9 +313
,13 @@ void hard_link_cluster(struct file_struc
if (file->F_HLINDEX != SKIPPED_LINK)
continue;
hlink2 = f_name(file, NULL);
if (file->F_HLINDEX != SKIPPED_LINK)
continue;
hlink2 = f_name(file, NULL);
@@
-5518,7
+5518,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
--- old/log.c
+++ new/log.c
+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
--- old/log.c
+++ new/log.c
-@@ -6
07,8 +607
,10 @@ static void log_formatted(enum logcode c
+@@ -6
15,8 +615
,10 @@ static void log_formatted(enum logcode c
n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
@@
-5647,7
+5647,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
extern struct stats stats;
extern char *stdout_format;
extern char *tmpdir;
extern struct stats stats;
extern char *stdout_format;
extern char *tmpdir;
-@@ -3
49,6 +350
,10 @@ int recv_files(int f_in, struct file_lis
+@@ -3
50,6 +351
,10 @@ int recv_files(int f_in, struct file_lis
int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int max_phase = protocol_version >= 29 ? 2 : 1;
int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int max_phase = protocol_version >= 29 ? 2 : 1;
@@
-5658,7
+5658,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
int i, recv_ok;
if (verbose > 2)
int i, recv_ok;
if (verbose > 2)
-@@ -5
49,7 +554
,16 @@ int recv_files(int f_in, struct file_lis
+@@ -5
53,7 +558
,16 @@ int recv_files(int f_in, struct file_lis
* mode based on the local permissions and some heuristics. */
if (!preserve_perms) {
int exists = fd1 != -1;
* mode based on the local permissions and some heuristics. */
if (!preserve_perms) {
int exists = fd1 != -1;
@@
-5893,9
+5893,9
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#include "byteorder.h"
#include "lib/mdfour.h"
#include "lib/wildmatch.h"
#include "byteorder.h"
#include "lib/mdfour.h"
#include "lib/wildmatch.h"
-@@ -668,6 +688,16 @@ struct chmod_mode_struct;
-
+@@ -669,6 +689,16 @@ struct chmod_mode_struct;
#define UNUSED(x) x __attribute__((__unused__))
#define UNUSED(x) x __attribute__((__unused__))
+ #define NORETURN __attribute__((__noreturn__))
+typedef struct {
+ STRUCT_STAT st;
+typedef struct {
+ STRUCT_STAT st;