extern int cvs_exclude;
extern int am_root;
extern int relative_paths;
+extern int io_timeout;
+extern int io_error;
+extern struct stats stats;
/*
free a sums struct
}
+/*
+ * delete a file or directory. If force_delet is set then delete
+ * recursively
+ */
+static int delete_file(char *fname)
+{
+ DIR *d;
+ struct dirent *di;
+ char buf[MAXPATHLEN];
+ extern int force_delete;
+ STRUCT_STAT st;
+ int ret;
+ extern int recurse;
+
+ if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
+
+#if SUPPORT_LINKS
+ ret = do_lstat(fname, &st);
+#else
+ ret = do_stat(fname, &st);
+#endif
+ if (ret) {
+ rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ if (!S_ISDIR(st.st_mode)) {
+ rprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
+ if (!force_delete || !recurse ||
+ (errno != ENOTEMPTY && errno != EEXIST)) {
+ rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ /* now we do a recsursive delete on the directory ... */
+ d = opendir(fname);
+ if (!d) {
+ rprintf(FERROR,"opendir(%s): %s\n",
+ fname,strerror(errno));
+ return -1;
+ }
+
+ for (di=readdir(d); di; di=readdir(d)) {
+ char *dname = d_name(di);
+ if (strcmp(dname,".")==0 ||
+ strcmp(dname,"..")==0)
+ continue;
+ slprintf(buf, sizeof(buf)-1, "%s/%s", fname, dname);
+ if (verbose > 0)
+ rprintf(FINFO,"deleting %s\n", buf);
+ if (delete_file(buf) != 0) {
+ closedir(d);
+ return -1;
+ }
+ }
+
+ closedir(d);
+
+ if (do_rmdir(fname) != 0) {
+ rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
/*
send a sums struct down a fd
write_int(f_out,s->sums[i].sum1);
write_buf(f_out,s->sums[i].sum2,csum_length);
}
- write_flush(f_out);
}
generate approximately one checksum every n bytes
*/
-static struct sum_struct *generate_sums(struct map_struct *buf,off_t len,int n)
+static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n)
{
int i;
struct sum_struct *s;
int count;
int block_len = n;
int remainder = (len%block_len);
- off_t offset = 0;
+ OFF_T offset = 0;
count = (len+(block_len-1))/block_len;
}
if (verbose > 3)
- fprintf(FERROR,"count=%d rem=%d n=%d flength=%d\n",
+ rprintf(FINFO,"count=%d rem=%d n=%d flength=%d\n",
s->count,s->remainder,s->n,(int)s->flength);
s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
s->sums[i].i = i;
if (verbose > 3)
- fprintf(FERROR,"chunk[%d] offset=%d len=%d sum1=%08x\n",
+ rprintf(FINFO,"chunk[%d] offset=%d len=%d sum1=%08x\n",
i,(int)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1);
len -= n1;
{
struct sum_struct *s;
int i;
- off_t offset = 0;
+ OFF_T offset = 0;
s = (struct sum_struct *)malloc(sizeof(*s));
if (!s) out_of_memory("receive_sums");
s->sums = NULL;
if (verbose > 3)
- fprintf(FERROR,"count=%d n=%d rem=%d\n",
+ rprintf(FINFO,"count=%d n=%d rem=%d\n",
s->count,s->n,s->remainder);
if (s->count == 0)
offset += s->sums[i].len;
if (verbose > 3)
- fprintf(FERROR,"chunk[%d] len=%d offset=%d sum1=%08x\n",
+ rprintf(FINFO,"chunk[%d] len=%d offset=%d sum1=%08x\n",
i,s->sums[i].len,(int)s->sums[i].offset,s->sums[i].sum1);
}
}
-static int set_perms(char *fname,struct file_struct *file,struct stat *st,
+static int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
int report)
{
int updated = 0;
- struct stat st2;
+ STRUCT_STAT st2;
+ extern int am_daemon;
if (dry_run) return 0;
if (!st) {
if (link_stat(fname,&st2) != 0) {
- fprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
return 0;
}
st = &st2;
st->st_mtime != file->modtime) {
updated = 1;
if (set_modtime(fname,file->modtime) != 0) {
- fprintf(FERROR,"failed to set times on %s : %s\n",
+ rprintf(FERROR,"failed to set times on %s : %s\n",
fname,strerror(errno));
return 0;
}
st->st_mode != file->mode) {
updated = 1;
if (do_chmod(fname,file->mode) != 0) {
- fprintf(FERROR,"failed to set permissions on %s : %s\n",
+ rprintf(FERROR,"failed to set permissions on %s : %s\n",
fname,strerror(errno));
return 0;
}
}
#endif
- if ((am_root && preserve_uid && st->st_uid != file->uid) ||
- (preserve_gid && st->st_gid != file->gid)) {
- updated = 1;
- if (do_lchown(fname,
- (am_root&&preserve_uid)?file->uid:-1,
- preserve_gid?file->gid:-1) != 0) {
- if (verbose>1 || preserve_uid)
- fprintf(FERROR,"chown %s : %s\n",fname,strerror(errno));
- return updated;
- }
+ if ((am_root || !am_daemon) &&
+ ((am_root && preserve_uid && st->st_uid != file->uid) ||
+ (preserve_gid && st->st_gid != file->gid))) {
+ if (do_lchown(fname,
+ (am_root&&preserve_uid)?file->uid:-1,
+ preserve_gid?file->gid:-1) != 0) {
+ if (preserve_uid && st->st_uid != file->uid)
+ updated = 1;
+ if (verbose>1 || preserve_uid)
+ rprintf(FERROR,"chown %s : %s\n",
+ fname,strerror(errno));
+ return updated;
+ }
+ updated = 1;
}
if (verbose > 1 && report) {
- if (updated)
- fprintf(FINFO,"%s\n",fname);
- else
- fprintf(FINFO,"%s is uptodate\n",fname);
+ if (updated)
+ rprintf(FINFO,"%s\n",fname);
+ else
+ rprintf(FINFO,"%s is uptodate\n",fname);
}
return updated;
}
/* choose whether to skip a particular file */
static int skip_file(char *fname,
- struct file_struct *file, struct stat *st)
+ struct file_struct *file, STRUCT_STAT *st)
{
if (st->st_size != file->length) {
return 0;
/* use a larger block size for really big files */
int adapt_block_size(struct file_struct *file, int bsize)
{
- int ret = file->length / (10000); /* rough heuristic */
+ int ret;
+
+ if (bsize != BLOCK_SIZE) return bsize;
+
+ ret = file->length / (10000); /* rough heuristic */
ret = ret & ~15; /* multiple of 16 */
if (ret < bsize) ret = bsize;
if (ret > CHUNK_SIZE/2) ret = CHUNK_SIZE/2;
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
{
int fd;
- struct stat st;
+ STRUCT_STAT st;
struct map_struct *buf;
struct sum_struct *s;
int statret;
struct file_struct *file = flist->files[i];
if (verbose > 2)
- fprintf(FERROR,"recv_generator(%s,%d)\n",fname,i);
+ rprintf(FINFO,"recv_generator(%s,%d)\n",fname,i);
statret = link_stat(fname,&st);
if (dry_run) return;
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (do_unlink(fname) != 0) {
- fprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
return;
}
statret = -1;
}
- if (statret != 0 && mkdir(fname,file->mode) != 0 && errno != EEXIST) {
+ if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
if (!(relative_paths && errno==ENOENT &&
create_directory_path(fname)==0 &&
- mkdir(fname,file->mode)==0)) {
- fprintf(FERROR,"mkdir %s : %s (2)\n",
+ do_mkdir(fname,file->mode)==0)) {
+ rprintf(FERROR,"mkdir %s : %s (2)\n",
fname,strerror(errno));
}
}
if (set_perms(fname,file,NULL,0) && verbose)
- fprintf(FINFO,"%s/\n",fname);
+ rprintf(FINFO,"%s/\n",fname);
return;
}
}
}
}
- do_unlink(fname);
+ delete_file(fname);
if (do_symlink(file->link,fname) != 0) {
- fprintf(FERROR,"link %s -> %s : %s\n",
+ rprintf(FERROR,"link %s -> %s : %s\n",
fname,file->link,strerror(errno));
} else {
set_perms(fname,file,NULL,0);
if (verbose)
- fprintf(FINFO,"%s -> %s\n",
+ rprintf(FINFO,"%s -> %s\n",
fname,file->link);
}
#endif
if (statret != 0 ||
st.st_mode != file->mode ||
st.st_rdev != file->rdev) {
- do_unlink(fname);
+ delete_file(fname);
if (verbose > 2)
- fprintf(FERROR,"mknod(%s,0%o,0x%x)\n",
+ rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
fname,(int)file->mode,(int)file->rdev);
if (do_mknod(fname,file->mode,file->rdev) != 0) {
- fprintf(FERROR,"mknod %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"mknod %s : %s\n",fname,strerror(errno));
} else {
set_perms(fname,file,NULL,0);
if (verbose)
- fprintf(FINFO,"%s\n",fname);
+ rprintf(FINFO,"%s\n",fname);
}
} else {
set_perms(fname,file,&st,1);
if (preserve_hard_links && check_hard_link(file)) {
if (verbose > 1)
- fprintf(FINFO,"%s is a hard link\n",f_name(file));
+ rprintf(FINFO,"%s is a hard link\n",f_name(file));
return;
}
if (!S_ISREG(file->mode)) {
- fprintf(FERROR,"skipping non-regular file %s\n",fname);
+ rprintf(FINFO,"skipping non-regular file %s\n",fname);
return;
}
if (!dry_run) send_sums(NULL,f_out);
} else {
if (verbose > 1)
- fprintf(FERROR,"recv_generator failed to open %s\n",fname);
+ rprintf(FERROR,"recv_generator failed to open %s\n",fname);
}
return;
}
if (!S_ISREG(st.st_mode)) {
- /* its not a regular file on the receiving end, but it is on the
- sending end. If its a directory then skip it (too dangerous to
- do a recursive deletion??) otherwise try to unlink it */
- if (S_ISDIR(st.st_mode)) {
- fprintf(FERROR,"ERROR: %s is a directory\n",fname);
- return;
- }
- if (do_unlink(fname) != 0) {
- fprintf(FERROR,"%s : not a regular file (generator)\n",fname);
+ if (delete_file(fname) != 0) {
return;
}
if (update_only && st.st_mtime > file->modtime) {
if (verbose > 1)
- fprintf(FERROR,"%s is newer\n",fname);
+ rprintf(FINFO,"%s is newer\n",fname);
return;
}
fd = open(fname,O_RDONLY);
if (fd == -1) {
- fprintf(FERROR,"failed to open %s : %s\n",fname,strerror(errno));
- fprintf(FERROR,"skipping %s\n",fname);
+ rprintf(FERROR,"failed to open %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"skipping %s\n",fname);
return;
}
}
if (verbose > 3)
- fprintf(FERROR,"gen mapped %s of size %d\n",fname,(int)st.st_size);
+ rprintf(FINFO,"gen mapped %s of size %d\n",fname,(int)st.st_size);
s = generate_sums(buf,st.st_size,adapt_block_size(file, block_size));
if (verbose > 2)
- fprintf(FERROR,"sending sums for %d\n",i);
+ rprintf(FINFO,"sending sums for %d\n",i);
write_int(f_out,i);
send_sums(s,f_out);
- write_flush(f_out);
close(fd);
if (buf) unmap_file(buf);
static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
{
int i,n,remainder,len,count;
- off_t offset = 0;
- off_t offset2;
+ OFF_T offset = 0;
+ OFF_T offset2;
char *data;
static char file_sum1[MD4_SUM_LENGTH];
static char file_sum2[MD4_SUM_LENGTH];
for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) {
if (i > 0) {
if (verbose > 3)
- fprintf(FERROR,"data recv %d at %d\n",i,(int)offset);
+ rprintf(FINFO,"data recv %d at %d\n",i,(int)offset);
+ stats.literal_data += i;
sum_update(data,i);
- if (fd != -1 && write_sparse(fd,data,i) != i) {
- fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
+ if (fd != -1 && write_file(fd,data,i) != i) {
+ rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
exit_cleanup(1);
}
offset += i;
if (i == count-1 && remainder != 0)
len = remainder;
+ stats.matched_data += len;
+
if (verbose > 3)
- fprintf(FERROR,"chunk[%d] of size %d at %d offset=%d\n",
+ rprintf(FINFO,"chunk[%d] of size %d at %d offset=%d\n",
i,len,(int)offset2,(int)offset);
map = map_ptr(buf,offset2,len);
see_token(map, len);
sum_update(map,len);
- if (fd != -1 && write_sparse(fd,map,len) != len) {
- fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
+ if (fd != -1 && write_file(fd,map,len) != len) {
+ rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
exit_cleanup(1);
}
offset += len;
}
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
- fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
exit_cleanup(1);
}
if (remote_version >= 14) {
read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
if (verbose > 2)
- fprintf(FERROR,"got file_sum\n");
+ rprintf(FINFO,"got file_sum\n");
if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0)
return 0;
}
{
if (!S_ISDIR(f->mode)) {
if (do_unlink(f_name(f)) != 0) {
- fprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
+ rprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
} else if (verbose) {
- fprintf(FERROR,"deleting %s\n",f_name(f));
+ rprintf(FINFO,"deleting %s\n",f_name(f));
}
} else {
if (do_rmdir(f_name(f)) != 0) {
- if (errno != ENOTEMPTY)
- fprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
+ if (errno != ENOTEMPTY && errno != EEXIST)
+ rprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
} else if (verbose) {
- fprintf(FERROR,"deleting directory %s\n",f_name(f));
+ rprintf(FINFO,"deleting directory %s\n",f_name(f));
}
}
}
-/* 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.
- The aim is to see if a directory has already had the deletion algorithm applied
- to it (due to recursion), and if so to skip it. The bisection is to
- prevent this being an n^2 algorithm */
-static int delete_already_done(struct file_list *flist,int j)
+static struct delete_list {
+ dev_t dev;
+ ino_t inode;
+} *delete_list;
+static int dlist_len, dlist_alloc_len;
+
+static void add_delete_entry(struct file_struct *file)
{
- int low=0,high=j-1;
- char *name;
- char *p;
+ if (dlist_len == dlist_alloc_len) {
+ dlist_alloc_len += 1024;
+ delete_list = (struct delete_list *)Realloc(delete_list, sizeof(delete_list[0])*dlist_alloc_len);
+ if (!delete_list) out_of_memory("add_delete_entry");
+ }
- if (j == 0) return 0;
+ delete_list[dlist_len].dev = file->dev;
+ delete_list[dlist_len].inode = file->inode;
+ dlist_len++;
- name = strdup(f_name(flist->files[j]));
+ if (verbose > 3)
+ rprintf(FINFO,"added %s to delete list\n", f_name(file));
+}
- if (!name) {
- fprintf(FERROR,"out of memory in delete_already_done");
- exit_cleanup(1);
- }
+/* 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.
+*/
+static int delete_already_done(struct file_list *flist,int j)
+{
+ int i;
+ STRUCT_STAT st;
- p = strrchr(name,'/');
- if (!p) {
- free(name);
- return 0;
- }
- *p = 0;
+ if (link_stat(f_name(flist->files[j]), &st)) return 1;
- while (low != high) {
- int mid = (low+high)/2;
- int ret = strcmp(f_name(flist->files[flist_up(flist, mid)]),name);
- if (ret == 0) {
- free(name);
+ for (i=0;i<dlist_len;i++) {
+ if (st.st_ino == delete_list[i].inode &&
+ st.st_dev == delete_list[i].dev)
return 1;
- }
- if (ret > 0) {
- high=mid;
- } else {
- low=mid+1;
- }
}
- low = flist_up(flist, low);
-
- if (strcmp(f_name(flist->files[low]),name) == 0) {
- free(name);
- return 1;
- }
-
- free(name);
return 0;
}
to match more closely what most people seem to expect of this option */
static void delete_files(struct file_list *flist)
{
- struct file_list *local_file_list;
- int i, j;
+ struct file_list *local_file_list;
+ int i, j;
+ char *name;
- if (cvs_exclude)
- add_cvs_excludes();
+ if (cvs_exclude)
+ add_cvs_excludes();
- for (j=0;j<flist->count;j++) {
- char *name = f_name(flist->files[j]);
+ if (io_error) {
+ rprintf(FINFO,"IO error encountered - skipping file deletion\n");
+ return;
+ }
- if (!S_ISDIR(flist->files[j]->mode)) continue;
+ for (j=0;j<flist->count;j++) {
+ if (!S_ISDIR(flist->files[j]->mode) ||
+ !(flist->files[j]->flags & FLAG_DELETE)) continue;
- if (delete_already_done(flist, j)) continue;
+ if (remote_version < 19 &&
+ delete_already_done(flist, j)) continue;
- if (!(local_file_list = send_file_list(-1,1,&name)))
- continue;
+ name = strdup(f_name(flist->files[j]));
- if (verbose > 1)
- fprintf(FINFO,"deleting in %s\n", name);
+ if (!(local_file_list = send_file_list(-1,1,&name))) {
+ free(name);
+ continue;
+ }
- for (i=local_file_list->count-1;i>=0;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);
- }
+ if (verbose > 1)
+ rprintf(FINFO,"deleting in %s\n", name);
+
+ for (i=local_file_list->count-1;i>=0;i--) {
+ if (!local_file_list->files[i]->basename) continue;
+ if (remote_version < 19 &&
+ 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]);
+ }
+ }
+ flist_free(local_file_list);
+ free(name);
+ }
}
static char *cleanup_fname;
void exit_cleanup(int code)
{
+ io_flush();
if (cleanup_fname)
do_unlink(cleanup_fname);
signal(SIGUSR1, SIG_IGN);
}
-int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
-{
- int fd1,fd2;
- struct stat st;
- char *fname;
- char fnametmp[MAXPATHLEN];
- struct map_struct *buf;
- int i;
- struct file_struct *file;
- int phase=0;
- int recv_ok;
- if (verbose > 2) {
- fprintf(FERROR,"recv_files(%d) starting\n",flist->count);
- }
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
- }
+static int get_tmpname(char *fnametmp, char *fname)
+{
+ char *f;
+
+ /* open tmp file */
+ if (tmpdir) {
+ f = strrchr(fname,'/');
+ if (f == NULL)
+ f = fname;
+ else
+ f++;
+ if (strlen(tmpdir)+strlen(f)+10 > MAXPATHLEN) {
+ rprintf(FERROR,"filename too long\n");
+ return 0;
+ }
+ slprintf(fnametmp,MAXPATHLEN-1, "%s/.%s.XXXXXX",tmpdir,f);
+ return 1;
+ }
- while (1)
- {
- i = read_int(f_in);
- if (i == -1) {
- if (phase==0 && remote_version >= 13) {
- phase++;
- csum_length = SUM_LENGTH;
- if (verbose > 2)
- fprintf(FERROR,"recv_files phase=%d\n",phase);
- write_int(f_gen,-1);
- write_flush(f_gen);
- continue;
+ f = strrchr(fname,'/');
+
+ if (strlen(fname)+9 > MAXPATHLEN) {
+ rprintf(FERROR,"filename too long\n");
+ return 0;
}
- break;
- }
- file = flist->files[i];
- fname = f_name(file);
+ if (f) {
+ *f = 0;
+ slprintf(fnametmp,MAXPATHLEN-1,"%s/.%s.XXXXXX",
+ fname,f+1);
+ *f = '/';
+ } else {
+ slprintf(fnametmp,MAXPATHLEN-1,".%s.XXXXXX",fname);
+ }
- if (local_name)
- fname = local_name;
+ return 1;
+}
- if (dry_run) {
- if (!am_server && verbose)
- printf("%s\n",fname);
- continue;
- }
+int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
+{
+ int fd1,fd2;
+ STRUCT_STAT st;
+ char *fname;
+ char fnametmp[MAXPATHLEN];
+ struct map_struct *buf;
+ int i;
+ struct file_struct *file;
+ int phase=0;
+ int recv_ok;
+
+ if (verbose > 2) {
+ rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
+ }
- if (verbose > 2)
- fprintf(FERROR,"recv_files(%s)\n",fname);
+ if (recurse && delete_mode && !local_name && flist->count>0) {
+ delete_files(flist);
+ }
- /* open the file */
- fd1 = open(fname,O_RDONLY);
+ while (1) {
+ i = read_int(f_in);
+ if (i == -1) {
+ if (phase==0 && remote_version >= 13) {
+ phase++;
+ csum_length = SUM_LENGTH;
+ if (verbose > 2)
+ rprintf(FINFO,"recv_files phase=%d\n",phase);
+ write_int(f_gen,-1);
+ continue;
+ }
+ break;
+ }
- if (fd1 != -1 && fstat(fd1,&st) != 0) {
- fprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
- receive_data(f_in,NULL,-1,NULL);
- close(fd1);
- continue;
- }
+ if (i < 0 || i >= flist->count) {
+ rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
+ i, flist->count);
+ exit_cleanup(1);
+ }
- if (fd1 != -1 && !S_ISREG(st.st_mode)) {
- fprintf(FERROR,"%s : not a regular file (recv_files)\n",fname);
- receive_data(f_in,NULL,-1,NULL);
- close(fd1);
- continue;
- }
+ file = flist->files[i];
+ fname = f_name(file);
- if (fd1 != -1 && st.st_size > 0) {
- buf = map_file(fd1,st.st_size);
- if (verbose > 2)
- fprintf(FERROR,"recv mapped %s of size %d\n",fname,(int)st.st_size);
- } else {
- buf = NULL;
- }
+ stats.num_transferred_files++;
+ stats.total_transferred_size += file->length;
- /* open tmp file */
- if (strlen(fname) > (MAXPATHLEN-8)) {
- fprintf(FERROR,"filename too long\n");
- if (buf) unmap_file(buf);
- close(fd1);
- continue;
- }
- 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);
- if (buf) unmap_file(buf);
- close(fd1);
- continue;
- }
- fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
- if (fd2 == -1 && relative_paths && errno == ENOENT &&
- create_directory_path(fnametmp) == 0) {
- fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
- }
- if (fd2 == -1) {
- fprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
- receive_data(f_in,buf,-1,NULL);
- if (buf) unmap_file(buf);
- close(fd1);
- continue;
- }
-
- cleanup_fname = fnametmp;
+ if (local_name)
+ fname = local_name;
- if (!am_server && verbose)
- printf("%s\n",fname);
+ if (dry_run) {
+ if (!am_server && verbose)
+ printf("%s\n",fname);
+ continue;
+ }
- /* recv file data */
- recv_ok = receive_data(f_in,buf,fd2,fname);
+ if (verbose > 2)
+ rprintf(FINFO,"recv_files(%s)\n",fname);
- if (buf) unmap_file(buf);
- if (fd1 != -1) {
- close(fd1);
- }
- close(fd2);
+ /* open the file */
+ fd1 = open(fname,O_RDONLY);
- if (verbose > 2)
- fprintf(FERROR,"renaming %s to %s\n",fnametmp,fname);
+ if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
+ rprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
+ receive_data(f_in,NULL,-1,NULL);
+ close(fd1);
+ continue;
+ }
- if (make_backups) {
- char fnamebak[MAXPATHLEN];
- if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) {
- fprintf(FERROR,"backup filename too long\n");
- continue;
- }
- sprintf(fnamebak,"%s%s",fname,backup_suffix);
- if (rename(fname,fnamebak) != 0 && errno != ENOENT) {
- fprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
- continue;
- }
- }
+ if (fd1 != -1 && !S_ISREG(st.st_mode)) {
+ rprintf(FERROR,"%s : not a regular file (recv_files)\n",fname);
+ receive_data(f_in,NULL,-1,NULL);
+ close(fd1);
+ continue;
+ }
- /* move tmp file over real file */
- if (rename(fnametmp,fname) != 0) {
- 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);
- }
- do_unlink(fnametmp);
- } else {
- fprintf(FERROR,"rename %s -> %s : %s\n",
- fnametmp,fname,strerror(errno));
- do_unlink(fnametmp);
- }
- } else {
- set_perms(fname,file,NULL,0);
- }
+ 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);
+ } else {
+ buf = NULL;
+ }
- cleanup_fname = NULL;
+ if (!get_tmpname(fnametmp,fname)) {
+ if (buf) unmap_file(buf);
+ close(fd1);
+ continue;
+ }
+ if (NULL == do_mktemp(fnametmp)) {
+ rprintf(FERROR,"mktemp %s failed\n",fnametmp);
+ receive_data(f_in,buf,-1,NULL);
+ if (buf) unmap_file(buf);
+ close(fd1);
+ continue;
+ }
- if (!recv_ok) {
- if (csum_length == SUM_LENGTH) {
- fprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
- fname);
- } else {
- if (verbose > 1)
- fprintf(FERROR,"redoing %s(%d)\n",fname,i);
- write_int(f_gen,i);
- }
- }
- }
+ fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+ if (fd2 == -1 && relative_paths && errno == ENOENT &&
+ create_directory_path(fnametmp) == 0) {
+ fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+ }
+ if (fd2 == -1) {
+ rprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
+ receive_data(f_in,buf,-1,NULL);
+ if (buf) unmap_file(buf);
+ close(fd1);
+ continue;
+ }
+
+ cleanup_fname = fnametmp;
+
+ if (!am_server && verbose)
+ printf("%s\n",fname);
+
+ /* recv file data */
+ recv_ok = receive_data(f_in,buf,fd2,fname);
+
+ if (buf) unmap_file(buf);
+ if (fd1 != -1) {
+ close(fd1);
+ }
+ close(fd2);
+
+ if (verbose > 2)
+ rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
+
+ if (make_backups) {
+ char fnamebak[MAXPATHLEN];
+ if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) {
+ rprintf(FERROR,"backup filename too long\n");
+ continue;
+ }
+ slprintf(fnamebak,sizeof(fnamebak)-1,"%s%s",fname,backup_suffix);
+ if (do_rename(fname,fnamebak) != 0 && errno != ENOENT) {
+ rprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
+ continue;
+ }
+ }
- if (preserve_hard_links)
- do_hard_links(flist);
+ /* move tmp file over real file */
+ if (do_rename(fnametmp,fname) != 0) {
+ if (errno == EXDEV) {
+ /* rename failed on cross-filesystem link.
+ Copy the file instead. */
+ if (copy_file(fnametmp,fname, file->mode)) {
+ rprintf(FERROR,"copy %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ } else {
+ set_perms(fname,file,NULL,0);
+ }
+ do_unlink(fnametmp);
+ } else {
+ rprintf(FERROR,"rename %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ do_unlink(fnametmp);
+ }
+ } else {
+ set_perms(fname,file,NULL,0);
+ }
- /* 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->basename || !S_ISDIR(file->mode)) continue;
- recv_generator(f_name(file),flist,i,-1);
- }
+ cleanup_fname = NULL;
+
+
+ if (!recv_ok) {
+ if (csum_length == SUM_LENGTH) {
+ rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
+ fname);
+ } else {
+ if (verbose > 1)
+ rprintf(FINFO,"redoing %s(%d)\n",fname,i);
+ write_int(f_gen,i);
+ }
+ }
+ }
- if (verbose > 2)
- fprintf(FERROR,"recv_files finished\n");
-
- return 0;
+ if (preserve_hard_links)
+ do_hard_links(flist);
+
+ /* now we need to fix any directory permissions that were
+ modified during the transfer */
+ 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);
+ }
+
+ if (verbose > 2)
+ rprintf(FINFO,"recv_files finished\n");
+
+ return 0;
}
-off_t send_files(struct file_list *flist,int f_out,int f_in)
+void send_files(struct file_list *flist,int f_out,int f_in)
{
int fd;
struct sum_struct *s;
struct map_struct *buf;
- struct stat st;
+ STRUCT_STAT st;
char fname[MAXPATHLEN];
- off_t total=0;
int i;
struct file_struct *file;
int phase = 0;
if (verbose > 2)
- fprintf(FERROR,"send_files starting\n");
+ rprintf(FINFO,"send_files starting\n");
- setup_nonblocking(f_in,f_out);
+ setup_readbuffer(f_in);
while (1) {
+ int offset=0;
+
i = read_int(f_in);
if (i == -1) {
if (phase==0 && remote_version >= 13) {
phase++;
csum_length = SUM_LENGTH;
write_int(f_out,-1);
- write_flush(f_out);
if (verbose > 2)
- fprintf(FERROR,"send_files phase=%d\n",phase);
+ rprintf(FINFO,"send_files phase=%d\n",phase);
continue;
}
break;
}
+ if (i < 0 || i >= flist->count) {
+ rprintf(FERROR,"Invalid file index %d (count=%d)\n",
+ i, flist->count);
+ exit_cleanup(1);
+ }
+
file = flist->files[i];
+ stats.num_transferred_files++;
+ stats.total_transferred_size += file->length;
+
fname[0] = 0;
if (file->basedir) {
- strncpy(fname,file->basedir,MAXPATHLEN-1);
- fname[MAXPATHLEN-1] = 0;
+ strlcpy(fname,file->basedir,MAXPATHLEN-1);
if (strlen(fname) == MAXPATHLEN-1) {
- fprintf(FERROR, "send_files failed on long-named directory %s\n",
+ io_error = 1;
+ rprintf(FERROR, "send_files failed on long-named directory %s\n",
fname);
- return -1;
+ return;
}
- strcat(fname,"/");
+ strlcat(fname,"/",MAXPATHLEN-1);
+ offset = strlen(file->basedir)+1;
}
- strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
+ strlcat(fname,f_name(file),MAXPATHLEN-strlen(fname));
if (verbose > 2)
- fprintf(FERROR,"send_files(%d,%s)\n",i,fname);
+ rprintf(FINFO,"send_files(%d,%s)\n",i,fname);
if (dry_run) {
if (!am_server && verbose)
s = receive_sums(f_in);
if (!s) {
- fprintf(FERROR,"receive_sums failed\n");
- return -1;
+ io_error = 1;
+ rprintf(FERROR,"receive_sums failed\n");
+ return;
}
fd = open(fname,O_RDONLY);
if (fd == -1) {
- fprintf(FERROR,"send_files failed to open %s: %s\n",
+ io_error = 1;
+ rprintf(FERROR,"send_files failed to open %s: %s\n",
fname,strerror(errno));
free_sums(s);
continue;
}
/* map the local file */
- if (fstat(fd,&st) != 0) {
- fprintf(FERROR,"fstat failed : %s\n",strerror(errno));
+ if (do_fstat(fd,&st) != 0) {
+ io_error = 1;
+ rprintf(FERROR,"fstat failed : %s\n",strerror(errno));
free_sums(s);
close(fd);
- return -1;
+ return;
}
if (st.st_size > 0) {
}
if (verbose > 2)
- fprintf(FERROR,"send_files mapped %s of size %d\n",
+ rprintf(FINFO,"send_files mapped %s of size %d\n",
fname,(int)st.st_size);
write_int(f_out,i);
write_int(f_out,s->remainder);
if (verbose > 2)
- fprintf(FERROR,"calling match_sums %s\n",fname);
+ rprintf(FINFO,"calling match_sums %s\n",fname);
if (!am_server && verbose)
- printf("%s\n",fname);
+ printf("%s\n",fname+offset);
match_sums(f_out,s,buf,st.st_size);
- write_flush(f_out);
if (buf) unmap_file(buf);
close(fd);
free_sums(s);
if (verbose > 2)
- fprintf(FERROR,"sender finished %s\n",fname);
-
- total += st.st_size;
+ rprintf(FINFO,"sender finished %s\n",fname);
}
if (verbose > 2)
- fprintf(FERROR,"send files finished\n");
+ rprintf(FINFO,"send files finished\n");
match_report();
write_int(f_out,-1);
- write_flush(f_out);
-
- return total;
}
int phase=0;
if (verbose > 2)
- fprintf(FERROR,"generator starting pid=%d count=%d\n",
+ rprintf(FINFO,"generator starting pid=%d count=%d\n",
(int)getpid(),flist->count);
for (i = 0; i < flist->count; i++) {
ignore_times=1;
if (verbose > 2)
- fprintf(FERROR,"generate_files phase=%d\n",phase);
+ rprintf(FINFO,"generate_files phase=%d\n",phase);
write_int(f,-1);
- write_flush(f);
+
+ /* we expect to just sit around now, so don't exit on a timeout. If we
+ really get a timeout then the other process should exit */
+ io_timeout = 0;
if (remote_version >= 13) {
/* in newer versions of the protocol the files can cycle through
phase++;
if (verbose > 2)
- fprintf(FERROR,"generate_files phase=%d\n",phase);
+ rprintf(FINFO,"generate_files phase=%d\n",phase);
write_int(f,-1);
- write_flush(f);
}
-
-
- if (verbose > 2)
- fprintf(FERROR,"generator wrote %ld\n",(long)write_total());
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff