X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fextract.c;h=0ad5545426d611ae6cd88058cb171395fb4ead81;hb=a1a15e3202fa50cd0ee6b8b854c9f238c45fba2e;hp=c3a99e084d3d143f1b8d4612d00d33008a72ef54;hpb=f6edb92580aa886a2a0189463c19189a050dc62d;p=chaz%2Ftar

diff --git a/src/extract.c b/src/extract.c
index c3a99e0..0ad5545 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -23,7 +23,6 @@
 #include <quotearg.h>
 #include <utimens.h>
 #include <errno.h>
-#include <xgetcwd.h>
 #include <priv-set.h>
 
 #include "common.h"
@@ -516,7 +515,7 @@ file_newer_p (const char *file_name, struct tar_stat_info *tar_stat)
    properly restored on returning RECOVER_NO.  */
 
 static int
-maybe_recoverable (char *file_name, int *interdir_made)
+maybe_recoverable (char *file_name, bool *interdir_made)
 {
   int e = errno;
 
@@ -561,7 +560,7 @@ maybe_recoverable (char *file_name, int *interdir_made)
 	  errno = ENOENT;
 	  return RECOVER_NO;
 	}
-      *interdir_made = 1;
+      *interdir_made = true;
       return RECOVER_OK;
 
     default:
@@ -642,19 +641,17 @@ extract_dir (char *file_name, int typeflag)
 {
   int status;
   mode_t mode;
-  int interdir_made = 0;
+  bool interdir_made = false;
 
   /* Save 'root device' to avoid purging mount points. */
   if (one_file_system_option && root_device == 0)
     {
       struct stat st;
-      char *dir = xgetcwd ();
 
-      if (deref_stat (true, dir, &st))
-	stat_diag (dir);
+      if (stat (".", &st) != 0)
+	stat_diag (".");
       else
 	root_device = st.st_dev;
-      free (dir);
     }
 
   if (incremental_option)
@@ -775,7 +772,7 @@ extract_file (char *file_name, int typeflag)
   int status;
   size_t count;
   size_t written;
-  int interdir_made = 0;
+  bool interdir_made = false;
   mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask;
   mode_t invert_permissions =
     0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0;
@@ -812,7 +809,7 @@ extract_file (char *file_name, int typeflag)
 	}
     }
 
-  mv_begin (&current_stat_info);
+  mv_begin_read (&current_stat_info);
   if (current_stat_info.is_sparse)
     sparse_extract_file (fd, &current_stat_info, &size);
   else
@@ -882,7 +879,7 @@ extract_file (char *file_name, int typeflag)
    process.  */
 
 static int
-create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
+create_placeholder_file (char *file_name, bool is_symlink, bool *interdir_made)
 {
   int fd;
   struct stat st;
@@ -964,7 +961,7 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
 static int
 extract_link (char *file_name, int typeflag)
 {
-  int interdir_made = 0;
+  bool interdir_made = false;
   char const *link_name;
   int rc;
 
@@ -1023,7 +1020,7 @@ static int
 extract_symlink (char *file_name, int typeflag)
 {
 #ifdef HAVE_SYMLINK
-  int interdir_made = 0;
+  bool interdir_made = false;
 
   if (! absolute_names_option
       && (IS_ABSOLUTE_FILE_NAME (current_stat_info.link_name)
@@ -1065,7 +1062,7 @@ extract_symlink (char *file_name, int typeflag)
 static int
 extract_node (char *file_name, int typeflag)
 {
-  int interdir_made = 0;
+  bool interdir_made = false;
   mode_t mode = current_stat_info.stat.st_mode & ~ current_umask;
   mode_t invert_permissions =
     0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0;
@@ -1096,7 +1093,7 @@ static int
 extract_fifo (char *file_name, int typeflag)
 {
   int status;
-  int interdir_made = 0;
+  bool interdir_made = false;
   mode_t mode = current_stat_info.stat.st_mode & ~ current_umask;
   mode_t invert_permissions =
     0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0;
@@ -1278,7 +1275,7 @@ extract_archive (void)
   priv_set_remove_linkdir ();
 
   set_next_block_after (current_header);
-  decode_header (current_header, &current_stat_info, &current_format, 1);
+
   if (!current_stat_info.file_name[0]
       || (interactive_option
 	  && !confirm ("extract", current_stat_info.file_name)))