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) {
- return stat(Path, Buffer);
+ return do_stat(Path, Buffer);
} else {
- return lstat(Path, Buffer);
+ return do_lstat(Path, Buffer);
}
#else
- return stat(Path, Buffer);
+ return do_stat(Path, Buffer);
#endif
}
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)
- fprintf(FINFO,"excluding file %s\n",fname);
+ rprintf(FINFO,"excluding file %s\n",fname);
return 0;
}
return 1;
static void set_filesystem(char *fname)
{
- struct stat st;
+ STRUCT_STAT st;
if (link_stat(fname,&st) != 0) return;
filesystem_dev = st.st_dev;
}
-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;
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;
#endif
if (always_checksum) {
- write_buf(f,file->sum,csum_length);
+ write_buf(f,file->sum,csum_length);
}
last_mode = file->mode;
-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;
bzero((char *)file,sizeof(*file));
(*fptr) = file;
+ if (l2 >= MAXPATHLEN-l1) overflow("receive_file_entry");
+
strncpy(thisname,lastname,l1);
- read_buf(f,&thisname[l1],l2);
+ read_sbuf(f,&thisname[l1],l2);
thisname[l1+l2] = 0;
strncpy(lastname,thisname,MAXPATHLEN-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);
int l = read_int(f);
file->link = (char *)malloc(l+1);
if (!file->link) out_of_memory("receive_file_entry 2");
- read_buf(f,file->link,l);
- file->link[l] = 0;
+ read_sbuf(f,file->link,l);
}
#if SUPPORT_HARD_LINKS
/* 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 */
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];
if (link_stat(fname,&st) != 0) {
io_error = 1;
- fprintf(FERROR,"%s: %s\n",
+ rprintf(FERROR,"%s: %s\n",
fname,strerror(errno));
return NULL;
}
if (S_ISDIR(st.st_mode) && !recurse) {
- fprintf(FINFO,"skipping directory %s\n",fname);
+ rprintf(FINFO,"skipping directory %s\n",fname);
return NULL;
}
return NULL;
if (verbose > 2)
- fprintf(FINFO,"make_file(%s)\n",fname);
+ rprintf(FINFO,"make_file(%s)\n",fname);
file = (struct file_struct *)malloc(sizeof(*file));
if (!file) out_of_memory("make_file");
char lnk[MAXPATHLEN];
if ((l=readlink(fname,lnk,MAXPATHLEN-1)) == -1) {
io_error=1;
- fprintf(FERROR,"readlink %s : %s\n",
+ rprintf(FERROR,"readlink %s : %s\n",
fname,strerror(errno));
return NULL;
}
}
#endif
- if (always_checksum && S_ISREG(st.st_mode)) {
+ if (always_checksum) {
file->sum = (char *)malloc(MD4_SUM_LENGTH);
if (!file->sum) out_of_memory("md4 sum");
- file_checksum(fname,file->sum,st.st_size);
+ /* drat. we have to provide a null checksum for non-regular
+ files in order to be compatible with earlier versions
+ of rsync */
+ if (S_ISREG(st.st_mode)) {
+ file_checksum(fname,file->sum,st.st_size);
+ } else {
+ memset(file->sum, 0, MD4_SUM_LENGTH);
+ }
}
if (flist_dir) {
static void send_file_name(int f,struct file_list *flist,char *fname,
- int recursive)
+ int recursive, unsigned base_flags)
{
struct file_struct *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) {
d = opendir(dir);
if (!d) {
io_error = 1;
- fprintf(FERROR,"%s: %s\n",
+ rprintf(FERROR,"%s: %s\n",
dir,strerror(errno));
return;
}
if (fname[l-1] != '/') {
if (l == MAXPATHLEN-1) {
io_error = 1;
- fprintf(FERROR,"skipping long-named directory %s\n",fname);
+ rprintf(FERROR,"skipping long-named directory %s\n",fname);
closedir(d);
return;
}
local_exclude_list = make_exclude_list(fname,NULL,0);
} else {
io_error = 1;
- fprintf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname);
+ rprintf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname);
}
}
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;
- strncpy(p,di->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);
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) {
- fprintf(FINFO,"building file list ... ");
- fflush(FINFO);
+ rprintf(FINFO,"building file list ... ");
+ rflush(FINFO);
}
flist = (struct file_list *)malloc(sizeof(flist[0]));
if (link_stat(fname,&st) != 0) {
io_error=1;
- fprintf(FERROR,"%s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
continue;
}
if (S_ISDIR(st.st_mode) && !recurse) {
- fprintf(FINFO,"skipping directory %s\n",fname);
+ rprintf(FINFO,"skipping directory %s\n",fname);
continue;
}
*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 {
if (dir && *dir) {
if (getcwd(dbuf,MAXPATHLEN-1) == NULL) {
- fprintf(FERROR,"getwd : %s\n",strerror(errno));
+ rprintf(FERROR,"getwd : %s\n",strerror(errno));
exit_cleanup(1);
}
if (chdir(dir) != 0) {
io_error=1;
- fprintf(FERROR,"chdir %s : %s\n",
+ rprintf(FERROR,"chdir %s : %s\n",
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) {
- fprintf(FERROR,"chdir %s : %s\n",
+ rprintf(FERROR,"chdir %s : %s\n",
dbuf,strerror(errno));
exit_cleanup(1);
}
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) {
- send_file_entry(NULL,f);
+ send_file_entry(NULL,f,0);
write_flush(f);
}
if (verbose && recurse && !am_server && f != -1)
- fprintf(FINFO,"done\n");
+ rprintf(FINFO,"done\n");
clean_flist(flist);
write_int(f, io_error);
}
+ if (verbose > 2)
+ rprintf(FINFO,"send_file_list done\n");
+
return flist;
}
unsigned char flags;
if (verbose && recurse && !am_server) {
- fprintf(FINFO,"receiving file list ... ");
- fflush(FINFO);
+ rprintf(FINFO,"receiving file list ... ");
+ rflush(FINFO);
}
flist = (struct file_list *)malloc(sizeof(flist[0]));
flist->count++;
if (verbose > 2)
- fprintf(FINFO,"recv_file_name(%s)\n",f_name(flist->files[i]));
+ rprintf(FINFO,"recv_file_name(%s)\n",f_name(flist->files[i]));
}
if (verbose > 2)
- fprintf(FINFO,"received %d names\n",flist->count);
+ rprintf(FINFO,"received %d names\n",flist->count);
clean_flist(flist);
if (verbose && recurse && !am_server) {
- fprintf(FINFO,"done\n");
+ rprintf(FINFO,"done\n");
}
/* now recv the uid/gid list. This was introduced in protocol version 15 */
io_error |= read_int(f);
}
+ if (verbose > 2)
+ rprintf(FINFO,"recv_file_list done\n");
+
return flist;
oom:
strcmp(f_name(flist->files[i]),
f_name(flist->files[i-1])) == 0) {
if (verbose > 1 && !am_server)
- fprintf(FINFO,"removing duplicate name %s from file list %d\n",
+ rprintf(FINFO,"removing duplicate name %s from file list %d\n",
f_name(flist->files[i-1]),i-1);
free_file(flist->files[i]);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff