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;
*/
static int check_exclude_file(char *fname, int is_dir, int exclude_level)
{
+ int rc;
+
#if 0 /* This currently never happens, so avoid a useless compare. */
if (exclude_level == NO_EXCLUDES)
return 0;
return 0;
}
}
- if (server_exclude_list
- && check_exclude(server_exclude_list, fname, is_dir,
- "server pattern"))
+ if (server_exclude_list.head
+ && check_exclude(&server_exclude_list, fname, is_dir) < 0)
return 1;
if (exclude_level != ALL_EXCLUDES)
return 0;
- if (exclude_list && check_exclude(exclude_list, fname, is_dir,
- "pattern"))
- return 1;
- if (local_exclude_list
- && check_exclude(local_exclude_list, fname, is_dir,
- "local-cvsignore"))
+ if (exclude_list.head
+ && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
+ return rc < 0;
+ if (local_exclude_list.head
+ && check_exclude(&local_exclude_list, fname, is_dir) < 0)
return 1;
return 0;
}
unsigned short flags;
static time_t modtime;
static mode_t mode;
- static dev_t dev, rdev;
+ static uint64 dev;
+ static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
static gid_t gid;
if (!file) {
write_byte(f, 0);
modtime = 0, mode = 0;
- dev = rdev = makedev(0, 0);
+ dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
#if SUPPORT_HARD_LINKS
if (flags & XMIT_HAS_IDEV_DATA) {
- if (protocol_version >= 28) {
- /* major/minor dev_t and 64-bit ino_t */
- if (!(flags & XMIT_SAME_DEV)) {
- write_int(f, major(dev));
- write_int(f, minor(dev));
- }
- write_longint(f, file->F_INODE);
- } else if (protocol_version < 26) {
+ if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
write_int(f, dev);
write_int(f, file->F_INODE);
} else {
/* 64-bit dev_t and ino_t */
- write_longint(f, dev);
+ if (!(flags & XMIT_SAME_DEV))
+ write_longint(f, dev);
write_longint(f, file->F_INODE);
}
}
{
static time_t modtime;
static mode_t mode;
- static dev_t dev, rdev;
+ static uint64 dev;
+ static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
static gid_t gid;
if (!fptr) {
modtime = 0, mode = 0;
- dev = rdev = makedev(0, 0);
+ dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
flags |= XMIT_HAS_IDEV_DATA;
if (flags & XMIT_HAS_IDEV_DATA) {
- INO64_T inode;
- if (protocol_version >= 28) {
- if (!(flags & XMIT_SAME_DEV)) {
- uint32 dev_major = read_int(f);
- uint32 dev_minor = read_int(f);
- dev = makedev(dev_major, dev_minor);
- }
- inode = read_longint(f);
- } else if (protocol_version < 26) {
- dev = (dev_t)read_int(f);
+ uint64 inode;
+ if (protocol_version < 26) {
+ dev = read_int(f);
inode = read_int(f);
} else {
- dev = (dev_t)read_longint(f);
+ if (!(flags & XMIT_SAME_DEV))
+ dev = read_longint(f);
inode = read_longint(f);
}
if (flist->hlink_pool) {
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;
}
}
offset++;
}
- local_exclude_list = NULL;
-
if (cvs_exclude) {
if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
< MAXPATHLEN - offset) {
dir, errno, strerror(errno));
}
- if (local_exclude_list)
- free_exclude_list(&local_exclude_list); /* Zeros pointer too */
-
closedir(d);
}