X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.h;h=4595bd67295f78b23a698913796ef3f3b3a1ec39;hb=ca14885884b5ca211624809e1e8539ec5a028b10;hp=ad6872428496a7dc5ad9c2f36500e4650e08581a;hpb=005d0d455c49f83afe1c0ce2ad9ceaddbc582175;p=chaz%2Ftar

diff --git a/src/tar.h b/src/tar.h
index ad68724..4595bd6 100644
--- a/src/tar.h
+++ b/src/tar.h
@@ -1,7 +1,7 @@
 /* GNU tar Archive Format description.
 
    Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2000, 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    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
@@ -15,7 +15,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.  */
 
 /* tar Header Block, from POSIX 1003.1-1990.  */
 
@@ -192,8 +192,7 @@ struct oldgnu_header
 /* Solaris extended header */
 #define SOLARIS_XHDTYPE 'X'
 
-
-/* Jörg Schilling star header */
+/* J@"org Schilling star header */
 
 struct star_header
 {				/* byte offset */
@@ -221,7 +220,8 @@ struct star_header
 #define SPARSES_IN_STAR_HEADER      4
 #define SPARSES_IN_STAR_EXT_HEADER  21
 
-struct star_in_header {
+struct star_in_header
+{
   char fill[345];       /*   0  Everything that is before t_prefix */
   char prefix[1];       /* 345  t_name prefix */
   char fill2;           /* 346  */
@@ -236,11 +236,13 @@ struct star_in_header {
   char xmagic[4];       /* 508  "tar" */
 };
 
-struct star_ext_header {
+struct star_ext_header
+{
   struct sparse sp[SPARSES_IN_STAR_EXT_HEADER];
   char isextended;
 };
 
+/* END */
 
 
 /* tar Header Block, overall structure.  */
@@ -263,41 +265,49 @@ enum archive_format
 
 /* Information about a sparse file.  */
 struct sp_array
-  {
-    off_t offset;
-    size_t numbytes;
-  };
+{
+  off_t offset;
+  size_t numbytes;
+};
 
 struct tar_stat_info
 {
   char *orig_file_name;     /* name of file read from the archive header */
   char *file_name;          /* name of file for the current archive entry
 			       after being normalized.  */
-  int had_trailing_slash;   /* nonzero if the current archive entry had a
+  bool had_trailing_slash;  /* true if the current archive entry had a
 			       trailing slash before it was normalized. */
   char *link_name;          /* name of link for the current archive entry.  */
 
-  unsigned int  devminor;   /* device minor number */
-  unsigned int  devmajor;   /* device major number */
   char          *uname;     /* user name of owner */
   char          *gname;     /* group name of owner */
   struct stat   stat;       /* regular filesystem stat */
 
-  /* Nanosecond parts of file timestamps (if available) */
-  unsigned long atime_nsec;
-  unsigned long mtime_nsec;
-  unsigned long ctime_nsec;
+  /* STAT doesn't always have access, data modification, and status
+     change times in a convenient form, so store them separately.  */
+  struct timespec atime;
+  struct timespec mtime;
+  struct timespec ctime;
 
   off_t archive_file_size;  /* Size of file as stored in the archive.
 			       Equals stat.st_size for non-sparse files */
 
   bool   is_sparse;         /* Is the file sparse */
 
+  /* For sparse files: */
+  unsigned sparse_major;
+  unsigned sparse_minor;
   size_t sparse_map_avail;  /* Index to the first unused element in
 			       sparse_map array. Zero if the file is
 			       not sparse */
   size_t sparse_map_size;   /* Size of the sparse map */
   struct sp_array *sparse_map;
+
+  /* For dumpdirs */
+  bool is_dumpdir;          /* Is the member a dumpdir? */
+  bool skipped;             /* The member contents is already read
+			       (for GNUTYPE_DUMPDIR) */
+  char *dumpdir;            /* Contents of the dump directory */
 };
 
 union block
@@ -310,5 +320,3 @@ union block
   struct star_in_header star_in_header;
   struct star_ext_header star_ext_header;
 };
-
-/* End of Format description.  */