From: Paul Eggert Date: Fri, 14 Nov 2025 01:07:36 +0000 (-0800) Subject: Standardize on “working directory” X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ba9e244e83a496e10be5309cc6b4e16e75f9096;p=thirdparty%2Ftar.git Standardize on “working directory” --- diff --git a/doc/tar.1 b/doc/tar.1 index ca928a0c..ef9b39b4 100644 --- a/doc/tar.1 +++ b/doc/tar.1 @@ -12,7 +12,7 @@ .\" .\" You should have received a copy of the GNU General Public License .\" along with this program. If not, see . -.TH TAR 1 "January 1, 2025" "TAR" "GNU TAR Manual" +.TH TAR 1 "November 13, 2025" "TAR" "GNU TAR Manual" .SH NAME tar \- an archiving utility .SH SYNOPSIS @@ -182,7 +182,7 @@ archived. Directories are archived recursively, unless the \fB\-d\fR, \fB\-\-diff\fR, \fB\-\-compare\fR Find differences between archive and file system. The arguments are optional and specify archive members to compare. If not given, the -current working directory is assumed. +working directory is assumed. .TP \fB\-\-delete\fR Delete from the archive. The arguments supply names of the archive diff --git a/doc/tar.texi b/doc/tar.texi index 2fe2c45c..afc0c97e 100644 --- a/doc/tar.texi +++ b/doc/tar.texi @@ -1399,7 +1399,7 @@ practice/collection.tar @end smallexample Note that the archive thus created is not in the subdirectory -@file{practice}, but rather in the current working directory---the +@file{practice}, but rather in the working directory---the directory from which @command{tar} was invoked. Before trying to archive a directory from its superior directory, you should make sure you have write access to the superior directory itself, not only the directory @@ -1421,7 +1421,7 @@ $ @kbd{tar --create --file=foo.tar .} @noindent @command{tar} will report @samp{tar: ./foo.tar is the archive; not dumped}. This happens because @command{tar} creates the archive -@file{foo.tar} in the current directory before putting any files into +@file{foo.tar} in the working directory before putting any files into it. Then, when @command{tar} attempts to add all the files in the directory @file{.} to the archive, it notices that the file @file{./foo.tar} is the same as the archive @file{foo.tar}, and skips @@ -1849,7 +1849,7 @@ $ @kbd{tar --extract --file=music.tar --strip-components=1 folk} @end smallexample @noindent -will extract the file @file{folk} into the current working directory. +will extract the file @file{folk} into the working directory. @node going further @section Going Further Ahead in this Manual @@ -2668,7 +2668,7 @@ itself. @xref{dereference}. @item --directory=@var{dir} @itemx -C @var{dir} -When this option is specified, @command{tar} will change its current directory +When this option is specified, @command{tar} will change its working directory to @var{dir} before performing any operations. When this option is used during archive creation, it is order sensitive. @xref{directory}. @@ -3267,7 +3267,7 @@ Synonym for @option{--format=v7}. @opsummary{one-file-system} @item --one-file-system Used when creating an archive. Prevents @command{tar} from recursing into -directories that are on different file systems from the current +directories that are on different file systems from the working directory. @opsummary{one-top-level} @@ -3636,7 +3636,7 @@ $ @kbd{tar cf archive.tar --transform 's,^\./,usr/,' .} @end smallexample @noindent -will add to @file{archive} files from the current working directory, +will add to @file{archive} files from the working directory, replacing initial @samp{./} prefix with @samp{usr/}. For the detailed discussion, @xref{transform}. @@ -3914,7 +3914,7 @@ and @command{tar} were invoked as follows: @end example @noindent -then the file @file{README} would be looked up in the current working +then the file @file{README} would be looked up in the working directory, and files @file{main.c} and @file{Makefile} would be looked up in the directory @file{src}. @@ -7821,7 +7821,7 @@ If you specify either @option{--list} (@option{-t}) or operates on all the archive members in the archive. If run with @option{--diff} option, tar will compare the archive with -the contents of the current working directory. +the contents of the working directory. If you specify any other operation, @command{tar} does nothing. @@ -8675,7 +8675,7 @@ a\backslash @end smallexample Here is how usual @command{ls} command would have listed them, if they -had existed in the current working directory: +had existed in the working directory: @smallexample @group @@ -8903,7 +8903,7 @@ extraction. For example, suppose you have archived whole @file{/usr} hierarchy to a tar archive named @file{usr.tar}. Among other files, this archive contains @file{usr/include/stdlib.h}, which you wish to extract to -the current working directory. To do so, you type: +the working directory. To do so, you type: @smallexample $ @kbd{tar -xf usr.tar --strip=2 usr/include/stdlib.h} @@ -8942,7 +8942,7 @@ stdlib.h @end smallexample Notice that in both cases the file @file{stdlib.h} is extracted to the -current working directory, @option{--show-transformed-names} affects +working directory, @option{--show-transformed-names} affects only the way its name is displayed. This option is especially useful for verifying whether the invocation @@ -9445,7 +9445,7 @@ $ @kbd{tar -c -f jams.tar grape prune -C food cherry} @end smallexample @noindent -will place the files @file{grape} and @file{prune} from the current +will place the files @file{grape} and @file{prune} from the working directory into the archive @file{jams.tar}, followed by the file @file{cherry} from the directory @file{food}. This option is especially useful when you have several widely separated files that you want to @@ -9455,7 +9455,7 @@ Note that the file @file{cherry} is recorded in the archive under the precise name @file{cherry}, @emph{not} @file{food/cherry}. Thus, the archive will contain three files that all appear to have come from the same directory; if the archive is extracted with plain @samp{tar ---extract}, all three files will be written in the current directory. +--extract}, all three files will be written in the working directory. Contrast this with the command, @@ -9487,8 +9487,8 @@ directories where those files were located. Note that @option{--directory} options are interpreted consecutively. If @option{--directory} specifies a relative file name, it is interpreted -relative to the then current directory, which might not be the same as -the original current working directory of @command{tar}, due to a previous +relative to the then working directory, which might not be the same as +the original working directory of @command{tar}, due to a previous @option{--directory} option. When using @option{--files-from} (@pxref{files}), you can put various @@ -11683,7 +11683,7 @@ backup tapes. For example, if the archive contained a file @file{/usr/bin/computoy}, @GNUTAR{} would extract the file to @file{usr/bin/computoy}, -relative to the current directory. If you want to extract the files in +relative to the working directory. If you want to extract the files in an archive to the same absolute names that they had when the archive was created, you should do a @samp{cd /} before extracting the files from the archive, or you should either use the @option{--absolute-names} diff --git a/tests/incr07.at b/tests/incr07.at index f408d2bb..1297dede 100644 --- a/tests/incr07.at +++ b/tests/incr07.at @@ -21,7 +21,7 @@ AT_KEYWORDS([incremental extract incr07 chdir]) # Tar 1.26 had problems extracting from incremental restores when given # the -C option. The code in incremen.c:try_purge_directory and # misc.c:remove_any_file was using savedir(), which ignored eventual changes -# in the current working directory and caused the malfunctioning. +# in the working directory and caused the malfunctioning. # # The problem was reported by Piotr Rotter on 2013-03-22. # @@ -29,7 +29,7 @@ AT_KEYWORDS([incremental extract incr07 chdir]) # Stratton Treadway. # # References: <514C8F56.90900@active24.pl>, -# http://lists.gnu.org/archive/html/bug-tar/2013-03/msg00036.html, +# http://lists.gnu.org/archive/html/bug-tar/2013-03/msg00036.html, # <20130326181922.GZ3732@shire.ontko.com>, # http://lists.gnu.org/archive/html/bug-tar/2013-03/msg00042.html, # <20130327051828.GA3732@shire.ontko.com>, diff --git a/tests/incr08.at b/tests/incr08.at index ba24f306..dcedd56b 100644 --- a/tests/incr08.at +++ b/tests/incr08.at @@ -29,7 +29,7 @@ # being confused with each other. # # The bug is triggered when dumping both relative paths after -C and -# absolute paths that match the process' current working directory. +# absolute paths that match the process' working directory. # # Reported by: Nathan Stratton Treadway # References: <20130922192135.GJ32256@shire.ontko.com>, diff --git a/tests/onetop05.at b/tests/onetop05.at index 60f24caa..a78f7bfa 100644 --- a/tests/onetop05.at +++ b/tests/onetop05.at @@ -22,7 +22,7 @@ AT_SETUP([tar --one-top-level restoring permissions]) AT_KEYWORDS([extract onetop onetop05 chdir]) # When extracting an archive that contains ./ with the --one-top-level option, -# the mode and ownership of ./ would be incorrectly applied to the current +# the mode and ownership of ./ would be incorrectly applied to the # working directory, instead of the requested top-level directory. AT_TAR_CHECK([ @@ -47,7 +47,7 @@ if test 700 = $mode; then else echo "CWD: mode changed: 700 != $mode" fi - + mkdir d2 chmod 700 d2 tar -C d2 --one-top-level=top -xpf d.tar @@ -60,7 +60,7 @@ fi mode=$(genfile --stat=mode.7777 d2/top) if test $mode = $orig_mode; then echo "TOP: OK" -else +else echo "TOP: mode changed: $orig_mode != $mode" fi ],