intenral untar respects -p, wording tweaks

git-svn-id: https://svn.r-project.org/R/trunk@88367 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

doc/NEWS.Rd

@@ -46,6 +46,10 @@
       \item \code{tcltk::tclVersion()} now only optionally includes the
       \sQuote{patch level}, as Tcl full versions can be of the form
       \code{8.7a5} or \code{9.0b1} without three clear components.
+
+      \item \code{untar(tar = "internal")} supports \code{extras =
+	"-P"} to use unchanged the recorded file paths (as many external
+      \command{tar} programs do).
     }
   }
 
@@ -64,15 +68,11 @@
     }
   }
 
-  \subsection{INSTALLATION}{
+  \subsection{INSTALLATION on a UNIX-ALIKE}{
     \itemize{
       \item \command{configure} appends \command{bsdtar} to the list of
       command names it tries when finding a default for \env{TAR}.
-    }
-  }
 
-  \subsection{INSTALLATION on a UNIX-ALIKE}{
-    \itemize{
       \item Failures in building the documentation for the base packages,
       including from parsing their Rd files, are no longer ignored by
       \command{make docs}.
@@ -149,9 +149,10 @@
       Thanks to \I{Heather Turner}, \I{Ella Kaye}, and
       \I{Philippe Grosjean}.
 
-      \item \code{<Date> \%in\% set} has become as fast again, as it was
-      before \R 4.3.0, via new S3 method \code{mtfrm.Date}.
-      Additionally, \code{<character> \%in\% <Date>} and vice versa are
+      \item \code{<Date> \%in\% set} has become as fast  as it was
+      before \R 4.3.0, \emph{via} a new S3 method \code{mtfrm.Date}.
+      
+      \code{<character> \%in\% <Date>} and vice versa are now
       documented to work in concordance with \code{==} and as an exception
       to the typical \code{match()} behaviour which relies on
       \dQuote{univariate} \code{mtfrm()} alone.

src/library/utils/R/tar.R

@@ -22,10 +22,11 @@ untar <- function(tarfile, files = NULL, list = FALSE, exdir = ".",
                   support_old_tars = Sys.getenv("R_SUPPORT_OLD_TARS", FALSE),
                   tar = Sys.getenv("TAR"))
 {
+    allow_all <- isTRUE(grepl("-P", extras))
     if (inherits(tarfile, "connection") || identical(tar, "internal")) {
         if (!missing(compressed))
             warning("argument 'compressed' is ignored for the internal method")
-        return(untar2(tarfile, files, list, exdir, restore_times))
+        return(untar2(tarfile, files, list, exdir, restore_times, allow_all))
     }
 
     if (!(is.character(tarfile) && length(tarfile) == 1L))
@@ -37,7 +38,7 @@ untar <- function(tarfile, files = NULL, list = FALSE, exdir = ".",
     if (!nzchar(TAR) && .Platform$OS.type == "windows" &&
         nzchar(Sys.which("tar.exe"))) TAR <- "tar.exe"
     if (!nzchar(TAR) || TAR == "internal")
-        return(untar2(tarfile, files, list, exdir))
+        return(untar2(tarfile, files, list, exdir, restore_times, allow_all))
 
     ## The ability of external tar commands to handle compressed tarfiles
     ## automagically varies and is poorly documented.
@@ -127,7 +128,7 @@ untar <- function(tarfile, files = NULL, list = FALSE, exdir = ".",
 
 ##' R's "internal" untar() -- called from untar(), *not* exported
 untar2 <- function(tarfile, files = NULL, list = FALSE, exdir = ".",
-                   restore_times = TRUE)
+                   restore_times = TRUE, allow_all_paths = FALSE)
 {
     ## might be used with len = 12, so result of more than max int
     getOctD <- function(block, offset, len)

src/library/utils/man/untar.Rd

@@ -207,9 +207,9 @@ untar(tarfile, files = NULL, list = FALSE, exdir = ".",
   refuses to extract paths containing \code{".."}  with the same
   workaround.  The internal implementation removes leading slashes (with
   a warning) and stops with an error for paths starting with \code{"~"}
-  or containing \code{".."}.
-  
-  Extracted files will overwrite any existing file unless flag \option{-k}
+  or containing \code{".."}, again unless \code{extras = "-P"} is specified.
+
+  Extracted files will overwrite existing file unless flag \option{-k}
   is included in \code{extras}.
 }