#include "rsync.h"
+extern int csum_length;
+
extern int verbose;
extern int am_server;
extern int always_checksum;
extern time_t starttime;
+extern int remote_version;
+
extern char *backup_suffix;
extern int block_size;
extern int update_only;
extern int make_backups;
extern int preserve_links;
+extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_devices;
extern int preserve_uid;
if (s)
for (i=0;i<s->count;i++) {
write_int(f_out,s->sums[i].sum1);
- write_buf(f_out,s->sums[i].sum2,SUM_LENGTH);
+ 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(char *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;
}
if (verbose > 3)
- fprintf(stderr,"count=%d rem=%d n=%d flength=%d\n",
+ fprintf(FERROR,"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(stderr,"chunk[%d] offset=%d len=%d sum1=%08x\n",
+ fprintf(FERROR,"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(stderr,"count=%d n=%d rem=%d\n",
+ fprintf(FERROR,"count=%d n=%d rem=%d\n",
s->count,s->n,s->remainder);
block_len = s->n;
for (i=0;i<s->count;i++) {
s->sums[i].sum1 = read_int(f);
- read_buf(f,s->sums[i].sum2,SUM_LENGTH);
+ read_buf(f,s->sums[i].sum2,csum_length);
s->sums[i].offset = offset;
s->sums[i].i = i;
offset += s->sums[i].len;
if (verbose > 3)
- fprintf(stderr,"chunk[%d] len=%d offset=%d sum1=%08x\n",
+ fprintf(FERROR,"chunk[%d] len=%d offset=%d sum1=%08x\n",
i,s->sums[i].len,(int)s->sums[i].offset,s->sums[i].sum1);
}
if (!st) {
if (stat(fname,&st2) != 0) {
- fprintf(stderr,"stat %s : %s\n",fname,strerror(errno));
+ fprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
return;
}
st = &st2;
}
- if (preserve_times && st->st_mtime != file->modtime) {
+ if (preserve_times && !S_ISLNK(st->st_mode) &&
+ st->st_mtime != file->modtime) {
updated = 1;
if (set_modtime(fname,file->modtime) != 0) {
- fprintf(stderr,"failed to set times on %s : %s\n",
+ fprintf(FERROR,"failed to set times on %s : %s\n",
fname,strerror(errno));
return;
}
}
#ifdef HAVE_CHMOD
- if (preserve_perms && st->st_mode != file->mode) {
+ if (preserve_perms && !S_ISLNK(st->st_mode) &&
+ st->st_mode != file->mode) {
updated = 1;
if (chmod(fname,file->mode) != 0) {
- fprintf(stderr,"failed to set permissions on %s : %s\n",
+ fprintf(FERROR,"failed to set permissions on %s : %s\n",
fname,strerror(errno));
return;
}
preserve_uid?file->uid:-1,
preserve_gid?file->gid:-1) != 0) {
if (verbose>1 || preserve_uid)
- fprintf(stderr,"chown %s : %s\n",fname,strerror(errno));
+ fprintf(FERROR,"chown %s : %s\n",fname,strerror(errno));
return;
}
}
if (verbose > 1 && report) {
if (updated)
- fprintf(am_server?stderr:stdout,"%s\n",fname);
+ fprintf(FINFO,"%s\n",fname);
else
- fprintf(am_server?stderr:stdout,"%s is uptodate\n",fname);
+ fprintf(FINFO,"%s is uptodate\n",fname);
}
}
{
int fd;
struct stat st;
- char *buf;
+ struct map_struct *buf;
struct sum_struct *s;
char sum[SUM_LENGTH];
int statret;
+ struct file_struct *file = &flist->files[i];
if (verbose > 2)
- fprintf(stderr,"recv_generator(%s)\n",fname);
+ fprintf(FERROR,"recv_generator(%s,%d)\n",fname,i);
statret = lstat(fname,&st);
#if SUPPORT_LINKS
- if (preserve_links && S_ISLNK(flist->files[i].mode)) {
+ if (preserve_links && S_ISLNK(file->mode)) {
char lnk[MAXPATHLEN];
int l;
if (statret == 0) {
l = readlink(fname,lnk,MAXPATHLEN-1);
if (l > 0) {
lnk[l] = 0;
- if (strcmp(lnk,flist->files[i].link) == 0) {
- if (verbose > 1)
- fprintf(am_server?stderr:stdout,"%s is uptodate\n",fname);
+ if (strcmp(lnk,file->link) == 0) {
+ set_perms(fname,file,&st,1);
return;
}
}
}
if (!dry_run) unlink(fname);
- if (!dry_run && symlink(flist->files[i].link,fname) != 0) {
- fprintf(stderr,"link %s -> %s : %s\n",
- fname,flist->files[i].link,strerror(errno));
+ if (!dry_run && symlink(file->link,fname) != 0) {
+ fprintf(FERROR,"link %s -> %s : %s\n",
+ fname,file->link,strerror(errno));
} else {
+ set_perms(fname,file,NULL,0);
if (verbose)
- fprintf(am_server?stderr:stdout,"%s -> %s\n",fname,flist->files[i].link);
+ fprintf(FINFO,"%s -> %s\n",
+ fname,file->link);
}
return;
}
#endif
#ifdef HAVE_MKNOD
- if (preserve_devices && IS_DEVICE(flist->files[i].mode)) {
+ if (preserve_devices && IS_DEVICE(file->mode)) {
if (statret != 0 ||
- st.st_mode != flist->files[i].mode ||
- st.st_rdev != flist->files[i].dev) {
+ st.st_mode != file->mode ||
+ st.st_rdev != file->rdev) {
if (!dry_run) unlink(fname);
if (verbose > 2)
- fprintf(stderr,"mknod(%s,0%o,0x%x)\n",
- fname,(int)flist->files[i].mode,(int)flist->files[i].dev);
+ fprintf(FERROR,"mknod(%s,0%o,0x%x)\n",
+ fname,(int)file->mode,(int)file->rdev);
if (!dry_run &&
- mknod(fname,flist->files[i].mode,flist->files[i].dev) != 0) {
- fprintf(stderr,"mknod %s : %s\n",fname,strerror(errno));
+ mknod(fname,file->mode,file->rdev) != 0) {
+ fprintf(FERROR,"mknod %s : %s\n",fname,strerror(errno));
} else {
- set_perms(fname,&flist->files[i],NULL,0);
+ set_perms(fname,file,NULL,0);
if (verbose)
- fprintf(am_server?stderr:stdout,"%s\n",fname);
+ fprintf(FINFO,"%s\n",fname);
}
} else {
- set_perms(fname,&flist->files[i],&st,1);
+ set_perms(fname,file,&st,1);
}
return;
}
#endif
- if (!S_ISREG(flist->files[i].mode)) {
- fprintf(stderr,"skipping non-regular file %s\n",fname);
+ if (preserve_hard_links && check_hard_link(file)) {
+ if (verbose > 1)
+ fprintf(FINFO,"%s is a hard link\n",file->name);
+ return;
+ }
+
+ if (!S_ISREG(file->mode)) {
+ fprintf(FERROR,"skipping non-regular file %s\n",fname);
return;
}
if (!dry_run) send_sums(NULL,f_out);
} else {
if (verbose > 1)
- fprintf(stderr,"recv_generator failed to open %s\n",fname);
+ fprintf(FERROR,"recv_generator failed to open %s\n",fname);
}
return;
}
if (!S_ISREG(st.st_mode)) {
- fprintf(stderr,"%s : not a regular file\n",fname);
+ fprintf(FERROR,"%s : not a regular file\n",fname);
return;
}
- if (update_only && st.st_mtime >= flist->files[i].modtime) {
+ if (update_only && st.st_mtime >= file->modtime) {
if (verbose > 1)
- fprintf(stderr,"%s is newer\n",fname);
+ fprintf(FERROR,"%s is newer\n",fname);
return;
}
file_checksum(fname,sum,st.st_size);
}
- if (st.st_size == flist->files[i].length &&
- ((!ignore_times && st.st_mtime == flist->files[i].modtime) ||
+ if (st.st_size == file->length &&
+ ((!ignore_times && st.st_mtime == file->modtime) ||
(always_checksum && S_ISREG(st.st_mode) &&
- memcmp(sum,flist->files[i].sum,SUM_LENGTH) == 0))) {
- set_perms(fname,&flist->files[i],&st,1);
+ memcmp(sum,file->sum,csum_length) == 0))) {
+ set_perms(fname,file,&st,1);
return;
}
fd = open(fname,O_RDONLY);
if (fd == -1) {
- fprintf(stderr,"failed to open %s : %s\n",fname,strerror(errno));
+ fprintf(FERROR,"failed to open %s : %s\n",fname,strerror(errno));
return;
}
}
if (verbose > 3)
- fprintf(stderr,"mapped %s of size %d\n",fname,(int)st.st_size);
+ fprintf(FERROR,"gen mapped %s of size %d\n",fname,(int)st.st_size);
s = generate_sums(buf,st.st_size,block_size);
+ if (verbose > 2)
+ fprintf(FERROR,"sending sums for %d\n",i);
+
write_int(f_out,i);
send_sums(s,f_out);
write_flush(f_out);
close(fd);
- unmap_file(buf,st.st_size);
+ unmap_file(buf);
free_sums(s);
}
-static void receive_data(int f_in,char *buf,int fd,char *fname)
+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;
+ char *data;
+ static char file_sum1[SUM_LENGTH];
+ static char file_sum2[SUM_LENGTH];
+ char *map=NULL;
count = read_int(f_in);
n = read_int(f_in);
remainder = read_int(f_in);
- for (i=read_int(f_in); i != 0; i=read_int(f_in)) {
+ sum_init();
+
+ for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) {
if (i > 0) {
if (verbose > 3)
- fprintf(stderr,"data recv %d at %d\n",i,(int)offset);
+ fprintf(FERROR,"data recv %d at %d\n",i,(int)offset);
- if (read_write(f_in,fd,i) != i) {
- fprintf(stderr,"write failed on %s : %s\n",fname,strerror(errno));
- exit(1);
+ sum_update(data,i);
+
+ if (write_sparse(fd,data,i) != i) {
+ fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
+ exit_cleanup(1);
}
offset += i;
} else {
len = remainder;
if (verbose > 3)
- fprintf(stderr,"chunk[%d] of size %d at %d offset=%d\n",
+ fprintf(FERROR,"chunk[%d] of size %d at %d offset=%d\n",
i,len,(int)offset2,(int)offset);
- if (write(fd,map_ptr(buf,offset2,len),len) != len) {
- fprintf(stderr,"write failed on %s : %s\n",fname,strerror(errno));
- exit(1);
+ map = map_ptr(buf,offset2,len);
+
+ sum_update(map,len);
+
+ if (write_sparse(fd,map,len) != len) {
+ fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
+ exit_cleanup(1);
}
offset += len;
}
}
+
+ if (offset > 0 && sparse_end(fd) != 0) {
+ fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
+ exit_cleanup(1);
+ }
+
+ sum_end(file_sum1);
+
+ if (remote_version >= 14) {
+ read_buf(f_in,file_sum2,SUM_LENGTH);
+ if (verbose > 2)
+ fprintf(FERROR,"got file_sum\n");
+ if (memcmp(file_sum1,file_sum2,SUM_LENGTH) != 0)
+ return 0;
+ }
+ return 1;
}
{
if (!S_ISDIR(f->mode)) {
if (!dry_run && unlink(f->name) != 0) {
- fprintf(stderr,"unlink %s : %s\n",f->name,strerror(errno));
+ fprintf(FERROR,"unlink %s : %s\n",f->name,strerror(errno));
} else if (verbose) {
- fprintf(stderr,"deleting %s\n",f->name);
+ fprintf(FERROR,"deleting %s\n",f->name);
}
} else {
if (!dry_run && rmdir(f->name) != 0) {
if (errno != ENOTEMPTY)
- fprintf(stderr,"rmdir %s : %s\n",f->name,strerror(errno));
+ fprintf(FERROR,"rmdir %s : %s\n",f->name,strerror(errno));
} else if (verbose) {
- fprintf(stderr,"deleting directory %s\n",f->name);
+ fprintf(FERROR,"deleting directory %s\n",f->name);
}
}
}
char *dot=".";
int i;
- if (!am_server && cvs_exclude)
+ if (cvs_exclude)
add_cvs_excludes();
+
if (!(local_file_list = send_file_list(-1,recurse,1,&dot)))
return;
static char *cleanup_fname = NULL;
-void sig_int(void)
+void exit_cleanup(int code)
{
if (cleanup_fname)
unlink(cleanup_fname);
- exit(1);
+ exit(code);
+}
+
+void sig_int(void)
+{
+ exit_cleanup(1);
}
-int recv_files(int f_in,struct file_list *flist,char *local_name)
+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];
- char *buf;
+ struct map_struct *buf;
int i;
+ struct file_struct *file;
+ int phase=0;
+ int recv_ok;
if (verbose > 2) {
- fprintf(stderr,"recv_files(%d) starting\n",flist->count);
+ fprintf(FERROR,"recv_files(%d) starting\n",flist->count);
}
if (recurse && delete_mode && !local_name && flist->count>0) {
}
while (1)
- {
+ {
i = read_int(f_in);
- if (i == -1) break;
+ 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;
+ }
+ break;
+ }
- fname = flist->files[i].name;
+ file = &flist->files[i];
+ fname = file->name;
if (local_name)
fname = local_name;
}
if (verbose > 2)
- fprintf(stderr,"recv_files(%s)\n",fname);
+ fprintf(FERROR,"recv_files(%s)\n",fname);
/* open the file */
fd1 = open(fname,O_RDONLY);
if (fd1 != -1 && fstat(fd1,&st) != 0) {
- fprintf(stderr,"fstat %s : %s\n",fname,strerror(errno));
+ fprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
close(fd1);
return -1;
}
if (fd1 != -1 && !S_ISREG(st.st_mode)) {
- fprintf(stderr,"%s : not a regular file\n",fname);
+ fprintf(FERROR,"%s : not a regular file\n",fname);
close(fd1);
return -1;
}
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;
}
- if (verbose > 2)
- fprintf(stderr,"mapped %s of size %d\n",fname,(int)st.st_size);
-
/* open tmp file */
sprintf(fnametmp,"%s.XXXXXX",fname);
if (NULL == mktemp(fnametmp)) {
- fprintf(stderr,"mktemp %s failed\n",fnametmp);
+ fprintf(FERROR,"mktemp %s failed\n",fnametmp);
return -1;
}
- fd2 = open(fnametmp,O_WRONLY|O_CREAT,flist->files[i].mode);
+ fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
if (fd2 == -1) {
- fprintf(stderr,"open %s : %s\n",fnametmp,strerror(errno));
+ fprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
return -1;
}
printf("%s\n",fname);
/* recv file data */
- receive_data(f_in,buf,fd2,fname);
+ recv_ok = receive_data(f_in,buf,fd2,fname);
if (fd1 != -1) {
- unmap_file(buf,st.st_size);
+ unmap_file(buf);
close(fd1);
}
close(fd2);
if (verbose > 2)
- fprintf(stderr,"renaming %s to %s\n",fnametmp,fname);
+ fprintf(FERROR,"renaming %s to %s\n",fnametmp,fname);
if (make_backups) {
char fnamebak[MAXPATHLEN];
sprintf(fnamebak,"%s%s",fname,backup_suffix);
if (rename(fname,fnamebak) != 0 && errno != ENOENT) {
- fprintf(stderr,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
- exit(1);
+ fprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
+ exit_cleanup(1);
}
}
/* move tmp file over real file */
if (rename(fnametmp,fname) != 0) {
- fprintf(stderr,"rename %s -> %s : %s\n",
+ fprintf(FERROR,"rename %s -> %s : %s\n",
fnametmp,fname,strerror(errno));
}
cleanup_fname = NULL;
- set_perms(fname,&flist->files[i],NULL,0);
+ set_perms(fname,file,NULL,0);
+
+ if (!recv_ok) {
+ if (verbose > 1)
+ fprintf(FERROR,"redoing %s(%d)\n",fname,i);
+ write_int(f_gen,i);
+ }
}
if (verbose > 2)
- fprintf(stderr,"recv_files finished\n");
+ fprintf(FERROR,"recv_files finished\n");
return 0;
}
{
int fd;
struct sum_struct *s;
- char *buf;
+ struct map_struct *buf;
struct stat st;
char fname[MAXPATHLEN];
off_t total=0;
int i;
+ struct file_struct *file;
+ int phase = 0;
if (verbose > 2)
- fprintf(stderr,"send_files starting\n");
+ fprintf(FERROR,"send_files starting\n");
setup_nonblocking(f_in,f_out);
while (1)
{
i = read_int(f_in);
- if (i == -1) break;
+ 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);
+ continue;
+ }
+ break;
+ }
+
+ file = &flist->files[i];
fname[0] = 0;
- if (flist->files[i].dir) {
- strcpy(fname,flist->files[i].dir);
+ if (file->dir) {
+ strcpy(fname,file->dir);
strcat(fname,"/");
}
- strcat(fname,flist->files[i].name);
+ strcat(fname,file->name);
if (verbose > 2)
- fprintf(stderr,"send_files(%d,%s)\n",i,fname);
+ fprintf(FERROR,"send_files(%d,%s)\n",i,fname);
if (dry_run) {
if (!am_server && verbose)
s = receive_sums(f_in);
if (!s) {
- fprintf(stderr,"receive_sums failed\n");
+ fprintf(FERROR,"receive_sums failed\n");
return -1;
}
fd = open(fname,O_RDONLY);
if (fd == -1) {
- fprintf(stderr,"send_files failed to open %s: %s\n",
+ fprintf(FERROR,"send_files failed to open %s: %s\n",
fname,strerror(errno));
continue;
}
/* map the local file */
if (fstat(fd,&st) != 0) {
- fprintf(stderr,"fstat failed : %s\n",strerror(errno));
+ fprintf(FERROR,"fstat failed : %s\n",strerror(errno));
return -1;
}
}
if (verbose > 2)
- fprintf(stderr,"send_files mapped %s of size %d\n",
+ fprintf(FERROR,"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(stderr,"calling match_sums %s\n",fname);
+ fprintf(FERROR,"calling match_sums %s\n",fname);
if (!am_server && verbose)
printf("%s\n",fname);
match_sums(f_out,s,buf,st.st_size);
write_flush(f_out);
- unmap_file(buf,st.st_size);
+ unmap_file(buf);
close(fd);
free_sums(s);
if (verbose > 2)
- fprintf(stderr,"sender finished %s\n",fname);
+ fprintf(FERROR,"sender finished %s\n",fname);
total += st.st_size;
}
+ if (verbose > 2)
+ fprintf(FERROR,"send files finished\n");
+
match_report();
write_int(f_out,-1);
-void generate_files(int f,struct file_list *flist,char *local_name)
+void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
{
int i;
+ int phase=0;
if (verbose > 2)
- fprintf(stderr,"generator starting pid=%d count=%d\n",
+ fprintf(FERROR,"generator starting pid=%d count=%d\n",
(int)getpid(),flist->count);
for (i = 0; i < flist->count; i++) {
- if (!flist->files[i].name) continue;
- if (S_ISDIR(flist->files[i].mode)) {
+ struct file_struct *file = &flist->files[i];
+ if (!file->name) continue;
+ if (S_ISDIR(file->mode)) {
if (dry_run) continue;
- if (mkdir(flist->files[i].name,flist->files[i].mode) != 0 &&
+ if (mkdir(file->name,file->mode) != 0 &&
errno != EEXIST) {
- fprintf(stderr,"mkdir %s : %s\n",
- flist->files[i].name,strerror(errno));
+ fprintf(FERROR,"mkdir %s : %s\n",
+ file->name,strerror(errno));
}
continue;
}
- recv_generator(local_name?local_name:flist->files[i].name,
+ recv_generator(local_name?local_name:file->name,
flist,i,f);
}
+
+ phase++;
+ csum_length = SUM_LENGTH;
+ ignore_times=1;
+
+ if (verbose > 2)
+ fprintf(FERROR,"generate_files phase=%d\n",phase);
+
write_int(f,-1);
write_flush(f);
+
+ if (remote_version >= 13) {
+ 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,
+ flist,i,f);
+ }
+
+ phase++;
+ if (verbose > 2)
+ fprintf(FERROR,"generate_files phase=%d\n",phase);
+
+ write_int(f,-1);
+ write_flush(f);
+ }
+
+
if (verbose > 2)
- fprintf(stderr,"generator wrote %d\n",write_total());
+ fprintf(FERROR,"generator wrote %d\n",write_total());
}
+
+
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff