#include "system.h"
-#include <grp.h>
#include <hash.h>
-#include <pwd.h>
#include <quotearg.h>
#include "common.h"
void (*decoder) (struct tar_stat_info *, char const *);
};
-static struct xhdr_tab const xhdr_tab[];
+/* This declaration must be extern, because ISO C99 section 6.9.2
+ prohibits a tentative definition that has both internal linkage and
+ incomplete type. If we made it static, we'd have to declare its
+ size which would be a maintenance pain; if we put its initializer
+ here, we'd need a boatload of forward declarations, which would be
+ even more of a pain. */
+extern struct xhdr_tab const xhdr_tab[];
static struct xhdr_tab const *
locate_handler (char const *keyword)
return NULL;
}
+/* Decodes a single extended header record. Advances P to the next
+ record.
+ Returns true on success, false otherwise. */
static bool
decode_record (char **p, struct tar_stat_info *st)
{
struct xhdr_tab const *t;
if (**p == 0)
- return true;
+ return false;
len = strtoul (*p, p, 10);
if (**p != ' ')
{
- ERROR ((0, 0, _("Malformed extended header")));
- return true;
+ ERROR ((0, 0, _("Malformed extended header: missing whitespace after the length")));
+ return false;
}
keyword = ++*p;
if (**p != '=')
{
- ERROR ((0, 0, _("Malformed extended header")));
- return true;
+ ERROR ((0, 0, _("Malformed extended header: missing equal sign")));
+ return false;
}
eqp = *p;
}
*eqp = '=';
*p = &start[len];
- return false;
+ return true;
}
void
xheader_decode (struct tar_stat_info *st)
{
- char *p = extended_header.buffer;
+ char *p = extended_header.buffer + BLOCKSIZE;
char *endp = &extended_header.buffer[extended_header.size-1];
while (p < endp)
- if (decode_record (&p, st))
+ if (!decode_record (&p, st))
break;
}
void
xheader_read (union block *p, size_t size)
{
- size_t i, j;
+ size_t j = 0;
size_t nblocks;
free (extended_header.buffer);
+ size += BLOCKSIZE;
extended_header.size = size;
nblocks = (size + BLOCKSIZE - 1) / BLOCKSIZE;
extended_header.buffer = xmalloc (size + 1);
- set_next_block_after (p);
- for (i = j = 0; i < nblocks; i++)
+ do
{
- size_t len;
+ size_t len = size;
- p = find_next_block ();
- len = size;
if (len > BLOCKSIZE)
len = BLOCKSIZE;
+
memcpy (&extended_header.buffer[j], p->buffer, len);
set_next_block_after (p);
+ p = find_next_block ();
+
j += len;
size -= len;
}
+ while (size > 0);
}
static size_t
assign_string (&st->uname, arg);
}
-static struct xhdr_tab const xhdr_tab[] = {
+struct xhdr_tab const xhdr_tab[] = {
{ "atime", atime_coder, atime_decoder },
{ "comment", dummy_coder, dummy_decoder },
{ "charset", dummy_coder, dummy_decoder },
{ "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.offset", sparse_offset_coder, sparse_offset_decoder },