Remove defines and declarations imported from paxutils

[chaz/tar] / src / list.c

diff --git a/src/list.c b/src/list.c
index 16a6970a58f618c1c16aeb0c5ccd2d6b0757134c..e56e7dce930d5e42c92aff77a1857c37fa1b6192 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Define to non-zero for forcing old ctime format instead of ISO format.  */
 #undef USE_OLD_CTIME
@@ -369,7 +369,8 @@ read_header (bool raw_extended_headers)
       if (header->header.typeflag == GNUTYPE_LONGNAME
          || header->header.typeflag == GNUTYPE_LONGLINK
          || header->header.typeflag == XHDTYPE
-         || header->header.typeflag == XGLTYPE)
+         || header->header.typeflag == XGLTYPE
+         || header->header.typeflag == SOLARIS_XHDTYPE)
        {
          if (raw_extended_headers)
            return HEADER_SUCCESS_EXTENDED;
@@ -427,7 +428,8 @@ read_header (bool raw_extended_headers)
 
              *bp = '\0';
            }
-         else if (header->header.typeflag == XHDTYPE)
+         else if (header->header.typeflag == XHDTYPE
+                  || header->header.typeflag == SOLARIS_XHDTYPE)
            xheader_read (header, OFF_FROM_HEADER (header->header.size));
          else if (header->header.typeflag == XGLTYPE)
            {
@@ -918,18 +920,6 @@ uintmax_from_header (const char *p, size_t s)
 }
 
 
-/* Format O as a null-terminated decimal string into BUF _backwards_;
-   return pointer to start of result.  */
-char *
-stringify_uintmax_t_backwards (uintmax_t o, char *buf)
-{
-  *--buf = '\0';
-  do
-    *--buf = '0' + (int) (o % 10);
-  while ((o /= 10) != 0);
-  return buf;
-}
-
 /* Return a printable representation of T.  The result points to
    static storage that can be reused in the next call to this
    function, to ctime, or to asctime.  */
@@ -1090,7 +1080,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
          break;
        }
 
-      decode_mode (st->stat.st_mode, modes + 1);
+      pax_decode_mode (st->stat.st_mode, modes + 1);
 
       /* Time stamp.  */
 
@@ -1249,7 +1239,7 @@ print_for_mkdir (char *dirname, int length, mode_t mode)
       /* File type and modes.  */
 
       modes[0] = 'd';
-      decode_mode (mode, modes + 1);
+      pax_decode_mode (mode, modes + 1);
 
       if (block_number_option)
        {