Avoid splitting a multi-byte character when trimming a name.

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 1738dca..0bc6517 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -48,6 +48,7 @@ extern int keep_partial;
 extern int checksum_len;
 extern int checksum_seed;
 extern int inplace;
+extern int allowed_lull;
 extern int delay_updates;
 extern mode_t orig_umask;
 extern struct stats stats;
@@ -128,6 +129,14 @@ int get_tmpname(char *fnametmp, const char *fname, BOOL make_unique)
                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--;
+       }
+
        if (make_unique) {
                static unsigned counter_limit;
                unsigned counter;
@@ -172,7 +181,7 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
         * access to ensure that there is no race condition.  They will be
         * correctly updated after the right owner and group info is set.
         * (Thanks to snabb@epipe.fi for pointing this out.) */
-       fd = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
+       fd = do_mkstemp(fnametmp, (file->mode & INITACCESSPERMS) | S_IWUSR);
 
 #if 0
        /* In most cases parent directories will already exist because their
@@ -227,7 +236,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                sum.flength = (OFF_T)sum.count * sum.blength;
                if (sum.remainder)
                        sum.flength -= sum.blength - sum.remainder;
-               if (append_mode == 2) {
+               if (append_mode == 2 && mapbuf) {
                        for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
                                if (INFO_GTE(PROGRESS, 1))
                                        show_progress(offset, total_size);
@@ -254,6 +263,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                if (INFO_GTE(PROGRESS, 1))
                        show_progress(offset, total_size);
 
+               if (allowed_lull)
+                       maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH | MSK_ACTIVE_RECEIVER);
+
                if (i > 0) {
                        if (DEBUG_GTE(DELTASUM, 3)) {
                                rprintf(FINFO,"data recv %d at %s\n",
@@ -281,8 +293,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
 
                if (DEBUG_GTE(DELTASUM, 3)) {
                        rprintf(FINFO,
-                               "chunk[%d] of size %ld at %s offset=%s\n",
-                               i, (long)len, big_num(offset2), big_num(offset));
+                               "chunk[%d] of size %ld at %s offset=%s%s\n",
+                               i, (long)len, big_num(offset2), big_num(offset),
+                               updating_basis_or_equiv && offset == offset2 ? " (seek)" : "");
                }
 
                if (mapbuf) {
@@ -317,8 +330,7 @@ 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
-        && ftruncate(fd, offset) < 0) {
+       if (inplace && fd != -1 && do_ftruncate(fd, offset) < 0) {
                rsyserr(FERROR_XFER, errno, "ftruncate failed on %s",
                        full_fname(fname));
        }
@@ -327,7 +339,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
        if (INFO_GTE(PROGRESS, 1))
                end_progress(total_size);
 
-       if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
+       if (fd != -1 && offset > 0 && sparse_end(fd, offset) != 0) {
            report_write_error:
                rsyserr(FERROR_XFER, errno, "write failed on %s",
                        full_fname(fname));
@@ -467,7 +479,6 @@ int recv_files(int f_in, int f_out, char *local_name)
        char fnamecmpbuf[MAXPATHLEN];
        uchar fnamecmp_type;
        struct file_struct *file;
-       struct stats initial_stats;
        int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
        enum logcode log_code = log_before_transfer ? FLOG : FINFO;
        int max_phase = protocol_version >= 29 ? 2 : 1;
@@ -612,14 +623,17 @@ int recv_files(int f_in, int f_out, char *local_name)
                        }
                }
 
+               if (!log_before_transfer)
+                       remember_initial_stats();
+
                if (!do_xfers) { /* log the transfer */
-                       log_item(FCLIENT, file, &stats, iflags, NULL);
+                       log_item(FCLIENT, file, iflags, NULL);
                        if (read_batch)
                                discard_receive_data(f_in, F_LENGTH(file));
                        continue;
                }
                if (write_batch < 0) {
-                       log_item(FCLIENT, file, &stats, iflags, NULL);
+                       log_item(FCLIENT, file, iflags, NULL);
                        if (!am_server)
                                discard_receive_data(f_in, F_LENGTH(file));
                        continue;
@@ -677,8 +691,6 @@ int recv_files(int f_in, int f_out, char *local_name)
                                fnamecmp = fname;
                }
 
-               initial_stats = stats;
-
                /* open the file */
                fd1 = do_open(fnamecmp, O_RDONLY, 0);
 
@@ -773,7 +785,7 @@ int recv_files(int f_in, int f_out, char *local_name)
 
                /* log the transfer */
                if (log_before_transfer)
-                       log_item(FCLIENT, file, &initial_stats, iflags, NULL);
+                       log_item(FCLIENT, file, iflags, NULL);
                else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
                        rprintf(FINFO, "%s\n", fname);
 
@@ -781,7 +793,7 @@ int recv_files(int f_in, int f_out, char *local_name)
                recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
                                       fname, fd2, F_LENGTH(file));
 
-               log_item(log_code, file, &initial_stats, iflags, NULL);
+               log_item(log_code, file, iflags, NULL);
 
                if (fd1 != -1)
                        close(fd1);