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
close the other half of the pipe in do_recv(). This fixes the problem
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
63b8663
..
cf40151
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-48,16
+48,16
@@
extern int io_error;
static char **local_exclude_list;
static char **local_exclude_list;
-int link_stat(const char *Path,
struct stat
*Buffer)
+int link_stat(const char *Path,
STRUCT_STAT
*Buffer)
{
#if SUPPORT_LINKS
if (copy_links) {
{
#if SUPPORT_LINKS
if (copy_links) {
- return stat(Path, Buffer);
+ return
do_
stat(Path, Buffer);
} else {
} else {
- return lstat(Path, Buffer);
+ return
do_
lstat(Path, Buffer);
}
#else
}
#else
- return stat(Path, Buffer);
+ return
do_
stat(Path, Buffer);
#endif
}
#endif
}
@@
-65,11
+65,11
@@
int link_stat(const char *Path, struct stat *Buffer)
This function is used to check if a file should be included/excluded
from the list of files based on its name and type etc
*/
This function is used to check if a file should be included/excluded
from the list of files based on its name and type etc
*/
-static int match_file_name(char *fname,
struct stat
*st)
+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;
@@
-80,7
+80,7
@@
static dev_t filesystem_dev;
static void set_filesystem(char *fname)
{
static void set_filesystem(char *fname)
{
-
struct stat
st;
+
STRUCT_STAT
st;
if (link_stat(fname,&st) != 0) return;
filesystem_dev = st.st_dev;
}
if (link_stat(fname,&st) != 0) return;
filesystem_dev = st.st_dev;
}
@@
-134,7
+134,7
@@
static void clean_fname(char *name)
-void send_file_entry(struct file_struct *file,int f)
+void send_file_entry(struct file_struct *file,int f
,unsigned base_flags
)
{
unsigned char flags;
static time_t last_time;
{
unsigned char flags;
static time_t last_time;
@@
-155,7
+155,7
@@
void send_file_entry(struct file_struct *file,int f)
fname = f_name(file);
fname = f_name(file);
- flags =
FILE_VALID
;
+ flags =
base_flags
;
if (file->mode == last_mode) flags |= SAME_MODE;
if (file->rdev == last_rdev) flags |= SAME_RDEV;
if (file->mode == last_mode) flags |= SAME_MODE;
if (file->rdev == last_rdev) flags |= SAME_RDEV;
@@
-218,14
+218,14
@@
void send_file_entry(struct file_struct *file,int f)
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;
}
-void receive_file_entry(struct file_struct **fptr,
-
unsigned char
flags,int f)
+
static
void receive_file_entry(struct file_struct **fptr,
+
unsigned
flags,int f)
{
static time_t last_time;
static mode_t last_mode;
{
static time_t last_time;
static mode_t last_mode;
@@
-253,11
+253,11
@@
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);
@@
-280,6
+280,7
@@
void receive_file_entry(struct file_struct **fptr,
if (!file->basename) out_of_memory("receive_file_entry 1");
if (!file->basename) out_of_memory("receive_file_entry 1");
+ file->flags = flags;
file->length = read_longint(f);
file->modtime = (flags & SAME_TIME) ? last_time : (time_t)read_int(f);
file->mode = (flags & SAME_MODE) ? last_mode : (mode_t)read_int(f);
file->length = read_longint(f);
file->modtime = (flags & SAME_TIME) ? last_time : (time_t)read_int(f);
file->mode = (flags & SAME_MODE) ? last_mode : (mode_t)read_int(f);
@@
-321,9
+322,9
@@
void receive_file_entry(struct file_struct **fptr,
/* determine if a file in a different filesstem should be skipped
when one_file_system is set. We bascally only want to include
the mount points - but they can be hard to find! */
/* determine if a file in a different filesstem should be skipped
when one_file_system is set. We bascally only want to include
the mount points - but they can be hard to find! */
-static int skip_filesystem(char *fname,
struct stat
*st)
+static int skip_filesystem(char *fname,
STRUCT_STAT
*st)
{
{
-
struct stat
st2;
+
STRUCT_STAT
st2;
char *p = strrchr(fname, '/');
/* skip all but directories */
char *p = strrchr(fname, '/');
/* skip all but directories */
@@
-345,12
+346,12
@@
static int skip_filesystem(char *fname, struct stat *st)
static struct file_struct *make_file(char *fname)
{
struct file_struct *file;
static struct file_struct *make_file(char *fname)
{
struct file_struct *file;
-
struct stat
st;
+
STRUCT_STAT
st;
char sum[SUM_LENGTH];
char *p;
char cleaned_name[MAXPATHLEN];
char sum[SUM_LENGTH];
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;
@@
-359,13
+360,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;
}
@@
-378,7
+379,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");
@@
-417,7
+418,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;
}
@@
-460,7
+461,7
@@
static struct file_struct *make_file(char *fname)
static void send_file_name(int f,struct file_list *flist,char *fname,
static void send_file_name(int f,struct file_list *flist,char *fname,
- int recursive)
+ int recursive
, unsigned base_flags
)
{
struct file_struct *file;
{
struct file_struct *file;
@@
-482,7
+483,7
@@
static void send_file_name(int f,struct file_list *flist,char *fname,
if (strcmp(file->basename,"")) {
flist->files[flist->count++] = file;
if (strcmp(file->basename,"")) {
flist->files[flist->count++] = file;
- send_file_entry(file,f);
+ send_file_entry(file,f
,base_flags
);
}
if (S_ISDIR(file->mode) && recursive) {
}
if (S_ISDIR(file->mode) && recursive) {
@@
-506,22
+507,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);
@@
-532,16
+532,17
@@
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);
}
}
for (di=readdir(d); di; di=readdir(d)) {
}
}
for (di=readdir(d); di; di=readdir(d)) {
- if (strcmp(di->d_name,".")==0 ||
- strcmp(di->d_name,"..")==0)
+ char *dname = d_name(di);
+ if (strcmp(dname,".")==0 ||
+ strcmp(dname,"..")==0)
continue;
continue;
- str
ncpy(p,di->d_
name,MAXPATHLEN-(l+1));
- send_file_name(f,flist,fname,recurse);
+ str
lcpy(p,d
name,MAXPATHLEN-(l+1));
+ send_file_name(f,flist,fname,recurse
,FLAG_DELETE
);
}
closedir(d);
}
closedir(d);
@@
-552,15
+553,15
@@
static void send_directory(int f,struct file_list *flist,char *dir)
struct file_list *send_file_list(int f,int argc,char *argv[])
{
int i,l;
struct file_list *send_file_list(int f,int argc,char *argv[])
{
int i,l;
-
struct stat
st;
+
STRUCT_STAT
st;
char *p,*dir;
char dbuf[MAXPATHLEN];
char lastpath[MAXPATHLEN]="";
struct file_list *flist;
if (verbose && recurse && !am_server && f != -1) {
char *p,*dir;
char dbuf[MAXPATHLEN];
char lastpath[MAXPATHLEN]="";
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]));
@@
-572,26
+573,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;
}
@@
-612,11
+616,11
@@
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;
- send_file_name(f, flist, fname, 0);
+ send_file_name(f, flist, fname, 0
, 0
);
*p = '/';
}
} else {
*p = '/';
}
} else {
@@
-629,22
+633,22
@@
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;
}
flist_dir = dir;
if (one_file_system)
set_filesystem(fname);
dir,strerror(errno));
continue;
}
flist_dir = dir;
if (one_file_system)
set_filesystem(fname);
- send_file_name(f,flist,fname,recurse);
+ send_file_name(f,flist,fname,recurse
,FLAG_DELETE
);
flist_dir = NULL;
if (chdir(dbuf) != 0) {
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);
}
@@
-653,16
+657,15
@@
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);
- send_file_name(f,flist,fname,recurse);
+ send_file_name(f,flist,fname,recurse
,FLAG_DELETE
);
}
if (f != -1) {
}
if (f != -1) {
- send_file_entry(NULL,f);
- write_flush(f);
+ send_file_entry(NULL,f,0);
}
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);
@@
-677,8
+680,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;
}
@@
-690,8
+698,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]));
@@
-729,17
+737,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 */
@@
-753,7
+761,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;
@@
-848,7
+856,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]);
}
@@
-870,9
+878,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;