extern int verbose;
extern int am_server;
extern int always_checksum;
-extern off_t total_size;
+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 = NULL;
+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(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 void send_directory(int f,struct file_list *flist,char *dir);
-static char *flist_dir = NULL;
+static char *flist_dir;
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=0;
- static mode_t last_mode=0;
- static dev_t last_rdev=0;
- static uid_t last_uid=0;
- static gid_t last_gid=0;
- static char lastname[MAXPATHLEN]="";
+ static time_t last_time;
+ static mode_t last_mode;
+ static dev_t last_rdev;
+ static uid_t last_uid;
+ static gid_t last_gid;
+ static char lastname[MAXPATHLEN];
char *fname;
int l1,l2;
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;
write_byte(f,l2);
write_buf(f,fname+l1,l2);
- write_int(f,(int)file->length);
+ write_longint(f,file->length);
if (!(flags & SAME_TIME))
write_int(f,(int)file->modtime);
if (!(flags & SAME_MODE))
#if SUPPORT_HARD_LINKS
if (preserve_hard_links && S_ISREG(file->mode)) {
- write_int(f,file->dev);
- write_int(f,file->inode);
+ write_int(f,(int)file->dev);
+ write_int(f,(int)file->inode);
}
#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=0;
- static mode_t last_mode=0;
- static dev_t last_rdev=0;
- static uid_t last_uid=0;
- static gid_t last_gid=0;
+ static time_t last_time;
+ static mode_t last_mode;
+ static dev_t last_rdev;
+ static uid_t last_uid;
+ static gid_t last_gid;
static char lastname[MAXPATHLEN];
char thisname[MAXPATHLEN];
int l1=0,l2=0;
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->length = (off_t)read_int(f);
+ 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);
if (preserve_uid)
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];
bzero(sum,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");
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) {
-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, 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) && recurse) {
+ 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;
d = opendir(dir);
if (!d) {
- fprintf(FERROR,"%s: %s\n",
+ io_error = 1;
+ rprintf(FERROR,"%s: %s\n",
dir,strerror(errno));
return;
}
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;
}
strcpy(p,".cvsignore");
local_exclude_list = make_exclude_list(fname,NULL,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);
+ 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;
- char *p,*dir;
- char dbuf[MAXPATHLEN];
- struct file_list *flist;
-
- if (verbose && recurse && !am_server && f != -1) {
- fprintf(FINFO,"building file list ... ");
- fflush(FINFO);
- }
-
- flist = (struct file_list *)malloc(sizeof(flist[0]));
- if (!flist) out_of_memory("send_file_list");
-
- flist->count=0;
- flist->malloced = 1000;
- flist->files = (struct file_struct **)malloc(sizeof(flist->files[0])*
- flist->malloced);
- if (!flist->files) out_of_memory("send_file_list");
+ int i,l;
+ STRUCT_STAT st;
+ char *p,*dir;
+ char dbuf[MAXPATHLEN];
+ char lastpath[MAXPATHLEN]="";
+ struct file_list *flist;
+
+ if (verbose && recurse && !am_server && f != -1) {
+ rprintf(FINFO,"building file list ... ");
+ rflush(FINFO);
+ }
- for (i=0;i<argc;i++) {
- char fname2[MAXPATHLEN];
- char *fname = fname2;
+ flist = (struct file_list *)malloc(sizeof(flist[0]));
+ if (!flist) out_of_memory("send_file_list");
- strncpy(fname,argv[i],MAXPATHLEN-1);
- fname[MAXPATHLEN-1] = 0;
+ flist->count=0;
+ flist->malloced = 1000;
+ flist->files = (struct file_struct **)malloc(sizeof(flist->files[0])*
+ flist->malloced);
+ if (!flist->files) out_of_memory("send_file_list");
- l = strlen(fname);
- if (l != 1 && fname[l-1] == '/') {
- strcat(fname,".");
- }
+ for (i=0;i<argc;i++) {
+ char fname2[MAXPATHLEN];
+ char *fname = fname2;
- if (link_stat(fname,&st) != 0) {
- fprintf(FERROR,"%s : %s\n",fname,strerror(errno));
- continue;
- }
+ strncpy(fname,argv[i],MAXPATHLEN-1);
+ fname[MAXPATHLEN-1] = 0;
- if (S_ISDIR(st.st_mode) && !recurse) {
- fprintf(FERROR,"skipping directory %s\n",fname);
- continue;
- }
-
- dir = NULL;
-
- if (!relative_paths) {
- p = strrchr(fname,'/');
- if (p) {
- *p = 0;
- if (p == fname)
- dir = "/";
- else
- dir = fname;
- fname = p+1;
- }
- }
+ l = strlen(fname);
+ if (l != 1 && fname[l-1] == '/') {
+ strcat(fname,".");
+ }
- if (!*fname)
- fname = ".";
+ if (link_stat(fname,&st) != 0) {
+ io_error=1;
+ rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
+ continue;
+ }
- 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",dir,strerror(errno));
- continue;
- }
- flist_dir = dir;
- if (one_file_system)
- set_filesystem(fname);
- send_file_name(f,flist,fname);
- flist_dir = NULL;
- if (chdir(dbuf) != 0) {
- fprintf(FERROR,"chdir %s : %s\n",dbuf,strerror(errno));
- exit_cleanup(1);
- }
- continue;
- }
+ if (S_ISDIR(st.st_mode) && !recurse) {
+ rprintf(FINFO,"skipping directory %s\n",fname);
+ continue;
+ }
- if (one_file_system)
- set_filesystem(fname);
- send_file_name(f,flist,fname);
- }
+ dir = NULL;
+
+ if (!relative_paths) {
+ p = strrchr(fname,'/');
+ if (p) {
+ *p = 0;
+ if (p == fname)
+ dir = "/";
+ else
+ dir = fname;
+ fname = p+1;
+ }
+ } else if (f != -1 && (p=strrchr(fname,'/'))) {
+ /* this ensures we send the intermediate directories,
+ thus getting their permissions right */
+ *p = 0;
+ if (strcmp(lastpath,fname)) {
+ strcpy(lastpath, fname);
+ *p = '/';
+ for (p=fname+1; (p=strchr(p,'/')); p++) {
+ *p = 0;
+ send_file_name(f, flist, fname, 0, 0);
+ *p = '/';
+ }
+ } else {
+ *p = '/';
+ }
+ }
+
+ if (!*fname)
+ fname = ".";
+
+ if (dir && *dir) {
+ if (getcwd(dbuf,MAXPATHLEN-1) == NULL) {
+ rprintf(FERROR,"getwd : %s\n",strerror(errno));
+ exit_cleanup(1);
+ }
+ if (chdir(dir) != 0) {
+ io_error=1;
+ 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,FLAG_DELETE);
+ flist_dir = NULL;
+ if (chdir(dbuf) != 0) {
+ rprintf(FERROR,"chdir %s : %s\n",
+ dbuf,strerror(errno));
+ exit_cleanup(1);
+ }
+ continue;
+ }
+
+ if (one_file_system)
+ set_filesystem(fname);
+ send_file_name(f,flist,fname,recurse,FLAG_DELETE);
+ }
- if (f != -1) {
- send_file_entry(NULL,f);
- write_flush(f);
- }
+ if (f != -1) {
+ send_file_entry(NULL,f,0);
+ write_flush(f);
+ }
- if (verbose && recurse && !am_server && f != -1)
- fprintf(FINFO,"done\n");
+ if (verbose && recurse && !am_server && f != -1)
+ rprintf(FINFO,"done\n");
+
+ clean_flist(flist);
+
+ /* now send the uid/gid list. This was introduced in protocol
+ version 15 */
+ if (f != -1 && remote_version >= 15) {
+ send_uid_list(f);
+ }
- clean_flist(flist);
+ /* if protocol version is >= 17 then send the io_error flag */
+ if (f != -1 && remote_version >= 17) {
+ write_int(f, io_error);
+ }
- /* now send the uid/gid list. This was introduced in protocol version 15 */
- if (f != -1 && remote_version >= 15) {
- send_uid_list(f);
- }
+ if (verbose > 2)
+ rprintf(FINFO,"send_file_list done\n");
- return flist;
+ 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(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");
+
return flist;
oom:
if (!file) return;
if (file->basename) free(file->basename);
if (file->link) free(file->link);
+ if (file->sum) free(file->sum);
bzero((char *)file, sizeof(*file));
- free(file);
}
int i;
for (i=1;i<flist->count;i++) {
free_file(flist->files[i]);
+ free(flist->files[i]);
}
bzero((char *)flist->files, sizeof(flist->files[0])*flist->count);
free(flist->files);
for (i=1;i<flist->count;i++) {
if (flist->files[i]->basename &&
+ flist->files[i-1]->basename &&
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]);
- flist->files[i] = NULL;
}
}
}
static int n;
char *p = names[n];
- if (!f) return NULL;
+ if (!f || !f->basename) return NULL;
n = (n+1)%10;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff