Add some temp-name dot heuristics for OS X's sake.

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 7641b9b..1819830 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
 extern int remove_source_files;
 extern int append_mode;
 extern int sparse_files;
+extern int preallocate_files;
 extern int keep_partial;
 extern int checksum_len;
 extern int checksum_seed;
@@ -93,7 +94,7 @@ static int updating_basis_or_equiv;
  * transfer is in progress. */
 int get_tmpname(char *fnametmp, const char *fname, BOOL make_unique)
 {
-       int maxname, added, length = 0;
+       int maxname, length = 0;
        const char *f;
        char *suf;
 
@@ -112,6 +113,8 @@ int get_tmpname(char *fnametmp, const char *fname, BOOL make_unique)
                }
        } else
                f = fname;
+       if (*f == '.') /* avoid an extra leading dot for OS X's sake */
+               f++;
        fnametmp[length++] = '.';
 
        /* The maxname value is bufsize, and includes space for the '\0'.
@@ -119,24 +122,30 @@ int get_tmpname(char *fnametmp, const char *fname, BOOL make_unique)
        maxname = MIN(MAXPATHLEN - length - TMPNAME_SUFFIX_LEN,
                      NAME_MAX - 1 - TMPNAME_SUFFIX_LEN);
 
-       if (maxname < 1) {
+       if (maxname < 0) {
                rprintf(FERROR_XFER, "temporary filename too long: %s\n", fname);
                fnametmp[0] = '\0';
                return 0;
        }
 
-       added = strlcpy(fnametmp + length, f, maxname);
-       if (added >= maxname)
-               added = maxname - 1;
-       suf = fnametmp + length + added;
-
-       /* Trim any dangling high-bit chars if the first-trimmed char (if any) is
-        * also a high-bit char, just in case we cut into a multi-byte sequence.
-        * We are guaranteed to stop because of the leading '.' we added. */
-       if ((int)f[added] & 0x80) {
-               while ((int)suf[-1] & 0x80)
+       if (maxname) {
+               int added = strlcpy(fnametmp + length, f, maxname);
+               if (added >= maxname)
+                       added = maxname - 1;
+               suf = fnametmp + length + added;
+
+               /* Trim any dangling high-bit chars if the first-trimmed char (if any) is
+                * also a high-bit char, just in case we cut into a multi-byte sequence.
+                * We are guaranteed to stop because of the leading '.' we added. */
+               if ((int)f[added] & 0x80) {
+                       while ((int)suf[-1] & 0x80)
+                               suf--;
+               }
+               /* trim one trailing dot before our suffix's dot */
+               if (suf[-1] == '.')
                        suf--;
-       }
+       } else
+               suf = fnametmp + length - 1; /* overwrite the leading dot with suffix's dot */
 
        if (make_unique) {
                static unsigned counter_limit;
@@ -227,6 +236,22 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
        char *data;
        int32 i;
        char *map = NULL;
+#ifdef SUPPORT_PREALLOCATION
+#ifdef PREALLOCATE_NEEDS_TRUNCATE
+       OFF_T preallocated_len = 0;
+#endif
+
+       if (preallocate_files && fd != -1 && total_size > 0) {
+               /* Try to preallocate enough space for file's eventual length.  Can
+                * reduce fragmentation on filesystems like ext4, xfs, and NTFS. */
+               if (do_fallocate(fd, 0, total_size) == 0) {
+#ifdef PREALLOCATE_NEEDS_TRUNCATE
+                       preallocated_len = total_size;
+#endif
+               } else
+                       rsyserr(FWARNING, errno, "do_fallocate %s", full_fname(fname));
+       }
+#endif
 
        read_sum_head(f_in, &sum);
 
@@ -341,7 +366,14 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                goto report_write_error;
 
 #ifdef HAVE_FTRUNCATE
-       if (inplace && fd != -1 && do_ftruncate(fd, offset) < 0) {
+       /* inplace: New data could be shorter than old data.
+        * preallocate_files: total_size could have been an overestimate.
+        *     Cut off any extra preallocated zeros from dest file. */
+       if ((inplace
+#ifdef PREALLOCATE_NEEDS_TRUNCATE
+         || preallocated_len > offset
+#endif
+         ) && fd != -1 && do_ftruncate(fd, offset) < 0) {
                rsyserr(FERROR_XFER, errno, "ftruncate failed on %s",
                        full_fname(fname));
        }