X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0b73ca12fa018b3f6e45cc54912423930b3d6758..66203a982b3d249bafda9b9272c4c103c19e4a9b:/receiver.c diff --git a/receiver.c b/receiver.c index 7cc9a81d..20afb4fb 100644 --- a/receiver.c +++ b/receiver.c @@ -36,7 +36,6 @@ extern char *compare_dest; extern int make_backups; extern char *backup_suffix; - static struct delete_list { dev_t dev; INO_T inode; @@ -146,6 +145,7 @@ static void delete_files(struct file_list *flist) if (-1 == flist_find(flist,local_file_list->files[i])) { char *f = f_name(local_file_list->files[i]); int k = strlen(f) - strlen(backup_suffix); +/* Hi Andrew, do we really need to play with backup_suffix here? */ if (make_backups && ((k <= 0) || (strcmp(f+k,backup_suffix) != 0))) { (void) make_backup(f); @@ -225,8 +225,8 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, extern int cleanup_got_literal; if (verbose > 3) { - rprintf(FINFO,"data recv %d at %d\n", - i,(int)offset); + rprintf(FINFO,"data recv %d at %.0f\n", + i,(double)offset); } stats.literal_data += i; @@ -243,7 +243,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, } i = -(i+1); - offset2 = i*n; + offset2 = i*(OFF_T)n; len = n; if (i == count-1 && remainder != 0) len = remainder; @@ -251,8 +251,8 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, stats.matched_data += len; if (verbose > 3) - rprintf(FINFO,"chunk[%d] of size %d at %d offset=%d\n", - i,len,(int)offset2,(int)offset); + rprintf(FINFO,"chunk[%d] of size %d at %.0f offset=%.0f\n", + i,len,(double)offset2,(double)offset); map = map_ptr(buf,offset2,len); @@ -291,6 +291,8 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, } +/* main routine for receiver process. Receiver process runs on the + same host as the generator process. */ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) { @@ -400,7 +402,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) if (fd1 != -1 && st.st_size > 0) { buf = map_file(fd1,st.st_size); if (verbose > 2) - rprintf(FINFO,"recv mapped %s of size %d\n",fnamecmp,(int)st.st_size); + rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)st.st_size); } else { buf = NULL; }