extern int cvs_exclude;
extern int io_error;
extern char *tmpdir;
+extern char *compare_dest;
+extern int make_backups;
+extern char *backup_suffix;
static struct delete_list {
static void delete_one(struct file_struct *f)
{
if (!S_ISDIR(f->mode)) {
- if (do_unlink(f_name(f)) != 0) {
+ if (robust_unlink(f_name(f)) != 0) {
rprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
} else if (verbose) {
rprintf(FINFO,"deleting %s\n",f_name(f));
S_ISDIR(local_file_list->files[i]->mode))
add_delete_entry(local_file_list->files[i]);
if (-1 == flist_find(flist,local_file_list->files[i])) {
- delete_one(local_file_list->files[i]);
- }
+ char *f = f_name(local_file_list->files[i]);
+ int k = strlen(f) - strlen(backup_suffix);
+ if (make_backups && ((k <= 0) ||
+ (strcmp(f+k,backup_suffix) != 0))) {
+ (void) make_backup(f);
+ } else {
+ delete_one(local_file_list->files[i]);
+ }
+ }
}
flist_free(local_file_list);
free(name);
rprintf(FERROR,"filename too long\n");
return 0;
}
- slprintf(fnametmp,MAXPATHLEN-1, "%s/.%s.XXXXXX",tmpdir,f);
+ slprintf(fnametmp,MAXPATHLEN, "%s/.%s.XXXXXX",tmpdir,f);
return 1;
}
if (f) {
*f = 0;
- slprintf(fnametmp,MAXPATHLEN-1,"%s/.%s.XXXXXX",
+ slprintf(fnametmp,MAXPATHLEN,"%s/.%s.XXXXXX",
fname,f+1);
*f = '/';
} else {
- slprintf(fnametmp,MAXPATHLEN-1,".%s.XXXXXX",fname);
+ slprintf(fnametmp,MAXPATHLEN,".%s.XXXXXX",fname);
}
return 1;
if (fd != -1 && write_file(fd,data,i) != i) {
rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_FILEIO);
}
offset += i;
continue;
if (fd != -1 && write_file(fd,map,len) != len) {
rprintf(FERROR,"write failed on %s : %s\n",
fname,strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_FILEIO);
}
offset += len;
}
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
rprintf(FERROR,"write failed on %s : %s\n",
fname,strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_FILEIO);
}
sum_end(file_sum1);
STRUCT_STAT st;
char *fname;
char fnametmp[MAXPATHLEN];
+ char *fnamecmp;
+ char fnamecmpbuf[MAXPATHLEN];
struct map_struct *buf;
int i;
struct file_struct *file;
int phase=0;
int recv_ok;
-
+ extern struct stats stats;
+ struct stats initial_stats;
+
if (verbose > 2) {
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
if (i < 0 || i >= flist->count) {
rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
i, flist->count);
- exit_cleanup(1);
+ exit_cleanup(RERR_PROTOCOL);
}
file = flist->files[i];
fname = local_name;
if (dry_run) {
- if (!am_server && verbose)
- rprintf(FINFO,"%s\n",fname);
+ if (!am_server) {
+ log_transfer(file, fname);
+ }
continue;
}
+ initial_stats = stats;
+
if (verbose > 2)
rprintf(FINFO,"recv_files(%s)\n",fname);
+ fnamecmp = fname;
+
/* open the file */
- fd1 = open(fname,O_RDONLY);
+ fd1 = open(fnamecmp,O_RDONLY);
+
+ 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);
+ }
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
- rprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"fstat %s : %s\n",fnamecmp,strerror(errno));
receive_data(f_in,NULL,-1,NULL,file->length);
close(fd1);
continue;
}
if (fd1 != -1 && !S_ISREG(st.st_mode)) {
- rprintf(FERROR,"%s : not a regular file (recv_files)\n",fname);
+ rprintf(FERROR,"%s : not a regular file (recv_files)\n",fnamecmp);
receive_data(f_in,NULL,-1,NULL,file->length);
close(fd1);
continue;
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",fname,(int)st.st_size);
+ rprintf(FINFO,"recv mapped %s of size %d\n",fnamecmp,(int)st.st_size);
} else {
buf = NULL;
}
continue;
}
+ /* mktemp is deliberately used here instead of mkstemp.
+ because O_EXCL is used on the open, the race condition
+ is not a problem or a security hole, and we want to
+ control the access permissions on the created file. */
if (NULL == do_mktemp(fnametmp)) {
rprintf(FERROR,"mktemp %s failed\n",fnametmp);
receive_data(f_in,buf,-1,NULL,file->length);
setuid/setgid bits to ensure that there is no race
condition. They are then correctly updated after
the lchown. Thanks to snabb@epipe.fi for pointing
- this out */
+ this out. We also set it initially without group
+ access because of a similar race condition. */
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
- file->mode & ACCESSPERMS);
+ file->mode & INITACCESSPERMS);
- if (fd2 == -1 && relative_paths && errno == ENOENT &&
+ if (fd2 == -1 && errno == ENOENT &&
+ (relative_paths || (compare_dest != NULL)) &&
create_directory_path(fnametmp) == 0) {
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
- file->mode & ACCESSPERMS);
+ file->mode & INITACCESSPERMS);
}
if (fd2 == -1) {
- rprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
+ rprintf(FERROR,"cannot create %s : %s\n",fnametmp,strerror(errno));
receive_data(f_in,buf,-1,NULL,file->length);
if (buf) unmap_file(buf);
if (fd1 != -1) close(fd1);
continue;
}
- cleanup_set(fnametmp, fname, file);
+ cleanup_set(fnametmp, fname, file, buf, fd1, fd2);
+
+ if (!am_server) {
+ log_transfer(file, fname);
+ }
- if (!am_server && verbose)
- rprintf(FINFO,"%s\n",fname);
-
/* recv file data */
recv_ok = receive_data(f_in,buf,fd2,fname,file->length);
+
+ log_recv(file, &initial_stats);
if (buf) unmap_file(buf);
if (fd1 != -1) {
rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
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",
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff