X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftar.c;h=9b73de3cce8c23b9570356fd95a481de9b4fa88d;hb=6f1783ad432c0d2625d1232463987594414089fe;hp=24b0f90bf72097c17f9dd5da1ca734397968d49c;hpb=5e0e89eac1a00a2edb87ea7b69f1f38c2b1249e1;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 24b0f90..9b73de3 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 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., - 59 Place - Suite 330, Boston, MA 02111-1307, USA. */ + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "system.h" @@ -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 -- atoi doesn't. For now, punt. */ -#define intconv atoi +#include "xstrtol.h" time_t get_date (); @@ -50,39 +45,6 @@ static void usage PARAMS ((int)); /* Miscellaneous. */ -/*------------------------------------------------------------------------. -| Check if STRING is the decimal representation of number, and return its | -| value. If not a decimal number, return -1. | -`------------------------------------------------------------------------*/ - -static int -check_decimal (const char *string) -{ - int value = -1; - - while (*string) - switch (*string) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - value = value < 0 ? *string - '0' : 10 * value + *string - '0'; - string++; - break; - - default: - return -1; - } - return value; -} - /*----------------------------------------------. | Doesn't return if stdin already requested. | `----------------------------------------------*/ @@ -144,39 +106,40 @@ confirm (const char *message_action, const char *message_name) do it. For the others, we share the code for the equivalent short named option, the name of which is stored in the otherwise-unused `val' field of the `struct option'; for long options that have no equivalent - short option, we use nongraphic characters as pseudo short option - characters, starting at 2 and going upwards. */ - -#define BACKUP_OPTION 2 -#define DELETE_OPTION 3 -#define EXCLUDE_OPTION 4 -#define GROUP_OPTION 5 -#define MODE_OPTION 6 -#define NEWER_MTIME_OPTION 7 -#define NO_RECURSE_OPTION 8 -#define NULL_OPTION 9 -#define OWNER_OPTION 10 -#define POSIX_OPTION 11 -#define PRESERVE_OPTION 12 -#define RECORD_SIZE_OPTION 13 -#define RSH_COMMAND_OPTION 14 -#define SUFFIX_OPTION 15 -#define USE_COMPRESS_PROGRAM_OPTION 16 -#define VOLNO_FILE_OPTION 17 - -/* Some cleanup is being made in GNU tar long options. Using old names is - allowed for a while, but will also send a warning to stderr. Take old - names out in 1.14, or in summer 1997, whichever happens last. We use - nongraphic characters as pseudo short option characters, starting at 31 - and going downwards. */ - -#define OBSOLETE_ABSOLUTE_NAMES 31 -#define OBSOLETE_BLOCK_COMPRESS 30 -#define OBSOLETE_BLOCKING_FACTOR 29 -#define OBSOLETE_BLOCK_NUMBER 28 -#define OBSOLETE_READ_FULL_RECORDS 27 -#define OBSOLETE_TOUCH 26 -#define OBSOLETE_VERSION_CONTROL 25 + short option, we use non-characters as pseudo short options, + starting at CHAR_MAX + 1 and going upwards. */ + +enum +{ + BACKUP_OPTION = CHAR_MAX + 1, + DELETE_OPTION, + EXCLUDE_OPTION, + GROUP_OPTION, + MODE_OPTION, + NEWER_MTIME_OPTION, + NO_RECURSE_OPTION, + NULL_OPTION, + OWNER_OPTION, + POSIX_OPTION, + PRESERVE_OPTION, + RECORD_SIZE_OPTION, + RSH_COMMAND_OPTION, + SUFFIX_OPTION, + USE_COMPRESS_PROGRAM_OPTION, + VOLNO_FILE_OPTION, + + /* Some cleanup is being made in GNU tar long options. Using old names is + allowed for a while, but will also send a warning to stderr. Take old + names out in 1.14, or in summer 1997, whichever happens last. */ + + OBSOLETE_ABSOLUTE_NAMES, + OBSOLETE_BLOCK_COMPRESS, + OBSOLETE_BLOCKING_FACTOR, + OBSOLETE_BLOCK_NUMBER, + OBSOLETE_READ_FULL_RECORDS, + OBSOLETE_TOUCH, + OBSOLETE_VERSION_CONTROL +}; /* If nonzero, display usage information and exit. */ static int show_help = 0; @@ -432,7 +395,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); @@ -476,7 +439,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. */ @@ -489,7 +452,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. */ @@ -526,11 +488,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. */ @@ -579,8 +543,14 @@ decode_options (int argc, char *const *argv) /* Fall through. */ case 'b': - blocking_factor = intconv (optarg); - record_size = blocking_factor * 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: @@ -676,10 +646,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: @@ -835,11 +810,16 @@ decode_options (int argc, char *const *argv) break; case GROUP_OPTION: - if (!gname_to_gid (optarg, &group_option)) - if (!check_decimal (optarg) >= 0) - ERROR ((TAREXIT_FAILURE, 0, _("Invalid group given on option"))); - else - group_option = check_decimal (optarg); + if (! (strlen (optarg) < GNAME_FIELD_SIZE + && gname_to_gid (optarg, &group_option))) + { + uintmax_t g; + 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; case MODE_OPTION: @@ -861,11 +841,16 @@ decode_options (int argc, char *const *argv) break; case OWNER_OPTION: - if (!uname_to_uid (optarg, &owner_option)) - if (!check_decimal (optarg) >= 0) - ERROR ((TAREXIT_FAILURE, 0, _("Invalid owner given on option"))); - else - owner_option = check_decimal (optarg); + if (! (strlen (optarg) < UNAME_FIELD_SIZE + && uname_to_uid (optarg, &owner_option))) + { + uintmax_t u; + 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; case POSIX_OPTION: @@ -888,11 +873,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: @@ -998,7 +989,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\ @@ -1098,7 +1089,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. */