extern int remote_version;
extern char *backup_suffix;
+extern char *tmpdir;
extern int whole_file;
extern int block_size;
struct map_struct *buf;
struct sum_struct *s;
int statret;
- struct file_struct *file = &flist->files[i];
+ struct file_struct *file = flist->files[i];
if (verbose > 2)
fprintf(FERROR,"recv_generator(%s,%d)\n",fname,i);
if (preserve_hard_links && check_hard_link(file)) {
if (verbose > 1)
- fprintf(FINFO,"%s is a hard link\n",file->name);
+ fprintf(FINFO,"%s is a hard link\n",f_name(file));
return;
}
return;
}
- if (update_only && st.st_mtime >= file->modtime) {
+ if (update_only && st.st_mtime > file->modtime) {
if (verbose > 1)
fprintf(FERROR,"%s is newer\n",fname);
return;
static void delete_one(struct file_struct *f)
{
if (!S_ISDIR(f->mode)) {
- if (!dry_run && unlink(f->name) != 0) {
- fprintf(FERROR,"unlink %s : %s\n",f->name,strerror(errno));
+ if (!dry_run && unlink(f_name(f)) != 0) {
+ fprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
} else if (verbose) {
- fprintf(FERROR,"deleting %s\n",f->name);
+ fprintf(FERROR,"deleting %s\n",f_name(f));
}
} else {
- if (!dry_run && rmdir(f->name) != 0) {
+ if (!dry_run && rmdir(f_name(f)) != 0) {
if (errno != ENOTEMPTY)
- fprintf(FERROR,"rmdir %s : %s\n",f->name,strerror(errno));
+ fprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
} else if (verbose) {
- fprintf(FERROR,"deleting directory %s\n",f->name);
+ fprintf(FERROR,"deleting directory %s\n",f_name(f));
}
}
}
if (j == 0) return 0;
- name = strdup(flist->files[j].name);
+ name = strdup(f_name(flist->files[j]));
if (!name) {
fprintf(FERROR,"out of memory in delete_already_done");
while (low != high) {
int mid = (low+high)/2;
- int ret = strcmp(flist->files[flist_up(flist, mid)].name,name);
+ int ret = strcmp(f_name(flist->files[flist_up(flist, mid)]),name);
if (ret == 0) {
free(name);
return 1;
low = flist_up(flist, low);
- if (strcmp(flist->files[low].name,name) == 0) {
+ if (strcmp(f_name(flist->files[low]),name) == 0) {
free(name);
return 1;
}
add_cvs_excludes();
for (j=0;j<flist->count;j++) {
- char *name = flist->files[j].name;
+ char *name = f_name(flist->files[j]);
- if (!S_ISDIR(flist->files[j].mode)) continue;
+ if (!S_ISDIR(flist->files[j]->mode)) continue;
if (delete_already_done(flist, j)) continue;
fprintf(FINFO,"deleting in %s\n", name);
for (i=local_file_list->count-1;i>=0;i--) {
- if (!local_file_list->files[i].name) continue;
- if (-1 == flist_find(flist,&local_file_list->files[i])) {
- delete_one(&local_file_list->files[i]);
+ if (!local_file_list->files[i]->basename) continue;
+ if (-1 == flist_find(flist,local_file_list->files[i])) {
+ delete_one(local_file_list->files[i]);
}
}
+ flist_free(local_file_list);
}
}
break;
}
- file = &flist->files[i];
- fname = file->name;
+ file = flist->files[i];
+ fname = f_name(file);
if (local_name)
fname = local_name;
/* open tmp file */
if (strlen(fname) > (MAXPATHLEN-8)) {
fprintf(FERROR,"filename too long\n");
+ if (buf) unmap_file(buf);
close(fd1);
continue;
}
- sprintf(fnametmp,"%s.XXXXXX",fname);
+ if (tmpdir) {
+ char *f;
+ f = strrchr(fname,'/');
+ if (f == NULL)
+ f = fname;
+ else
+ f++;
+ sprintf(fnametmp,"%s/%s.XXXXXX",tmpdir,f);
+ } else {
+ sprintf(fnametmp,"%s.XXXXXX",fname);
+ }
if (NULL == mktemp(fnametmp)) {
fprintf(FERROR,"mktemp %s failed\n",fnametmp);
receive_data(f_in,buf,-1,NULL);
close(fd1);
continue;
}
- fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
+ fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
if (fd2 == -1 && relative_paths && errno == ENOENT &&
create_directory_path(fnametmp) == 0) {
- fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
+ fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
}
if (fd2 == -1) {
fprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
/* recv file data */
recv_ok = receive_data(f_in,buf,fd2,fname);
+ if (buf) unmap_file(buf);
if (fd1 != -1) {
- if (buf) unmap_file(buf);
close(fd1);
}
close(fd2);
/* move tmp file over real file */
if (rename(fnametmp,fname) != 0) {
- fprintf(FERROR,"rename %s -> %s : %s\n",
- fnametmp,fname,strerror(errno));
- unlink(fnametmp);
+ if (errno == EXDEV) {
+ /* rename failed on cross-filesystem link.
+ Copy the file instead. */
+ if (copy_file(fnametmp,fname, file->mode)) {
+ fprintf(FERROR,"copy %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ } else {
+ set_perms(fname,file,NULL,0);
+ }
+ unlink(fnametmp);
+ } else {
+ fprintf(FERROR,"rename %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ unlink(fnametmp);
+ }
+ } else {
+ set_perms(fname,file,NULL,0);
}
cleanup_fname = NULL;
- set_perms(fname,file,NULL,0);
if (!recv_ok) {
if (verbose > 1)
/* now we need to fix any directory permissions that were
modified during the transfer */
for (i = 0; i < flist->count; i++) {
- struct file_struct *file = &flist->files[i];
- if (!file->name || !S_ISDIR(file->mode)) continue;
- recv_generator(file->name,flist,i,-1);
+ struct file_struct *file = flist->files[i];
+ if (!file->basename || !S_ISDIR(file->mode)) continue;
+ recv_generator(f_name(file),flist,i,-1);
}
if (verbose > 2)
break;
}
- file = &flist->files[i];
+ file = flist->files[i];
fname[0] = 0;
- if (file->dir) {
- strncpy(fname,file->dir,MAXPATHLEN-1);
- fname[MAXPATHLEN-1] = 0;
- if (strlen(fname) == MAXPATHLEN-1) {
- fprintf(FERROR, "send_files failed on long-named directory %s\n",
- fname);
- return -1;
- }
- strcat(fname,"/");
+ if (file->basedir) {
+ strncpy(fname,file->basedir,MAXPATHLEN-1);
+ fname[MAXPATHLEN-1] = 0;
+ if (strlen(fname) == MAXPATHLEN-1) {
+ fprintf(FERROR, "send_files failed on long-named directory %s\n",
+ fname);
+ return -1;
+ }
+ strcat(fname,"/");
}
- strncat(fname,file->name,MAXPATHLEN-strlen(fname));
+ strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
if (verbose > 2)
fprintf(FERROR,"send_files(%d,%s)\n",i,fname);
(int)getpid(),flist->count);
for (i = 0; i < flist->count; i++) {
- struct file_struct *file = &flist->files[i];
+ struct file_struct *file = flist->files[i];
mode_t saved_mode = file->mode;
- if (!file->name) continue;
+ if (!file->basename) continue;
/* we need to ensure that any directories we create have writeable
permissions initially so that we can create the files within
file->mode |= S_IWUSR; /* user write */
}
- recv_generator(local_name?local_name:file->name,
+ recv_generator(local_name?local_name:f_name(file),
flist,i,f);
file->mode = saved_mode;
/* in newer versions of the protocol the files can cycle through
the system more than once to catch initial checksum errors */
for (i=read_int(f_recv); i != -1; i=read_int(f_recv)) {
- struct file_struct *file = &flist->files[i];
- recv_generator(local_name?local_name:file->name,
+ struct file_struct *file = flist->files[i];
+ recv_generator(local_name?local_name:f_name(file),
flist,i,f);
}