X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=02737a147885df38f2e020037ed06c12e3617e8f;hb=eaef08322eeb8d66c8dc34d483a94f2f9d7f12fa;hp=32e8522f8d3c0c1b9a62bb98abe9ed171a9844a3;hpb=07f380748c431d6f4e1f1d668792e9dd1fb3fc7f;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 32e8522..02737a1 100644 --- a/src/tar.c +++ b/src/tar.c @@ -164,6 +164,7 @@ struct option long_options[] = {"block-number", no_argument, NULL, 'R'}, {"block-size", required_argument, NULL, OBSOLETE_BLOCKING_FACTOR}, {"blocking-factor", required_argument, NULL, 'b'}, + {"bzip2", no_argument, NULL, 'y'}, {"catenate", no_argument, NULL, 'A'}, {"checkpoint", no_argument, &checkpoint_option, 1}, {"compare", no_argument, NULL, 'd'}, @@ -340,6 +341,7 @@ Archive format selection:\n\ PATTERN at list/extract time, a globbing PATTERN\n\ -o, --old-archive, --portability write a V7 format archive\n\ --posix write a POSIX conformant archive\n\ + -y, --bzip2 filter the archive through bzip2\n\ -z, --gzip, --ungzip filter the archive through gzip\n\ -Z, --compress, --uncompress filter the archive through compress\n\ --use-compress-program=PROG filter through PROG (must accept -d)\n"), @@ -400,7 +402,7 @@ or a device. *This* `tar' defaults to `-f%s -b%d'.\n"), DEFAULT_ARCHIVE, DEFAULT_BLOCKING); fputs (_("\ \n\ -Report bugs to .\n"), +Report bugs to .\n"), stdout); } exit (status); @@ -416,7 +418,7 @@ Report bugs to .\n"), Y per-block gzip compression */ #define OPTION_STRING \ - "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz" + "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxyz" static void set_subcommand_option (enum subcommand subcommand) @@ -438,6 +440,18 @@ set_use_compress_program_option (const char *string) use_compress_program_option = string; } +/* Ignore DUMMY (which will always be null in practice), and add + PATTERN to the proper set of patterns to be excluded -- either + patterns with slashes, or patterns without. */ +static void +add_filtered_exclude (struct exclude *dummy, char const *pattern) +{ + add_exclude ((strchr (pattern, '/') + ? excluded_with_slash + : excluded_without_slash), + pattern); +} + static void decode_options (int argc, char *const *argv) { @@ -452,7 +466,9 @@ decode_options (int argc, char *const *argv) archive_format = DEFAULT_FORMAT; blocking_factor = DEFAULT_BLOCKING; record_size = DEFAULT_BLOCKING * BLOCKSIZE; - excluded = new_exclude (); + excluded_with_slash = new_exclude (); + excluded_without_slash = new_exclude (); + newer_mtime_option = TYPE_MINIMUM (time_t); owner_option = -1; group_option = -1; @@ -550,11 +566,11 @@ decode_options (int argc, char *const *argv) case 'b': { - long l; - if (! (xstrtol (optarg, (char **) 0, 10, &l, "") == LONGINT_OK - && l == (blocking_factor = l) + uintmax_t u; + if (! (xstrtoumax (optarg, (char **) 0, 10, &u, "") == LONGINT_OK + && u == (blocking_factor = u) && 0 < blocking_factor - && l == (record_size = l * (size_t) BLOCKSIZE) / BLOCKSIZE)) + && u == (record_size = u * (size_t) BLOCKSIZE) / BLOCKSIZE)) USAGE_ERROR ((0, 0, _("Invalid blocking factor"))); } break; @@ -653,12 +669,10 @@ decode_options (int argc, char *const *argv) case 'L': { - unsigned long u; - if (xstrtoul (optarg, (char **) 0, 10, &u, "") != LONG_MAX) + uintmax_t u; + if (xstrtoumax (optarg, (char **) 0, 10, &u, "") != LONG_MAX) USAGE_ERROR ((0, 0, _("Invalid tape length"))); - clear_tarlong (tape_length_option); - add_to_tarlong (tape_length_option, u); - mult_tarlong (tape_length_option, 1024); + tape_length_option = 1024 * (tarlong) u; multi_volume_option = 1; } break; @@ -684,7 +698,7 @@ decode_options (int argc, char *const *argv) /* Fall through. */ case NEWER_MTIME_OPTION: - if (newer_mtime_option) + if (newer_mtime_option != TYPE_MINIMUM (time_t)) USAGE_ERROR ((0, 0, _("More than one threshold date"))); newer_mtime_option = get_date (optarg, (voidstar) 0); @@ -784,10 +798,14 @@ decode_options (int argc, char *const *argv) break; case 'X': - if (add_exclude_file (excluded, optarg, '\n') != 0) + if (add_exclude_file (add_filtered_exclude, NULL, optarg, '\n') != 0) FATAL_ERROR ((0, errno, "%s", optarg)); break; + case 'y': + set_use_compress_program_option ("bzip2"); + break; + case 'z': set_use_compress_program_option ("gzip"); break; @@ -811,7 +829,7 @@ decode_options (int argc, char *const *argv) break; case EXCLUDE_OPTION: - add_exclude (excluded, optarg); + add_filtered_exclude (NULL, optarg); break; case GROUP_OPTION: @@ -823,7 +841,7 @@ decode_options (int argc, char *const *argv) && g == (gid_t) g) group_option = g; else - ERROR ((TAREXIT_FAILURE, 0, _("Invalid group given on option"))); + FATAL_ERROR ((0, 0, _("Invalid group given on option"))); } break; @@ -832,9 +850,9 @@ decode_options (int argc, char *const *argv) = mode_compile (optarg, MODE_MASK_EQUALS | MODE_MASK_PLUS | MODE_MASK_MINUS); if (mode_option == MODE_INVALID) - ERROR ((TAREXIT_FAILURE, 0, _("Invalid mode given on option"))); + FATAL_ERROR ((0, 0, _("Invalid mode given on option"))); if (mode_option == MODE_MEMORY_EXHAUSTED) - ERROR ((TAREXIT_FAILURE, 0, _("Memory exhausted"))); + FATAL_ERROR ((0, 0, _("Memory exhausted"))); break; case NO_RECURSE_OPTION: @@ -854,7 +872,7 @@ decode_options (int argc, char *const *argv) && u == (uid_t) u) owner_option = u; else - ERROR ((TAREXIT_FAILURE, 0, _("Invalid owner given on option"))); + FATAL_ERROR ((0, 0, _("Invalid owner given on option"))); } break; @@ -1155,9 +1173,6 @@ main (int argc, char *const *argv) break; case CREATE_SUBCOMMAND: - if (totals_option) - init_total_written (); - create_archive (); name_close ();