Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Describe symbolic link handling when writing to a "use chroot = no" module.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
9bf0e95
..
f0d23ea
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-136,8
+136,8
@@
static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n)
}
if (verbose > 3)
}
if (verbose > 3)
- rprintf(FINFO,"count=%d rem=%d n=%d flength=%
d
\n",
- s->count,s->remainder,s->n,(
int
)s->flength);
+ rprintf(FINFO,"count=%d rem=%d n=%d flength=%
.0f
\n",
+ s->count,s->remainder,s->n,(
double
)s->flength);
s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
if (!s->sums) out_of_memory("generate_sums");
s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
if (!s->sums) out_of_memory("generate_sums");
@@
-154,8
+154,8
@@
static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n)
s->sums[i].i = i;
if (verbose > 3)
s->sums[i].i = i;
if (verbose > 3)
- 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);
+ rprintf(FINFO,"chunk[%d] offset=%
.0f
len=%d sum1=%08x\n",
+ i,(
double
)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1);
len -= n1;
offset += n1;
len -= n1;
offset += n1;
@@
-178,6
+178,7
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
extern char *compare_dest;
extern int list_only;
extern int preserve_perms;
extern char *compare_dest;
extern int list_only;
extern int preserve_perms;
+ extern int only_existing;
if (list_only) return;
if (list_only) return;
@@
-186,6
+187,12
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
statret = link_stat(fname,&st);
statret = link_stat(fname,&st);
+ if (only_existing && statret == -1 && errno == ENOENT) {
+ /* we only want to update existing files */
+ if (verbose > 1) rprintf(FINFO,"not creating %s\n",fname);
+ return;
+ }
+
if (statret == 0 &&
!preserve_perms &&
(S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
if (statret == 0 &&
!preserve_perms &&
(S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
@@
-242,7
+249,7
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
}
delete_file(fname);
if (do_symlink(file->link,fname) != 0) {
}
delete_file(fname);
if (do_symlink(file->link,fname) != 0) {
- rprintf(FERROR,"link %s -> %s : %s\n",
+ rprintf(FERROR,"
sym
link %s -> %s : %s\n",
fname,file->link,strerror(errno));
} else {
set_perms(fname,file,NULL,0);
fname,file->link,strerror(errno));
} else {
set_perms(fname,file,NULL,0);
@@
-353,8
+360,10
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
fd = do_open(fnamecmp, O_RDONLY, 0);
if (fd == -1) {
fd = do_open(fnamecmp, O_RDONLY, 0);
if (fd == -1) {
- rprintf(FERROR,"failed to open %s : %s\n",fnamecmp,strerror(errno));
- rprintf(FERROR,"skipping %s\n",fname);
+ rprintf(FERROR,"failed to open %s, continuing : %s\n",fnamecmp,strerror(errno));
+ /* pretend the file didn't exist */
+ write_int(f_out,i);
+ send_sums(NULL,f_out);
return;
}
return;
}
@@
-365,7
+374,7
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
}
if (verbose > 3)
}
if (verbose > 3)
- rprintf(FINFO,"gen mapped %s of size %
d\n",fnamecmp,(int
)st.st_size);
+ rprintf(FINFO,"gen mapped %s of size %
.0f\n",fnamecmp,(double
)st.st_size);
s = generate_sums(buf,st.st_size,adapt_block_size(file, block_size));
s = generate_sums(buf,st.st_size,adapt_block_size(file, block_size));