X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fxheader.c;h=1a7edd0f40588735bcdf584c3b1b2b4d939c8bee;hb=fc184a85e1cc0a75f8f034a9940e090555bc95bd;hp=aa94c4bf2dfb1575d71565bcb7a9121a01c76500;hpb=761802e87ab7e58f4216454257f6b451ee056dfa;p=chaz%2Ftar diff --git a/src/xheader.c b/src/xheader.c index aa94c4b..1a7edd0 100644 --- a/src/xheader.c +++ b/src/xheader.c @@ -20,6 +20,7 @@ #include #include +#include #include "common.h" @@ -32,14 +33,18 @@ 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 *); }; -/* This declaration must specify the number of elements in xhdr_tab, - because ISO C99 section 6.9.2 prohibits a tentative definition that - has both internal linkage and incomplete type. */ -static struct xhdr_tab const xhdr_tab[13]; +/* 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) @@ -117,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; @@ -131,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 @@ -268,7 +273,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) { } @@ -279,7 +284,7 @@ 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); } @@ -287,12 +292,14 @@ atime_coder (struct tar_stat_info const *st, char const *keyword, static void atime_decoder (struct tar_stat_info *st, char const *arg) { - st->stat.st_atime = strtoul (arg, NULL, 0); + uintmax_t u; + if (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK) + st->stat.st_atime = u; } 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); } @@ -300,12 +307,14 @@ gid_coder (struct tar_stat_info const *st, char const *keyword, static void gid_decoder (struct tar_stat_info *st, char const *arg) { - st->stat.st_gid = strtoul (arg, NULL, 0); + uintmax_t u; + if (xstrtoumax (arg, 0, 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); } @@ -318,7 +327,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); } @@ -331,7 +340,7 @@ 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); } @@ -339,12 +348,14 @@ ctime_coder (struct tar_stat_info const *st, char const *keyword, static void ctime_decoder (struct tar_stat_info *st, char const *arg) { - st->stat.st_ctime = strtoul (arg, NULL, 0); + uintmax_t u; + if (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK) + st->stat.st_ctime = u; } 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); } @@ -352,12 +363,14 @@ mtime_coder (struct tar_stat_info const *st, char const *keyword, static void mtime_decoder (struct tar_stat_info *st, char const *arg) { - st->stat.st_mtime = strtoul (arg, NULL, 0); + uintmax_t u; + if (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK) + st->stat.st_mtime = u; } 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); } @@ -372,7 +385,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); } @@ -380,12 +393,14 @@ size_coder (struct tar_stat_info const *st, char const *keyword, static void size_decoder (struct tar_stat_info *st, char const *arg) { - st->stat.st_size = strtoul (arg, NULL, 0); + uintmax_t u; + if (xstrtoumax (arg, 0, 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); } @@ -393,12 +408,14 @@ uid_coder (struct tar_stat_info const *st, char const *keyword, static void uid_decoder (struct tar_stat_info *st, char const *arg) { - st->stat.st_uid = strtoul (arg, NULL, 0); + uintmax_t u; + if (xstrtoumax (arg, 0, 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); } @@ -409,7 +426,82 @@ uname_decoder (struct tar_stat_info *st, char const *arg) assign_string (&st->uname, arg); } -static struct xhdr_tab const xhdr_tab[] = { +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, 0, 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, 0, 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, 0, 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, 0, 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 }, { "charset", dummy_coder, dummy_decoder }, @@ -423,14 +515,14 @@ static 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. */