The patches for 3.0.0pre8.

[rsync-patches.git] / preallocate.diff

diff --git a/preallocate.diff b/preallocate.diff
index f59b8564a5bd021d41113ffaf681f059e5fc1adf..f5f21a46ffee0d733a9b2c0e9e78595620659c08 100644 (file)
--- a/preallocate.diff
+++ b/preallocate.diff
@@ -19,8 +19,8 @@ diff --git a/configure.in b/configure.in
 -    extattr_get_link sigaction sigprocmask setattrlist)
 +    extattr_get_link sigaction sigprocmask setattrlist posix_fallocate)
  
- AC_CHECK_FUNCS(getpgrp tcgetpgrp)
- if test $ac_cv_func_getpgrp = yes; then
+ dnl cygwin iconv.h defines iconv_open as libiconv_open
+ if test x"$ac_cv_func_iconv_open" != x"yes"; then
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -224,7 +224,7 @@ diff --git a/util.c b/util.c
  extern int module_id;
  extern int modify_window;
  extern int relative_paths;
-@@ -272,6 +273,10 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -273,6 +274,10 @@ int copy_file(const char *source, const char *dest, int ofd,
        int ifd;
        char buf[1024 * 8];
        int len;   /* Number of bytes read into `buf'. */
@@ -235,7 +235,7 @@ diff --git a/util.c b/util.c
  
        if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
                rsyserr(FERROR_XFER, errno, "open %s", full_fname(source));
-@@ -293,7 +298,27 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -294,7 +299,27 @@ int copy_file(const char *source, const char *dest, int ofd,
                }
        }
  
@@ -263,7 +263,7 @@ diff --git a/util.c b/util.c
                if (full_write(ofd, buf, len) < 0) {
                        rsyserr(FERROR_XFER, errno, "write %s", full_fname(dest));
                        close(ifd);
-@@ -314,6 +339,16 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -315,6 +340,16 @@ int copy_file(const char *source, const char *dest, int ofd,
                        full_fname(source));
        }