tar: don't assume size of a sparse file chunk fits in size_t

[chaz/tar] / src / tar.h

diff --git a/src/tar.h b/src/tar.h
index fa6a625e5b260270ae78092b07d5973ce198caed..fddc83fbfdf065aa08ce3d8a2ae766b1590ab9b3 100644 (file)
--- a/src/tar.h
+++ b/src/tar.h
@@ -1,11 +1,11 @@
 /* GNU tar Archive Format description.
 
    Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
 /* GNU tar Archive Format description.
 
    Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,

-   2000, 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   2000, 2001, 2003, 2004, 2005, 2006, 2007 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
 
    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


@@ -265,7 +265,15 @@ enum archive_format
 struct sp_array
 {
   off_t offset;
 struct sp_array
 {
   off_t offset;

-  size_t numbytes;
+  off_t numbytes;
+};
+
+struct xheader
+{
+  struct obstack *stk;
+  size_t size;
+  char *buffer;
+  uintmax_t string_length;

 };
 
 struct tar_stat_info
 };
 
 struct tar_stat_info


@@ -301,6 +309,9 @@ struct tar_stat_info
   size_t sparse_map_size;   /* Size of the sparse map */
   struct sp_array *sparse_map;
 
   size_t sparse_map_size;   /* Size of the sparse map */
   struct sp_array *sparse_map;
 

+  /* Extended headers */
+  struct xheader xhdr;
+

   /* For dumpdirs */
   bool is_dumpdir;          /* Is the member a dumpdir? */
   bool skipped;             /* The member contents is already read
   /* For dumpdirs */
   bool is_dumpdir;          /* Is the member a dumpdir? */
   bool skipped;             /* The member contents is already read