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
don't need PIPE_BUF any more
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
861fb2f
..
1740209
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-299,7
+299,11
@@
static void receive_file_entry(struct file_struct **fptr,
memset((char *)file, 0, sizeof(*file));
(*fptr) = file;
memset((char *)file, 0, sizeof(*file));
(*fptr) = file;
- if (l2 >= MAXPATHLEN-l1) overflow("receive_file_entry");
+ if (l2 >= MAXPATHLEN-l1) {
+ rprintf(FERROR,"overflow: flags=0x%x l1=%d l2=%d lastname=%s\n",
+ flags, l1, l2, lastname);
+ overflow("receive_file_entry");
+ }
strlcpy(thisname,lastname,l1+1);
read_sbuf(f,&thisname[l1],l2);
strlcpy(thisname,lastname,l1+1);
read_sbuf(f,&thisname[l1],l2);
@@
-409,7
+413,8
@@
static int skip_filesystem(char *fname, STRUCT_STAT *st)
return (st2.st_dev != filesystem_dev);
}
return (st2.st_dev != filesystem_dev);
}
-static struct file_struct *make_file(int f, char *fname)
+/* create a file_struct for a named file */
+struct file_struct *make_file(int f, char *fname)
{
struct file_struct *file;
STRUCT_STAT st;
{
struct file_struct *file;
STRUCT_STAT st;
@@
-431,7
+436,7
@@
static struct file_struct *make_file(int f, char *fname)
if (readlink_stat(fname,&st,linkbuf) != 0) {
io_error = 1;
if (readlink_stat(fname,&st,linkbuf) != 0) {
io_error = 1;
- rprintf(FERROR,"%s: %s\n",
+ rprintf(FERROR,"
readlink
%s: %s\n",
fname,strerror(errno));
return NULL;
}
fname,strerror(errno));
return NULL;
}
@@
-668,8
+673,10
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
}
if (link_stat(fname,&st) != 0) {
}
if (link_stat(fname,&st) != 0) {
- io_error=1;
- rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
+ if (f != -1) {
+ io_error=1;
+ rprintf(FERROR,"link_stat %s : %s\n",fname,strerror(errno));
+ }
continue;
}
continue;
}
@@
-737,8
+744,7
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
if (one_file_system)
set_filesystem(fname);
if (one_file_system)
set_filesystem(fname);
- if (!recurse || !send_included_file_names(f,flist))
- send_file_name(f,flist,fname,recurse,FLAG_DELETE);
+ send_file_name(f,flist,fname,recurse,FLAG_DELETE);
if (olddir != NULL) {
flist_dir = NULL;
if (olddir != NULL) {
flist_dir = NULL;
@@
-769,7
+775,8
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
/* if protocol version is >= 17 then send the io_error flag */
if (f != -1 && remote_version >= 17) {
/* if protocol version is >= 17 then send the io_error flag */
if (f != -1 && remote_version >= 17) {
- write_int(f, io_error);
+ extern int module_id;
+ write_int(f, lp_ignore_errors(module_id)? 0 : io_error);
}
if (f != -1) {
}
if (f != -1) {
@@
-854,7
+861,12
@@
struct file_list *recv_file_list(int f)
/* if protocol version is >= 17 then recv the io_error flag */
if (f != -1 && remote_version >= 17) {
/* if protocol version is >= 17 then recv the io_error flag */
if (f != -1 && remote_version >= 17) {
- io_error |= read_int(f);
+ extern int module_id;
+ if (lp_ignore_errors(module_id)) {
+ read_int(f);
+ } else {
+ io_error |= read_int(f);
+ }
}
if (list_only) {
}
if (list_only) {
@@
-916,7
+928,7
@@
int flist_find(struct file_list *flist,struct file_struct *f)
/*
* free up one file
*/
/*
* free up one file
*/
-
static
void free_file(struct file_struct *file)
+void free_file(struct file_struct *file)
{
if (!file) return;
if (file->basename) free(file->basename);
{
if (!file) return;
if (file->basename) free(file->basename);
@@
-993,12
+1005,12
@@
static void clean_flist(struct file_list *flist, int strip_root)
if (verbose <= 3) return;
for (i=0;i<flist->count;i++) {
if (verbose <= 3) return;
for (i=0;i<flist->count;i++) {
- rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%
d
\n",
+ rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%
.0f
\n",
getpid(), i,
NS(flist->files[i]->dirname),
NS(flist->files[i]->basename),
flist->files[i]->mode,
getpid(), i,
NS(flist->files[i]->dirname),
NS(flist->files[i]->basename),
flist->files[i]->mode,
- (
int
)flist->files[i]->length);
+ (
double
)flist->files[i]->length);
}
}
}
}