Fixed failing hunks.

[rsync/rsync-patches.git] / preallocate.diff

diff --git a/preallocate.diff b/preallocate.diff
index 526e12b..ef81dcd 100644 (file)
--- a/preallocate.diff
+++ b/preallocate.diff
@@ -14,9 +14,9 @@ To use this patch, run these commands for a successful build:
 @@ -561,7 +561,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
-     strerror putenv iconv_open locale_charset nl_langinfo \
--    sigaction sigprocmask)
-+    sigaction sigprocmask posix_fallocate)
+     strerror putenv iconv_open locale_charset nl_langinfo getxattr \
+-    extattr_get_link sigaction sigprocmask)
++    extattr_get_link sigaction sigprocmask posix_fallocate)
  
  AC_CHECK_FUNCS(getpgrp tcgetpgrp)
  if test $ac_cv_func_getpgrp = yes; then
@@ -93,7 +93,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");
-@@ -1909,6 +1927,9 @@ void server_options(char **args,int *arg
+@@ -1911,6 +1929,9 @@ void server_options(char **args,int *arg
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  
@@ -156,7 +156,7 @@ To use this patch, run these commands for a successful build:
        if (do_progress)
 --- old/rsync.h
 +++ new/rsync.h
-@@ -563,6 +563,10 @@ struct idev_node {
+@@ -565,6 +565,10 @@ struct idev_node {
  #define ACLS_NEED_MASK 1
  #endif
  
@@ -164,12 +164,12 @@ To use this patch, run these commands for a successful build:
 +#define SUPPORT_PREALLOCATION 1
 +#endif
 +
- #define GID_NONE ((gid_t)-1)
- 
  union file_extras {
+       int32 num;
+       uint32 unum;
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -335,6 +335,7 @@ to the detailed description below for a 
+@@ -341,6 +341,7 @@ to the detailed description below for a 
       --super                 receiver attempts super-user activities
       --fake-super            store/recover privileged attrs using xattrs
   -S, --sparse                handle sparse files efficiently
@@ -177,7 +177,7 @@ To use this patch, run these commands for a successful build:
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy files whole (without rsync algorithm)
   -x, --one-file-system       don't cross filesystem boundaries
-@@ -956,6 +957,19 @@ NOTE: Don't use this option when the des
+@@ -962,6 +963,19 @@ NOTE: Don't use this option when the des
  filesystem. It doesn't seem to handle seeks over null regions
  correctly and ends up corrupting the files.