(decode_options): Don't pass names longer than UNAME_FIELD_SIZE to

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index 787d37c2145e13935a73e5514e341b577d52ad8c..10ac93c699a894620baf8c372d88724f1eb8a900 100644 (file)
--- 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
@@ -217,6 +217,7 @@ struct option long_options[] =
   {"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'},
@@ -397,6 +398,7 @@ Local file selection:\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
@@ -451,13 +453,13 @@ Report bugs to <tar-bugs@gnu.ai.mit.edu>.\n"),
 | 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:hiklmoprstuvwxz"
 
 static void
 set_subcommand_option (enum subcommand subcommand)
@@ -535,11 +537,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.  */
@@ -621,6 +625,10 @@ decode_options (int argc, char *const *argv)
        set_subcommand_option (DIFF_SUBCOMMAND);
        break;
 
+      case 'E':
+       ending_file_option = optarg;
+       break;
+
       case 'f':
        if (archive_names == allocated_archive_names)
          {
@@ -844,7 +852,8 @@ 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)
@@ -873,7 +882,8 @@ 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)