X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flist.c;h=98c1e396b3547cb22a5ac590bb24d03b03a9b521;hb=cf7169a2ede9bb08b71de68fe0c8bbecf827abe6;hp=b17f604303f60dac99f8c14f14338d0cf0091f82;hpb=138fc7e67e3d9845cd7d81aad0e9c7724784f9b9;p=debian%2Ftar diff --git a/src/list.c b/src/list.c index b17f6043..98c1e396 100644 --- a/src/list.c +++ b/src/list.c @@ -472,11 +472,11 @@ read_header (bool raw_extended_headers) static char * decode_xform (char *file_name, void *data) { - xform_type type = *(xform_type*)data; + int type = *(int*)data; switch (type) { - case xform_symlink: + case XFORM_SYMLINK: /* FIXME: It is not quite clear how and to which extent are the symbolic links subject to filename transformation. In the absence of another solution, symbolic links are exempt from component stripping and @@ -484,11 +484,11 @@ decode_xform (char *file_name, void *data) proper. */ return file_name; - case xform_link: + case XFORM_LINK: file_name = safer_name_suffix (file_name, true, absolute_names_option); break; - case xform_regfile: + case XFORM_REGFILE: file_name = safer_name_suffix (file_name, false, absolute_names_option); break; } @@ -505,9 +505,9 @@ decode_xform (char *file_name, void *data) } bool -transform_member_name (char **pinput, xform_type type) +transform_member_name (char **pinput, int type) { - return transform_name_fp (pinput, decode_xform, &type); + return transform_name_fp (pinput, type, decode_xform, &type); } #define ISOCTAL(c) ((c)>='0'&&(c)<='7') @@ -628,7 +628,16 @@ decode_header (union block *header, struct tar_stat_info *stat_info, stat_info->is_dumpdir = true; } - transform_member_name (&stat_info->file_name, xform_regfile); + transform_member_name (&stat_info->file_name, XFORM_REGFILE); + switch (header->header.typeflag) + { + case SYMTYPE: + transform_member_name (&stat_info->link_name, XFORM_SYMLINK); + break; + + case LNKTYPE: + transform_member_name (&stat_info->link_name, XFORM_LINK); + } } /* Convert buffer at WHERE0 of size DIGS from external format to