X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9d155ecd121ca2a7e58886b81a7b196a26231b0b..bd6edd3fa26dde8d134edb0166665c12082dd9a6:/flist.c diff --git a/flist.c b/flist.c index 62731a62..1d5fbff2 100644 --- a/flist.c +++ b/flist.c @@ -22,6 +22,7 @@ */ #include "rsync.h" +#include "rounding.h" extern int verbose; extern int list_only; @@ -81,7 +82,7 @@ static struct idev tmp_idev; static char tmp_sum[MD4_SUM_LENGTH]; static char empty_sum[MD4_SUM_LENGTH]; -static int flist_count_offset; +static int flist_count_offset; /* for --delete --progress */ static void clean_flist(struct file_list *flist, int strip_root, int no_dups); static void output_flist(struct file_list *flist); @@ -90,7 +91,7 @@ void init_flist(void) { if (verbose > 4) { rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n", - FILE_STRUCT_LEN, EXTRA_LEN); + (int)FILE_STRUCT_LEN, (int)EXTRA_LEN); } checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH; } @@ -310,7 +311,7 @@ void flist_expand(struct file_list *flist) out_of_memory("flist_expand"); } -static void send_file_entry(struct file_struct *file, int f) +static void send_file_entry(struct file_struct *file, int f, int ndx) { unsigned short flags; static time_t modtime; @@ -322,21 +323,9 @@ static void send_file_entry(struct file_struct *file, int f) static gid_t gid; static char lastname[MAXPATHLEN]; char fname[MAXPATHLEN]; + int first_hlink_ndx = -1; int l1, l2; - if (f < 0) - return; - - if (!file) { - write_byte(f, 0); - modtime = 0, mode = 0; - dev = 0, rdev = MAKEDEV(0, 0); - rdev_major = 0; - uid = 0, gid = 0; - *lastname = '\0'; - return; - } - f_name(file, fname); flags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */ @@ -382,12 +371,22 @@ static void send_file_entry(struct file_struct *file, int f) #ifdef SUPPORT_HARD_LINKS if (tmp_idev.dev != 0) { - if (tmp_idev.dev == dev) { - if (protocol_version >= 28) - flags |= XMIT_SAME_DEV; - } else - dev = tmp_idev.dev; - flags |= XMIT_HAS_IDEV_DATA; + if (protocol_version >= 30) { + struct idev_node *np = idev_node(tmp_idev.dev, tmp_idev.ino); + first_hlink_ndx = (int32)np->data - 1; + if (first_hlink_ndx < 0) { + np->data = (void*)(ndx + 1); + flags |= XMIT_HLINK_FIRST; + } + flags |= XMIT_HLINKED; + } else { + if (tmp_idev.dev == dev) { + if (protocol_version >= 28) + flags |= XMIT_SAME_DEV_pre30; + } else + dev = tmp_idev.dev; + flags |= XMIT_HLINKED; + } } #endif @@ -426,6 +425,11 @@ static void send_file_entry(struct file_struct *file, int f) write_byte(f, l2); write_buf(f, fname + l1, l2); + if (first_hlink_ndx >= 0) { + write_int(f, first_hlink_ndx); + goto the_end; + } + write_longint(f, F_LENGTH(file)); if (!(flags & XMIT_SAME_TIME)) write_int(f, modtime); @@ -466,14 +470,14 @@ static void send_file_entry(struct file_struct *file, int f) #endif #ifdef SUPPORT_HARD_LINKS - if (tmp_idev.dev != 0) { + if (tmp_idev.dev != 0 && protocol_version < 30) { if (protocol_version < 26) { /* 32-bit dev_t and ino_t */ write_int(f, (int32)dev); write_int(f, (int32)tmp_idev.ino); } else { /* 64-bit dev_t and ino_t */ - if (!(flags & XMIT_SAME_DEV)) + if (!(flags & XMIT_SAME_DEV_pre30)) write_longint(f, dev); write_longint(f, tmp_idev.ino); } @@ -491,6 +495,7 @@ static void send_file_entry(struct file_struct *file, int f) write_buf(f, sum, checksum_len); } + the_end: strlcpy(lastname, fname, MAXPATHLEN); } @@ -511,7 +516,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist, char thisname[MAXPATHLEN]; unsigned int l1 = 0, l2 = 0; int alloc_len, basename_len, dirname_len, linkname_len; - int extra_len = (flist_extra_cnt - 1) * EXTRA_LEN; + int extra_len = flist_extra_cnt * EXTRA_LEN; + int first_hlink_ndx = -1; OFF_T file_length; char *basename, *dirname, *bp; struct file_struct *file; @@ -568,6 +574,38 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } basename_len = strlen(basename) + 1; /* count the '\0' */ +#ifdef SUPPORT_HARD_LINKS + if (protocol_version >= 30 + && BITS_SETnUNSET(flags, XMIT_HLINKED, XMIT_HLINK_FIRST)) { + struct file_struct *first; + first_hlink_ndx = read_int(f); + if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->count) { + rprintf(FERROR, + "hard-link reference out of range: %d (%d)\n", + first_hlink_ndx, flist->count); + exit_cleanup(RERR_PROTOCOL); + } + first = flist->files[first_hlink_ndx]; + file_length = F_LENGTH(first); + modtime = first->modtime; + mode = first->mode; + if (preserve_uid) + uid = F_UID(first); + if (preserve_gid) + gid = F_GID(first); + if ((preserve_devices && IS_DEVICE(mode)) + || (preserve_specials && IS_SPECIAL(mode))) { + uint32 *devp = F_RDEV_P(first); + rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); + } + if (preserve_links && S_ISLNK(mode)) + linkname_len = strlen(F_SYMLINK(first)) + 1; + else + linkname_len = 0; + goto create_object; + } +#endif + file_length = read_longint(f); if (!(flags & XMIT_SAME_TIME)) modtime = (time_t)read_int(f); @@ -616,10 +654,11 @@ static struct file_struct *recv_file_entry(struct file_list *flist, linkname_len = 0; #ifdef SUPPORT_HARD_LINKS + create_object: if (preserve_hard_links) { if (protocol_version < 28 && S_ISREG(mode)) - flags |= XMIT_HAS_IDEV_DATA; - if (flags & XMIT_HAS_IDEV_DATA) + flags |= XMIT_HLINKED; + if (flags & XMIT_HLINKED) extra_len += EXTRA_LEN; } #endif @@ -630,11 +669,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist, if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) extra_len += EXTRA_LEN; +#if EXTRA_ROUNDING > 0 + if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN)) + extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN; +#endif + alloc_len = FILE_STRUCT_LEN + extra_len + basename_len + dirname_len + linkname_len; bp = pool_alloc(flist->file_pool, alloc_len, "recv_file_entry"); - memset(bp, 0, FILE_STRUCT_LEN + extra_len); + memset(bp, 0, extra_len + FILE_STRUCT_LEN); bp += extra_len; file = (struct file_struct *)bp; bp += FILE_STRUCT_LEN; @@ -643,7 +687,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, bp += basename_len + linkname_len; /* skip space for symlink too */ #ifdef SUPPORT_HARD_LINKS - if (flags & XMIT_HAS_IDEV_DATA) + if (flags & XMIT_HLINKED) file->flags |= FLAG_HLINKED; #endif file->modtime = modtime; @@ -702,26 +746,35 @@ static struct file_struct *recv_file_entry(struct file_list *flist, #ifdef SUPPORT_LINKS if (linkname_len) { - bp = (char*)F_BASENAME(file) + basename_len; - read_sbuf(f, bp, linkname_len - 1); + bp = (char*)file->basename + basename_len; + if (first_hlink_ndx >= 0) { + struct file_struct *first = flist->files[first_hlink_ndx]; + memcpy(bp, F_SYMLINK(first), linkname_len); + } else + read_sbuf(f, bp, linkname_len - 1); if (sanitize_paths) sanitize_path(bp, bp, "", lastdir_depth, NULL); } #endif #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && flags & XMIT_HAS_IDEV_DATA) { - struct idev *idevp = pool_talloc(hlink_pool, struct idev, - 1, "inode_table"); - F_HL_IDEV(file) = idevp; - if (protocol_version < 26) { - idevp->dev = read_int(f); - idevp->ino = read_int(f); + if (preserve_hard_links && flags & XMIT_HLINKED) { + if (protocol_version >= 30) { + F_HL_GNUM(file) = flags & XMIT_HLINK_FIRST + ? flist->count : first_hlink_ndx; } else { - if (!(flags & XMIT_SAME_DEV)) - dev = read_longint(f); - idevp->dev = dev; - idevp->ino = read_longint(f); + struct idev *idevp = pool_talloc(hlink_pool, struct idev, + 1, "inode_table"); + F_HL_IDEV(file) = idevp; + if (protocol_version < 26) { + idevp->dev = read_int(f); + idevp->ino = read_int(f); + } else { + if (!(flags & XMIT_SAME_DEV_pre30)) + dev = read_longint(f); + idevp->dev = dev; + idevp->ino = read_longint(f); + } } } #endif @@ -733,7 +786,11 @@ static struct file_struct *recv_file_entry(struct file_list *flist, /* Prior to 28, we get a useless set of nulls. */ bp = tmp_sum; } - read_buf(f, bp, checksum_len); + if (first_hlink_ndx >= 0) { + struct file_struct *first = flist->files[first_hlink_ndx]; + memcpy(bp, F_SUM(first), checksum_len); + } else + read_buf(f, bp, checksum_len); } return file; @@ -764,7 +821,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, char thisname[MAXPATHLEN]; char linkname[MAXPATHLEN]; int alloc_len, basename_len, dirname_len, linkname_len; - int extra_len = (flist_extra_cnt - 1) * EXTRA_LEN; + int extra_len = flist_extra_cnt * EXTRA_LEN; char *basename, *dirname, *bp; if (!flist || !flist->count) /* Ignore lastdir when invalid. */ @@ -886,6 +943,11 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) extra_len += EXTRA_LEN; +#if EXTRA_ROUNDING > 0 + if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN)) + extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN; +#endif + alloc_len = FILE_STRUCT_LEN + extra_len + basename_len + dirname_len + linkname_len; if (flist) @@ -895,7 +957,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, out_of_memory("make_file"); } - memset(bp, 0, FILE_STRUCT_LEN + extra_len); + memset(bp, 0, extra_len + FILE_STRUCT_LEN); bp += extra_len; file = (struct file_struct *)bp; bp += FILE_STRUCT_LEN; @@ -946,7 +1008,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, #ifdef SUPPORT_LINKS if (linkname_len) { - bp = (char*)F_BASENAME(file) + basename_len; + bp = (char*)file->basename + basename_len; memcpy(bp, linkname, linkname_len); } #endif @@ -987,8 +1049,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, /* Only called for temporary file_struct entries created by make_file(). */ void unmake_file(struct file_struct *file) { - int extra_cnt = flist_extra_cnt - 1 + LEN64_BUMP(file); - free(file->extras - extra_cnt); + int extra_cnt = flist_extra_cnt + LEN64_BUMP(file); +#if EXTRA_ROUNDING > 0 + if (extra_cnt & EXTRA_ROUNDING) + extra_cnt = (extra_cnt | EXTRA_ROUNDING) + 1; +#endif + free(REQ_EXTRA(file, extra_cnt)); } static struct file_struct *send_file_name(int f, struct file_list *flist, @@ -1009,7 +1075,8 @@ static struct file_struct *send_file_name(int f, struct file_list *flist, flist_expand(flist); flist->files[flist->count++] = file; - send_file_entry(file, f); + if (f >= 0) + send_file_entry(file, f, flist->count - 1); return file; } @@ -1045,8 +1112,7 @@ static void send_if_directory(int f, struct file_list *flist, * file list in memory without sending it over the wire. Also, get_dirlist() * might call this with f set to -2, which also indicates that local filter * rules should be ignored. */ -static void send_directory(int f, struct file_list *flist, - char *fbuf, int len) +static void send_directory(int f, struct file_list *flist, char *fbuf, int len) { struct dirent *di; unsigned remainder; @@ -1093,6 +1159,7 @@ static void send_directory(int f, struct file_list *flist, if (recurse) { int i, end = flist->count - 1; + /* send_if_directory() bumps flist->count, so use "end". */ for (i = start; i <= end; i++) send_if_directory(f, flist, flist->files[i], fbuf, len); } @@ -1116,6 +1183,11 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) start_write = stats.total_written; gettimeofday(&start_tv, NULL); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && protocol_version >= 30) + init_hard_links(); +#endif + flist = flist_new("send_file_list"); io_start_buffering_out(); @@ -1334,7 +1406,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) stats.flist_buildtime = 1; start_tv = end_tv; - send_file_entry(NULL, f); + write_byte(f, 0); /* Indicate end of file list */ + +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && protocol_version >= 30) + idev_destroy(); +#endif if (show_filelist_p()) finish_filelist_progress(flist); @@ -1382,6 +1459,10 @@ struct file_list *recv_file_list(int f) flist = flist_new("recv_file_list"); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && protocol_version < 30) + init_hard_links(); +#endif while ((flags = read_byte(f)) != 0) { struct file_struct *file; @@ -1504,7 +1585,8 @@ int flist_find(struct file_list *flist, struct file_struct *f) */ void clear_file(struct file_struct *file) { - memset((char*)file + EXTRA_LEN, 0, FILE_STRUCT_LEN - EXTRA_LEN + 1); + /* The +1 zeros out the first char of the basename. */ + memset(file, 0, FILE_STRUCT_LEN + 1); /* In an empty entry, dir.depth is an offset to the next non-empty * entry. Likewise for len32 in the opposite direction. We assume * that we're alone for now since flist_find() will adjust the counts @@ -1729,7 +1811,7 @@ static void output_flist(struct file_list *flist) dir = slash = ""; else slash = "/"; - name = F_BASENAME(file); + name = file->basename; trail = S_ISDIR(file->mode) ? "/" : ""; } else dir = slash = name = trail = ""; @@ -1780,7 +1862,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) c1 = c2 = NULL; if (!c1) { type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM; - c1 = (uchar*)F_BASENAME(f1); + c1 = (const uchar*)f1->basename; if (type1 == t_PATH && *c1 == '.' && !c1[1]) { type1 = t_ITEM; state1 = s_TRAILING; @@ -1793,7 +1875,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) } if (!c2) { type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM; - c2 = (uchar*)F_BASENAME(f2); + c2 = (const uchar*)f2->basename; if (type2 == t_PATH && *c2 == '.' && !c2[1]) { type2 = t_ITEM; state2 = s_TRAILING; @@ -1817,7 +1899,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) break; case s_SLASH: type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM; - c1 = (uchar*)F_BASENAME(f1); + c1 = (const uchar*)f1->basename; if (type1 == t_PATH && *c1 == '.' && !c1[1]) { type1 = t_ITEM; state1 = s_TRAILING; @@ -1847,7 +1929,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) break; case s_SLASH: type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM; - c2 = (uchar*)F_BASENAME(f2); + c2 = (const uchar*)f2->basename; if (type2 == t_PATH && *c2 == '.' && !c2[1]) { type2 = t_ITEM; state2 = s_TRAILING; @@ -1902,9 +1984,9 @@ char *f_name(struct file_struct *f, char *fbuf) int len = strlen(f->dirname); memcpy(fbuf, f->dirname, len); fbuf[len] = '/'; - strlcpy(fbuf + len + 1, F_BASENAME(f), MAXPATHLEN - (len + 1)); + strlcpy(fbuf + len + 1, f->basename, MAXPATHLEN - (len + 1)); } else - strlcpy(fbuf, F_BASENAME(f), MAXPATHLEN); + strlcpy(fbuf, f->basename, MAXPATHLEN); return fbuf; } @@ -1914,8 +1996,7 @@ char *f_name(struct file_struct *f, char *fbuf) * of the dirname string, and also indicates that "dirname" is a MAXPATHLEN * buffer (the functions we call will append names onto the end, but the old * dir value will be restored on exit). */ -struct file_list *get_dirlist(char *dirname, int dlen, - int ignore_filter_rules) +struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) { struct file_list *dirlist; char dirbuf[MAXPATHLEN];