aboutsummaryrefslogtreecommitdiffstats
path: root/receiver.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-07-30 16:14:22 +0000
committerWayne Davison <wayned@samba.org>2005-07-30 16:14:22 +0000
commit97894c647360239aca1ab7a132bc6ab092f92c8f (patch)
treea497fdb9538ce81cfd970c404c049639bc1777d6 /receiver.c
parent1f86fcf5dc1eb6a7077b0f6b52cc855409ddf881 (diff)
downloadandroid_external_rsync-97894c647360239aca1ab7a132bc6ab092f92c8f.tar.gz
android_external_rsync-97894c647360239aca1ab7a132bc6ab092f92c8f.tar.bz2
android_external_rsync-97894c647360239aca1ab7a132bc6ab092f92c8f.zip
- The combination of --update and --progress now outputs progress
information during the checksum scan of the already-sent data. - When --inplace creates a file, give it 0600 permissions, not 0000.
Diffstat (limited to 'receiver.c')
-rw-r--r--receiver.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/receiver.c b/receiver.c
index d348cf87..46e456e7 100644
--- a/receiver.c
+++ b/receiver.c
@@ -219,12 +219,16 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
if (sum.remainder)
sum.flength -= sum.blength - sum.remainder;
for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
+ if (do_progress)
+ show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
CHUNK_SIZE);
offset = j;
}
if (offset < sum.flength) {
int32 len = sum.flength - offset;
+ if (do_progress)
+ show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, len), len);
offset = sum.flength;
}
@@ -605,7 +609,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
/* We now check to see if we are writing file "inplace" */
if (inplace) {
- fd2 = do_open(fname, O_WRONLY|O_CREAT, 0);
+ fd2 = do_open(fname, O_WRONLY|O_CREAT, 0600);
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
full_fname(fname));