(AC_MBSTATE_T_OBJECT): Port to autoconf 2.13.

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index 0bc0b09d0c578a46d437f218679cf9c9d699280a..5415bbee8e950e30655a2e1b2d2afb1053cbf6c6 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -1,5 +1,5 @@
 /* A tar (tape archiver) program.
-   Copyright 1988, 92,93,94,95,96,97, 1999 Free Software Foundation, Inc.
+   Copyright 1988, 92,93,94,95,96,97,99, 2000 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
@@ -881,7 +881,7 @@ decode_options (int argc, char *const *argv)
        if (mode_option == MODE_INVALID)
          FATAL_ERROR ((0, 0, _("Invalid mode given on option")));
        if (mode_option == MODE_MEMORY_EXHAUSTED)
-         FATAL_ERROR ((0, 0, _("Memory exhausted")));
+         xalloc_die ();
        break;
 
       case NO_RECURSE_OPTION:
@@ -1050,7 +1050,7 @@ decode_options (int argc, char *const *argv)
   if (show_version)
     {
       printf ("tar (GNU %s) %s\n%s\n%s\n%s\n", PACKAGE, VERSION,
-             "Copyright 1999 Free Software Foundation, Inc.",
+             "Copyright 2000 Free Software Foundation, Inc.",
              _("\
 This program comes with NO WARRANTY, to the extent permitted by law.\n\
 You may redistribute it under the terms of the GNU General Public License;\n\
@@ -1132,12 +1132,13 @@ see the file named COPYING for details."),
     case CAT_SUBCOMMAND:
     case UPDATE_SUBCOMMAND:
     case APPEND_SUBCOMMAND:
+    case DELETE_SUBCOMMAND:
       for (archive_name_cursor = archive_name_array;
           archive_name_cursor < archive_name_array + archive_names;
           archive_name_cursor++)
        if (!strcmp (*archive_name_cursor, "-"))
          USAGE_ERROR ((0, 0,
-                       _("Options `-Aru' are incompatible with `-f -'")));
+                       _("Options `-Aru' and `--delete' are incompatible with `-f -'")));
 
     default:
       break;