X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=9de90990fb313de67cf55b44c9f41382457fb276;hb=1521a94b11b0b7a2fe2a8318207d7d6b4bdbf76b;hp=10224a9d4bdf21e6f62b9d1b3fcbef8d7e24c315;hpb=d1f1e3a18997f3357fe946750d13ab0ce2cc21ef;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 10224a9..9de9099 100644 --- a/src/tar.c +++ b/src/tar.c @@ -1,5 +1,5 @@ /* A tar (tape archiver) program. - Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. + Copyright (C) 1988, 92,93,94,95,96,97, 1999 Free Software Foundation, Inc. Written by John Gilmore, starting 1985-08-25. This program is free software; you can redistribute it and/or modify it @@ -27,12 +27,7 @@ #define GLOBAL #include "common.h" -#include "backupfile.h" -enum backup_type get_version (); - -/* FIXME: We should use a conversion routine that does reasonable error - checking -- atol doesn't. For now, punt. */ -#define intconv atol +#include "xstrtol.h" time_t get_date (); @@ -50,48 +45,6 @@ static void usage PARAMS ((int)); /* Miscellaneous. */ -/*------------------------------------------------------------------------. -| Check if STRING0 is the decimal representation of number, and store its | -| value. If not a decimal number, return 0. | -`------------------------------------------------------------------------*/ - -static int -check_decimal (const char *string0, uintmax_t *result) -{ - const char *string = string0; - uintmax_t value = 0; - - do - switch (*string) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - { - uintmax_t v10 = value * 10; - uintmax_t v10d = v10 + (*string - '0'); - if (v10 / 10 != value || v10d < v10) - return 0; - value = v10d; - } - break; - - default: - return 0; - } - while (*++string); - - *result = value; - return 1; -} - /*----------------------------------------------. | Doesn't return if stdin already requested. | `----------------------------------------------*/ @@ -487,7 +440,7 @@ decode_options (int argc, char *const *argv) int optchar; /* option letter */ int input_files; /* number of input files */ const char *backup_suffix_string; - const char *version_control_string; + const char *version_control_string = NULL; /* Set some default option values. */ @@ -500,7 +453,6 @@ decode_options (int argc, char *const *argv) group_option = -1; backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); - version_control_string = getenv ("VERSION_CONTROL"); /* Convert old-style tar call by exploding option element and rearranging options accordingly. */ @@ -537,11 +489,13 @@ decode_options (int argc, char *const *argv) *out++ = xstrdup (buffer); cursor = strchr (OPTION_STRING, *letter); if (cursor && cursor[1] == ':') - if (in < argv + argc) - *out++ = *in++; - else - USAGE_ERROR ((0, 0, _("Old option `%c' requires an argument."), - *letter)); + { + if (in < argv + argc) + *out++ = *in++; + else + USAGE_ERROR ((0, 0, _("Old option `%c' requires an argument."), + *letter)); + } } /* Copy all remaining options. */ @@ -590,8 +544,14 @@ decode_options (int argc, char *const *argv) /* Fall through. */ case 'b': - blocking_factor = intconv (optarg); - record_size = blocking_factor * (size_t) BLOCKSIZE; + { + long l; + if (! (xstrtol (optarg, (char **) 0, 10, &l, "") == LONGINT_OK + && l == (blocking_factor = l) + && 0 < blocking_factor + && l == (record_size = l * (size_t) BLOCKSIZE) / BLOCKSIZE)) + USAGE_ERROR ((0, 0, _("Invalid blocking factor"))); + } break; case OBSOLETE_READ_FULL_RECORDS: @@ -691,10 +651,15 @@ decode_options (int argc, char *const *argv) break; case 'L': - clear_tarlong (tape_length_option); - add_to_tarlong (tape_length_option, intconv (optarg)); - mult_tarlong (tape_length_option, 1024); - multi_volume_option = 1; + { + unsigned long u; + if (xstrtoul (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); + multi_volume_option = 1; + } break; case OBSOLETE_TOUCH: @@ -850,13 +815,15 @@ decode_options (int argc, char *const *argv) break; case GROUP_OPTION: - if (!gname_to_gid (optarg, &group_option)) + if (! (strlen (optarg) < GNAME_FIELD_SIZE + && gname_to_gid (optarg, &group_option))) { uintmax_t g; - if (!check_decimal (optarg, &g) || g != (gid_t) g) - ERROR ((TAREXIT_FAILURE, 0, _("Invalid group given on option"))); - else + if (xstrtoumax (optarg, (char **) 0, 10, &g, "") == LONGINT_OK + && g == (gid_t) g) group_option = g; + else + ERROR ((TAREXIT_FAILURE, 0, _("Invalid group given on option"))); } break; @@ -879,13 +846,15 @@ decode_options (int argc, char *const *argv) break; case OWNER_OPTION: - if (!uname_to_uid (optarg, &owner_option)) + if (! (strlen (optarg) < UNAME_FIELD_SIZE + && uname_to_uid (optarg, &owner_option))) { uintmax_t u; - if (!check_decimal (optarg, &u) || u != (uid_t) u) - ERROR ((TAREXIT_FAILURE, 0, _("Invalid owner given on option"))); - else + if (xstrtoumax (optarg, (char **) 0, 10, &u, "") == LONGINT_OK + && u == (uid_t) u) owner_option = u; + else + ERROR ((TAREXIT_FAILURE, 0, _("Invalid owner given on option"))); } break; @@ -909,11 +878,17 @@ decode_options (int argc, char *const *argv) break; case RECORD_SIZE_OPTION: - record_size = intconv (optarg); - if (record_size % BLOCKSIZE != 0) - USAGE_ERROR ((0, 0, _("Record size must be a multiple of %d."), - BLOCKSIZE)); - blocking_factor = record_size / BLOCKSIZE; + { + uintmax_t u; + if (! (xstrtoumax (optarg, (char **) 0, 10, &u, "") == LONG_MAX + && u == (size_t) u)) + USAGE_ERROR ((0, 0, _("Invalid record size"))); + record_size = u; + if (record_size % BLOCKSIZE != 0) + USAGE_ERROR ((0, 0, _("Record size must be a multiple of %d."), + BLOCKSIZE)); + blocking_factor = record_size / BLOCKSIZE; + } break; case RSH_COMMAND_OPTION: @@ -1019,7 +994,7 @@ decode_options (int argc, char *const *argv) printf ("tar (GNU %s) %s\n", PACKAGE, VERSION); fputs (_("\ \n\ -Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"), +Copyright (C) 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, Inc.\n"), stdout); fputs (_("\ This is free software; see the source for copying conditions. There is NO\n\ @@ -1119,7 +1094,7 @@ Written by John Gilmore and Jay Fenlason.\n"), simple_backup_suffix = xstrdup (backup_suffix_string); if (backup_option) - backup_type = get_version (version_control_string); + backup_type = xget_version ("--backup", version_control_string); } /* Tar proper. */