Fix bugs in handling the --remove-files option.

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 3c92e53d6d1e3f686e939c419e0df03159bb480b..5f12cf9aa483b3584bf02e9daa3678db976dc534 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -1242,6 +1242,8 @@ extract_archive (void)
   char typeflag;
   tar_extractor_t fun;
 
+  fatal_exit_hook = extract_finish;
+  
   /* Try to disable the ability to unlink a directory.  */
   priv_set_remove_linkdir ();
 
@@ -1406,18 +1408,3 @@ rename_directory (char *src, char *dst)
     }
   return true;
 }
-
-void
-fatal_exit (void)
-{
-  extract_finish ();
-  error (TAREXIT_FAILURE, 0, _("Error is not recoverable: exiting now"));
-  abort ();
-}
-
-void
-xalloc_die (void)
-{
-  error (0, 0, "%s", _("memory exhausted"));
-  fatal_exit ();
-}