extern int cvs_exclude;
extern int am_root;
extern int relative_paths;
+extern int io_timeout;
+extern int io_error;
/*
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;
+
+ if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
+
+#if SUPPORT_LINKS
+ ret = lstat(fname, &st);
+#else
+ ret = stat(fname, &st);
+#endif
+ if (ret) {
+ fprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ if (!S_ISDIR(st.st_mode)) {
+ fprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
+ if (!force_delete || (errno != ENOTEMPTY && errno != EEXIST)) {
+ fprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ /* now we do a recsursive delete on the directory ... */
+ d = opendir(fname);
+ if (!d) {
+ fprintf(FERROR,"opendir(%s): %s\n",
+ fname,strerror(errno));
+ return -1;
+ }
+
+ for (di=readdir(d); di; di=readdir(d)) {
+ if (strcmp(di->d_name,".")==0 ||
+ strcmp(di->d_name,"..")==0)
+ continue;
+ strncpy(buf, fname, (MAXPATHLEN-strlen(di->d_name))-2);
+ strcat(buf, "/");
+ strcat(buf, di->d_name);
+ buf[MAXPATHLEN-1] = 0;
+ if (verbose > 0)
+ fprintf(FINFO,"deleting %s\n", buf);
+ if (delete_file(buf) != 0) {
+ closedir(d);
+ return -1;
+ }
+ }
+
+ closedir(d);
+
+ if (do_rmdir(fname) != 0) {
+ fprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
/*
send a sums struct down a fd
}
if (verbose > 3)
- fprintf(FERROR,"count=%d rem=%d n=%d flength=%d\n",
+ fprintf(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",
+ fprintf(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;
s->sums = NULL;
if (verbose > 3)
- fprintf(FERROR,"count=%d n=%d rem=%d\n",
+ fprintf(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",
+ fprintf(FINFO,"chunk[%d] len=%d offset=%d sum1=%08x\n",
i,s->sums[i].len,(int)s->sums[i].offset,s->sums[i].sum1);
}
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 (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)
+ fprintf(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)
+ fprintf(FINFO,"%s\n",fname);
+ else
+ fprintf(FINFO,"%s is uptodate\n",fname);
}
return updated;
}
struct file_struct *file = flist->files[i];
if (verbose > 2)
- fprintf(FERROR,"recv_generator(%s,%d)\n",fname,i);
+ fprintf(FINFO,"recv_generator(%s,%d)\n",fname,i);
statret = link_stat(fname,&st);
}
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)) {
+ do_mkdir(fname,file->mode)==0)) {
fprintf(FERROR,"mkdir %s : %s (2)\n",
fname,strerror(errno));
}
}
}
}
- do_unlink(fname);
+ delete_file(fname);
if (do_symlink(file->link,fname) != 0) {
fprintf(FERROR,"link %s -> %s : %s\n",
fname,file->link,strerror(errno));
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",
+ fprintf(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));
}
if (!S_ISREG(file->mode)) {
- fprintf(FERROR,"skipping non-regular file %s\n",fname);
+ fprintf(FINFO,"skipping non-regular file %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);
+ fprintf(FINFO,"%s is newer\n",fname);
return;
}
}
if (verbose > 3)
- fprintf(FERROR,"gen mapped %s of size %d\n",fname,(int)st.st_size);
+ fprintf(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);
+ fprintf(FINFO,"sending sums for %d\n",i);
write_int(f_out,i);
send_sums(s,f_out);
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);
+ fprintf(FINFO,"data recv %d at %d\n",i,(int)offset);
sum_update(data,i);
- if (fd != -1 && write_sparse(fd,data,i) != i) {
+ if (fd != -1 && write_file(fd,data,i) != i) {
fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
exit_cleanup(1);
}
len = remainder;
if (verbose > 3)
- fprintf(FERROR,"chunk[%d] of size %d at %d offset=%d\n",
+ fprintf(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) {
+ if (fd != -1 && write_file(fd,map,len) != len) {
fprintf(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");
+ fprintf(FINFO,"got file_sum\n");
if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0)
return 0;
}
if (do_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(f));
+ fprintf(FINFO,"deleting %s\n",f_name(f));
}
} else {
if (do_rmdir(f_name(f)) != 0) {
- if (errno != ENOTEMPTY)
+ if (errno != ENOTEMPTY && errno != EEXIST)
fprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
} else if (verbose) {
- fprintf(FERROR,"deleting directory %s\n",f_name(f));
+ fprintf(FINFO,"deleting directory %s\n",f_name(f));
}
}
}
exit_cleanup(1);
}
+ name[strlen(name)-2] = 0;
+
p = strrchr(name,'/');
if (!p) {
free(name);
}
*p = 0;
+ strcat(name,"/.");
+
while (low != high) {
int mid = (low+high)/2;
int ret = strcmp(f_name(flist->files[flist_up(flist, mid)]),name);
if (cvs_exclude)
add_cvs_excludes();
+ if (io_error) {
+ fprintf(FINFO,"IO error encountered - skipping file deletion\n");
+ return;
+ }
+
for (j=0;j<flist->count;j++) {
char *name = f_name(flist->files[j]);
if (!S_ISDIR(flist->files[j]->mode)) continue;
+ if (strlen(name)<2 || strcmp(name+strlen(name)-2,"/.")!=0) continue;
+
if (delete_already_done(flist, j)) continue;
if (!(local_file_list = send_file_list(-1,1,&name)))
int recv_ok;
if (verbose > 2) {
- fprintf(FERROR,"recv_files(%d) starting\n",flist->count);
+ fprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
if (recurse && delete_mode && !local_name && flist->count>0) {
phase++;
csum_length = SUM_LENGTH;
if (verbose > 2)
- fprintf(FERROR,"recv_files phase=%d\n",phase);
+ fprintf(FINFO,"recv_files phase=%d\n",phase);
write_int(f_gen,-1);
write_flush(f_gen);
continue;
}
if (verbose > 2)
- fprintf(FERROR,"recv_files(%s)\n",fname);
+ fprintf(FINFO,"recv_files(%s)\n",fname);
/* open the file */
fd1 = open(fname,O_RDONLY);
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);
+ fprintf(FINFO,"recv mapped %s of size %d\n",fname,(int)st.st_size);
} else {
buf = NULL;
}
} else {
sprintf(fnametmp,"%s.XXXXXX",fname);
}
- if (NULL == mktemp(fnametmp)) {
+ if (NULL == do_mktemp(fnametmp)) {
fprintf(FERROR,"mktemp %s failed\n",fnametmp);
receive_data(f_in,buf,-1,NULL);
if (buf) unmap_file(buf);
close(fd2);
if (verbose > 2)
- fprintf(FERROR,"renaming %s to %s\n",fnametmp,fname);
+ fprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
if (make_backups) {
char fnamebak[MAXPATHLEN];
continue;
}
sprintf(fnamebak,"%s%s",fname,backup_suffix);
- if (rename(fname,fnamebak) != 0 && errno != ENOENT) {
+ if (do_rename(fname,fnamebak) != 0 && errno != ENOENT) {
fprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
continue;
}
}
/* move tmp file over real file */
- if (rename(fnametmp,fname) != 0) {
+ if (do_rename(fnametmp,fname) != 0) {
if (errno == EXDEV) {
/* rename failed on cross-filesystem link.
Copy the file instead. */
fname);
} else {
if (verbose > 1)
- fprintf(FERROR,"redoing %s(%d)\n",fname,i);
+ fprintf(FINFO,"redoing %s(%d)\n",fname,i);
write_int(f_gen,i);
}
}
}
if (verbose > 2)
- fprintf(FERROR,"recv_files finished\n");
+ fprintf(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;
char fname[MAXPATHLEN];
- off_t total=0;
int i;
struct file_struct *file;
int phase = 0;
+ int offset=0;
if (verbose > 2)
- fprintf(FERROR,"send_files starting\n");
+ fprintf(FINFO,"send_files starting\n");
setup_nonblocking(f_in,f_out);
write_int(f_out,-1);
write_flush(f_out);
if (verbose > 2)
- fprintf(FERROR,"send_files phase=%d\n",phase);
+ fprintf(FINFO,"send_files phase=%d\n",phase);
continue;
}
break;
strncpy(fname,file->basedir,MAXPATHLEN-1);
fname[MAXPATHLEN-1] = 0;
if (strlen(fname) == MAXPATHLEN-1) {
+ io_error = 1;
fprintf(FERROR, "send_files failed on long-named directory %s\n",
fname);
- return -1;
+ return;
}
strcat(fname,"/");
+ offset = strlen(file->basedir)+1;
}
strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
if (verbose > 2)
- fprintf(FERROR,"send_files(%d,%s)\n",i,fname);
+ fprintf(FINFO,"send_files(%d,%s)\n",i,fname);
if (dry_run) {
if (!am_server && verbose)
s = receive_sums(f_in);
if (!s) {
+ io_error = 1;
fprintf(FERROR,"receive_sums failed\n");
- return -1;
+ return;
}
fd = open(fname,O_RDONLY);
if (fd == -1) {
+ io_error = 1;
fprintf(FERROR,"send_files failed to open %s: %s\n",
fname,strerror(errno));
free_sums(s);
/* map the local file */
if (fstat(fd,&st) != 0) {
+ io_error = 1;
fprintf(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",
+ fprintf(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);
+ fprintf(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);
free_sums(s);
if (verbose > 2)
- fprintf(FERROR,"sender finished %s\n",fname);
-
- total += st.st_size;
+ fprintf(FINFO,"sender finished %s\n",fname);
}
if (verbose > 2)
- fprintf(FERROR,"send files finished\n");
+ fprintf(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",
+ fprintf(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);
+ fprintf(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
the system more than once to catch initial checksum errors */
phase++;
if (verbose > 2)
- fprintf(FERROR,"generate_files phase=%d\n",phase);
+ fprintf(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());
+ fprintf(FINFO,"generator wrote %ld\n",(long)write_total());
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff