From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 7 Jan 2000 19:25:23 +0000 (+0000)
Subject: (decode_options): Use xalloc_die to report memory exhaustion.
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=c598438dd2d4c7f8a8b4883a95b9d900b7c5662c;p=chaz%2Ftar

(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 0bc0b09..7271bf4 100644
--- 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;