/* 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
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
+ checking -- atol doesn't. For now, punt. */
+#define intconv atol
time_t get_date ();
/* Miscellaneous. */
/*------------------------------------------------------------------------.
-| Check if STRING is the decimal representation of number, and return its |
-| value. If not a decimal number, return -1. |
+| 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 *string)
+check_decimal (const char *string0, uintmax_t *result)
{
- int value = -1;
+ const char *string = string0;
+ uintmax_t value = 0;
- while (*string)
+ do
switch (*string)
{
case '0':
case '7':
case '8':
case '9':
- value = value < 0 ? *string - '0' : 10 * value + *string - '0';
- string++;
+ {
+ uintmax_t v10 = value * 10;
+ uintmax_t v10d = v10 + (*string - '0');
+ if (v10 / 10 != value || v10d < v10)
+ return 0;
+ value = v10d;
+ }
break;
default:
- return -1;
+ return 0;
}
- return value;
+ while (*++string);
+
+ *result = value;
+ return 1;
}
/*----------------------------------------------.
{"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'},
{"dereference", no_argument, NULL, 'h'},
{"diff", no_argument, NULL, 'd'},
{"directory", required_argument, NULL, 'C'},
+ {"ending-file", required_argument, NULL, 'E'},
{"exclude", required_argument, NULL, EXCLUDE_OPTION},
{"exclude-from", required_argument, NULL, 'X'},
{"extract", no_argument, NULL, 'x'},
{"totals", no_argument, &totals_option, 1},
{"touch", no_argument, NULL, 'm'},
{"uncompress", no_argument, NULL, 'Z'},
+ {"unbzip2", no_argument, NULL, 'y'},
{"ungzip", no_argument, NULL, 'z'},
{"unlink-first", no_argument, NULL, 'U'},
{"update", no_argument, NULL, 'u'},
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, --unbzip2 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"),
-h, --dereference dump instead the files symlinks point to\n\
--no-recursion avoid descending automatically in directories\n\
-l, --one-file-system stay in local file system when creating archive\n\
+ -E, --ending-file=NAME end reading the archive before file NAME\n\
-K, --starting-file=NAME begin at file NAME in the archive\n"),
stdout);
#if !MSDOS
| Parse the options for tar. |
`----------------------------*/
-/* Available option letters are DEHIJQY and aejnqy. Some are reserved:
+/* Available option letters are DHIJQY and aejnqy. Some are reserved:
y per-file gzip compression
Y per-block gzip compression */
#define OPTION_STRING \
- "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz"
+ "-01234567ABC:E:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxyz"
static void
set_subcommand_option (enum subcommand subcommand)
*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. */
case 'b':
blocking_factor = intconv (optarg);
- record_size = blocking_factor * BLOCKSIZE;
+ record_size = blocking_factor * (size_t) BLOCKSIZE;
break;
case OBSOLETE_READ_FULL_RECORDS:
set_subcommand_option (DIFF_SUBCOMMAND);
break;
+ case 'E':
+ ending_file_option = optarg;
+ break;
+
case 'f':
if (archive_names == allocated_archive_names)
{
add_exclude_file (optarg);
break;
+ case 'y':
+ set_use_compress_program_option ("bzip2");
+ break;
+
case 'z':
set_use_compress_program_option ("gzip");
break;
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 (!check_decimal (optarg, &g) || g != (gid_t) g)
+ ERROR ((TAREXIT_FAILURE, 0, _("Invalid group given on option")));
+ else
+ group_option = g;
+ }
break;
case MODE_OPTION:
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 (!check_decimal (optarg, &u) || u != (uid_t) u)
+ ERROR ((TAREXIT_FAILURE, 0, _("Invalid owner given on option")));
+ else
+ owner_option = u;
+ }
break;
case POSIX_OPTION:
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\
projects / chaz / tar / blobdiff