X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fxheader.c;h=b63cdb769f05f7d99dc6fbe35568c5a0ea17fd01;hb=463d99453f51ac4ae875d9bae97418671e7a62bc;hp=129ce8456fc324cac1f77c6224b7a26bfa23cd3b;hpb=f038194718845fe9ca9a596d3ee2e79484a5865a;p=chaz%2Ftar diff --git a/src/xheader.c b/src/xheader.c index 129ce84..b63cdb7 100644 --- a/src/xheader.c +++ b/src/xheader.c @@ -18,8 +18,10 @@ #include "system.h" +#include #include #include +#include #include #include "common.h" @@ -28,13 +30,16 @@ #define obstack_chunk_free free #include -bool xheader_protected_pattern_p (const char *pattern); -bool xheader_protected_keyword_p (const char *keyword); +#include + +static bool xheader_protected_pattern_p (char const *pattern); +static bool xheader_protected_keyword_p (char const *keyword); +static void xheader_set_single_keyword (char *) __attribute__ ((noreturn)); /* Used by xheader_finish() */ static void code_string (char const *string, char const *keyword, struct xheader *xhdr); -static void extended_header_init (); +static void extended_header_init (void); /* Number of global headers written so far. */ static size_t global_header_count; @@ -62,16 +67,23 @@ struct keyword_list /* List of keyword patterns set by delete= option */ static struct keyword_list *keyword_pattern_list; + /* List of keyword/value pairs set by `keyword=value' option */ static struct keyword_list *keyword_global_override_list; + /* List of keyword/value pairs set by `keyword:=value' option */ static struct keyword_list *keyword_override_list; + +/* List of keyword/value pairs decoded from the last 'g' type header */ +static struct keyword_list *global_header_override_list; + /* Template for the name field of an 'x' type header */ static char *exthdr_name; + /* Template for the name field of a 'g' type header */ static char *globexthdr_name; -bool +static bool xheader_keyword_deleted_p (const char *kw) { struct keyword_list *kp; @@ -82,7 +94,7 @@ xheader_keyword_deleted_p (const char *kw) return false; } -bool +static bool xheader_keyword_override_p (const char *keyword) { struct keyword_list *kp; @@ -93,8 +105,9 @@ xheader_keyword_override_p (const char *keyword) return false; } -void -xheader_list_append (struct keyword_list **root, char *kw, char *value) +static void +xheader_list_append (struct keyword_list **root, char const *kw, + char const *value) { struct keyword_list *kp = xmalloc (sizeof *kp); kp->pattern = xstrdup (kw); @@ -103,13 +116,31 @@ xheader_list_append (struct keyword_list **root, char *kw, char *value) *root = kp; } -void +static void +xheader_list_destroy (struct keyword_list **root) +{ + if (root) + { + struct keyword_list *kw = *root; + while (kw) + { + struct keyword_list *next = kw->next; + free (kw->pattern); + free (kw->value); + free (kw); + kw = next; + } + *root = NULL; + } +} + +static void xheader_set_single_keyword (char *kw) { - USAGE_ERROR ((0, 0, "Keyword %s is unknown or not yet imlemented", kw)); + USAGE_ERROR ((0, 0, _("Keyword %s is unknown or not yet imlemented"), kw)); } -void +static void xheader_set_keyword_equal (char *kw, char *eq) { bool global = true; @@ -128,11 +159,11 @@ xheader_set_keyword_equal (char *kw, char *eq) for (p = eq + 1; *p && isspace (*p); p++) ; - + if (strcmp (kw, "delete") == 0) { if (xheader_protected_pattern_p (p)) - USAGE_ERROR ((0, 0, "Pattern %s cannot be used", p)); + USAGE_ERROR ((0, 0, _("Pattern %s cannot be used"), p)); xheader_list_append (&keyword_pattern_list, p, NULL); } else if (strcmp (kw, "exthdr.name") == 0) @@ -142,7 +173,7 @@ xheader_set_keyword_equal (char *kw, char *eq) else { if (xheader_protected_keyword_p (kw)) - USAGE_ERROR ((0, 0, "Keyword %s cannot be overridden", kw)); + USAGE_ERROR ((0, 0, _("Keyword %s cannot be overridden"), kw)); if (global) xheader_list_append (&keyword_global_override_list, kw, p); else @@ -164,15 +195,35 @@ xheader_set_option (char *string) } } +static void +to_decimal (uintmax_t value, char *where, size_t size) +{ + size_t i = 0, j; + + where[i++] = 0; + do + { + where[i++] = '0' + value % 10; + value /= 10; + } + while (i < size && value); + for (j = 0, i--; j < i; j++, i--) + { + char c = where[j]; + where[j] = where[i]; + where[i] = c; + } +} + /* string Includes: Replaced By: %d The directory name of the file, equivalent to the result of the dirname utility on the translated - pathname. + file name. %f The filename of the file, equivalent to the result of the basename - utility on the translated pathname. + utility on the translated file name. %p The process ID of the pax process. %% A '%' character. */ @@ -183,11 +234,11 @@ xheader_format_name (struct tar_stat_info *st, const char *fmt, bool allow_n) size_t len = strlen (fmt); char *q; const char *p; - char *dirname = NULL; - char *basename = NULL; + char *dir = NULL; + char *base = NULL; char pidbuf[64]; char nbuf[64]; - + for (p = fmt; *p && (p = strchr (p, '%')); ) { switch (p[1]) @@ -199,38 +250,35 @@ xheader_format_name (struct tar_stat_info *st, const char *fmt, bool allow_n) case 'd': if (st) { - dirname = safer_name_suffix (dir_name (st->orig_file_name), - false); - len += strlen (dirname) - 1; + dir = safer_name_suffix (dir_name (st->orig_file_name), false); + len += strlen (dir) - 1; } break; - + case 'f': if (st) { - basename = base_name (st->orig_file_name); - len += strlen (basename) - 1; + base = base_name (st->orig_file_name); + len += strlen (base) - 1; } break; - + case 'p': - snprintf (pidbuf, sizeof pidbuf, "%lu", - (unsigned long) getpid ()); + to_decimal (getpid (), pidbuf, sizeof pidbuf); len += strlen (pidbuf) - 1; break; - + case 'n': if (allow_n) { - snprintf (nbuf, sizeof nbuf, "%lu", - (unsigned long) global_header_count + 1); + to_decimal (global_header_count + 1, pidbuf, sizeof pidbuf); len += strlen (nbuf) - 1; } break; } p++; } - + buf = xmalloc (len + 1); for (q = buf, p = fmt; *p; ) { @@ -242,19 +290,19 @@ xheader_format_name (struct tar_stat_info *st, const char *fmt, bool allow_n) *q++ = *p++; p++; break; - + case 'd': - if (dirname) - q = stpcpy (q, dirname); + if (dir) + q = stpcpy (q, dir); p += 2; break; - + case 'f': - if (basename) - q = stpcpy (q, basename); + if (base) + q = stpcpy (q, base); p += 2; break; - + case 'p': q = stpcpy (q, pidbuf); p += 2; @@ -267,7 +315,7 @@ xheader_format_name (struct tar_stat_info *st, const char *fmt, bool allow_n) p += 2; } /* else fall through */ - + default: *q++ = *p++; if (*p) @@ -296,7 +344,7 @@ xheader_xhdr_name (struct tar_stat_info *st) #define GLOBAL_HEADER_TEMPLATE "/GlobalHead.%p.%n" char * -xheader_ghdr_name () +xheader_ghdr_name (void) { if (!globexthdr_name) { @@ -319,7 +367,7 @@ xheader_write (char type, char *name, struct xheader *xhdr) union block *header; size_t size; char *p; - + size = xhdr->size; header = start_private_header (name, size); header->header.typeflag = type; @@ -327,11 +375,11 @@ xheader_write (char type, char *name, struct xheader *xhdr) simple_finish_header (header); p = xhdr->buffer; - + do { size_t len; - + header = find_next_block (); len = BLOCKSIZE; if (len > size) @@ -345,17 +393,17 @@ xheader_write (char type, char *name, struct xheader *xhdr) } while (size > 0); xheader_destroy (xhdr); -} +} void -xheader_write_global () +xheader_write_global (void) { char *name; struct keyword_list *kp; if (!keyword_global_override_list) return; - + extended_header_init (); for (kp = keyword_global_override_list; kp; kp = kp->next) code_string (kp->value, kp->pattern, &extended_header); @@ -397,7 +445,7 @@ locate_handler (char const *keyword) return NULL; } -bool +static bool xheader_protected_pattern_p (const char *pattern) { struct xhdr_tab const *p; @@ -408,7 +456,7 @@ xheader_protected_pattern_p (const char *pattern) return false; } -bool +static bool xheader_protected_keyword_p (const char *keyword) { struct xhdr_tab const *p; @@ -423,13 +471,14 @@ xheader_protected_keyword_p (const char *keyword) record. Returns true on success, false otherwise. */ static bool -decode_record (char **p, struct tar_stat_info *st) +decode_record (char **p, + void (*handler) (void *, char const *, char const *), + void *data) { size_t len; char const *keyword; - char *eqp; char *start = *p; - struct xhdr_tab const *t; + char endc; if (**p == 0) return false; @@ -453,26 +502,15 @@ decode_record (char **p, struct tar_stat_info *st) return false; } - eqp = *p; **p = 0; - if (xheader_keyword_deleted_p (keyword) - || xheader_keyword_override_p (keyword)) - return true; - t = locate_handler (keyword); - if (t) - { - char endc; - char *value; + endc = start[len-1]; + start[len-1] = 0; - value = ++*p; + handler (data, keyword, *p + 1); - endc = start[len-1]; - start[len-1] = 0; - t->decoder (st, value); - start[len-1] = endc; - } - *eqp = '='; + start[len-1] = endc; + **p = '='; *p = &start[len]; return true; } @@ -488,25 +526,63 @@ run_override_list (struct keyword_list *kp, struct tar_stat_info *st) } } +static void +decx (void *data, char const *keyword, char const *value) +{ + struct xhdr_tab const *t; + struct tar_stat_info *st = data; + + if (xheader_keyword_deleted_p (keyword) + || xheader_keyword_override_p (keyword)) + return; + + t = locate_handler (keyword); + if (t) + t->decoder (st, value); +} + void xheader_decode (struct tar_stat_info *st) { run_override_list (keyword_global_override_list, st); - + run_override_list (global_header_override_list, st); + if (extended_header.size) { 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, decx, st)) break; } run_override_list (keyword_override_list, st); } static void -extended_header_init () +decg (void *data, char const *keyword, char const *value) +{ + struct keyword_list **kwl = data; + xheader_list_append (kwl, keyword, value); +} + +void +xheader_decode_global (void) +{ + if (extended_header.size) + { + char *p = extended_header.buffer + BLOCKSIZE; + char *endp = &extended_header.buffer[extended_header.size-1]; + + xheader_list_destroy (&global_header_override_list); + while (p < endp) + if (!decode_record (&p, decg, &global_header_override_list)) + break; + } +} + +static void +extended_header_init (void) { if (!extended_header.stk) { @@ -519,8 +595,7 @@ void xheader_store (char const *keyword, struct tar_stat_info const *st, void *data) { struct xhdr_tab const *t; - char *value; - + if (extended_header.buffer) return; t = locate_handler (keyword); @@ -551,7 +626,7 @@ xheader_read (union block *p, size_t size) if (len > BLOCKSIZE) len = BLOCKSIZE; - + memcpy (&extended_header.buffer[j], p->buffer, len); set_next_block_after (p); @@ -645,7 +720,29 @@ xheader_destroy (struct xheader *xhdr) static void code_string (char const *string, char const *keyword, struct xheader *xhdr) { - xheader_print (xhdr, keyword, string); + char *outstr; + if (!utf8_convert (true, string, &outstr)) + { + /* FIXME: report error */ + outstr = xstrdup (string); + } + xheader_print (xhdr, keyword, outstr); + free (outstr); +} + +static void +decode_string (char **string, char const *arg) +{ + if (*string) + { + free (*string); + *string = NULL; + } + if (!utf8_convert (false, arg, string)) + { + /* FIXME: report error and act accordingly to --pax invalid=UTF-8 */ + assign_string (string, arg); + } } static void @@ -687,19 +784,22 @@ 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, void *data) +dummy_coder (struct tar_stat_info const *st __attribute__ ((unused)), + char const *keyword __attribute__ ((unused)), + struct xheader *xhdr __attribute__ ((unused)), + void *data __attribute__ ((unused))) { } static void -dummy_decoder (struct tar_stat_info *st, char const *arg) +dummy_decoder (struct tar_stat_info *st __attribute__ ((unused)), + char const *arg __attribute__ ((unused))) { } static void atime_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_time (st->stat.st_atime, st->atime_nsec, keyword, xhdr); } @@ -712,7 +812,7 @@ atime_decoder (struct tar_stat_info *st, char const *arg) static void gid_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_num (st->stat.st_gid, keyword, xhdr); } @@ -727,7 +827,7 @@ gid_decoder (struct tar_stat_info *st, char const *arg) static void gname_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_string (st->gname, keyword, xhdr); } @@ -735,12 +835,12 @@ gname_coder (struct tar_stat_info const *st, char const *keyword, static void gname_decoder (struct tar_stat_info *st, char const *arg) { - assign_string (&st->gname, arg); + decode_string (&st->gname, arg); } static void linkpath_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_string (st->link_name, keyword, xhdr); } @@ -748,12 +848,12 @@ linkpath_coder (struct tar_stat_info const *st, char const *keyword, static void linkpath_decoder (struct tar_stat_info *st, char const *arg) { - assign_string (&st->link_name, arg); + decode_string (&st->link_name, arg); } static void ctime_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_time (st->stat.st_ctime, st->ctime_nsec, keyword, xhdr); } @@ -766,7 +866,7 @@ ctime_decoder (struct tar_stat_info *st, char const *arg) static void mtime_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_time (st->stat.st_mtime, st->mtime_nsec, keyword, xhdr); } @@ -779,7 +879,7 @@ mtime_decoder (struct tar_stat_info *st, char const *arg) static void path_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_string (st->file_name, keyword, xhdr); } @@ -787,14 +887,14 @@ path_coder (struct tar_stat_info const *st, char const *keyword, static void path_decoder (struct tar_stat_info *st, char const *arg) { - assign_string (&st->orig_file_name, arg); - assign_string (&st->file_name, arg); + decode_string (&st->orig_file_name, arg); + decode_string (&st->file_name, arg); st->had_trailing_slash = strip_trailing_slashes (st->file_name); } static void size_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_num (st->stat.st_size, keyword, xhdr); } @@ -804,12 +904,12 @@ size_decoder (struct tar_stat_info *st, char const *arg) { uintmax_t u; if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK) - st->stat.st_size = u; + st->archive_file_size = st->stat.st_size = u; } static void uid_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_num (st->stat.st_uid, keyword, xhdr); } @@ -824,7 +924,7 @@ uid_decoder (struct tar_stat_info *st, char const *arg) static void uname_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, void *data __attribute__ ((unused))) { code_string (st->uname, keyword, xhdr); } @@ -832,7 +932,7 @@ uname_coder (struct tar_stat_info const *st, char const *keyword, static void uname_decoder (struct tar_stat_info *st, char const *arg) { - assign_string (&st->uname, arg); + decode_string (&st->uname, arg); } static void @@ -847,12 +947,13 @@ 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; + st->stat.st_size = u; } static void sparse_numblocks_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void *data) + struct xheader *xhdr, + void *data __attribute__ ((unused))) { code_num (st->sparse_map_avail, keyword, xhdr); } @@ -901,7 +1002,7 @@ sparse_numbytes_decoder (struct tar_stat_info *st, char const *arg) { if (st->sparse_map_avail == st->sparse_map_size) { - size_t newsize = st->sparse_map_size *= 2; + st->sparse_map_size *= 2; st->sparse_map = xrealloc (st->sparse_map, st->sparse_map_size * sizeof st->sparse_map[0]); @@ -911,18 +1012,18 @@ sparse_numbytes_decoder (struct tar_stat_info *st, char const *arg) } struct xhdr_tab const xhdr_tab[] = { - { "atime", atime_coder, atime_decoder }, - { "comment", dummy_coder, dummy_decoder }, - { "charset", dummy_coder, dummy_decoder }, - { "ctime", ctime_coder, ctime_decoder }, - { "gid", gid_coder, gid_decoder }, - { "gname", gname_coder, gname_decoder }, - { "linkpath", linkpath_coder, linkpath_decoder}, - { "mtime", mtime_coder, mtime_decoder }, - { "path", path_coder, path_decoder }, - { "size", size_coder, size_decoder }, - { "uid", uid_coder, uid_decoder }, - { "uname", uname_coder, uname_decoder }, + { "atime", atime_coder, atime_decoder, false }, + { "comment", dummy_coder, dummy_decoder, false }, + { "charset", dummy_coder, dummy_decoder, false }, + { "ctime", ctime_coder, ctime_decoder, false }, + { "gid", gid_coder, gid_decoder, false }, + { "gname", gname_coder, gname_decoder, false }, + { "linkpath", linkpath_coder, linkpath_decoder, false }, + { "mtime", mtime_coder, mtime_decoder, false }, + { "path", path_coder, path_decoder, false }, + { "size", size_coder, size_decoder, false }, + { "uid", uid_coder, uid_decoder, false }, + { "uname", uname_coder, uname_decoder, false }, /* Sparse file handling */ { "GNU.sparse.size", sparse_size_coder, sparse_size_decoder, true }, @@ -938,11 +1039,12 @@ struct xhdr_tab const xhdr_tab[] = { /* 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. */ - { "GNU.dumpdir", dumpdir_coder, dumpdir_decoder }, + { "GNU.dump.name", dump_name_coder, dump_name_decoder, false }, + { "GNU.dump.status", dump_status_coder, dump_status_decoder, false }, /* Keeps the tape/volume header. May be present only in the global headers. Equivalent to GNUTYPE_VOLHDR. */ - { "GNU.volume.header", volume_header_coder, volume_header_decoder }, + { "GNU.volume.header", volume_header_coder, volume_header_decoder, false }, /* These may be present in a first global header of the archive. They provide the same functionality as GNUTYPE_MULTIVOL header. @@ -950,9 +1052,9 @@ struct xhdr_tab const xhdr_tab[] = { otherwise kept in the size field of a multivolume header. The GNU.volume.offset keeps the offset of the start of this volume, otherwise kept in oldgnu_header.offset. */ - { "GNU.volume.size", volume_size_coder, volume_size_decoder }, - { "GNU.volume.offset", volume_offset_coder, volume_offset_decoder }, + { "GNU.volume.size", volume_size_coder, volume_size_decoder, false }, + { "GNU.volume.offset", volume_offset_coder, volume_offset_decoder, false }, #endif - { NULL, NULL, NULL } + { NULL, NULL, NULL, false } };