X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Freparse.c;h=1cbca56f146610f966df66a458346966e3c2c4a4;hp=446b6f9f3765fc74f1c89c5eca495338be9cc53f;hb=d5984b47ca93ee5fa96a3d49aa5017b10e10e399;hpb=f2f293a1759c81e7bd5deb904c3909368f3feaa5 diff --git a/src/reparse.c b/src/reparse.c index 446b6f9f..1cbca56f 100644 --- a/src/reparse.c +++ b/src/reparse.c @@ -45,6 +45,8 @@ #include #include +/* On-disk format of a symbolic link (WIM_IO_REPARSE_TAG_SYMLINK) or junction + * point (WIM_IO_REPARSE_TAG_MOUNT_POINT) reparse data buffer. */ struct reparse_buffer_disk { le32 rptag; le16 rpdatalen; @@ -84,15 +86,15 @@ static const utf16lechar volume_junction_prefix[11] = { * Return value is: * * Non-negative integer: - * The name is an absolute symbolic link in one of several formats, - * and the return value is the number of UTF-16LE characters that need to - * be advanced to reach a simple "absolute" path starting with a backslash - * (i.e. skip over \??\ and/or drive letter) + * The name is an absolute symbolic link in one of several formats, + * and the return value is the number of UTF-16LE characters that need to + * be advanced to reach a simple "absolute" path starting with a backslash + * (i.e. skip over \??\ and/or drive letter) * Negative integer: * SUBST_NAME_IS_VOLUME_JUNCTION: - * The name is a volume junction. + * The name is a volume junction. * SUBST_NAME_IS_RELATIVE_LINK: - * The name is a relative symbolic link. + * The name is a relative symbolic link. * SUBST_NAME_IS_UNKNOWN: * The name does not appear to be a valid symbolic link, junction, * or mount point. @@ -184,7 +186,7 @@ parse_reparse_data(const u8 * restrict rpbuf, u16 rpbuflen, if (rpdata->rptag == WIM_IO_REPARSE_TAG_SYMLINK) { if (rpbuflen < 20) goto out_invalid; - rpdata->rpflags = le16_to_cpu(rpbuf_disk->symlink.rpflags); + rpdata->rpflags = le32_to_cpu(rpbuf_disk->symlink.rpflags); data = rpbuf_disk->symlink.data; } else { data = rpbuf_disk->junction.data; @@ -213,7 +215,8 @@ out_invalid: */ int make_reparse_buffer(const struct reparse_data * restrict rpdata, - u8 * restrict rpbuf) + u8 * restrict rpbuf, + u16 * restrict rpbuflen_ret) { struct reparse_buffer_disk *rpbuf_disk = (struct reparse_buffer_disk*)rpbuf; @@ -250,6 +253,7 @@ make_reparse_buffer(const struct reparse_data * restrict rpdata, *(utf16lechar*)data = cpu_to_le16(0); data += 2; rpbuf_disk->rpdatalen = cpu_to_le16(data - rpbuf - 8); + *rpbuflen_ret = data - rpbuf; return 0; } @@ -268,7 +272,8 @@ make_reparse_buffer(const struct reparse_data * restrict rpdata, int wim_inode_get_reparse_data(const struct wim_inode * restrict inode, u8 * restrict rpbuf, - u16 * restrict rpbuflen_ret) + u16 * restrict rpbuflen_ret, + struct wim_lookup_table_entry *lte_override) { struct wim_lookup_table_entry *lte; int ret; @@ -277,10 +282,14 @@ wim_inode_get_reparse_data(const struct wim_inode * restrict inode, wimlib_assert(inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT); - lte = inode_unnamed_lte_resolved(inode); - if (!lte) { - ERROR("Reparse point has no reparse data!"); - return WIMLIB_ERR_INVALID_REPARSE_DATA; + if (!lte_override) { + lte = inode_unnamed_lte_resolved(inode); + if (!lte) { + ERROR("Reparse point has no reparse data!"); + return WIMLIB_ERR_INVALID_REPARSE_DATA; + } + } else { + lte = lte_override; } if (wim_resource_size(lte) > REPARSE_POINT_MAX_SIZE - 8) { @@ -323,7 +332,8 @@ wim_inode_get_reparse_data(const struct wim_inode * restrict inode, * on failure a negated error code is returned rather than -1 with errno set. */ ssize_t wim_inode_readlink(const struct wim_inode * restrict inode, - char * restrict buf, size_t bufsize) + char * restrict buf, size_t bufsize, + struct wim_lookup_table_entry *lte_override) { int ret; struct reparse_buffer_disk rpbuf_disk _aligned_attribute(8); @@ -335,7 +345,8 @@ wim_inode_readlink(const struct wim_inode * restrict inode, wimlib_assert(inode_is_symlink(inode)); - if (wim_inode_get_reparse_data(inode, (u8*)&rpbuf_disk, &rpbuflen)) + if (wim_inode_get_reparse_data(inode, (u8*)&rpbuf_disk, &rpbuflen, + lte_override)) return -EIO; if (parse_reparse_data((const u8*)&rpbuf_disk, rpbuflen, &rpdata)) @@ -397,6 +408,7 @@ wim_inode_set_symlink(struct wim_inode *inode, utf16lechar *name_utf16le; size_t name_utf16le_nbytes; int ret; + u16 rpbuflen; DEBUG("Creating reparse point data buffer for UNIX " "symlink target \"%s\"", target); @@ -417,8 +429,8 @@ wim_inode_set_symlink(struct wim_inode *inode, * ways to provide Windows paths.) * * To change a UNIX relative symbolic link to Windows format, we only - * need to translate it to UTF-16LE and replace backslashes with forward - * slashes. We do not make any attempt to handle filename character + * need to translate it to UTF-16LE and replace forward slashes with + * backslashes. We do not make any attempt to handle filename character * problems, such as a link target that itself contains backslashes on * UNIX. Then, for these relative links, we set the reparse header * @flags field to SYMBOLIC_LINK_RELATIVE. @@ -479,11 +491,11 @@ wim_inode_set_symlink(struct wim_inode *inode, rpdata.rpflags = SYMBOLIC_LINK_RELATIVE; } - ret = make_reparse_buffer(&rpdata, (u8*)&rpbuf_disk); + ret = make_reparse_buffer(&rpdata, (u8*)&rpbuf_disk, &rpbuflen); if (ret == 0) { ret = inode_set_unnamed_stream(inode, (u8*)&rpbuf_disk + 8, - le16_to_cpu(rpbuf_disk.rpdatalen), + rpbuflen - 8, lookup_table); } FREE(name_utf16le); @@ -511,12 +523,13 @@ unix_get_ino_and_dev(const char *path, u64 *ino_ret, u64 *dev_ret) #endif /* !defined(__WIN32__) */ +/* is_rp_path_separator() - characters treated as path separators in absolute + * symbolic link targets */ + #ifdef __WIN32__ -# define RP_PATH_SEPARATOR L'\\' # define is_rp_path_separator(c) ((c) == L'\\' || (c) == L'/') # define os_get_ino_and_dev win32_get_file_and_vol_ids #else -# define RP_PATH_SEPARATOR '/' # define is_rp_path_separator(c) ((c) == '/') # define os_get_ino_and_dev unix_get_ino_and_dev #endif @@ -558,7 +571,7 @@ capture_fixup_absolute_symlink(tchar *dest, /* Link points inside capture root. Return abbreviated * path. */ if (*p == T('\0')) - *(p - 1) = RP_PATH_SEPARATOR; + *(p - 1) = OS_PREFERRED_PATH_SEPARATOR; while (p - 1 >= dest && is_rp_path_separator(*(p - 1))) p--; #ifdef __WIN32__