if (preserve_perms && !S_ISLNK(st->st_mode) &&
st->st_mode != file->mode) {
updated = 1;
- if (chmod(fname,file->mode) != 0) {
+ if (do_chmod(fname,file->mode) != 0) {
fprintf(FERROR,"failed to set permissions on %s : %s\n",
fname,strerror(errno));
return 0;
if ((am_root && preserve_uid && st->st_uid != file->uid) ||
(preserve_gid && st->st_gid != file->gid)) {
updated = 1;
- if (lchown(fname,
+ if (do_lchown(fname,
(am_root&&preserve_uid)?file->uid:-1,
preserve_gid?file->gid:-1) != 0) {
if (verbose>1 || preserve_uid)
}
+/* 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 */
+ ret = ret & ~15; /* multiple of 16 */
+ if (ret < bsize) ret = bsize;
+ if (ret > CHUNK_SIZE/2) ret = CHUNK_SIZE/2;
+ return ret;
+}
+
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
{
int fd;
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 (S_ISDIR(file->mode)) {
if (dry_run) return;
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- if (unlink(fname) != 0) {
+ if (do_unlink(fname) != 0) {
fprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
return;
}
}
}
}
- if (!dry_run) unlink(fname);
- if (!dry_run && symlink(file->link,fname) != 0) {
+ do_unlink(fname);
+ if (do_symlink(file->link,fname) != 0) {
fprintf(FERROR,"link %s -> %s : %s\n",
fname,file->link,strerror(errno));
} else {
if (statret != 0 ||
st.st_mode != file->mode ||
st.st_rdev != file->rdev) {
- if (!dry_run) unlink(fname);
+ do_unlink(fname);
if (verbose > 2)
fprintf(FERROR,"mknod(%s,0%o,0x%x)\n",
fname,(int)file->mode,(int)file->rdev);
- if (!dry_run &&
- mknod(fname,file->mode,file->rdev) != 0) {
+ if (do_mknod(fname,file->mode,file->rdev) != 0) {
fprintf(FERROR,"mknod %s : %s\n",fname,strerror(errno));
} else {
set_perms(fname,file,NULL,0);
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;
}
fprintf(FERROR,"ERROR: %s is a directory\n",fname);
return;
}
- if (unlink(fname) != 0) {
+ if (do_unlink(fname) != 0) {
fprintf(FERROR,"%s : not a regular file (generator)\n",fname);
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;
if (verbose > 3)
fprintf(FERROR,"gen mapped %s of size %d\n",fname,(int)st.st_size);
- s = generate_sums(buf,st.st_size,block_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);
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 (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);
+ fprintf(FERROR,"deleting %s\n",f_name(f));
}
} else {
- if (!dry_run && rmdir(f->name) != 0) {
+ if (do_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);
}
}
-static char *cleanup_fname = NULL;
+static char *cleanup_fname;
void exit_cleanup(int code)
{
if (cleanup_fname)
- unlink(cleanup_fname);
+ do_unlink(cleanup_fname);
signal(SIGUSR1, SIG_IGN);
if (code) {
-#ifdef GETPGRP_VOID
- kill(-getpgrp(), SIGUSR1);
-#else
- kill(-getpgrp(getpid()), SIGUSR1);
-#endif
+ kill_all(SIGUSR1);
}
exit(code);
}
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;
}
close(fd1);
continue;
}
- fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+ 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 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+ fd2 = do_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);
} else {
set_perms(fname,file,NULL,0);
}
- unlink(fnametmp);
+ do_unlink(fnametmp);
} else {
fprintf(FERROR,"rename %s -> %s : %s\n",
fnametmp,fname,strerror(errno));
- unlink(fnametmp);
+ do_unlink(fnametmp);
}
} else {
set_perms(fname,file,NULL,0);
if (!recv_ok) {
- if (verbose > 1)
- fprintf(FERROR,"redoing %s(%d)\n",fname,i);
- if (csum_length == SUM_LENGTH)
- fprintf(FERROR,"ERROR: file corruption in %s\n",fname);
- write_int(f_gen,i);
+ 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);
+ }
}
}
/* 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)
int i;
struct file_struct *file;
int phase = 0;
+ int offset=0;
if (verbose > 2)
fprintf(FERROR,"send_files starting\n");
setup_nonblocking(f_in,f_out);
- while (1)
- {
- 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);
- continue;
- }
- break;
- }
-
- 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,"/");
- }
- strncat(fname,file->name,MAXPATHLEN-strlen(fname));
-
- if (verbose > 2)
- fprintf(FERROR,"send_files(%d,%s)\n",i,fname);
-
- if (dry_run) {
- if (!am_server && verbose)
- printf("%s\n",fname);
- write_int(f_out,i);
- continue;
- }
-
- s = receive_sums(f_in);
- if (!s) {
- fprintf(FERROR,"receive_sums failed\n");
- return -1;
- }
-
- fd = open(fname,O_RDONLY);
- if (fd == -1) {
- fprintf(FERROR,"send_files failed to open %s: %s\n",
- fname,strerror(errno));
- continue;
- }
-
- /* map the local file */
- if (fstat(fd,&st) != 0) {
- fprintf(FERROR,"fstat failed : %s\n",strerror(errno));
- close(fd);
- return -1;
- }
-
- if (st.st_size > 0) {
- buf = map_file(fd,st.st_size);
- } else {
- buf = NULL;
- }
-
- if (verbose > 2)
- 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->count);
- write_int(f_out,s->n);
- write_int(f_out,s->remainder);
-
- if (verbose > 2)
- 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);
-
- if (buf) unmap_file(buf);
- close(fd);
-
- free_sums(s);
+ while (1) {
+ 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);
+ continue;
+ }
+ break;
+ }
- if (verbose > 2)
- fprintf(FERROR,"sender finished %s\n",fname);
+ file = flist->files[i];
+
+ fname[0] = 0;
+ 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,"/");
+ 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);
+
+ if (dry_run) {
+ if (!am_server && verbose)
+ printf("%s\n",fname);
+ write_int(f_out,i);
+ continue;
+ }
- total += st.st_size;
- }
+ s = receive_sums(f_in);
+ if (!s) {
+ fprintf(FERROR,"receive_sums failed\n");
+ return -1;
+ }
+
+ fd = open(fname,O_RDONLY);
+ if (fd == -1) {
+ fprintf(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));
+ free_sums(s);
+ close(fd);
+ return -1;
+ }
+
+ if (st.st_size > 0) {
+ buf = map_file(fd,st.st_size);
+ } else {
+ buf = NULL;
+ }
+
+ if (verbose > 2)
+ 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->count);
+ write_int(f_out,s->n);
+ write_int(f_out,s->remainder);
+
+ if (verbose > 2)
+ fprintf(FERROR,"calling match_sums %s\n",fname);
+
+ if (!am_server && verbose)
+ 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;
+ }
if (verbose > 2)
- fprintf(FERROR,"send files finished\n");
+ fprintf(FERROR,"send files finished\n");
match_report();
(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);
}
if (verbose > 2)
- fprintf(FERROR,"generator wrote %d\n",write_total());
+ fprintf(FERROR,"generator wrote %ld\n",(long)write_total());
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff