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"
#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 ();
\f
/* 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. |
`----------------------------------------------*/
{"block-number", no_argument, NULL, 'R'},
{"block-size", required_argument, NULL, OBSOLETE_BLOCKING_FACTOR},
{"blocking-factor", required_argument, NULL, 'b'},
- {"bunzip2", no_argument, NULL, 'y'},
- {"bzip2", no_argument, NULL, 'y'},
{"catenate", no_argument, NULL, 'A'},
{"checkpoint", no_argument, &checkpoint_option, 1},
{"compare", no_argument, NULL, 'd'},
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, --bunzip2 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"),
DEFAULT_ARCHIVE, DEFAULT_BLOCKING);
fputs (_("\
\n\
-Report bugs to <tar-bugs@gnu.ai.mit.edu>.\n"),
+Report bugs to <tar-bugs@gnu.org>.\n"),
stdout);
}
exit (status);
Y per-block gzip compression */
#define OPTION_STRING \
- "-01234567ABC:E:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxyz"
+ "-01234567ABC:E:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz"
static void
set_subcommand_option (enum subcommand subcommand)
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. */
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. */
/* 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:
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:
add_exclude_file (optarg);
break;
- case 'y':
- set_use_compress_program_option ("bzip2");
- break;
-
case 'z':
set_use_compress_program_option ("gzip");
break;
&& 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;
&& 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;
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:
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);
}
\f
/* Tar proper. */
projects / chaz / tar / blobdiff