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
Better error messages when unlink fails
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
886c672
..
1ab2bdd
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-35,6
+35,8
@@
extern int size_only;
extern int io_timeout;
extern int remote_version;
extern int always_checksum;
extern int io_timeout;
extern int remote_version;
extern int always_checksum;
+extern int modify_window;
+extern char *compare_dest;
/* choose whether to skip a particular file */
/* choose whether to skip a particular file */
@@
-49,6
+51,15
@@
static int skip_file(char *fname,
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
+ char fnamecmpdest[MAXPATHLEN];
+
+ if (compare_dest != NULL) {
+ if (access(fname, 0) != 0) {
+ slprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
+ compare_dest,fname);
+ fname = fnamecmpdest;
+ }
+ }
file_checksum(fname,sum,st->st_size);
if (remote_version < 21) {
return (memcmp(sum,file->sum,2) == 0);
file_checksum(fname,sum,st->st_size);
if (remote_version < 21) {
return (memcmp(sum,file->sum,2) == 0);
@@
-65,7
+76,7
@@
static int skip_file(char *fname,
return 0;
}
return 0;
}
- return (
st->st_mtime == file->modtime
);
+ return (
cmp_modtime(st->st_mtime,file->modtime) == 0
);
}
}
@@
-136,8
+147,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
+165,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
+189,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,13
+198,19
@@
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 the file exists already and we aren't perserving
presmissions then act as though the remote end sent
us the file permissions we already have */
if (statret == 0 &&
!preserve_perms &&
(S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
/* if the file exists already and we aren't perserving
presmissions then act as though the remote end sent
us the file permissions we already have */
- file->mode =
st.st_mode
;
+ file->mode =
(file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT)
;
}
if (S_ISDIR(file->mode)) {
}
if (S_ISDIR(file->mode)) {
@@
-234,15
+252,15
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
l = readlink(fname,lnk,MAXPATHLEN-1);
if (l > 0) {
lnk[l] = 0;
l = readlink(fname,lnk,MAXPATHLEN-1);
if (l > 0) {
lnk[l] = 0;
- if (
file->link &&
strcmp(lnk,file->link) == 0) {
+ if (strcmp(lnk,file->link) == 0) {
set_perms(fname,file,&st,1);
return;
}
}
set_perms(fname,file,&st,1);
return;
}
}
+ delete_file(fname);
}
}
- delete_file(fname);
if (do_symlink(file->link,fname) != 0) {
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);
@@
-326,7
+344,7
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
return;
}
return;
}
- if (update_only &&
st.st_mtime > file->modtime
&& fnamecmp == fname) {
+ if (update_only &&
cmp_modtime(st.st_mtime,file->modtime)>0
&& fnamecmp == fname) {
if (verbose > 1)
rprintf(FINFO,"%s is newer\n",fname);
return;
if (verbose > 1)
rprintf(FINFO,"%s is newer\n",fname);
return;
@@
-353,8
+371,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
+385,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));