Fixed failing hunks.

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

diff --git a/preallocate.diff b/preallocate.diff
index 049a430..ef81dcd 100644 (file)
--- a/preallocate.diff
+++ b/preallocate.diff
@@ -156,7 +156,7 @@ To use this patch, run these commands for a successful build:
        if (do_progress)
 --- old/rsync.h
 +++ new/rsync.h
        if (do_progress)
 --- old/rsync.h
 +++ new/rsync.h

-@@ -564,6 +564,10 @@ struct idev_node {
+@@ -565,6 +565,10 @@ struct idev_node {

  #define ACLS_NEED_MASK 1
  #endif
  
  #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 SUPPORT_PREALLOCATION 1
 +#endif
 +

- #define GID_NONE ((gid_t)-1)
- 

  union file_extras {
  union file_extras {

+       int32 num;
+       uint32 unum;

 --- old/rsync.yo
 +++ new/rsync.yo
 --- 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
       --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
   -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.
  
  filesystem. It doesn't seem to handle seeks over null regions
  correctly and ends up corrupting the files.