Started merging with cpio into paxutils.

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 49ed02908ff62715c68536830d866416af656b20..214d975e5b3e84b79266a13287e6384321d4dd73 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -19,9 +19,10 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "system.h"
+#include <system.h>
 #include <quotearg.h>
 #include <errno.h>
+#include <xgetcwd.h>
 
 #if HAVE_UTIME_H
 # include <utime.h>
@@ -113,7 +114,6 @@ extr_init (void)
   we_are_root = geteuid () == 0;
   same_permissions_option += we_are_root;
   same_owner_option += we_are_root;
-  xalloc_fail_func = extract_finish;
 
   /* Save 'root device' to avoid purging mount points.
      FIXME: Should the same be done after handling -C option ? */
@@ -367,7 +367,7 @@ repair_delayed_set_stat (char const *dir,
 static int
 make_directories (char *file_name)
 {
-  char *cursor0 = file_name + FILESYSTEM_PREFIX_LEN (file_name);
+  char *cursor0 = file_name + FILE_SYSTEM_PREFIX_LEN (file_name);
   char *cursor;                        /* points into the file name */
   int did_something = 0;       /* did we do anything yet? */
   int mode;
@@ -811,8 +811,7 @@ extract_archive (void)
        break;
 
       if (absolute_names_option
-         || ! (ISSLASH (current_stat_info.link_name
-                        [FILESYSTEM_PREFIX_LEN (current_stat_info.link_name)])
+         || ! (IS_ABSOLUTE_FILE_NAME (current_stat_info.link_name)
                || contains_dot_dot (current_stat_info.link_name)))
        {
          while (status = symlink (current_stat_info.link_name, file_name),
@@ -1210,3 +1209,10 @@ fatal_exit (void)
   error (TAREXIT_FAILURE, 0, _("Error is not recoverable: exiting now"));
   abort ();
 }
+
+void
+xalloc_die (void)
+{
+  error (0, 0, "%s", _("memory exhausted"));
+  fatal_exit ();
+}