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
change WRAP to ZWRAP so it doesn't conflict with IRIX includes
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
5303873
..
d3c07ed
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-69,7
+69,7
@@
static int match_file_name(char *fname,STRUCT_STAT *st)
{
if (check_exclude(fname,local_exclude_list)) {
if (verbose > 2)
{
if (check_exclude(fname,local_exclude_list)) {
if (verbose > 2)
-
f
printf(FINFO,"excluding file %s\n",fname);
+
r
printf(FINFO,"excluding file %s\n",fname);
return 0;
}
return 1;
return 0;
}
return 1;
@@
-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;
@@
-360,13
+366,13
@@
static struct file_struct *make_file(char *fname)
if (link_stat(fname,&st) != 0) {
io_error = 1;
if (link_stat(fname,&st) != 0) {
io_error = 1;
-
f
printf(FERROR,"%s: %s\n",
+
r
printf(FERROR,"%s: %s\n",
fname,strerror(errno));
return NULL;
}
if (S_ISDIR(st.st_mode) && !recurse) {
fname,strerror(errno));
return NULL;
}
if (S_ISDIR(st.st_mode) && !recurse) {
-
f
printf(FINFO,"skipping directory %s\n",fname);
+
r
printf(FINFO,"skipping directory %s\n",fname);
return NULL;
}
return NULL;
}
@@
-379,7
+385,7
@@
static struct file_struct *make_file(char *fname)
return NULL;
if (verbose > 2)
return NULL;
if (verbose > 2)
-
f
printf(FINFO,"make_file(%s)\n",fname);
+
r
printf(FINFO,"make_file(%s)\n",fname);
file = (struct file_struct *)malloc(sizeof(*file));
if (!file) out_of_memory("make_file");
file = (struct file_struct *)malloc(sizeof(*file));
if (!file) out_of_memory("make_file");
@@
-418,7
+424,7
@@
static struct file_struct *make_file(char *fname)
char lnk[MAXPATHLEN];
if ((l=readlink(fname,lnk,MAXPATHLEN-1)) == -1) {
io_error=1;
char lnk[MAXPATHLEN];
if ((l=readlink(fname,lnk,MAXPATHLEN-1)) == -1) {
io_error=1;
-
f
printf(FERROR,"readlink %s : %s\n",
+
r
printf(FERROR,"readlink %s : %s\n",
fname,strerror(errno));
return NULL;
}
fname,strerror(errno));
return NULL;
}
@@
-507,22
+513,21
@@
static void send_directory(int f,struct file_list *flist,char *dir)
d = opendir(dir);
if (!d) {
io_error = 1;
d = opendir(dir);
if (!d) {
io_error = 1;
-
f
printf(FERROR,"%s: %s\n",
+
r
printf(FERROR,"%s: %s\n",
dir,strerror(errno));
return;
}
dir,strerror(errno));
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) {
io_error = 1;
l = strlen(fname);
if (fname[l-1] != '/') {
if (l == MAXPATHLEN-1) {
io_error = 1;
-
f
printf(FERROR,"skipping long-named directory %s\n",fname);
+
r
printf(FERROR,"skipping long-named directory %s\n",fname);
closedir(d);
return;
}
closedir(d);
return;
}
- str
cat(fname,"/"
);
+ str
lcat(fname,"/", MAXPATHLEN-1
);
l++;
}
p = fname + strlen(fname);
l++;
}
p = fname + strlen(fname);
@@
-533,7
+538,7
@@
static void send_directory(int f,struct file_list *flist,char *dir)
local_exclude_list = make_exclude_list(fname,NULL,0);
} else {
io_error = 1;
local_exclude_list = make_exclude_list(fname,NULL,0);
} else {
io_error = 1;
-
f
printf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname);
+
r
printf(FINFO,"cannot cvs-exclude in long-named directory %s\n",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);
}
@@
-561,8
+566,8
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
struct file_list *flist;
if (verbose && recurse && !am_server && f != -1) {
struct file_list *flist;
if (verbose && recurse && !am_server && f != -1) {
-
f
printf(FINFO,"building file list ... ");
-
f
flush(FINFO);
+
r
printf(FINFO,"building file list ... ");
+
r
flush(FINFO);
}
flist = (struct file_list *)malloc(sizeof(flist[0]));
}
flist = (struct file_list *)malloc(sizeof(flist[0]));
@@
-574,26
+579,29
@@
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) {
io_error=1;
}
if (link_stat(fname,&st) != 0) {
io_error=1;
-
f
printf(FERROR,"%s : %s\n",fname,strerror(errno));
+
r
printf(FERROR,"%s : %s\n",fname,strerror(errno));
continue;
}
if (S_ISDIR(st.st_mode) && !recurse) {
continue;
}
if (S_ISDIR(st.st_mode) && !recurse) {
-
f
printf(FINFO,"skipping directory %s\n",fname);
+
r
printf(FINFO,"skipping directory %s\n",fname);
continue;
}
continue;
}
@@
-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;
@@
-631,12
+639,12
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
if (dir && *dir) {
if (getcwd(dbuf,MAXPATHLEN-1) == NULL) {
if (dir && *dir) {
if (getcwd(dbuf,MAXPATHLEN-1) == NULL) {
-
f
printf(FERROR,"getwd : %s\n",strerror(errno));
+
r
printf(FERROR,"getwd : %s\n",strerror(errno));
exit_cleanup(1);
}
if (chdir(dir) != 0) {
io_error=1;
exit_cleanup(1);
}
if (chdir(dir) != 0) {
io_error=1;
-
f
printf(FERROR,"chdir %s : %s\n",
+
r
printf(FERROR,"chdir %s : %s\n",
dir,strerror(errno));
continue;
}
dir,strerror(errno));
continue;
}
@@
-646,7
+654,7
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
send_file_name(f,flist,fname,recurse,FLAG_DELETE);
flist_dir = NULL;
if (chdir(dbuf) != 0) {
send_file_name(f,flist,fname,recurse,FLAG_DELETE);
flist_dir = NULL;
if (chdir(dbuf) != 0) {
-
f
printf(FERROR,"chdir %s : %s\n",
+
r
printf(FERROR,"chdir %s : %s\n",
dbuf,strerror(errno));
exit_cleanup(1);
}
dbuf,strerror(errno));
exit_cleanup(1);
}
@@
-660,11
+668,10
@@
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)
-
f
printf(FINFO,"done\n");
+
r
printf(FINFO,"done\n");
clean_flist(flist);
clean_flist(flist);
@@
-679,8
+686,13
@@
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)
if (verbose > 2)
-
f
printf(FINFO,"send_file_list done\n");
+
r
printf(FINFO,"send_file_list done\n");
return flist;
}
return flist;
}
@@
-692,8
+704,8
@@
struct file_list *recv_file_list(int f)
unsigned char flags;
if (verbose && recurse && !am_server) {
unsigned char flags;
if (verbose && recurse && !am_server) {
-
f
printf(FINFO,"receiving file list ... ");
-
f
flush(FINFO);
+
r
printf(FINFO,"receiving file list ... ");
+
r
flush(FINFO);
}
flist = (struct file_list *)malloc(sizeof(flist[0]));
}
flist = (struct file_list *)malloc(sizeof(flist[0]));
@@
-731,17
+743,17
@@
struct file_list *recv_file_list(int f)
flist->count++;
if (verbose > 2)
flist->count++;
if (verbose > 2)
-
f
printf(FINFO,"recv_file_name(%s)\n",f_name(flist->files[i]));
+
r
printf(FINFO,"recv_file_name(%s)\n",f_name(flist->files[i]));
}
if (verbose > 2)
}
if (verbose > 2)
-
f
printf(FINFO,"received %d names\n",flist->count);
+
r
printf(FINFO,"received %d names\n",flist->count);
clean_flist(flist);
if (verbose && recurse && !am_server) {
clean_flist(flist);
if (verbose && recurse && !am_server) {
-
f
printf(FINFO,"done\n");
+
r
printf(FINFO,"done\n");
}
/* now recv the uid/gid list. This was introduced in protocol version 15 */
}
/* now recv the uid/gid list. This was introduced in protocol version 15 */
@@
-755,7
+767,7
@@
struct file_list *recv_file_list(int f)
}
if (verbose > 2)
}
if (verbose > 2)
-
f
printf(FINFO,"recv_file_list done\n");
+
r
printf(FINFO,"recv_file_list done\n");
return flist;
return flist;
@@
-850,7
+862,7
@@
void clean_flist(struct file_list *flist)
strcmp(f_name(flist->files[i]),
f_name(flist->files[i-1])) == 0) {
if (verbose > 1 && !am_server)
strcmp(f_name(flist->files[i]),
f_name(flist->files[i-1])) == 0) {
if (verbose > 1 && !am_server)
-
f
printf(FINFO,"removing duplicate name %s from file list %d\n",
+
r
printf(FINFO,"removing duplicate name %s from file list %d\n",
f_name(flist->files[i-1]),i-1);
free_file(flist->files[i]);
}
f_name(flist->files[i-1]),i-1);
free_file(flist->files[i]);
}
@@
-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;