X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/575f2fca9ab74cb30cca67323a414d7b0cdd0845..bcacc18bdf1bdac625ef1f178e8e32892544cc30:/flist.c

diff --git a/flist.c b/flist.c
index 3e3b3a68..80754e95 100644
--- a/flist.c
+++ b/flist.c
@@ -48,16 +48,16 @@ extern int io_error;
 
 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
 }
 
@@ -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
  */
-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)
@@ -80,7 +80,7 @@ static dev_t filesystem_dev;
 
 static void set_filesystem(char *fname)
 {
-  struct stat st;
+  STRUCT_STAT st;
   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;
@@ -155,7 +155,7 @@ void send_file_entry(struct file_struct *file,int f)
 
   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;
@@ -209,7 +209,7 @@ void send_file_entry(struct file_struct *file,int f)
 #endif
 
   if (always_checksum) {
-    write_buf(f,file->sum,csum_length);
+	  write_buf(f,file->sum,csum_length);
   }       
 
   last_mode = file->mode;
@@ -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;
@@ -280,6 +280,7 @@ void receive_file_entry(struct file_struct **fptr,
   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);
@@ -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! */
-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 */
@@ -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;
-	struct stat st;
+	STRUCT_STAT st;
 	char sum[SUM_LENGTH];
 	char *p;
 	char cleaned_name[MAXPATHLEN];
@@ -426,10 +427,17 @@ static struct file_struct *make_file(char *fname)
 	}
 #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) {
@@ -453,7 +461,7 @@ static struct file_struct *make_file(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;
 
@@ -475,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;
-    send_file_entry(file,f);
+    send_file_entry(file,f,base_flags);
   }
 
   if (S_ISDIR(file->mode) && recursive) {
@@ -534,7 +542,7 @@ static void send_directory(int f,struct file_list *flist,char *dir)
 		    strcmp(di->d_name,"..")==0)
 			continue;
 		strncpy(p,di->d_name,MAXPATHLEN-(l+1));
-		send_file_name(f,flist,fname,recurse);
+		send_file_name(f,flist,fname,recurse,FLAG_DELETE);
 	}
 
 	closedir(d);
@@ -545,7 +553,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 stat st;
+	STRUCT_STAT st;
 	char *p,*dir;
 	char dbuf[MAXPATHLEN];
 	char lastpath[MAXPATHLEN]="";
@@ -609,7 +617,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
 				*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 {
@@ -634,7 +642,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
 			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",
@@ -646,11 +654,11 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
 		
 		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);
 	}