X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftar.c;h=223de2cdf531137d07c2ddbdbfe705f9af1fa764;hb=fbc54fa3378b6ee5bbf9ad735dce47eee606317c;hp=10ba8a9b8a06bf2a9709008e6bf9a3d8d731f7bf;hpb=c1b30c268f8517bfe61fe253a34613584351efc0;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 10ba8a9..223de2c 100644 --- a/src/tar.c +++ b/src/tar.c @@ -74,7 +74,7 @@ static const char *stdin_used_by; /* Doesn't return if stdin already requested. */ -void +static void request_stdin (const char *option) { if (stdin_used_by) @@ -1142,20 +1142,6 @@ add_file_id (const char *filename) file_id_list = p; } -/* Default density numbers for [0-9][lmh] device specifications */ - -#ifndef LOW_DENSITY_NUM -# define LOW_DENSITY_NUM 0 -#endif - -#ifndef MID_DENSITY_NUM -# define MID_DENSITY_NUM 8 -#endif - -#ifndef HIGH_DENSITY_NUM -# define HIGH_DENSITY_NUM 16 -#endif - static void update_argv (const char *filename, struct argp_state *state) { @@ -1509,7 +1495,7 @@ parse_opt (int key, char *arg, struct argp_state *state) { uintmax_t u; char *p; - + if (xstrtoumax (arg, &p, 10, &u, TAR_SIZE_SUFFIXES) != LONGINT_OK) USAGE_ERROR ((0, 0, "%s: %s", quotearg_colon (arg), _("Invalid tape length"))); @@ -1968,7 +1954,7 @@ parse_opt (int key, char *arg, struct argp_state *state) case RECORD_SIZE_OPTION: { uintmax_t u; - + if (! (xstrtoumax (arg, NULL, 10, &u, TAR_SIZE_SUFFIXES) == LONGINT_OK && u == (size_t) u)) USAGE_ERROR ((0, 0, "%s: %s", quotearg_colon (arg), @@ -2494,8 +2480,8 @@ decode_options (int argc, char **argv) _("Cowardly refusing to create an empty archive"))); if (args.compress_autodetect && archive_names && strcmp (archive_name_array[0], "-")) - set_comression_program_by_suffix (archive_name_array[0], - use_compress_program_option); + set_compression_program_by_suffix (archive_name_array[0], + use_compress_program_option); break; case EXTRACT_SUBCOMMAND: