#include "rsync.h"
+extern struct stats stats;
+
extern int csum_length;
extern int verbose;
extern int am_server;
extern int always_checksum;
-extern int64 total_size;
extern int cvs_exclude;
extern int relative_paths;
extern int copy_links;
extern int remote_version;
+extern int io_error;
-static char **local_exclude_list;
+static struct exclude_struct **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 (check_exclude(fname,local_exclude_list,st)) {
if (verbose > 2)
- fprintf(FERROR,"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;
}
static char *flist_dir;
-static void clean_fname(char *name)
-{
- char *p;
- int l;
- int modified = 1;
-
- if (!name) return;
-
- while (modified) {
- modified = 0;
-
- if ((p=strstr(name,"/./"))) {
- modified = 1;
- while (*p) {
- p[0] = p[2];
- p++;
- }
- }
-
- if ((p=strstr(name,"//"))) {
- modified = 1;
- while (*p) {
- p[0] = p[1];
- p++;
- }
- }
-
- if (strncmp(p=name,"./",2) == 0) {
- modified = 1;
- do {
- p[0] = p[2];
- } while (*p++);
- }
-
- l = strlen(p=name);
- if (l > 1 && p[l-1] == '/') {
- modified = 1;
- p[l-1] = 0;
- }
- }
-}
-
-
-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;
if (file->gid == last_gid) flags |= SAME_GID;
if (file->modtime == last_time) flags |= SAME_TIME;
- for (l1=0;lastname[l1] && fname[l1] == lastname[l1];l1++) ;
+ for (l1=0;lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);l1++) ;
l2 = strlen(fname) - l1;
if (l1 > 0) flags |= SAME_NAME;
if (l2 > 255) flags |= LONG_NAME;
+ /* we must make sure we don't send a zero flags byte or the other
+ end will terminate the flist transfer */
+ if (flags == 0 && !S_ISDIR(file->mode)) flags |= FLAG_DELETE;
+ if (flags == 0) flags |= LONG_NAME;
+
write_byte(f,flags);
if (flags & SAME_NAME)
write_byte(f,l1);
#endif
if (always_checksum) {
- write_buf(f,file->sum,csum_length);
+ write_buf(f,file->sum,csum_length);
}
last_mode = file->mode;
last_gid = file->gid;
last_time = file->modtime;
- strncpy(lastname,fname,MAXPATHLEN-1);
+ strlcpy(lastname,fname,MAXPATHLEN-1);
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;
file = (struct file_struct *)malloc(sizeof(*file));
if (!file) out_of_memory("receive_file_entry");
- bzero((char *)file,sizeof(*file));
+ memset((char *)file, 0, sizeof(*file));
(*fptr) = file;
- strncpy(thisname,lastname,l1);
- read_buf(f,&thisname[l1],l2);
+ if (l2 >= MAXPATHLEN-l1) overflow("receive_file_entry");
+
+ strlcpy(thisname,lastname,l1);
+ read_sbuf(f,&thisname[l1],l2);
thisname[l1+l2] = 0;
- strncpy(lastname,thisname,MAXPATHLEN-1);
+ strlcpy(lastname,thisname,MAXPATHLEN-1);
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 (!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)
+{
+ STRUCT_STAT st2;
+ char *p = strrchr(fname, '/');
+
+ /* skip all but directories */
+ if (!S_ISDIR(st->st_mode)) return 1;
+
+ /* if its not a subdirectory then allow */
+ if (!p) return 0;
+
+ *p = 0;
+ if (link_stat(fname, &st2)) {
+ *p = '/';
+ return 0;
+ }
+ *p = '/';
+
+ return (st2.st_dev != filesystem_dev);
+}
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];
- strncpy(cleaned_name, fname, MAXPATHLEN-1);
+ strlcpy(cleaned_name, fname, MAXPATHLEN-1);
cleaned_name[MAXPATHLEN-1] = 0;
clean_fname(cleaned_name);
fname = cleaned_name;
- bzero(sum,SUM_LENGTH);
+ memset(sum,0,SUM_LENGTH);
if (link_stat(fname,&st) != 0) {
- fprintf(FERROR,"%s: %s\n",
+ io_error = 1;
+ rprintf(FERROR,"%s: %s\n",
fname,strerror(errno));
return NULL;
}
if (S_ISDIR(st.st_mode) && !recurse) {
- fprintf(FERROR,"skipping directory %s\n",fname);
+ rprintf(FINFO,"skipping directory %s\n",fname);
return NULL;
}
- if (one_file_system && st.st_dev != filesystem_dev)
- return NULL;
+ if (one_file_system && st.st_dev != filesystem_dev) {
+ if (skip_filesystem(fname, &st))
+ return NULL;
+ }
if (!match_file_name(fname,&st))
return NULL;
if (verbose > 2)
- fprintf(FERROR,"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");
- bzero((char *)file,sizeof(*file));
+ memset((char *)file,0,sizeof(*file));
if ((p = strrchr(fname,'/'))) {
static char *lastdir;
int l;
char lnk[MAXPATHLEN];
if ((l=readlink(fname,lnk,MAXPATHLEN-1)) == -1) {
- fprintf(FERROR,"readlink %s : %s\n",
+ io_error=1;
+ 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) {
}
if (!S_ISDIR(st.st_mode))
- total_size += st.st_size;
+ stats.total_size += st.st_size;
return file;
}
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) {
- char **last_exclude_list = local_exclude_list;
- send_directory(f,flist,f_name(file));
- local_exclude_list = last_exclude_list;
- return;
+ struct exclude_struct **last_exclude_list = local_exclude_list;
+ send_directory(f,flist,f_name(file));
+ local_exclude_list = last_exclude_list;
+ return;
}
}
d = opendir(dir);
if (!d) {
- fprintf(FERROR,"%s: %s\n",
+ io_error = 1;
+ rprintf(FERROR,"opendir(%s): %s\n",
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) {
- fprintf(FERROR,"skipping long-named directory %s\n",fname);
+ io_error = 1;
+ rprintf(FERROR,"skipping long-named directory %s\n",fname);
closedir(d);
return;
}
- strcat(fname,"/");
+ strlcat(fname,"/", MAXPATHLEN-1);
l++;
}
p = fname + strlen(fname);
if (cvs_exclude) {
if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN-1) {
strcpy(p,".cvsignore");
- local_exclude_list = make_exclude_list(fname,NULL,0);
+ local_exclude_list = make_exclude_list(fname,NULL,0,0);
} else {
- fprintf(FERROR,"cannot cvs-exclude in long-named directory %s\n",fname);
+ io_error = 1;
+ 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);
+ strlcpy(p,dname,MAXPATHLEN-(l+1));
+ send_file_name(f,flist,fname,recurse,0);
}
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;
+ int64 start_write;
if (verbose && recurse && !am_server && f != -1) {
- fprintf(FINFO,"building file list ... ");
- fflush(FINFO);
+ rprintf(FINFO,"building file list ... ");
+ rflush(FINFO);
}
+ start_write = stats.total_written;
+
flist = (struct file_list *)malloc(sizeof(flist[0]));
if (!flist) 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;
- 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] == '/') {
- strcat(fname,".");
+ strlcat(fname,".",MAXPATHLEN-1);
}
if (link_stat(fname,&st) != 0) {
- fprintf(FERROR,"%s : %s\n",fname,strerror(errno));
+ io_error=1;
+ rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
continue;
}
if (S_ISDIR(st.st_mode) && !recurse) {
- fprintf(FERROR,"skipping directory %s\n",fname);
+ rprintf(FINFO,"skipping directory %s\n",fname);
continue;
}
thus getting their permissions right */
*p = 0;
if (strcmp(lastpath,fname)) {
- strcpy(lastpath, fname);
+ strlcpy(lastpath, fname, sizeof(lastpath)-1);
*p = '/';
for (p=fname+1; (p=strchr(p,'/')); p++) {
+ int copy_links_saved = copy_links;
*p = 0;
- send_file_name(f, flist, fname, 0);
+ copy_links = 0;
+ send_file_name(f, flist, fname, 0, 0);
+ copy_links = copy_links_saved;
*p = '/';
}
} else {
fname = ".";
if (dir && *dir) {
- if (getcwd(dbuf,MAXPATHLEN-1) == NULL) {
- fprintf(FERROR,"getwd : %s\n",strerror(errno));
- exit_cleanup(1);
- }
- if (chdir(dir) != 0) {
- fprintf(FERROR,"chdir %s : %s\n",
+ char *olddir = push_dir(dir, 1);
+
+ if (!olddir) {
+ io_error=1;
+ rprintf(FERROR,"push_dir %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",
- dbuf,strerror(errno));
+ if (pop_dir(olddir) != 0) {
+ rprintf(FERROR,"pop_dir %s : %s\n",
+ dir,strerror(errno));
exit_cleanup(1);
}
continue;
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);
- write_flush(f);
+ send_file_entry(NULL,f,0);
}
if (verbose && recurse && !am_server && f != -1)
- fprintf(FINFO,"done\n");
+ rprintf(FINFO,"done\n");
clean_flist(flist);
send_uid_list(f);
}
+ /* if protocol version is >= 17 then send the io_error flag */
+ if (f != -1 && remote_version >= 17) {
+ write_int(f, io_error);
+ }
+
+ if (f != -1) {
+ io_end_buffering(f);
+ stats.flist_size = stats.total_written - start_write;
+ stats.num_files = flist->count;
+ }
+
+ if (verbose > 2)
+ rprintf(FINFO,"send_file_list done\n");
+
return flist;
}
{
struct file_list *flist;
unsigned char flags;
+ int64 start_read;
if (verbose && recurse && !am_server) {
- fprintf(FINFO,"receiving file list ... ");
- fflush(FINFO);
+ rprintf(FINFO,"receiving file list ... ");
+ rflush(FINFO);
}
+ start_read = stats.total_read;
+
flist = (struct file_list *)malloc(sizeof(flist[0]));
if (!flist)
goto oom;
receive_file_entry(&flist->files[i],flags,f);
if (S_ISREG(flist->files[i]->mode))
- total_size += flist->files[i]->length;
+ stats.total_size += flist->files[i]->length;
flist->count++;
if (verbose > 2)
- fprintf(FERROR,"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(FERROR,"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 */
recv_uid_list(f, flist);
}
+ /* if protocol version is >= 17 then recv the io_error flag */
+ if (f != -1 && remote_version >= 17) {
+ io_error |= read_int(f);
+ }
+
+ if (verbose > 2)
+ rprintf(FINFO,"recv_file_list done\n");
+
+ stats.flist_size = stats.total_read - start_read;
+ stats.num_files = flist->count;
+
return flist;
oom:
if (!(*f1)->basename) return -1;
if (!(*f2)->basename) return 1;
if ((*f1)->dirname == (*f2)->dirname)
- return strcmp((*f1)->basename, (*f2)->basename);
- return strcmp(f_name(*f1),f_name(*f2));
+ return u_strcmp((*f1)->basename, (*f2)->basename);
+ return u_strcmp(f_name(*f1),f_name(*f2));
}
if (file->basename) free(file->basename);
if (file->link) free(file->link);
if (file->sum) free(file->sum);
- bzero((char *)file, sizeof(*file));
+ memset((char *)file, 0, sizeof(*file));
}
free_file(flist->files[i]);
free(flist->files[i]);
}
- bzero((char *)flist->files, sizeof(flist->files[0])*flist->count);
+ memset((char *)flist->files, 0, sizeof(flist->files[0])*flist->count);
free(flist->files);
- bzero((char *)flist, sizeof(*flist));
+ memset((char *)flist, 0, sizeof(*flist));
free(flist);
}
strcmp(f_name(flist->files[i]),
f_name(flist->files[i-1])) == 0) {
if (verbose > 1 && !am_server)
- fprintf(FERROR,"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]);
}
n = (n+1)%10;
if (f->dirname) {
- sprintf(p, "%s/%s", f->dirname, f->basename);
+ slprintf(p, MAXPATHLEN-1, "%s/%s", f->dirname, f->basename);
} else {
- strcpy(p, f->basename);
+ strlcpy(p, f->basename, MAXPATHLEN-1);
}
return p;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff