diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2022-02-15 17:40:34 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-02-15 17:42:51 -0800 |
| commit | eeda008a59fe70bc6102b042fe24634d481bf073 (patch) | |
| tree | c6c2232c793ba52b0c9b2d927dd734bb829947d1 | |
| parent | 5c713540e34f51323b9f63b7459254bc845603ed (diff) | |
| download | tar-eeda008a59fe70bc6102b042fe24634d481bf073.tar.gz | |
tar: revamp "file is the archive" diagnostic
* src/create.c (dump_file0): For clarity, change diagnostic
wording from "file is the archive; not dumped" to "archive cannot
contain itself; not dumped". All test cases and documentation changed.
| -rw-r--r-- | doc/tar.1 | 4 | ||||
| -rw-r--r-- | doc/tar.texi | 6 | ||||
| -rw-r--r-- | src/create.c | 2 | ||||
| -rw-r--r-- | tests/positional02.at | 3 |
4 files changed, 6 insertions, 9 deletions
@@ -13,7 +13,7 @@ .\" .\" You should have received a copy of the GNU General Public License .\" along with this program. If not, see <http://www.gnu.org/licenses/>. -.TH TAR 1 "July 13, 2020" "TAR" "GNU TAR Manual" +.TH TAR 1 "February 15, 2022" "TAR" "GNU TAR Manual" .SH NAME tar \- an archiving utility .SH SYNOPSIS @@ -1168,7 +1168,7 @@ Keywords applicable for \fBtar --create\fR: "%s: file is unchanged; not dumped" .TP .B ignore-archive -"%s: file is the archive; not dumped" +"%s: archive cannot contain itself; not dumped" .TP .B file-removed "%s: File removed before we read it" diff --git a/doc/tar.texi b/doc/tar.texi index e9564b69..a70e8898 100644 --- a/doc/tar.texi +++ b/doc/tar.texi @@ -4634,11 +4634,9 @@ Disable all warning messages. @item file-unchanged @samp{%s: file is unchanged; not dumped} @kwindex ignore-archive -@cindex @samp{file is the archive; not dumped}, warning message -@kwindex ignore-archive -@cindex @samp{file is the archive; not dumped}, warning message +@cindex @samp{archive cannot contain itself; not dumped}, warning message @item ignore-archive -@samp{%s: file is the archive; not dumped} +@samp{%s: archive cannot contain itself; not dumped} @kwindex file-removed @cindex @samp{File removed before we read it}, warning message @item file-removed diff --git a/src/create.c b/src/create.c index 1ffc3281..30db2b5c 100644 --- a/src/create.c +++ b/src/create.c @@ -1723,7 +1723,7 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p) if (sys_file_is_archive (st)) { WARNOPT (WARN_IGNORE_ARCHIVE, - (0, 0, _("%s: file is the archive; not dumped"), + (0, 0, _("%s: archive cannot contain itself; not dumped"), quotearg_colon (p))); return; } diff --git a/tests/positional02.at b/tests/positional02.at index fa626027..ac1ed7b7 100644 --- a/tests/positional02.at +++ b/tests/positional02.at @@ -39,11 +39,10 @@ tar -cf a.tar . -C dir ./A.b ./B.a ], -[tar: ./a.tar: file is the archive; not dumped +[tar: ./a.tar: archive cannot contain itself; not dumped tar: The following options were used after any non-optional arguments in archive create or update mode. These options are positional and affect only arguments that follow them. Please, rearrange them properly. tar: -C 'dir' has no effect tar: Exiting with failure status due to previous errors ]) AT_CLEANUP - |