X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/16edf86595a5a990a942fa045dfb523dae1fe6cb..9439c0cb5a4b020b9bfcfe0351e33c17b9c53b54:/flist.c diff --git a/flist.c b/flist.c index 23def370..eb94d004 100644 --- a/flist.c +++ b/flist.c @@ -30,6 +30,7 @@ extern int am_root; extern int am_server; extern int am_daemon; extern int am_sender; +extern int am_generator; extern int inc_recurse; extern int do_progress; extern int always_checksum; @@ -196,12 +197,12 @@ static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf) rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", path, linkbuf); } - return do_stat(path, stp); + return x_stat(path, stp, NULL); } } return 0; #else - return do_stat(path, stp); + return x_stat(path, stp, NULL); #endif } @@ -209,17 +210,17 @@ int link_stat(const char *path, STRUCT_STAT *stp, int follow_dirlinks) { #ifdef SUPPORT_LINKS if (copy_links) - return do_stat(path, stp); - if (do_lstat(path, stp) < 0) + return x_stat(path, stp, NULL); + if (x_lstat(path, stp, NULL) < 0) return -1; if (follow_dirlinks && S_ISLNK(stp->st_mode)) { STRUCT_STAT st; - if (do_stat(path, &st) == 0 && S_ISDIR(st.st_mode)) + if (x_stat(path, &st, NULL) == 0 && S_ISDIR(st.st_mode)) *stp = st; } return 0; #else - return do_stat(path, stp); + return x_stat(path, stp, NULL); #endif } @@ -254,26 +255,6 @@ static int is_excluded(char *fname, int is_dir, int filter_level) return 0; } -static int to_wire_mode(mode_t mode) -{ -#ifdef SUPPORT_LINKS -#if _S_IFLNK != 0120000 - if (S_ISLNK(mode)) - return (mode & ~(_S_IFMT)) | 0120000; -#endif -#endif - return mode; -} - -static mode_t from_wire_mode(int mode) -{ -#if _S_IFLNK != 0120000 - if ((mode & (_S_IFMT)) == 0120000) - return (mode & ~(_S_IFMT)) | _S_IFLNK; -#endif - return mode; -} - static void send_directory(int f, struct file_list *flist, int ndx, char *fbuf, int len, int flags); @@ -471,26 +452,30 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) if (flags & XMIT_SAME_NAME) write_byte(f, l1); if (flags & XMIT_LONG_NAME) - write_abbrevint30(f, l2); + write_varint30(f, l2); else write_byte(f, l2); write_buf(f, fname + l1, l2); if (first_hlink_ndx >= 0) { - write_abbrevint30(f, first_hlink_ndx); + write_varint30(f, first_hlink_ndx); goto the_end; } - write_longint(f, F_LENGTH(file)); - if (!(flags & XMIT_SAME_TIME)) - write_int(f, modtime); + write_varlong30(f, F_LENGTH(file), 3); + if (!(flags & XMIT_SAME_TIME)) { + if (protocol_version >= 30) + write_varlong(f, modtime, 4); + else + write_int(f, modtime); + } if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); else { - write_abbrevint(f, uid); + write_varint(f, uid); if (flags & XMIT_USER_NAME_FOLLOWS) { int len = strlen(user_name); write_byte(f, len); @@ -502,7 +487,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) if (protocol_version < 30) write_int(f, gid); else { - write_abbrevint(f, gid); + write_varint(f, gid); if (flags & XMIT_GROUP_NAME_FOLLOWS) { int len = strlen(group_name); write_byte(f, len); @@ -517,9 +502,9 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) write_int(f, (int)rdev); } else { if (!(flags & XMIT_SAME_RDEV_MAJOR)) - write_abbrevint30(f, major(rdev)); + write_varint30(f, major(rdev)); if (protocol_version >= 30) - write_abbrevint(f, minor(rdev)); + write_varint(f, minor(rdev)); else if (flags & XMIT_RDEV_MINOR_8_pre30) write_byte(f, minor(rdev)); else @@ -531,7 +516,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) if (preserve_links && S_ISLNK(mode)) { const char *sl = F_SYMLINK(file); int len = strlen(sl); - write_abbrevint30(f, len); + write_varint30(f, len); write_buf(f, sl, len); } #endif @@ -572,7 +557,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) static struct file_struct *recv_file_entry(struct file_list *flist, int flags, int f) { - static time_t modtime; + static int64 modtime; static mode_t mode; static int64 dev; static dev_t rdev; @@ -597,7 +582,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, l1 = read_byte(f); if (flags & XMIT_LONG_NAME) - l2 = read_abbrevint30(f); + l2 = read_varint30(f); else l2 = read_byte(f); @@ -636,7 +621,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, if (protocol_version >= 30 && BITS_SETnUNSET(flags, XMIT_HLINKED, XMIT_HLINK_FIRST)) { struct file_struct *first; - first_hlink_ndx = read_abbrevint30(f); + first_hlink_ndx = read_varint30(f); if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->count) { rprintf(FERROR, "hard-link reference out of range: %d (%d)\n", @@ -665,9 +650,20 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } #endif - file_length = read_longint(f); - if (!(flags & XMIT_SAME_TIME)) - modtime = (time_t)read_int(f); + file_length = read_varlong30(f, 3); + if (!(flags & XMIT_SAME_TIME)) { + if (protocol_version >= 30) { + modtime = read_varlong(f, 4); +#if SIZEOF_TIME_T < SIZEOF_INT64 + if ((modtime > INT_MAX || modtime < INT_MIN) && !am_generator) { + rprintf(FERROR, + "Time value of %s truncated on receiver.\n", + lastname); + } +#endif + } else + modtime = read_int(f); + } if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -678,7 +674,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, if (protocol_version < 30) uid = (uid_t)read_int(f); else { - uid = (uid_t)read_abbrevint(f); + uid = (uid_t)read_varint(f); if (flags & XMIT_USER_NAME_FOLLOWS) uid = recv_user_name(f, uid); else if (inc_recurse && am_root && !numeric_ids) @@ -689,7 +685,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, if (protocol_version < 30) gid = (gid_t)read_int(f); else { - gid = (gid_t)read_abbrevint(f); + gid = (gid_t)read_varint(f); if (flags & XMIT_GROUP_NAME_FOLLOWS) gid = recv_group_name(f, gid); else if (inc_recurse && (!am_root || !numeric_ids)) @@ -705,9 +701,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } else { uint32 rdev_minor; if (!(flags & XMIT_SAME_RDEV_MAJOR)) - rdev_major = read_abbrevint30(f); + rdev_major = read_varint30(f); if (protocol_version >= 30) - rdev_minor = read_abbrevint(f); + rdev_minor = read_varint(f); else if (flags & XMIT_RDEV_MINOR_8_pre30) rdev_minor = read_byte(f); else @@ -721,7 +717,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(mode)) { - linkname_len = read_abbrevint30(f) + 1; /* count the '\0' */ + linkname_len = read_varint30(f) + 1; /* count the '\0' */ if (linkname_len <= 0 || linkname_len > MAXPATHLEN) { rprintf(FERROR, "overflow: linkname_len=%d\n", linkname_len - 1); @@ -783,7 +779,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, if (flags & XMIT_HLINKED) file->flags |= FLAG_HLINKED; #endif - file->modtime = modtime; + file->modtime = (time_t)modtime; file->len32 = (uint32)file_length; if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) { file->flags |= FLAG_LENGTH64; @@ -954,7 +950,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, if (save_errno == ENOENT) { #ifdef SUPPORT_LINKS /* Avoid "vanished" error if symlink points nowhere. */ - if (copy_links && do_lstat(thisname, &st) == 0 + if (copy_links && x_lstat(thisname, &st, NULL) == 0 && S_ISLNK(st.st_mode)) { io_error |= IOERR_GENERAL; rprintf(FERROR, "symlink has no referent: %s\n", @@ -1126,7 +1122,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, int save_mode = file->mode; file->mode = S_IFDIR; /* Find a directory with our name. */ if (flist_find(dir_flist, file) >= 0 - && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) { + && x_stat(thisname, &st2, NULL) == 0 && S_ISDIR(st2.st_mode)) { file->modtime = st2.st_mtime; file->len32 = 0; file->mode = st2.st_mode;