extern int make_backups;
extern char *backup_suffix;
-
static struct delete_list {
dev_t dev;
INO_T inode;
} *delete_list;
static int dlist_len, dlist_alloc_len;
-
/* yuck! This function wouldn't have been necessary if I had the sorting
algorithm right. Unfortunately fixing the sorting algorithm would introduce
a backward incompatibility as file list indexes are sent over the link.
/* this deletes any files on the receiving side that are not present
on the sending side. For version 1.6.4 I have changed the behaviour
to match more closely what most people seem to expect of this option */
-static void delete_files(struct file_list *flist)
+void delete_files(struct file_list *flist)
{
struct file_list *local_file_list;
int i, j;
char *name;
+ extern int module_id;
+ extern int ignore_errors;
+ extern int max_delete;
+ static int deletion_count;
if (cvs_exclude)
add_cvs_excludes();
- if (io_error) {
+ if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
rprintf(FINFO,"IO error encountered - skipping file deletion\n");
return;
}
rprintf(FINFO,"deleting in %s\n", name);
for (i=local_file_list->count-1;i>=0;i--) {
+ if (max_delete && deletion_count > max_delete) break;
if (!local_file_list->files[i]->basename) continue;
if (remote_version < 19 &&
S_ISDIR(local_file_list->files[i]->mode))
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);
} else {
+ deletion_count++;
delete_one(local_file_list->files[i]);
}
}
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;
}
i = -(i+1);
- offset2 = i*n;
+ offset2 = i*(OFF_T)n;
len = n;
if (i == count-1 && remainder != 0)
len = remainder;
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);
+ if (buf) {
+ map = map_ptr(buf,offset2,len);
- see_token(map, len);
- sum_update(map,len);
+ see_token(map, len);
+ sum_update(map,len);
+ }
if (fd != -1 && write_file(fd,map,len) != len) {
rprintf(FERROR,"write failed on %s : %s\n",
offset += len;
}
- end_progress();
+ end_progress(total_size);
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
rprintf(FERROR,"write failed on %s : %s\n",
}
+/* 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)
{
int phase=0;
int recv_ok;
extern struct stats stats;
+ extern int preserve_perms;
+ extern int delete_after;
struct stats initial_stats;
if (verbose > 2) {
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
- }
-
while (1) {
cleanup_disable();
fnamecmp = fname;
/* open the file */
- fd1 = open(fnamecmp,O_RDONLY);
+ fd1 = do_open(fnamecmp, O_RDONLY, 0);
if ((fd1 == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
compare_dest,fname);
fnamecmp = fnamecmpbuf;
- fd1 = open(fnamecmp,O_RDONLY);
+ fd1 = do_open(fnamecmp, O_RDONLY, 0);
}
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
continue;
}
+ if (fd1 != -1 && !preserve_perms) {
+ /* if the file exists already and we aren't perserving
+ presmissions then act as though the remote end sent
+ us the file permissions we already have */
+ file->mode = st.st_mode;
+ }
+
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;
}
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
file->mode & INITACCESSPERMS);
- if (fd2 == -1 && errno == ENOENT &&
- (relative_paths || (compare_dest != NULL)) &&
+ /* in most cases parent directories will already exist
+ because their information should have been previously
+ transferred, but that may not be the case with -R */
+ if (fd2 == -1 && relative_paths && errno == ENOENT &&
create_directory_path(fnametmp) == 0) {
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
file->mode & INITACCESSPERMS);
finish_transfer(fname, fnametmp, file);
cleanup_disable();
-
+
if (!recv_ok) {
if (csum_length == SUM_LENGTH) {
rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
}
}
+ if (delete_after) {
+ if (recurse && delete_mode && !local_name && flist->count>0) {
+ delete_files(flist);
+ }
+ }
+
if (preserve_hard_links)
do_hard_links(flist);
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
if (!file->basename || !S_ISDIR(file->mode)) continue;
- recv_generator(f_name(file),flist,i,-1);
+ recv_generator(local_name?local_name:f_name(file),flist,i,-1);
}
if (verbose > 2)