X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=src%2Ftar.c;h=782ed3b5328a7778cb7afd786416803e5f3b0cbb;hb=34795cedb7db68babf7eae672ba47fd486555be8;hp=5b61144c65c979fcb2c51b3e8918a59629a78fba;hpb=f6edb92580aa886a2a0189463c19189a050dc62d;p=chaz%2Ftar

diff --git a/src/tar.c b/src/tar.c
index 5b61144..782ed3b 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)
@@ -1364,6 +1364,8 @@ expand_pax_option (struct tar_args *targs, const char *arg)
 }
 
 
+#define TAR_SIZE_SUFFIXES "bBcGgkKMmPTtw"
+
 static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
@@ -1506,10 +1508,15 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 'L':
       {
 	uintmax_t u;
-	if (xstrtoumax (arg, 0, 10, &u, "") != LONGINT_OK)
+	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")));
-	tape_length_option = 1024 * (tarlong) u;
+	if (p > arg && !strchr (TAR_SIZE_SUFFIXES, p[-1]))
+	  tape_length_option = 1024 * (tarlong) u;
+	else
+	  tape_length_option = (tarlong) u;
 	multi_volume_option = true;
       }
       break;
@@ -1961,7 +1968,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case RECORD_SIZE_OPTION:
       {
 	uintmax_t u;
-	if (! (xstrtoumax (arg, 0, 10, &u, "") == LONGINT_OK
+
+	if (! (xstrtoumax (arg, NULL, 10, &u, TAR_SIZE_SUFFIXES) == LONGINT_OK
 	       && u == (size_t) u))
 	  USAGE_ERROR ((0, 0, "%s: %s", quotearg_colon (arg),
 			_("Invalid record size")));
@@ -2486,8 +2494,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: