Fix handling of hard link targets by -c --transform

[chaz/tar] / src / list.c

diff --git a/src/list.c b/src/list.c
index d6768d936687311d3208557e86a457caabc1cede..98c1e396b3547cb22a5ac590bb24d03b03a9b521 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -1,13 +1,13 @@
 /* List a tar archive, with support routines for reading a tar archive.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,
 /* List a tar archive, with support routines for reading a tar archive.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,

-   2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

 
    Written by John Gilmore, on 1985-08-26.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
 
    Written by John Gilmore, on 1985-08-26.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -76,7 +76,6 @@ read_and (void (*do_something) (void))
     {
       prev_status = status;
       tar_stat_destroy (&current_stat_info);
     {
       prev_status = status;
       tar_stat_destroy (&current_stat_info);

-      xheader_destroy (&extended_header);

 
       status = read_header (false);
       switch (status)
 
       status = read_header (false);
       switch (status)


@@ -302,8 +301,8 @@ read_header_primitive (bool raw_extended_headers, struct tar_stat_info *info)
   size_t size, written;
   union block *next_long_name = 0;
   union block *next_long_link = 0;
   size_t size, written;
   union block *next_long_name = 0;
   union block *next_long_link = 0;

-  size_t next_long_name_blocks;
-  size_t next_long_link_blocks;
+  size_t next_long_name_blocks = 0;
+  size_t next_long_link_blocks = 0;

 
   while (1)
     {
 
   while (1)
     {


@@ -387,12 +386,16 @@ read_header_primitive (bool raw_extended_headers, struct tar_stat_info *info)
            }
          else if (header->header.typeflag == XHDTYPE
                   || header->header.typeflag == SOLARIS_XHDTYPE)
            }
          else if (header->header.typeflag == XHDTYPE
                   || header->header.typeflag == SOLARIS_XHDTYPE)

-           xheader_read (header, OFF_FROM_HEADER (header->header.size));
+           xheader_read (&info->xhdr, header,
+                         OFF_FROM_HEADER (header->header.size));

          else if (header->header.typeflag == XGLTYPE)
            {
          else if (header->header.typeflag == XGLTYPE)
            {

-             xheader_read (header, OFF_FROM_HEADER (header->header.size));
-             xheader_decode_global ();
-             xheader_destroy (&extended_header);
+             struct xheader xhdr;
+             memset (&xhdr, 0, sizeof xhdr);
+             xheader_read (&xhdr, header,
+                           OFF_FROM_HEADER (header->header.size));
+             xheader_decode_global (&xhdr);
+             xheader_destroy (&xhdr);

            }
 
          /* Loop!  */
            }
 
          /* Loop!  */


@@ -469,9 +472,27 @@ read_header (bool raw_extended_headers)
 static char *
 decode_xform (char *file_name, void *data)
 {
 static char *
 decode_xform (char *file_name, void *data)
 {

-  bool link_target = *(bool*)data;
-  file_name = safer_name_suffix (file_name, link_target,
-                                absolute_names_option);
+  int type = *(int*)data;
+
+  switch (type)
+    {
+    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
+        name suffix normalization, but subject to filename transformation
+        proper. */ 
+      return file_name;
+      
+    case XFORM_LINK:
+      file_name = safer_name_suffix (file_name, true, absolute_names_option);
+      break;
+      
+    case XFORM_REGFILE:
+      file_name = safer_name_suffix (file_name, false, absolute_names_option);
+      break;
+    }
+  

   if (strip_name_components)
     {
       size_t prefix_len = stripped_prefix_len (file_name,
   if (strip_name_components)
     {
       size_t prefix_len = stripped_prefix_len (file_name,


@@ -484,9 +505,9 @@ decode_xform (char *file_name, void *data)
 }
 
 bool
 }
 
 bool

-transform_member_name (char **pinput, bool lnk)
+transform_member_name (char **pinput, int type)

 {
 {

-  return transform_name_fp (pinput, decode_xform, &lnk);
+  return transform_name_fp (pinput, type, decode_xform, &type);

 }
 
 #define ISOCTAL(c) ((c)>='0'&&(c)<='7')
 }
 
 #define ISOCTAL(c) ((c)>='0'&&(c)<='7')


@@ -518,7 +539,7 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
          && ISOCTAL (header->star_header.ctime[0])
          && header->star_header.ctime[11] == ' ')
        format = STAR_FORMAT;
          && ISOCTAL (header->star_header.ctime[0])
          && header->star_header.ctime[11] == ' ')
        format = STAR_FORMAT;

-      else if (extended_header.size)
+      else if (stat_info->xhdr.size)

        format = POSIX_FORMAT;
       else
        format = USTAR_FORMAT;
        format = POSIX_FORMAT;
       else
        format = USTAR_FORMAT;


@@ -607,7 +628,16 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
        stat_info->is_dumpdir = true;
     }
 
        stat_info->is_dumpdir = true;
     }
 

-  transform_member_name (&stat_info->file_name, false);
+  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
 }
 
 /* Convert buffer at WHERE0 of size DIGS from external format to