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
handle broken readdir() on Solaris 2.6 (it returns the name offset by
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
63b8663
..
5303873
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,7
+65,7
@@
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)
@@
-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;
@@
-224,8
+224,8
@@
void send_file_entry(struct file_struct *file,int f)
-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;
@@
-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,7
+346,7
@@
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];
@@
-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) {
@@
-537,11
+538,12
@@
static void send_directory(int f,struct file_list *flist,char *dir)
}
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;
- strncpy(p,d
i->d_
name,MAXPATHLEN-(l+1));
- send_file_name(f,flist,fname,recurse);
+ strncpy(p,dname,MAXPATHLEN-(l+1));
+ send_file_name(f,flist,fname,recurse
,FLAG_DELETE
);
}
closedir(d);
}
closedir(d);
@@
-552,7
+554,7
@@
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]="";
char *p,*dir;
char dbuf[MAXPATHLEN];
char lastpath[MAXPATHLEN]="";
@@
-616,7
+618,7
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
*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 {
@@
-641,7
+643,7
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
flist_dir = dir;
if (one_file_system)
set_filesystem(fname);
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) {
fprintf(FERROR,"chdir %s : %s\n",
flist_dir = NULL;
if (chdir(dbuf) != 0) {
fprintf(FERROR,"chdir %s : %s\n",
@@
-653,11
+655,11
@@
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);
+ send_file_entry(NULL,f
,0
);
write_flush(f);
}
write_flush(f);
}