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
Fixed failing hunks.
[rsync/rsync-patches.git]
/
flags.diff
diff --git
a/flags.diff
b/flags.diff
index
914083f
..
edb1b54
100644
(file)
--- a/
flags.diff
+++ b/
flags.diff
@@
-27,7
+27,7
@@
To use this patch, run these commands for a successful build:
#ifdef ICONV_OPTION
int ic_ndx;
#ifdef ICONV_OPTION
int ic_ndx;
-@@ -1
12,6 +11
3,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -1
22,6 +12
3,8 @@ void setup_protocol(int f_out,int f_in)
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
@@
-44,7
+44,7
@@
To use this patch, run these commands for a successful build:
setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
- strerror putenv iconv_open locale_charset nl_langinfo getxattr \
+ chflags strerror putenv iconv_open locale_charset nl_langinfo getxattr \
setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
- strerror putenv iconv_open locale_charset nl_langinfo getxattr \
+ chflags strerror putenv iconv_open locale_charset nl_langinfo getxattr \
- extattr_get_link sigaction sigprocmask)
+ extattr_get_link sigaction sigprocmask
setattrlist
)
AC_CHECK_FUNCS(getpgrp tcgetpgrp)
--- old/flist.c
AC_CHECK_FUNCS(getpgrp tcgetpgrp)
--- old/flist.c
@@
-259,7
+259,7
@@
To use this patch, run these commands for a successful build:
}
}
}
}
-@@ -12
58,7 +1269
,7 @@ static void recv_generator(char *fname,
+@@ -12
63,7 +1274
,7 @@ static void recv_generator(char *fname,
* full later (right before we handle its contents). */
if (statret == 0
&& (S_ISDIR(sx.st.st_mode)
* full later (right before we handle its contents). */
if (statret == 0
&& (S_ISDIR(sx.st.st_mode)
@@
-268,7
+268,7
@@
To use this patch, run these commands for a successful build:
goto cleanup; /* Any errors get reported later. */
if (do_mkdir(fname, file->mode & 0700) == 0)
file->flags |= FLAG_DIR_CREATED;
goto cleanup; /* Any errors get reported later. */
if (do_mkdir(fname, file->mode & 0700) == 0)
file->flags |= FLAG_DIR_CREATED;
-@@ -127
0,7 +1281
,7 @@ static void recv_generator(char *fname,
+@@ -127
5,7 +1286
,7 @@ static void recv_generator(char *fname,
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
@@
-277,7
+277,7
@@
To use this patch, run these commands for a successful build:
goto skipping_dir_contents;
statret = -1;
}
goto skipping_dir_contents;
statret = -1;
}
-@@ -1
399,7 +1410
,7 @@ static void recv_generator(char *fname,
+@@ -1
404,7 +1415
,7 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
}
/* Not the right symlink (or not a symlink), so
* delete it. */
@@
-286,7
+286,7
@@
To use this patch, run these commands for a successful build:
goto cleanup;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
goto cleanup;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
-@@ -14
78,7 +1489
,7 @@ static void recv_generator(char *fname,
+@@ -14
83,7 +1494
,7 @@ static void recv_generator(char *fname,
goto return_with_success;
goto cleanup;
}
goto return_with_success;
goto cleanup;
}
@@
-295,7
+295,7
@@
To use this patch, run these commands for a successful build:
goto cleanup;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
goto cleanup;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
-@@ -15
69,7 +1580
,7 @@ static void recv_generator(char *fname,
+@@ -15
74,7 +1585
,7 @@ static void recv_generator(char *fname,
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
@@
-376,7
+376,7
@@
To use this patch, run these commands for a successful build:
if (write_batch && read_batch) {
snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
if (write_batch && read_batch) {
snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
-@@ -179
0,6 +1807
,9 @@ void server_options(char **args, int *ar
+@@ -179
2,6 +1809
,9 @@ void server_options(char **args, int *ar
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
@@
-565,7
+565,7
@@
To use this patch, run these commands for a successful build:
transfer. The resulting value is treated as though it was the permissions
--- old/syscall.c
+++ new/syscall.c
transfer. The resulting value is treated as though it was the permissions
--- old/syscall.c
+++ new/syscall.c
-@@ -1
62,6 +162
,15 @@ int do_chmod(const char *path, mode_t mo
+@@ -1
73,6 +173
,15 @@ int do_chmod(const char *path, mode_t mo
}
#endif
}
#endif