X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fxheader.c;h=af2c4be0d4135e4f91d5208c36c390bc534d488e;hb=95be2c50b429bfe7201590dd744864ab64c5d87e;hp=d5a75b3e32d8678348fca82b7dcdbe37db3751bc;hpb=4ed709c3c2376017c04ab827eaf93bd8ccf7c3a5;p=chaz%2Ftar

diff --git a/src/xheader.c b/src/xheader.c
index d5a75b3..af2c4be 100644
--- a/src/xheader.c
+++ b/src/xheader.c
@@ -33,7 +33,8 @@
 struct xhdr_tab
 {
   char const *keyword;
-  void (*coder) (struct tar_stat_info const *, char const *, struct xheader *);
+  void (*coder) (struct tar_stat_info const *, char const *,
+		 struct xheader *, void *data);
   void (*decoder) (struct tar_stat_info *, char const *);
 };
 
@@ -121,7 +122,7 @@ xheader_decode (struct tar_stat_info *st)
 }
 
 void
-xheader_store (char const *keyword, struct tar_stat_info const *st)
+xheader_store (char const *keyword, struct tar_stat_info const *st, void *data)
 {
   struct xhdr_tab const *t;
 
@@ -135,7 +136,7 @@ xheader_store (char const *keyword, struct tar_stat_info const *st)
       extended_header.stk = xmalloc (sizeof *extended_header.stk);
       obstack_init (extended_header.stk);
     }
-  t->coder (st, keyword, &extended_header);
+  t->coder (st, keyword, &extended_header, data);
 }
 
 void
@@ -249,17 +250,33 @@ code_string (char const *string, char const *keyword, struct xheader *xhdr)
 }
 
 static void
-code_time (time_t t, char const *keyword, struct xheader *xhdr)
+code_time (time_t t, unsigned long nano,
+	   char const *keyword, struct xheader *xhdr)
 {
-  char sbuf[100];
+  char sbuf[200];
   size_t s = format_uintmax (t, NULL, 0);
+  if (s + 11 >= sizeof sbuf)
+    return;
   format_uintmax (t, sbuf, s);
   sbuf[s++] = '.';
-  format_uintmax (0, sbuf + s, 9);
-  sbuf[s+9] = 0;
+  s += format_uintmax (nano, sbuf + s, 9);
+  sbuf[s] = 0;
   xheader_print (xhdr, keyword, sbuf);
 }
 
+static void
+decode_time (char const *arg, time_t *secs, unsigned long *nsecs)
+{
+  uintmax_t u;
+  char *p;
+  if (xstrtoumax (arg, &p, 10, &u, "") == LONGINT_OK)
+    {
+      *secs = u;
+      if (*p == '.' && xstrtoumax (p+1, NULL, 10, &u, "") == LONGINT_OK)
+	*nsecs = u;
+    }
+}
+
 static void
 code_num (uintmax_t value, char const *keyword, struct xheader *xhdr)
 {
@@ -272,7 +289,7 @@ code_num (uintmax_t value, char const *keyword, struct xheader *xhdr)
 
 static void
 dummy_coder (struct tar_stat_info const *st, char const *keyword,
-	     struct xheader *xhdr)
+	     struct xheader *xhdr, void *data)
 {
 }
 
@@ -283,22 +300,20 @@ dummy_decoder (struct tar_stat_info *st, char const *arg)
 
 static void
 atime_coder (struct tar_stat_info const *st, char const *keyword,
-	     struct xheader *xhdr)
+	     struct xheader *xhdr, void *data)
 {
-  code_time (st->stat.st_atime, keyword, xhdr);
+  code_time (st->stat.st_atime, st->atime_nsec, keyword, xhdr);
 }
 
 static void
 atime_decoder (struct tar_stat_info *st, char const *arg)
 {
-  uintmax_t u;
-  if (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK)
-    st->stat.st_atime = u;
+  decode_time (arg, &st->stat.st_atime, &st->atime_nsec);
 }
 
 static void
 gid_coder (struct tar_stat_info const *st, char const *keyword,
-	   struct xheader *xhdr)
+	   struct xheader *xhdr, void *data)
 {
   code_num (st->stat.st_gid, keyword, xhdr);
 }
@@ -307,13 +322,13 @@ static void
 gid_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK)
+  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
     st->stat.st_gid = u;
 }
 
 static void
 gname_coder (struct tar_stat_info const *st, char const *keyword,
-	     struct xheader *xhdr)
+	     struct xheader *xhdr, void *data)
 {
   code_string (st->gname, keyword, xhdr);
 }
@@ -326,7 +341,7 @@ gname_decoder (struct tar_stat_info *st, char const *arg)
 
 static void
 linkpath_coder (struct tar_stat_info const *st, char const *keyword,
-		struct xheader *xhdr)
+		struct xheader *xhdr, void *data)
 {
   code_string (st->link_name, keyword, xhdr);
 }
@@ -339,37 +354,33 @@ linkpath_decoder (struct tar_stat_info *st, char const *arg)
 
 static void
 ctime_coder (struct tar_stat_info const *st, char const *keyword,
-	     struct xheader *xhdr)
+	     struct xheader *xhdr, void *data)
 {
-  code_time (st->stat.st_ctime, keyword, xhdr);
+  code_time (st->stat.st_ctime, st->ctime_nsec, keyword, xhdr);
 }
 
 static void
 ctime_decoder (struct tar_stat_info *st, char const *arg)
 {
-  uintmax_t u;
-  if (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK)
-    st->stat.st_ctime = u;
+  decode_time (arg, &st->stat.st_ctime, &st->ctime_nsec);
 }
 
 static void
 mtime_coder (struct tar_stat_info const *st, char const *keyword,
-	     struct xheader *xhdr)
+	     struct xheader *xhdr, void *data)
 {
-  code_time (st->stat.st_mtime, keyword, xhdr);
+  code_time (st->stat.st_mtime, st->mtime_nsec, keyword, xhdr);
 }
 
 static void
 mtime_decoder (struct tar_stat_info *st, char const *arg)
 {
-  uintmax_t u;
-  if (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK)
-    st->stat.st_mtime = u;
+  decode_time (arg, &st->stat.st_mtime, &st->mtime_nsec);
 }
 
 static void
 path_coder (struct tar_stat_info const *st, char const *keyword,
-	    struct xheader *xhdr)
+	    struct xheader *xhdr, void *data)
 {
   code_string (st->file_name, keyword, xhdr);
 }
@@ -384,7 +395,7 @@ path_decoder (struct tar_stat_info *st, char const *arg)
 
 static void
 size_coder (struct tar_stat_info const *st, char const *keyword,
-	    struct xheader *xhdr)
+	    struct xheader *xhdr, void *data)
 {
   code_num (st->stat.st_size, keyword, xhdr);
 }
@@ -393,13 +404,13 @@ static void
 size_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK)
+  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
     st->stat.st_size = u;
 }
 
 static void
 uid_coder (struct tar_stat_info const *st, char const *keyword,
-	   struct xheader *xhdr)
+	   struct xheader *xhdr, void *data)
 {
   code_num (st->stat.st_uid, keyword, xhdr);
 }
@@ -408,13 +419,13 @@ static void
 uid_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK)
+  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
     st->stat.st_uid = u;
 }
 
 static void
 uname_coder (struct tar_stat_info const *st, char const *keyword,
-	     struct xheader *xhdr)
+	     struct xheader *xhdr, void *data)
 {
   code_string (st->uname, keyword, xhdr);
 }
@@ -425,6 +436,81 @@ uname_decoder (struct tar_stat_info *st, char const *arg)
   assign_string (&st->uname, arg);
 }
 
+static void
+sparse_size_coder (struct tar_stat_info const *st, char const *keyword,
+	     struct xheader *xhdr, void *data)
+{
+  size_coder (st, keyword, xhdr, data);
+}
+
+static void
+sparse_size_decoder (struct tar_stat_info *st, char const *arg)
+{
+  uintmax_t u;
+  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+    st->archive_file_size = u;
+}
+
+static void
+sparse_numblocks_coder (struct tar_stat_info const *st, char const *keyword,
+			struct xheader *xhdr, void *data)
+{
+  code_num (st->sparse_map_avail, keyword, xhdr);
+}
+
+static void
+sparse_numblocks_decoder (struct tar_stat_info *st, char const *arg)
+{
+  uintmax_t u;
+  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+    {
+      st->sparse_map_size = u;
+      st->sparse_map = calloc(st->sparse_map_size, sizeof(st->sparse_map[0]));
+      st->sparse_map_avail = 0;
+    }
+}
+
+static void
+sparse_offset_coder (struct tar_stat_info const *st, char const *keyword,
+		     struct xheader *xhdr, void *data)
+{
+  size_t i = *(size_t*)data;
+  code_num (st->sparse_map[i].offset, keyword, xhdr);
+}
+
+static void
+sparse_offset_decoder (struct tar_stat_info *st, char const *arg)
+{
+  uintmax_t u;
+  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+    st->sparse_map[st->sparse_map_avail].offset = u;
+}
+
+static void
+sparse_numbytes_coder (struct tar_stat_info const *st, char const *keyword,
+		     struct xheader *xhdr, void *data)
+{
+  size_t i = *(size_t*)data;
+  code_num (st->sparse_map[i].numbytes, keyword, xhdr);
+}
+
+static void
+sparse_numbytes_decoder (struct tar_stat_info *st, char const *arg)
+{
+  uintmax_t u;
+  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+    {
+      if (st->sparse_map_avail == st->sparse_map_size)
+	{
+	  size_t newsize = st->sparse_map_size *= 2;
+	  st->sparse_map = xrealloc (st->sparse_map,
+				     st->sparse_map_size
+				     * sizeof st->sparse_map[0]);
+	}
+      st->sparse_map[st->sparse_map_avail++].numbytes = u;
+    }
+}
+
 struct xhdr_tab const xhdr_tab[] = {
   { "atime",	atime_coder,	atime_decoder	},
   { "comment",	dummy_coder,	dummy_decoder	},
@@ -439,14 +525,14 @@ struct xhdr_tab const xhdr_tab[] = {
   { "uid",	uid_coder,	uid_decoder	},
   { "uname",	uname_coder,	uname_decoder	},
 
-  /* The number of entries in xhdr_tab must agree with the array
-     bounds in xhdr_tab's forward declaration.  */
-
-#if 0 /* GNU private keywords (not yet implemented) */
   /* Sparse file handling */
+  { "GNU.sparse.size",       sparse_size_coder, sparse_size_decoder },
+  { "GNU.sparse.numblocks",  sparse_numblocks_coder, sparse_numblocks_decoder },
   { "GNU.sparse.offset",     sparse_offset_coder, sparse_offset_decoder },
   { "GNU.sparse.numbytes",   sparse_numbytes_coder, sparse_numbytes_decoder },
 
+#if 0 /* GNU private keywords (not yet implemented) */
+
   /* The next directory entry actually contains the names of files
      that were in the directory at the time the dump was made.
      Supersedes GNUTYPE_DUMPDIR header type.  */