Matt McCutchen's Web Site / rsync / rsync.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added "debug_type" to the exclude_list_struct.
[rsync/rsync.git] / flist.c
diff --git a/flist.c b/flist.c
index 6baa8bf..077e42c 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -64,9 +64,9 @@ extern int sanitize_paths;
 extern int read_batch;
 extern int write_batch;
 
-extern struct exclude_struct **exclude_list;
-extern struct exclude_struct **server_exclude_list;
-extern struct exclude_struct **local_exclude_list;
+extern struct exclude_list_struct exclude_list;
+extern struct exclude_list_struct server_exclude_list;
+extern struct exclude_list_struct local_exclude_list;
 
 int io_error;
 
@@ -226,15 +226,15 @@ static int check_exclude_file(char *fname, int is_dir, int exclude_level)
                                return 0;
                }
        }
-       if (server_exclude_list
-        && check_exclude(server_exclude_list, fname, is_dir))
+       if (server_exclude_list.head
+        && check_exclude(&server_exclude_list, fname, is_dir))
                return 1;
        if (exclude_level != ALL_EXCLUDES)
                return 0;
-       if (exclude_list && check_exclude(exclude_list, fname, is_dir))
+       if (exclude_list.head && check_exclude(&exclude_list, fname, is_dir))
                return 1;
-       if (local_exclude_list
-        && check_exclude(local_exclude_list, fname, is_dir))
+       if (local_exclude_list.head
+           && check_exclude(&local_exclude_list, fname, is_dir))
                return 1;
        return 0;
 }
@@ -324,8 +324,9 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        unsigned short flags;
        static time_t modtime;
        static mode_t mode;
-       static DEV64_T rdev, rdev_high;
-       static DEV64_T dev;
+       static uint64 dev;
+       static dev_t rdev;
+       static uint32 rdev_major;
        static uid_t uid;
        static gid_t gid;
        static char lastname[MAXPATHLEN];
@@ -338,7 +339,8 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        if (!file) {
                write_byte(f, 0);
                modtime = 0, mode = 0;
-               rdev = 0, rdev_high = 0, dev = 0;
+               dev = 0, rdev = makedev(0, 0);
+               rdev_major = 0;
                uid = 0, gid = 0;
                *lastname = '\0';
                return;
@@ -357,21 +359,20 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        if (preserve_devices) {
                if (protocol_version < 28) {
                        if (IS_DEVICE(mode)) {
-                               if (file->u.rdev == rdev) {
-                                       /* Set both flags to simplify the test
-                                        * when writing the data. */
-                                       flags |= XMIT_SAME_RDEV_pre28
-                                           | XMIT_SAME_HIGH_RDEV;
-                               } else
+                               if (file->u.rdev == rdev)
+                                       flags |= XMIT_SAME_RDEV_pre28;
+                               else
                                        rdev = file->u.rdev;
                        } else
-                               rdev = 0;
+                               rdev = makedev(0, 0);
                } else if (IS_DEVICE(mode)) {
                        rdev = file->u.rdev;
-                       if ((rdev & ~(DEV64_T)0xFF) == rdev_high)
-                               flags |= XMIT_SAME_HIGH_RDEV;
+                       if ((uint32)major(rdev) == rdev_major)
+                               flags |= XMIT_SAME_RDEV_MAJOR;
                        else
-                               rdev_high = rdev & ~(DEV64_T)0xFF;
+                               rdev_major = major(rdev);
+                       if ((uint32)minor(rdev) <= 0xFFu)
+                               flags |= XMIT_RDEV_MINOR_IS_SMALL;
                }
        }
        if (file->uid == uid)
@@ -452,12 +453,17 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
                write_int(f, gid);
        }
        if (preserve_devices && IS_DEVICE(mode)) {
-               /* If XMIT_SAME_HIGH_RDEV is off, XMIT_SAME_RDEV_pre28 is
-                * also off. */
-               if (!(flags & XMIT_SAME_HIGH_RDEV))
-                       write_int(f, rdev);
-               else if (protocol_version >= 28)
-                       write_byte(f, rdev);
+               if (protocol_version < 28) {
+                       if (!(flags & XMIT_SAME_RDEV_pre28))
+                               write_int(f, (int)rdev);
+               } else {
+                       if (!(flags & XMIT_SAME_RDEV_MAJOR))
+                               write_int(f, major(rdev));
+                       if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+                               write_byte(f, minor(rdev));
+                       else
+                               write_int(f, minor(rdev));
+               }
        }
 
 #if SUPPORT_LINKS
@@ -510,8 +516,9 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 {
        static time_t modtime;
        static mode_t mode;
-       static DEV64_T rdev, rdev_high;
-       static DEV64_T dev;
+       static uint64 dev;
+       static dev_t rdev;
+       static uint32 rdev_major;
        static uid_t uid;
        static gid_t gid;
        static char lastname[MAXPATHLEN], *lastdir;
@@ -525,7 +532,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 
        if (!fptr) {
                modtime = 0, mode = 0;
-               rdev = 0, rdev_high = 0, dev = 0;
+               dev = 0, rdev = makedev(0, 0);
+               rdev_major = 0;
                uid = 0, gid = 0;
                *lastname = '\0';
                return;
@@ -587,15 +595,18 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
                if (protocol_version < 28) {
                        if (IS_DEVICE(mode)) {
                                if (!(flags & XMIT_SAME_RDEV_pre28))
-                                       rdev = (DEV64_T)read_int(f);
+                                       rdev = (dev_t)read_int(f);
                        } else
-                               rdev = 0;
+                               rdev = makedev(0, 0);
                } else if (IS_DEVICE(mode)) {
-                       if (!(flags & XMIT_SAME_HIGH_RDEV)) {
-                               rdev = (DEV64_T)read_int(f);
-                               rdev_high = rdev & ~(DEV64_T)0xFF;
-                       } else
-                               rdev = rdev_high | (DEV64_T)read_byte(f);
+                       uint32 rdev_minor;
+                       if (!(flags & XMIT_SAME_RDEV_MAJOR))
+                               rdev_major = read_int(f);
+                       if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+                               rdev_minor = read_byte(f);
+                       else
+                               rdev_minor = read_int(f);
+                       rdev = makedev(rdev_major, rdev_minor);
                }
        }
 
@@ -659,7 +670,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
        if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
                flags |= XMIT_HAS_IDEV_DATA;
        if (flags & XMIT_HAS_IDEV_DATA) {
-               INO64_T inode;
+               uint64 inode;
                if (protocol_version < 26) {
                        dev = read_int(f);
                        inode = read_int(f);
@@ -932,10 +943,11 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 
        if (recursive && S_ISDIR(file->mode)
            && !(file->flags & FLAG_MOUNT_POINT)) {
-               struct exclude_struct **last_exclude_list = local_exclude_list;
+               struct exclude_list_struct last_list = local_exclude_list;
+               local_exclude_list.head = local_exclude_list.tail = NULL;
                send_directory(f, flist, f_name_to(file, fbuf));
-               local_exclude_list = last_exclude_list;
-               return;
+               free_exclude_list(&local_exclude_list);
+               local_exclude_list = last_list;
        }
 }
 
@@ -970,13 +982,12 @@ static void send_directory(int f, struct file_list *flist, char *dir)
                offset++;
        }
 
-       local_exclude_list = NULL;
-
        if (cvs_exclude) {
                if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
-                   < MAXPATHLEN - offset)
-                       add_exclude_file(&local_exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
-               else {
+                   < MAXPATHLEN - offset) {
+                       add_exclude_file(&local_exclude_list, fname,
+                                        XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+               } else {
                        io_error |= IOERR_GENERAL;
                        rprintf(FINFO,
                                "cannot cvs-exclude in long-named directory %s\n",
@@ -1004,9 +1015,6 @@ static void send_directory(int f, struct file_list *flist, char *dir)
                        dir, errno, strerror(errno));
        }
 
-       if (local_exclude_list)
-               free_exclude_list(&local_exclude_list); /* Zeros pointer too */
-
        closedir(d);
 }
 
Matt McCutchen's repository for rsync, the fast and versatile remote file copier