(decode_options): Use xalloc_die to report memory exhaustion.

--delete and -f - are now incompatible, since we didn't have time
to fix their bugs.

diff --git a/src/tar.c b/src/tar.c
index 0bc0b09d0c578a46d437f218679cf9c9d699280a..7271bf440ce82da2666341e683c2fcea5ee06917 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -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:
@@ -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;