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
use mmap() for files of any size. This should be much more buffer
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
494b108
..
d3c07ed
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-218,7
+218,7
@@
void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
last_gid = file->gid;
last_time = file->modtime;
last_gid = file->gid;
last_time = file->modtime;
- str
n
cpy(lastname,fname,MAXPATHLEN-1);
+ str
l
cpy(lastname,fname,MAXPATHLEN-1);
lastname[MAXPATHLEN-1] = 0;
}
lastname[MAXPATHLEN-1] = 0;
}
@@
-253,15
+253,21
@@
static void receive_file_entry(struct file_struct **fptr,
if (l2 >= MAXPATHLEN-l1) overflow("receive_file_entry");
if (l2 >= MAXPATHLEN-l1) overflow("receive_file_entry");
- str
n
cpy(thisname,lastname,l1);
+ str
l
cpy(thisname,lastname,l1);
read_sbuf(f,&thisname[l1],l2);
thisname[l1+l2] = 0;
read_sbuf(f,&thisname[l1],l2);
thisname[l1+l2] = 0;
- str
n
cpy(lastname,thisname,MAXPATHLEN-1);
+ str
l
cpy(lastname,thisname,MAXPATHLEN-1);
lastname[MAXPATHLEN-1] = 0;
clean_fname(thisname);
lastname[MAXPATHLEN-1] = 0;
clean_fname(thisname);
+ if (relative_paths && thisname[0] == '/') {
+ /* strip / off absolute paths in destination */
+ memmove(thisname, thisname+1, strlen(thisname));
+ if (!thisname[0]) strcpy(thisname,".");
+ }
+
if ((p = strrchr(thisname,'/'))) {
static char *lastdir;
*p = 0;
if ((p = strrchr(thisname,'/'))) {
static char *lastdir;
*p = 0;
@@
-351,7
+357,7
@@
static struct file_struct *make_file(char *fname)
char *p;
char cleaned_name[MAXPATHLEN];
char *p;
char cleaned_name[MAXPATHLEN];
- str
n
cpy(cleaned_name, fname, MAXPATHLEN-1);
+ str
l
cpy(cleaned_name, fname, MAXPATHLEN-1);
cleaned_name[MAXPATHLEN-1] = 0;
clean_fname(cleaned_name);
fname = cleaned_name;
cleaned_name[MAXPATHLEN-1] = 0;
clean_fname(cleaned_name);
fname = cleaned_name;
@@
-512,8
+518,7
@@
static void send_directory(int f,struct file_list *flist,char *dir)
return;
}
return;
}
- strncpy(fname,dir,MAXPATHLEN-1);
- fname[MAXPATHLEN-1]=0;
+ strlcpy(fname,dir,MAXPATHLEN-1);
l = strlen(fname);
if (fname[l-1] != '/') {
if (l == MAXPATHLEN-1) {
l = strlen(fname);
if (fname[l-1] != '/') {
if (l == MAXPATHLEN-1) {
@@
-522,7
+527,7
@@
static void send_directory(int f,struct file_list *flist,char *dir)
closedir(d);
return;
}
closedir(d);
return;
}
- str
cat(fname,"/"
);
+ str
lcat(fname,"/", MAXPATHLEN-1
);
l++;
}
p = fname + strlen(fname);
l++;
}
p = fname + strlen(fname);
@@
-542,7
+547,7
@@
static void send_directory(int f,struct file_list *flist,char *dir)
if (strcmp(dname,".")==0 ||
strcmp(dname,"..")==0)
continue;
if (strcmp(dname,".")==0 ||
strcmp(dname,"..")==0)
continue;
- str
n
cpy(p,dname,MAXPATHLEN-(l+1));
+ str
l
cpy(p,dname,MAXPATHLEN-(l+1));
send_file_name(f,flist,fname,recurse,FLAG_DELETE);
}
send_file_name(f,flist,fname,recurse,FLAG_DELETE);
}
@@
-574,16
+579,19
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
flist->malloced);
if (!flist->files) out_of_memory("send_file_list");
flist->malloced);
if (!flist->files) out_of_memory("send_file_list");
+ if (f != -1) {
+ io_start_buffering(f);
+ }
+
for (i=0;i<argc;i++) {
char fname2[MAXPATHLEN];
char *fname = fname2;
for (i=0;i<argc;i++) {
char fname2[MAXPATHLEN];
char *fname = fname2;
- strncpy(fname,argv[i],MAXPATHLEN-1);
- fname[MAXPATHLEN-1] = 0;
+ strlcpy(fname,argv[i],MAXPATHLEN-1);
l = strlen(fname);
if (l != 1 && fname[l-1] == '/') {
l = strlen(fname);
if (l != 1 && fname[l-1] == '/') {
- str
cat(fname,"."
);
+ str
lcat(fname,".",MAXPATHLEN-1
);
}
if (link_stat(fname,&st) != 0) {
}
if (link_stat(fname,&st) != 0) {
@@
-614,7
+622,7
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
thus getting their permissions right */
*p = 0;
if (strcmp(lastpath,fname)) {
thus getting their permissions right */
*p = 0;
if (strcmp(lastpath,fname)) {
- str
cpy(lastpath, fname
);
+ str
lcpy(lastpath, fname, sizeof(lastpath)-1
);
*p = '/';
for (p=fname+1; (p=strchr(p,'/')); p++) {
*p = 0;
*p = '/';
for (p=fname+1; (p=strchr(p,'/')); p++) {
*p = 0;
@@
-660,7
+668,6
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
if (f != -1) {
send_file_entry(NULL,f,0);
if (f != -1) {
send_file_entry(NULL,f,0);
- write_flush(f);
}
if (verbose && recurse && !am_server && f != -1)
}
if (verbose && recurse && !am_server && f != -1)
@@
-679,6
+686,11
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
write_int(f, io_error);
}
write_int(f, io_error);
}
+ if (f != -1) {
+ io_end_buffering(f);
+ write_flush(f);
+ }
+
if (verbose > 2)
rprintf(FINFO,"send_file_list done\n");
if (verbose > 2)
rprintf(FINFO,"send_file_list done\n");
@@
-872,9
+884,9
@@
char *f_name(struct file_struct *f)
n = (n+1)%10;
if (f->dirname) {
n = (n+1)%10;
if (f->dirname) {
- s
printf(p
, "%s/%s", f->dirname, f->basename);
+ s
lprintf(p, MAXPATHLEN-1
, "%s/%s", f->dirname, f->basename);
} else {
} else {
- str
cpy(p, f->basename
);
+ str
lcpy(p, f->basename, MAXPATHLEN-1
);
}
return p;
}
return p;