X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/97a67bdfa9050ee0a55fe37d42181b5524cbef10..d62bcc17f303f30d1e3df1051b1390202a21cf9c:/flist.c diff --git a/flist.c b/flist.c index ace6484c..41acca35 100644 --- a/flist.c +++ b/flist.c @@ -33,6 +33,7 @@ extern int verbose; extern int do_progress; extern int am_root; extern int am_server; +extern int am_daemon; extern int always_checksum; extern int module_id; extern int ignore_errors; @@ -46,14 +47,12 @@ extern char *files_from; extern int filesfrom_fd; extern int one_file_system; -extern int make_backups; extern int preserve_links; extern int preserve_hard_links; extern int preserve_perms; extern int preserve_devices; extern int preserve_uid; extern int preserve_gid; -extern int preserve_times; extern int relative_paths; extern int implied_dirs; extern int copy_links; @@ -64,9 +63,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; @@ -211,6 +210,8 @@ int link_stat(const char *path, STRUCT_STAT * buffer) */ 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; @@ -226,15 +227,16 @@ 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) < 0) return 1; if (exclude_level != ALL_EXCLUDES) return 0; - if (exclude_list && check_exclude(exclude_list, fname, is_dir)) - return 1; - if (local_exclude_list - && check_exclude(local_exclude_list, fname, is_dir)) + 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; } @@ -324,8 +326,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 +341,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,22 +361,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)) { - if ((file->u.rdev & ~0xFF) == rdev_high) - flags |= XMIT_SAME_HIGH_RDEV; - else { - rdev = file->u.rdev; - rdev_high = rdev & ~0xFF; - } + rdev = file->u.rdev; + if ((uint32)major(rdev) == rdev_major) + flags |= XMIT_SAME_RDEV_MAJOR; + else + rdev_major = major(rdev); + if ((uint32)minor(rdev) <= 0xFFu) + flags |= XMIT_RDEV_MINOR_IS_SMALL; } } if (file->uid == uid) @@ -453,12 +455,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 @@ -511,8 +518,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; @@ -526,9 +534,11 @@ 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'; + lastdir_len = -1; return; } @@ -588,15 +598,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 & ~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); } } @@ -660,9 +673,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; - file->link_u.idev = pool_talloc(flist->hlink_pool, - struct idev, 1, "inode_table"); + uint64 inode; if (protocol_version < 26) { dev = read_int(f); inode = read_int(f); @@ -672,6 +683,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, inode = read_longint(f); } if (flist->hlink_pool) { + file->link_u.idev = pool_talloc(flist->hlink_pool, + struct idev, 1, "inode_table"); file->F_INODE = inode; file->F_DEV = dev; } @@ -732,6 +745,8 @@ struct file_struct *make_file(char *fname, char *basename, *dirname, *bp; unsigned short flags = 0; + if (!flist || !flist->count) /* Ignore lastdir when invalid. */ + lastdir_len = -1; if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname - flist_dir_len) { @@ -746,18 +761,26 @@ struct file_struct *make_file(char *fname, if (readlink_stat(thisname, &st, linkname) != 0) { int save_errno = errno; - if (errno == ENOENT && exclude_level != NO_EXCLUDES) { + if (errno == ENOENT) { + enum logcode c = am_daemon && protocol_version < 28 + ? FERROR : FINFO; /* either symlink pointing nowhere or file that * was removed during rsync run; see if excluded * before reporting an error */ - if (check_exclude_file(thisname, 0, exclude_level)) { + if (exclude_level != NO_EXCLUDES + && check_exclude_file(thisname, 0, exclude_level)) { /* file is excluded anyway, ignore silently */ return NULL; } + io_error |= IOERR_VANISHED; + rprintf(c, "file has vanished: %s\n", + full_fname(thisname)); + } + else { + io_error |= IOERR_GENERAL; + rsyserr(FERROR, save_errno, "readlink %s failed", + full_fname(thisname)); } - io_error |= IOERR_GENERAL; - rprintf(FERROR, "readlink %s failed: %s\n", - full_fname(thisname), strerror(save_errno)); return NULL; } @@ -923,10 +946,15 @@ 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; + if (verbose > 2) { + rprintf(FINFO, "[%s] popping %sexclude list\n", + who_am_i(), local_exclude_list.debug_type); + } + free_exclude_list(&local_exclude_list); + local_exclude_list = last_list; } } @@ -942,8 +970,7 @@ static void send_directory(int f, struct file_list *flist, char *dir) d = opendir(dir); if (!d) { io_error |= IOERR_GENERAL; - rprintf(FERROR, "opendir %s failed: %s\n", - full_fname(dir), strerror(errno)); + rsyserr(FERROR, errno, "opendir %s failed", full_fname(dir)); return; } @@ -961,13 +988,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_WORDS_ONLY); + } else { io_error |= IOERR_GENERAL; rprintf(FINFO, "cannot cvs-exclude in long-named directory %s\n", @@ -991,13 +1017,9 @@ static void send_directory(int f, struct file_list *flist, char *dir) } if (errno) { io_error |= IOERR_GENERAL; - rprintf(FERROR, "readdir(%s): (%d) %s\n", - dir, errno, strerror(errno)); + rsyserr(FERROR, errno, "readdir(%s)", dir); } - if (local_exclude_list) - free_exclude_list(&local_exclude_list); /* Zeros pointer too */ - closedir(d); } @@ -1030,8 +1052,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) io_start_buffering_out(f); if (filesfrom_fd >= 0) { if (argv[0] && !push_dir(argv[0])) { - rprintf(FERROR, "push_dir %s failed: %s\n", - full_fname(argv[0]), strerror(errno)); + rsyserr(FERROR, errno, "push_dir %s failed", + full_fname(argv[0])); exit_cleanup(RERR_FILESELECT); } use_ff_fd = 1; @@ -1068,8 +1090,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (link_stat(fname, &st) != 0) { if (f != -1) { io_error |= IOERR_GENERAL; - rprintf(FERROR, "link_stat %s failed: %s\n", - full_fname(fname), strerror(errno)); + rsyserr(FERROR, errno, "link_stat %s failed", + full_fname(fname)); } continue; } @@ -1138,8 +1160,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (!push_dir(dir)) { io_error |= IOERR_GENERAL; - rprintf(FERROR, "push_dir %s failed: %s\n", - full_fname(dir), strerror(errno)); + rsyserr(FERROR, errno, "push_dir %s failed", + full_fname(dir)); continue; } @@ -1161,8 +1183,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) flist_dir = NULL; flist_dir_len = 0; if (!pop_dir(olddir)) { - rprintf(FERROR, "pop_dir %s failed: %s\n", - full_fname(dir), strerror(errno)); + rsyserr(FERROR, errno, "pop_dir %s failed", + full_fname(dir)); exit_cleanup(RERR_FILESELECT); } } @@ -1497,11 +1519,17 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) if (!(c1 = (uchar*)f1->dirname)) { state1 = fnc_BASE; c1 = (uchar*)f1->basename; + } else if (!*c1) { + state1 = fnc_SLASH; + c1 = (uchar*)"/"; } else state1 = fnc_DIR; if (!(c2 = (uchar*)f2->dirname)) { state2 = fnc_BASE; c2 = (uchar*)f2->basename; + } else if (!*c2) { + state2 = fnc_SLASH; + c2 = (uchar*)"/"; } else state2 = fnc_DIR;