diff --git a/ChangeLog b/ChangeLog
index 5c845b0b250c8940580e5eb190342bde4be034d8..51501724b6e1cdc2bd3c52eb7ef700d0ed964c31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,620 @@
+2019-02-23 Sergey Poznyakoff <gray@gnu.org>
+
+ Version 1.32
+
+2019-02-04 Sergey Poznyakoff <gray@gnu.org>
+
+ Minor fixes in docs.
+
+ * doc/tar.1: Remove description of the --preserve option
+ Document verbosity levels.
+ * doc/tar.texi: Fix description of the -o option.
+
+2019-01-15 Daniel Le <greenrecyclebin@gmail.com>
+
+ Fix typos in the documentation
+
+ Short option "t" was mistranslated to "--test" instead of "--list"
+ in commit
+ 67cad0792b4e6cf22c6cb1b167b149cd176d49f9.
+
+2019-01-15 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix build on AIX
+
+ * src/unlink.c (flush_deferred_unlinks): Avoid possible duplicate
+ case
+ (if ENOTEMPTY==EEXIST)
+
+2019-01-15 Sergey Poznyakoff <gray@gnu.org>
+
+ Version 1.31.90
+
+2019-01-14 Sergey Poznyakoff <gray@gnu.org>
+
+ Ensure gnu format when running checkpoint tests
+
+2019-01-14 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix compression tests
+
+ Existing compression tests used tar with compiled-in
+ defaults. However,
+ some of the defaults are sure to create archives that are not
+ byte-to-byte
+ reproducible (e.g. DEFAULT_ARCHIVE_FORMAT=POSIX, because the
+ name field
+ in posix extended headers uses PID of the creating process
+ by default).
+ Moreover, some compressors (e.g. gzip) store current timestamp in
+ the file header when compressing from stdin, so that using cmp
+ on the
+ two created archives as the tests did is error-prone. Another
+ problem
+ is that the tests implicitly assumed that tar uses archive
+ suffix to
+ recognize its format when extracting, which isn't the
+ case. Finally,
+ there's hardly any reason in using sed to create m4 sources, when
+ everything can be achieved by m4 itself.
+
+ * tests/Makefile.am: Remove generation of compress-*.at files.
+ * tests/compress.at.in: Remove.
+ * tests/compress.m4: New file.
+ * tests/testsuite.at: Include compress.m4, use TAR_CHECK_COMPRESS
+ to
+ check compression options.
+
+2019-01-14 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix possible NULL dereference (savannah bug #55369)
+
+ * src/sparse.c (pax_decode_header): Check return from
+ find_next_block.
+
+2019-01-14 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix compilation without iconv.
+
+2019-01-14 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix iconv usage.
+
+ Patch by Christian Weisgerber.
+
+ * src/utf8.c (utf8_convert): non-zero return from iconv means
+ failure.
+
+2019-01-14 Pavel Raiskup <praiskup@redhat.com>
+
+ tests: fix numeric.at for BSD
+
+ While creating file, BSD kernels inherit the group ownership from
+ parent directory.
+ http://lists.gnu.org/archive/html/bug-tar/2016-06/msg00000.html
+
+ * tests/numeric.at: Attempt to 'chown' the newly created directory
+ to proper group (at least on affected machines that command is
+ expected to succeed).
+
+2019-01-14 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix typo in manpage.
+
+2019-01-14 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix expected output in dirrem tests.
+
+ In both tests, the "file changed as we read it" warning might be
+ produced for dir/sub, depending on the ctime resolution and
+ timing.
+ The problem was fixed by 64b43fdf70d82c39eb2ca900cd4f8e49,
+ but regressed
+ after e7cd377f7801d42aa8e07addff93d2150666c237, which removed
+ 1 second
+ delays between each pair of checkpoints. Since the presense
+ or absense
+ of this warning is irrelevant for the test, it is now suppressed.
+
+ * tests/dirrem01.at: Suppress the file-changed warning.
+ * tests/dirrem02.at: Likewise.
+
+2019-01-12 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ Fix the use of --checkpoint without explicit --checkpoint-action
+
+ * src/checkpoint.c (checkpoint_finish_compile): Set default
+ action,
+ if necessary.
+ * tests/checkpoint/defaults.at: New testcase.
+ * tests/checkpoint/dot-compat.at: New testcase.
+ * tests/checkpoint/dot-int.at: New testcase.
+ * tests/checkpoint/dot.at: New testcase.
+ * tests/checkpoint/interval.at: New testcase.
+ * tests/Makefile.am: Add new testcases.
+ * tests/testsuite.at Include new testcases.
+
+2019-01-10 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ Remove erroneous abort() call
+
+ The call was introduced by commit ccef8581. It caused tar to abort
+ on perfectly normal operations, like untarring archives containing
+ ./ with the -U option,
+
+ See
+ http://lists.gnu.org/archive/html/bug-tar/2019-01/msg00019.html
+ for details.
+
+ * src/extract.c (maybe_recoverable): Remove misplaced call
+ to abort().
+
+2019-01-02 Sergey Poznyakoff <gray@gnu.org>
+
+ Version 1.31
+
+2018-12-28 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix the difflink test
+
+ Hardlinking a symlink produces hardlink on BSD and symlink
+ on GNU/Linux. Avoid the ambiguity.
+
+ * tests/difflink.at: Create hard link from a regular file.
+
+2018-12-28 Sergey Poznyakoff <gray@gnu.org>
+
+ Work over a bug in gnulib error()
+
+ The error() function from glibc correctly prefixes each message it
+ prints with program_name as set by set_program_name. However, its
+ replacement from gnulib, which is linked in on systems where this
+ function is not available, prints the name returned by
+ getprogname()
+ instead. Due to this messages output by tar subprocess (which
+ sets its
+ program name to 'tar (child)') become indiscernible from those
+ printed
+ by the main process. In particular, this breaks the remfiles01.at
+ and
+ remfiles02.at test cases.
+
+ * configure.ac: Define ENABLE_ERROR_PRINT_PROGNAME if using
+ gnulib error().
+ * src/tar.c [ENABLE_ERROR_PRINT_PROGNAME] (tar_print_progname):
+ New function.
+ (main) [ENABLE_ERROR_PRINT_PROGNAME]: Set error_print_progname.
+
+2018-12-28 Sergey Poznyakoff <gray@gnu.org>
+
+ Implement the "wait" checkpoint action.
+
+ This action instructs tar to pause until given signal is
+ delivered.
+ The newer genfile tool uses this action for communication between
+ genfile and tar in exec mode. This eliminates race conitions and
+ speeds up the tests based on exec mode.
+
+ * doc/tar.texi: Document changes.
+ * paxutils: Upgrade.
+ * src/checkpoint.c: Implement the wait action.
+ * src/common.h (decode_signal): New proto.
+ * src/tar.c (decode_signal): New function.
+ (set_stat_signal): Rewrite.
+ * tests/dirrem01.at: Adjust genfile and tar command line arguments
+ to use the new feature.
+ * tests/dirrem02.at: Likewise.
+ * tests/filerem01.at: Likewise.
+ * tests/filerem02.at: Likewise.
+ * tests/grow.at: Likewise.
+ * tests/sptrcreat.at: Likewise.
+ * tests/sptrdiff00.at: Likewise.
+ * tests/sptrdiff01.at: Likewise.
+ * tests/truncate.at: Likewise.
+
+2018-12-27 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix CVE-2018-20482
+
+ * NEWS: Update.
+ * src/sparse.c (sparse_dump_region): Handle short read condition.
+ (sparse_extract_region,check_data_region): Fix dumped_size
+ calculation.
+ Handle short read condition.
+ (pax_decode_header): Fix dumped_size calculation.
+ * tests/Makefile.am: Add new testcases.
+ * tests/testsuite.at: Likewise.
+
+ * tests/sptrcreat.at: New file.
+ * tests/sptrdiff00.at: New file.
+ * tests/sptrdiff01.at: New file.
+
+2018-12-21 Sergey Poznyakoff <gray@gnu.org>
+
+ Disallow modifications to the global pax extended header in
+ update mode.
+
+ Updating global headers in update mode is not possible, because:
+
+ 1) If the original archive was not in PAX format, writing the
+ global header would overwrite first member header (and eventually
+ data blocks) in the archive.
+ 2) Otherwise, using the --pax-option can make the updated header
+ occupy more blocks than the original one, which would lead to the
+ same effect as in 1.
+
+ This also fixes
+ http://lists.gnu.org/archive/html/bug-tar/2018-12/msg00007.html
+
+ * src/xheader.c (xheader_forbid_global): New function.
+ * src/common.h (xheader_forbid_global): New prototype.
+ * src/update.c (update_archive): Use xheader_forbid_global,
+ instead
+ of trying to write global extended header record.
+
+2018-12-21 Sergey Poznyakoff <gray@gnu.org>
+
+ Bugfix
+
+ Bug reported in
+ http://lists.gnu.org/archive/html/bug-tar/2018-12/msg00014.html
+
+ * src/names.c (collect_and_sort_names): Fix iteration over
+ namelist.
+
+2018-12-21 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix semantics of -K used together with explicit member names.
+
+ This also fixes the bug reported in
+ http://lists.gnu.org/archive/html/bug-tar/2018-12/msg00012.html
+
+ * src/common.h (starting_file_option): Describe the variable.
+ * src/names.c (add_starting_file): New function.
+ (name_match): Ignore everything before the member indicated by the
+ --starting-file option
+ * src/tar.c: Use add_starting_file to handle the -K option.
+
+2018-12-21 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix error handling when reading incremental snapshots
+
+ Bug reported in
+ http://lists.gnu.org/archive/html/bug-tar/2018-12/msg00008.html
+
+ * incremen.c (read_incr_db_01): Don't try to continue after
+ errors.
+
+2018-12-21 Sergey Poznyakoff <gray@gnu.org>
+
+ Reject pax options starting with equals sign
+
+ Bug reported in
+ http://lists.gnu.org/archive/html/bug-tar/2018-12/msg00010.html
+
+ * xheader.c (xheader_set_keyword_equal): Bail out if the keyword
+ starts
+ with =
+
+2018-12-21 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix buffer overflow
+
+ Bug reported in
+ http://lists.gnu.org/archive/html/bug-tar/2018-12/msg00011.html
+
+ * src/xheader.c (xheader_format_name): fix length calculation
+
+2018-12-21 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix improper memory access
+
+ Bug reported in
+ http://lists.gnu.org/archive/html/bug-tar/2018-12/msg00009.html
+
+ * src/transform.c (parse_transform_expr): Check if re is not empty
+ before accessing its last byte.
+
+2018-11-24 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix parsing of ACLs
+
+ Text returned by acl_to_text can contain comments (introduced
+ by #).
+ Strip comments and horizontal tabs prior to storing ACLs in PAX
+ headers.
+
+ * src/xattrs.c (xattrs_acls_cleanup): New function.
+ (xattrs__acls_get_a,xattrs__acls_get_d): Use xattrs_acls_cleanup.
+
+2018-11-24 Sergey Poznyakoff <gray@gnu.org>
+
+ Don't try to read past the end of header string fields
+
+ * src/common.h (assign_string_n): New proto.
+ (ASSIGN_STRING_N): New macro.
+ * src/misc.c (assign_string_n): New function.
+ * gnulib.modules: Add strnlen.
+ * src/buffer.c: Use assign_string_n where appropriate.
+ * src/list.c: Likewise.
+
+2018-11-12 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix verbose ACL listing
+
+ * src/xattrs.c (acls_one_line): Advance pos.
+ (xattrs_print): Insert a comma between ACL and default ACL if both
+ are non-empty.
+
+2018-10-29 Paul Eggert <eggert@cs.ucla.edu>
+
+ tar: fix numbered backup bug
+
+ * src/misc.c (maybe_backup_file): Pass chdir_fd, not AT_FDCWD,
+ to find_backup_file_name. This fixes a bug whereby the wrong
+ backup file name was chosen for numbered backups.
+
+2018-10-29 Paul Eggert <eggert@cs.ucla.edu>
+
+ * src/tar.c (expand_pax_option): Pacify recent GCC.
+
+2018-10-29 Paul Eggert <eggert@cs.ucla.edu>
+
+ build: update gnulib submodule to latest
+
+ * src/misc.c (maybe_backup_file): Adjust to Gnulib change.
+
+2018-08-02 Sergey Poznyakoff <gray@gnu.org>
+
+ Minor fixes in wordsplit.c
+
+2018-08-02 Paul Eggert <eggert@cs.ucla.edu>
+
+ build: update gnulib submodule to latest
+
+2018-07-31 Sergey Poznyakoff <gray@gnu.org>
+
+ Silence gcc warnings in wordsplit
+
+2018-07-31 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix double-free introduced by 577dc345
+
+ * src/utf8.c (utf8_convert): Don't store freed value in *output
+
+2018-07-31 Pavel Raiskup <praiskup@redhat.com>
+
+ Report race on systems without O_DIRECTORY
+
+ * src/names.c (collect_and_sort_names): Report ENOTDIR after
+ successful fstat() but !S_ISDIR.
+
+2018-07-31 Pavel Raiskup <praiskup@redhat.com>
+
+ Avoid some resource leaks
+
+ * src/incremen.c (store_rename): Free temp_name, leaked before for
+ each renamed directory with --listed-incremental.
+ * src/transform.c (add_literal_segment): Tighten arguments by
+ const.
+ (parse_transform_expr): Free 'str', leaked storage for each
+ --transform option before.
+ * src/utf8.c (utf8_convert): Deallocate buffer for failed iconv()
+ call so callers don't have to.
+
+2018-07-31 Sergey Poznyakoff <gray@gnu.org>
+
+ Sync wordsplit and paxutils with the most recent versions
+
+2018-06-14 Paul Eggert <eggert@cs.ucla.edu>
+
+ * doc/tar.1: Fix font typo noted by esr.
+
+2018-05-16 Paul Eggert <eggert@cs.ucla.edu>
+
+ * doc/tar.1: Don't refer to nonexistent tar(5).
+
+2018-04-13 Jim Meyering <meyering@fb.com>
+
+ --one-top-level: avoid a heap-buffer-overflow
+
+ * NEWS: Mention this.
+ * src/suffix.c (strip_compression_suffix): Fix string comparison
+ guard.
+ Without this change, some ASAN-enabled test runs would fail
+ with the
+ following. Also, strip an additional .tar suffix only if
+ the just-
+ stripped suffix did not match /^\.t/".
+
+ ==30815==ERROR: AddressSanitizer: heap-buffer-overflow on
+ address 0x6020000002ed at pc 0x00000049d1f4 bp 0x7ffeb5906d50
+ sp 0x7ffeb5906500
+ READ of size 1 at 0x6020000002ed thread T0
+ SCARINESS: 12 (1-byte-read-heap-buffer-overflow)
+ #0 0x49d1f3 in __interceptor_strncmp
+ /j/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:407
+ #1 0x5670f3 in strip_compression_suffix
+ /j/tar/src/suffix.c:107
+ #2 0x575788 in decode_options /j/tar/src/tar.c:2545
+ #3 0x5760c0 in main /j/tar/src/tar.c:2708
+ #4 0x7f105090df29 in __libc_start_main ../csu/libc-start.c:308
+ #5 0x408629 in _start (/j/tar/src/tar+0x408629)
+
+ 0x6020000002ed is located 3 bytes to the left of 6-byte region
+ [0x6020000002f0,0x6020000002f6)
+ allocated by thread T0 here:
+ #0 0x4d0710 in __interceptor_malloc
+ /j/gcc/libsanitizer/asan/asan_malloc_linux.cc:86
+ #1 0x4908ad in __interceptor_strndup
+ /j/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:326
+ #2 0x5cbcbd in xstrndup /j/tar/gnu/xstrndup.c:32
+ #3 0x5a325b in base_name /j/tar/gnu/basename.c:57
+ #4 0x575772 in decode_options /j/tar/src/tar.c:2544
+ #5 0x5760c0 in main /j/tar/src/tar.c:2708
+ #6 0x7f105090df29 in __libc_start_main ../csu/libc-start.c:308
+
+2018-04-07 Andrew Hounsell <andrewhounsell@gmail.com>
+
+ Tiny fix
+
+ * doc/snapshot.texi: Fix a typo
+ * scripts/tar-snapshot-edit: Fix a typo
+
+2018-04-07 Jim Meyering <jim@meyering.net>
+
+ tests: avoid test failure with non-ancient autoconf
+
+ Running "make check" would fail with this:
+ T-nonl.at:30: error: m4_divert_push: cannot change diversion
+ to `GROW' inside m4_expand
+ * tests/T-nonl.at: Use printf in place of AS_ECHO_N.
+ These days, printf should work for everyone.
+
+2018-04-07 Jim Meyering <meyering@fb.com>
+
+ maint: avoid -Wstringop-truncation warnings from upcoming GCC8
+
+ * src/create.c (start_private_header, start_header): Convert
+ trivial uses of strncpy to memcpy, to avoid warnings like this:
+ In function 'strncpy',
+ inlined from 'start_private_header' at create.c:522:3:
+ /usr/include/bits/string_fortified.h:106:10: warning: \
+ '__builtin_strncpy' output truncated before terminating nul \
+ copying 2 bytes from a string of the same length \
+ [-Wstringop-truncation]
+
+2018-04-07 Jim Meyering <meyering@fb.com>
+
+ maint: avoid -Wstringop-truncation warnings upcoming GCC8
+
+ * src/buffer.c (gnu_add_multi_volume_header): Convert a use of
+ strncpy to memcpy, to avoid this warning:
+ In function 'strncpy',
+ inlined from 'gnu_add_multi_volume_header' at buffer.c:1782:3,
+ ...
+ /usr/include/bits/string_fortified.h:106:10: error:
+ '__builtin_strncpy'\
+ specified bound 100 equals destination size \
+ [-Werror=stringop-truncation]
+
+2018-04-07 Jim Meyering <meyering@fb.com>
+
+ maint: avoid warnings from upcoming GCC8
+
+ * src/transform.c (_single_transform_name_to_obstack): Mark with
+ FALLTHROUGH statement rather than /* FALL THROUGH */ comment.
+ Only the former works with gcc-8.
+ * src/extract.c (maybe_recoverable): Call abort to tell gcc-8 that
+ this code is unreachable.
+
+2018-04-07 Sergey Poznyakoff <gray@gnu.org>
+
+ Rewrite struct tm formatting
+
+ * src/list.c (tartime): Use strftime instead of manually
+ formatting
+ fields of the struct tm. This should also suppress some gcc
+ warnings.
+
+2018-04-07 Jim Meyering <jim@meyering.net>
+
+ tests: add coverage for new --zstd and all other compression tools
+
+ * tests/compress.at.in: New file: template from which each
+ per-compression-tool test is derived.
+ * tests/Makefile.am (TESTSUITE_AT): Add it.
+ (EXTRA_DIST): Add compress.at.in.
+ (compress-*.at): New rules to generate a file/tests for each
+ compression tool.
+ * tests/testsuite.at (Compression): Add each of these generated
+ files in a new section.
+ * tests/.gitignore: Ignore the new generated files.
+
+2018-03-18 Aaron Schrab <aaron@schrab.com>
+
+ Fix typo
+
+2018-03-18 Sergey Poznyakoff <gray@gnu.org>
+
+ Version 1.30.90
+
+ * NEWS: Update.
+ * configure.ac: Update.
+ * THANKS: Add Adam Borowski.
+
+2018-03-18 Adam Borowski <kilobyte@angband.pl>
+
+ Add support for zstd compression
+
+ * configure.ac (zstd): Register compression program.
+ * doc/tar.1: Mention --zstd.
+ * doc/tar.texi: Document zstd support.
+ * src/buffer.c: Register zstd compression.
+ * src/suffix.c: Add suffixes zst and tzst.
+ * src/tar.c: New compression option --zstd.
+
+2018-03-18 Pavel Raiskup <praiskup@redhat.com>
+
+ tests: fix race in dirrem01 and dirrem02
+
+ Previously the '--checkpoint-action=echo' was triggered after
+ '--checkpoint-action=sleep=1' - so the order of events *usually*
+ was (for --format='gnu'):
+
+ ...
+ 1. checkpoint handler before write of 'dir/sub' member
+ 2. one-second delay
+ 3. stderr write: 'tar: Write checkpoint 3'
+ 4. write the member 'dir/sub' into the archive
+ 5. check that the member's ctime has not been changed
+ 6. genfile's detecting 'Write checkpoint', doing unlink
+ ...
+
+ But sometimes, the genfile was fast enough to win the race and
+ unlinked the directory before the member was written into the
+ archive (IOW, the order was 1-2-3-6-4-5). This led to the
+ occasional warning 'tar: dir/sub: file changed as we read it'.
+
+ Swap the order of 'sleep=1' and 'echo' actions so the genfile
+ utility has (hopefully) enough time to do the unlink before
+ writing the file into the archive (enforce 1-2-3-6-4-5 order).
+
+ * tests/dirrem01.at: Swap 'sleep=1' and 'echo' actions.
+ * tests/dirrem02.at: Likewise.
+
+2018-03-13 Sergey Poznyakoff <gray@gnu.org>
+
+ Fix typos in the docs
+
+2018-03-13 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ Provide a way to skip tests that create very large files
+
+ Define environment variable TARTEST_SKIP_LARGE_FILES=1 in order
+ to skip tests that require lots of disk space.
+
+ * tests/testsuite.at (AT_SKIP_LARGE_FILES): New macro.
+ * tests/sparse03.at: Mark test with AT_SKIP_LARGE_FILES.
+ * tests/sparse05.at: Likewise.
+ * tests/star/pax-big-10g.at: Likewise.
+ * tests/star/ustar-big-2g.at: Likewise.
+ * tests/star/ustar-big-8g.at: Likewise.
+
+2018-03-13 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ Testsuite bugfix
+
+ * tests/difflink.at: Define order of files within tested archive.
+
+2018-03-13 Sergey Poznyakoff <gray@gnu.org>
+
+ testsuite: account for absolute file names starting with double
+ slash
+
+ * tests/incr08.at: Absolute file names can start with //
+ * tests/xform03.at: Likewise.
+
2017-12-17 Sergey Poznyakoff <gray@gnu.org>
Version 1.30
diff --git a/Makefile.am b/Makefile.am
index b48159718252435e4ff6110013aac371e0e0da25..15946e7a614b9dbca064db07ecfb1b555fd4b10d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
# Main Makefile for GNU tar.
-# Copyright 1994-1997, 1999-2001, 2003, 2007, 2009, 2013-2014, 2016-2017
-# Free Software Foundation, Inc.
+# Copyright 1994-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/Makefile.in b/Makefile.in
index f3b817b5c1cd35bee37ed448e93b39dc4df35150..502e4c44fa3344c9346e1dc34a0ff123080ac046 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,8 +16,7 @@
# Main Makefile for GNU tar.
-# Copyright 1994-1997, 1999-2001, 2003, 2007, 2009, 2013-2014, 2016-2017
-# Free Software Foundation, Inc.
+# Copyright 1994-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -60,7 +59,17 @@
# changelog_dir [mandatory] Directory where to create ChangeLog
# changelog_amend_file [optional] Amendment file
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -122,26 +131,12 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(srcdir)/Make.rules INSTALL NEWS README AUTHORS \
- ChangeLog THANKS $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in ABOUT-NLS COPYING TODO build-aux/ar-lib \
- build-aux/compile build-aux/config.guess \
- build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
- build-aux/install-sh build-aux/mdate-sh build-aux/missing \
- build-aux/texinfo.tex build-aux/ylwrap \
- $(top_srcdir)/build-aux/compile \
- $(top_srcdir)/build-aux/config.guess \
- $(top_srcdir)/build-aux/config.rpath \
- $(top_srcdir)/build-aux/config.sub \
- $(top_srcdir)/build-aux/install-sh \
- $(top_srcdir)/build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+ $(top_srcdir)/m4/__inline.m4 \
$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \
- $(top_srcdir)/m4/asm-underscore.m4 \
$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \
$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \
$(top_srcdir)/m4/canonicalize.m4 \
@@ -161,11 +156,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/extern-inline.m4 \
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \
- $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \
- $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filenamecat.m4 \
- $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
- $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
+ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
+ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
+ $(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fileblocks.m4 \
+ $(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
+ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
+ $(top_srcdir)/m4/fnmatch_h.m4 $(top_srcdir)/m4/fpending.m4 \
$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
$(top_srcdir)/m4/futimens.m4 \
@@ -179,7 +175,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 \
$(top_srcdir)/m4/group-member.m4 \
- $(top_srcdir)/m4/hard-locale.m4 \
$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/human.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \
$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \
@@ -274,6 +269,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -337,6 +334,18 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Make.rules $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/build-aux/compile \
+ $(top_srcdir)/build-aux/config.guess \
+ $(top_srcdir)/build-aux/config.rpath \
+ $(top_srcdir)/build-aux/config.sub \
+ $(top_srcdir)/build-aux/install-sh \
+ $(top_srcdir)/build-aux/missing ABOUT-NLS AUTHORS COPYING \
+ ChangeLog INSTALL NEWS README THANKS TODO build-aux/compile \
+ build-aux/config.guess build-aux/config.rpath \
+ build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+ build-aux/mdate-sh build-aux/missing build-aux/texinfo.tex \
+ build-aux/ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -469,6 +478,7 @@ GNULIB_FFSL = @GNULIB_FFSL@
GNULIB_FFSLL = @GNULIB_FFSLL@
GNULIB_FGETC = @GNULIB_FGETC@
GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FNMATCH = @GNULIB_FNMATCH@
GNULIB_FOPEN = @GNULIB_FOPEN@
GNULIB_FPRINTF = @GNULIB_FPRINTF@
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
@@ -501,6 +511,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
@@ -517,6 +528,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALENAME = @GNULIB_LOCALENAME@
GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_LSTAT = @GNULIB_LSTAT@
@@ -755,6 +767,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -778,6 +791,9 @@ HAVE_FEATURES_H = @HAVE_FEATURES_H@
HAVE_FFS = @HAVE_FFS@
HAVE_FFSL = @HAVE_FFSL@
HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FNMATCH = @HAVE_FNMATCH@
+HAVE_FNMATCH_H = @HAVE_FNMATCH_H@
+HAVE_FREELOCALE = @HAVE_FREELOCALE@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSTATAT = @HAVE_FSTATAT@
HAVE_FSYNC = @HAVE_FSYNC@
@@ -790,13 +806,16 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
HAVE_GETLOGIN = @HAVE_GETLOGIN@
HAVE_GETOPT_H = @HAVE_GETOPT_H@
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -829,6 +848,7 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -899,7 +919,6 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
HAVE_TIMEGM = @HAVE_TIMEGM@
HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
HAVE_TZSET = @HAVE_TZSET@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
@@ -954,8 +973,6 @@ HAVE_WMEMSET = @HAVE_WMEMSET@
HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
HAVE__BOOL = @HAVE__BOOL@
HAVE__EXIT = @HAVE__EXIT@
-HOST_CPU = @HOST_CPU@
-HOST_CPU_C_ABI = @HOST_CPU_C_ABI@
INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
@@ -1000,6 +1017,7 @@ NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
+NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
@@ -1027,6 +1045,7 @@ NEXT_DIRENT_H = @NEXT_DIRENT_H@
NEXT_ERRNO_H = @NEXT_ERRNO_H@
NEXT_FCNTL_H = @NEXT_FCNTL_H@
NEXT_FLOAT_H = @NEXT_FLOAT_H@
+NEXT_FNMATCH_H = @NEXT_FNMATCH_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
@@ -1087,9 +1106,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@
REPLACE_FDOPEN = @REPLACE_FDOPEN@
REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FNMATCH = @REPLACE_FNMATCH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREELOCALE = @REPLACE_FREELOCALE@
REPLACE_FREOPEN = @REPLACE_FREOPEN@
REPLACE_FSEEK = @REPLACE_FSEEK@
REPLACE_FSEEKO = @REPLACE_FSEEKO@
@@ -1107,6 +1128,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
REPLACE_GMTIME = @REPLACE_GMTIME@
REPLACE_ISATTY = @REPLACE_ISATTY@
@@ -1137,6 +1159,7 @@ REPLACE_MKNOD = @REPLACE_MKNOD@
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
REPLACE_MKTIME = @REPLACE_MKTIME@
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@
REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
@@ -1342,7 +1365,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Make.rules $(am__configu
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnits Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1352,7 +1374,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/Make.rules:
+$(srcdir)/Make.rules $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1572,15 +1594,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1616,16 +1638,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1801,6 +1824,8 @@ uninstall-am:
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
dist-hook:
$(MAKE) changelog_dir=$(distdir) ChangeLog
diff --git a/NEWS b/NEWS
index cd15fa1b1fa5b9482e204d5a5c066da0319d7ced..acbebdd47098787ff847099e493c122f10b190ee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,52 @@
-GNU tar NEWS - User visible changes. 2017-12-17
+GNU tar NEWS - User visible changes. 2019-02-23
Please send GNU tar bug reports to <bug-tar@gnu.org>
+
+version 1.32 - Sergey Poznyakoff, 2019-02-23
+
+* Fix the use of --checkpoint without explicit --checkpoint-action
+
+* Fix extraction with the -U option
+
+See http://lists.gnu.org/archive/html/bug-tar/2019-01/msg00015.html,
+for details
+
+* Fix iconv usage on BSD-based systems
+
+* Fix possible NULL dereference (savannah bug #55369)
+
+* Improve the testsuite
+
+
+version 1.31 - Sergey Poznyakoff, 2019-01-02
+
+* Fix heap-buffer-overrun with --one-top-level.
+Bug introduced with the addition of that option in 1.28.
+
+* Support for zstd compression
+
+New option '--zstd' instructs tar to use zstd as compression program.
+When listing, extractng and comparing, zstd compressed archives are
+recognized automatically.
+When '-a' option is in effect, zstd compression is selected if the
+destination archive name ends in '.zst' or '.tzst'.
+
+* The -K option interacts properly with member names given in the command line
+
+Names of members to extract can be specified along with the "-K NAME"
+option. In this case, tar will extract NAME and those of named members
+that appear in the archive after it, which is consistent with the
+semantics of the option.
+
+Previous versions of tar extracted NAME, those of named members that
+appeared before it, and everything after it.
+
+* Fix CVE-2018-20482
+
+When creating archives with the --sparse option, previous versions of
+tar would loop endlessly if a sparse file had been truncated while
+being archived.
+
version 1.30 - Sergey Poznyakoff, 2017-12-17
@@ -42,7 +88,7 @@ causing subsequent link extractions in that directory to fail.
This new warning control option suppresses warning messages about
unreadable files and directories. It has effect only if used together
-with the --ignore-failed-read option.
+with the --ignore-failed-read option.
* The --warnings=none option now suppresses all warnings
@@ -1641,7 +1687,7 @@ Versions 1.07 back to 1.00 by Jay Fenlason.
-Copyright 1994-2001, 2003-2010, 2013-2017 Free Software Foundation, Inc.
+Copyright 1994-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/README b/README
index 874b5455e75e9c2d5a8980060cbe08044e151be4..3a14c7ef4f313cd872363e0a33f2b4f1671c82f8 100644
--- a/README
+++ b/README
@@ -221,8 +221,7 @@ and share your findings by writing to <bug-tar@gnu.org>.
* Copying
-Copyright 1990-1992, 1994, 1997-2001, 2003-2004, 2007, 2012-2014,
-2016-2017 Free Software Foundation, Inc.
+Copyright 1990-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/THANKS b/THANKS
index 5e8e8c9233741b1f681ab32912ef7ed4a52ecb46..aee0a9241fd9bb35deb20e74940903e603ec6452 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ list of these people. Help me keep it complete and exempt of errors.
See various ChangeLogs for a detailed description of contributions.
Aage Robeck aagero@ifi.uio.no
+Adam Borowski kilobyte@angband.pl
Adye, TJ (Tim) T.J.Adye@rl.ac.uk
Akiko Matsushita matusita@sra.co.jp
Alan Bawden Alan@lcs.mit.edu
@@ -94,6 +95,7 @@ Christian Laubscher christian.laubscher@tiscalinet.ch
Christian T. Dum ctd@mpe-garching.mpg.de
Christian von Roques roques@pond.sub.org
Christian Wetzel wetzel@phoenix-pacs.de
+Christian Weisgerber naddy@mips.inka.de
Christoph Litauer litauer@mailhost.uni-koblenz.de
Christophe Colle colle@krtkg1.rug.ac.be
Christophe Kalt Christophe.Kalt@kbcfp.com
diff --git a/TODO b/TODO
index 752668aaa8e524cd84a36ac925c5b67bbd416a71..ecfc4f20435e249ef8add31e8cd90c2504aaf525 100644
--- a/TODO
+++ b/TODO
@@ -45,8 +45,7 @@ Suggestions for improving GNU tar.
* Copyright notice
-Copyright 2003-2004, 2007, 2013-2014, 2016-2017 Free Software
-Foundation, Inc.
+Copyright 2003-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/acinclude.m4 b/acinclude.m4
index 635b3c543ba31141c904ae696a79d4786139bb22..960506cdbd43557da7b66770c61dcd7afdaeced7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,6 @@
dnl Special Autoconf macros for GNU tar -*- autoconf -*-
-dnl Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+dnl Copyright 2009-2019 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU tar.
dnl
diff --git a/aclocal.m4 b/aclocal.m4
index 7d39b9b0f0dedd5b1c27e16d656c994077ffa216..38119414e7533420dd0a6655c404bb02a7ec3f28 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -644,7 +647,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -694,7 +697,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -733,7 +736,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -762,7 +765,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -809,7 +812,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -828,7 +831,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -909,7 +912,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -969,7 +972,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -997,7 +1000,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1016,7 +1019,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1148,11 +1151,11 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/00gnulib.m4])
+m4_include([m4/__inline.m4])
m4_include([m4/absolute-header.m4])
m4_include([m4/acl.m4])
m4_include([m4/alloca.m4])
m4_include([m4/argp.m4])
-m4_include([m4/asm-underscore.m4])
m4_include([m4/backupfile.m4])
m4_include([m4/bison.m4])
m4_include([m4/btowc.m4])
@@ -1188,6 +1191,7 @@ m4_include([m4/fchdir.m4])
m4_include([m4/fchmodat.m4])
m4_include([m4/fchownat.m4])
m4_include([m4/fcntl-o.m4])
+m4_include([m4/fcntl-safer.m4])
m4_include([m4/fcntl.m4])
m4_include([m4/fcntl_h.m4])
m4_include([m4/fdopendir.m4])
@@ -1196,6 +1200,7 @@ m4_include([m4/filenamecat.m4])
m4_include([m4/flexmember.m4])
m4_include([m4/float_h.m4])
m4_include([m4/fnmatch.m4])
+m4_include([m4/fnmatch_h.m4])
m4_include([m4/fpending.m4])
m4_include([m4/fseek.m4])
m4_include([m4/fseeko.m4])
@@ -1219,7 +1224,6 @@ m4_include([m4/glibc21.m4])
m4_include([m4/gnulib-common.m4])
m4_include([m4/gnulib-comp.m4])
m4_include([m4/group-member.m4])
-m4_include([m4/hard-locale.m4])
m4_include([m4/host-cpu-c-abi.m4])
m4_include([m4/human.m4])
m4_include([m4/iconv.m4])
diff --git a/build-aux/ar-lib b/build-aux/ar-lib
deleted file mode 100755
index fe2301e71a86f025f97a189dc6b5374e8b0caa65..0000000000000000000000000000000000000000
--- a/build-aux/ar-lib
+++ /dev/null
@@ -1,270 +0,0 @@
-#! /bin/sh
-# Wrapper for Microsoft lib.exe
-
-me=ar-lib
-scriptversion=2012-03-01.08; # UTC
-
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
-# Written by Peter Rosin <peda@lysator.liu.se>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-
-# func_error message
-func_error ()
-{
- echo "$me: $1" 1>&2
- exit 1
-}
-
-file_conv=
-
-# func_file_conv build_file
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts.
-func_file_conv ()
-{
- file=$1
- case $file in
- / | /[!/]*) # absolute file, and not a UNC file
- if test -z "$file_conv"; then
- # lazily determine how to convert abs files
- case `uname -s` in
- MINGW*)
- file_conv=mingw
- ;;
- CYGWIN*)
- file_conv=cygwin
- ;;
- *)
- file_conv=wine
- ;;
- esac
- fi
- case $file_conv in
- mingw)
- file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- ;;
- cygwin)
- file=`cygpath -m "$file" || echo "$file"`
- ;;
- wine)
- file=`winepath -w "$file" || echo "$file"`
- ;;
- esac
- ;;
- esac
-}
-
-# func_at_file at_file operation archive
-# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
-# for each of them.
-# When interpreting the content of the @FILE, do NOT use func_file_conv,
-# since the user would need to supply preconverted file names to
-# binutils ar, at least for MinGW.
-func_at_file ()
-{
- operation=$2
- archive=$3
- at_file_contents=`cat "$1"`
- eval set x "$at_file_contents"
- shift
-
- for member
- do
- $AR -NOLOGO $operation:"$member" "$archive" || exit $?
- done
-}
-
-case $1 in
- '')
- func_error "no command. Try '$0 --help' for more information."
- ;;
- -h | --h*)
- cat <<EOF
-Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
-
-Members may be specified in a file named with @FILE.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "$me, version $scriptversion"
- exit $?
- ;;
-esac
-
-if test $# -lt 3; then
- func_error "you must specify a program, an action and an archive"
-fi
-
-AR=$1
-shift
-while :
-do
- if test $# -lt 2; then
- func_error "you must specify a program, an action and an archive"
- fi
- case $1 in
- -lib | -LIB \
- | -ltcg | -LTCG \
- | -machine* | -MACHINE* \
- | -subsystem* | -SUBSYSTEM* \
- | -verbose | -VERBOSE \
- | -wx* | -WX* )
- AR="$AR $1"
- shift
- ;;
- *)
- action=$1
- shift
- break
- ;;
- esac
-done
-orig_archive=$1
-shift
-func_file_conv "$orig_archive"
-archive=$file
-
-# strip leading dash in $action
-action=${action#-}
-
-delete=
-extract=
-list=
-quick=
-replace=
-index=
-create=
-
-while test -n "$action"
-do
- case $action in
- d*) delete=yes ;;
- x*) extract=yes ;;
- t*) list=yes ;;
- q*) quick=yes ;;
- r*) replace=yes ;;
- s*) index=yes ;;
- S*) ;; # the index is always updated implicitly
- c*) create=yes ;;
- u*) ;; # TODO: don't ignore the update modifier
- v*) ;; # TODO: don't ignore the verbose modifier
- *)
- func_error "unknown action specified"
- ;;
- esac
- action=${action#?}
-done
-
-case $delete$extract$list$quick$replace,$index in
- yes,* | ,yes)
- ;;
- yesyes*)
- func_error "more than one action specified"
- ;;
- *)
- func_error "no action specified"
- ;;
-esac
-
-if test -n "$delete"; then
- if test ! -f "$orig_archive"; then
- func_error "archive not found"
- fi
- for member
- do
- case $1 in
- @*)
- func_at_file "${1#@}" -REMOVE "$archive"
- ;;
- *)
- func_file_conv "$1"
- $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
- ;;
- esac
- done
-
-elif test -n "$extract"; then
- if test ! -f "$orig_archive"; then
- func_error "archive not found"
- fi
- if test $# -gt 0; then
- for member
- do
- case $1 in
- @*)
- func_at_file "${1#@}" -EXTRACT "$archive"
- ;;
- *)
- func_file_conv "$1"
- $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
- ;;
- esac
- done
- else
- $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
- do
- $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
- done
- fi
-
-elif test -n "$quick$replace"; then
- if test ! -f "$orig_archive"; then
- if test -z "$create"; then
- echo "$me: creating $orig_archive"
- fi
- orig_archive=
- else
- orig_archive=$archive
- fi
-
- for member
- do
- case $1 in
- @*)
- func_file_conv "${1#@}"
- set x "$@" "@$file"
- ;;
- *)
- func_file_conv "$1"
- set x "$@" "$file"
- ;;
- esac
- shift
- shift
- done
-
- if test -n "$orig_archive"; then
- $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
- else
- $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
- fi
-
-elif test -n "$list"; then
- if test ! -f "$orig_archive"; then
- func_error "archive not found"
- fi
- $AR -NOLOGO -LIST "$archive" || exit $?
-fi
diff --git a/build-aux/compile b/build-aux/compile
index 531136b068ef00e23d38429e6ee9a57d581a0870..a85b723c7e67d46316e85e7422bd5088e9136042 100755
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 31e01efec3e3bb01d289f24d77baddb4f47a1f93..0f9b29c8848e3d7f43276c2c847486ecb4519be8 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2017 Free Software Foundation, Inc.
+# Copyright 1992-2019 Free Software Foundation, Inc.
-timestamp='2017-11-07'
+timestamp='2019-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,8 +84,6 @@ if test $# != 0; then
exit 1
fi
-trap 'exit 1' 1 2 15
-
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,38 @@ trap 'exit 1' 1 2 15
# Portable tmp directory creation inspired by the Autoconf team.
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+ : "${TMPDIR=/tmp}"
+ # shellcheck disable=SC2039
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+ dummy=$tmp/dummy
+ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+ ,,) echo "int x;" > "$dummy.c"
+ for driver in cc gcc c89 c99 ; do
+ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+ CC_FOR_BUILD="$driver"
+ break
+ fi
+ done
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+ esac
+}
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
PATH=$PATH:/.attbin ; export PATH
fi
@@ -132,14 +134,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
+ set_cc_for_build
+ cat <<-EOF > "$dummy.c"
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,13 +151,20 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+ # If ldd exists, use it to detect musl libc.
+ if command -v ldd >/dev/null && \
+ ldd --version 2>&1 | grep -q ^musl
+ then
+ LIBC=musl
+ fi
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,30 +178,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
+ "/sbin/$sysctl" 2>/dev/null || \
+ "/usr/sbin/$sysctl" 2>/dev/null || \
echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine="${arch}${endian}"-unknown
;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently (or will in the future) and ABI.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
+ set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
@@ -208,10 +217,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# Determine ABI tags.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
;;
esac
# The OS release
@@ -219,52 +228,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
+ case "$UNAME_VERSION" in
Debian*)
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}${abi}"
+ echo "$machine-${os}${release}${abi-}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
exit ;;
*:LibertyBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
exit ;;
*:MidnightBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
exit ;;
*:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:Sortix:*:*)
- echo ${UNAME_MACHINE}-unknown-sortix
+ echo "$UNAME_MACHINE"-unknown-sortix
exit ;;
*:Redox:*:*)
- echo ${UNAME_MACHINE}-unknown-redox
+ echo "$UNAME_MACHINE"-unknown-redox
exit ;;
+ mips:OSF1:*.*)
+ echo mips-dec-osf1
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -316,7 +328,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
@@ -325,10 +337,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo m68k-unknown-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
+ echo "$UNAME_MACHINE"-unknown-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
+ echo "$UNAME_MACHINE"-unknown-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -340,7 +352,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
+ echo arm-acorn-riscix"$UNAME_RELEASE"
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
@@ -367,19 +379,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
+ echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
+ set_cc_for_build
SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
@@ -392,13 +404,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
SUN_ARCH=x86_64
fi
fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
@@ -407,25 +419,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
exit ;;
sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
;;
sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
+ echo sparc-sun-sunos"$UNAME_RELEASE"
;;
esac
exit ;;
aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
+ echo sparc-auspex-sunos"$UNAME_RELEASE"
exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
@@ -436,44 +448,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
+ echo m68k-milan-mint"$UNAME_RELEASE"
exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
+ echo m68k-hades-mint"$UNAME_RELEASE"
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
+ echo m68k-unknown-mint"$UNAME_RELEASE"
exit ;;
m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
+ echo m68k-apple-machten"$UNAME_RELEASE"
exit ;;
powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
+ echo powerpc-apple-machten"$UNAME_RELEASE"
exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit ;;
RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
+ echo mips-dec-ultrix"$UNAME_RELEASE"
exit ;;
VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
+ echo vax-dec-ultrix"$UNAME_RELEASE"
exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
+ echo clipper-intergraph-clix"$UNAME_RELEASE"
exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
@@ -494,11 +506,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
{ echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
+ echo mips-mips-riscos"$UNAME_RELEASE"
exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
@@ -524,17 +536,17 @@ EOF
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+ [ "$TARGET_BINARY_INTERFACE"x = x ]
then
- echo m88k-dg-dgux${UNAME_RELEASE}
+ echo m88k-dg-dgux"$UNAME_RELEASE"
else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
fi
else
- echo i586-dg-dgux${UNAME_RELEASE}
+ echo i586-dg-dgux"$UNAME_RELEASE"
fi
exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
@@ -551,7 +563,7 @@ EOF
echo m68k-tektronix-bsd
exit ;;
*:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -563,14 +575,14 @@ EOF
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
#include <sys/systemcfg.h>
main()
@@ -581,7 +593,7 @@ EOF
exit(0);
}
EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
then
echo "$SYSTEM_NAME"
else
@@ -595,7 +607,7 @@ EOF
exit ;;
*:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -604,9 +616,9 @@ EOF
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
@@ -615,7 +627,7 @@ EOF
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
@@ -630,28 +642,28 @@ EOF
echo m68k-hp-bsd4.4
exit ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ case "$UNAME_MACHINE" in
9000/31?) HP_ARCH=m68000 ;;
9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
+ case "$sc_cpu_version" in
523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
+ case "$sc_kernel_bits" in
32) HP_ARCH=hppa2.0n ;;
64) HP_ARCH=hppa2.0w ;;
'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
esac ;;
esac
fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ if [ "$HP_ARCH" = "" ]; then
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -684,13 +696,13 @@ EOF
exit (0);
}
EOF
- (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = hppa2.0w ]
+ if [ "$HP_ARCH" = hppa2.0w ]
then
- eval $set_cc_for_build
+ set_cc_for_build
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -709,15 +721,15 @@ EOF
HP_ARCH=hppa64
fi
fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
exit ;;
ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux"$HPUX_REV"
exit ;;
3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
#include <unistd.h>
int
main ()
@@ -742,7 +754,7 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
@@ -763,9 +775,9 @@ EOF
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
+ echo "$UNAME_MACHINE"-unknown-osf1mk
else
- echo ${UNAME_MACHINE}-unknown-osf1
+ echo "$UNAME_MACHINE"-unknown-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -790,109 +802,120 @@ EOF
echo c4-convex-bsd
exit ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
exit ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
*:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+ exit ;;
+ arm:FreeBSD:*:*)
+ UNAME_PROCESSOR=`uname -p`
+ set_cc_for_build
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+ else
+ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+ fi
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
- case ${UNAME_PROCESSOR} in
+ case "$UNAME_PROCESSOR" in
amd64)
UNAME_PROCESSOR=x86_64 ;;
i386)
UNAME_PROCESSOR=i586 ;;
esac
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
+ echo "$UNAME_MACHINE"-pc-cygwin
exit ;;
*:MINGW64*:*)
- echo ${UNAME_MACHINE}-pc-mingw64
+ echo "$UNAME_MACHINE"-pc-mingw64
exit ;;
*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
+ echo "$UNAME_MACHINE"-pc-mingw32
exit ;;
*:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
+ echo "$UNAME_MACHINE"-pc-msys
exit ;;
i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
+ echo "$UNAME_MACHINE"-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case "$UNAME_MACHINE" in
x86)
- echo i586-pc-interix${UNAME_RELEASE}
+ echo i586-pc-interix"$UNAME_RELEASE"
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
+ echo x86_64-unknown-interix"$UNAME_RELEASE"
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
+ echo ia64-unknown-interix"$UNAME_RELEASE"
exit ;;
esac ;;
i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
+ echo "$UNAME_MACHINE"-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
+ echo x86_64-pc-cygwin
exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
+ *:Minix:*:*)
+ echo "$UNAME_MACHINE"-unknown-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -906,63 +929,63 @@ EOF
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
+ set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
e2k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
k1om:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
#undef CPU
#undef ${UNAME_MACHINE}
#undef ${UNAME_MACHINE}el
@@ -976,70 +999,70 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
;;
mips64el:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
+ echo or1k-unknown-linux-"$LIBC"
exit ;;
or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-unknown-linux-"$LIBC"
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-unknown-linux-"$LIBC"
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+ *) echo hppa-unknown-linux-"$LIBC" ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-unknown-linux-"$LIBC"
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-unknown-linux-"$LIBC"
exit ;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
+ echo powerpc64le-unknown-linux-"$LIBC"
exit ;;
ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
+ echo powerpcle-unknown-linux-"$LIBC"
exit ;;
riscv32:Linux:*:* | riscv64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1053,34 +1076,34 @@ EOF
# I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
+ echo "$UNAME_MACHINE"-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ echo "$UNAME_MACHINE"-unknown-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ echo "$UNAME_MACHINE"-unknown-atheos
exit ;;
i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
+ echo "$UNAME_MACHINE"-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
+ echo i386-unknown-lynxos"$UNAME_RELEASE"
exit ;;
i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
exit ;;
i*86:*:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
fi
exit ;;
i*86:*:5:[678]*)
@@ -1090,12 +1113,12 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1105,9 +1128,9 @@ EOF
&& UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv32
+ echo "$UNAME_MACHINE"-pc-sysv32
fi
exit ;;
pc:*:*:*)
@@ -1127,9 +1150,9 @@ EOF
exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1149,9 +1172,9 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
@@ -1160,28 +1183,28 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
+ echo mips-dde-sysv"$UNAME_RELEASE"
exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
@@ -1192,7 +1215,7 @@ EOF
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
+ echo "$UNAME_MACHINE"-sni-sysv4
else
echo ns32k-sni-sysv
fi
@@ -1212,23 +1235,23 @@ EOF
exit ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
+ echo "$UNAME_MACHINE"-stratus-vos
exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
exit ;;
mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
+ echo m68k-apple-aux"$UNAME_RELEASE"
exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv"$UNAME_RELEASE"
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv"$UNAME_RELEASE"
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1247,39 +1270,39 @@ EOF
echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
+ echo sx4-nec-superux"$UNAME_RELEASE"
exit ;;
SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
+ echo sx5-nec-superux"$UNAME_RELEASE"
exit ;;
SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
+ echo sx6-nec-superux"$UNAME_RELEASE"
exit ;;
SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
+ echo sx7-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
+ echo sx8-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
+ echo sx8r-nec-superux"$UNAME_RELEASE"
exit ;;
SX-ACE:SUPER-UX:*:*)
- echo sxace-nec-superux${UNAME_RELEASE}
+ echo sxace-nec-superux"$UNAME_RELEASE"
exit ;;
Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
+ set_cc_for_build
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
@@ -1307,7 +1330,7 @@ EOF
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
@@ -1315,22 +1338,25 @@ EOF
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
NEO-*:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
+ echo neo-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
+ echo nse-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSR-*:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
+ echo nsr-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSV-*:NONSTOP_KERNEL:*:*)
+ echo nsv-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
- echo nsx-tandem-nsk${UNAME_RELEASE}
+ echo nsx-tandem-nsk"$UNAME_RELEASE"
exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
@@ -1339,18 +1365,19 @@ EOF
echo bs2000-siemens-sysv
exit ;;
DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
+ # shellcheck disable=SC2154
if test "$cputype" = 386; then
UNAME_MACHINE=i386
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-unknown-plan9
+ echo "$UNAME_MACHINE"-unknown-plan9
exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
@@ -1371,14 +1398,14 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux"$UNAME_RELEASE"
exit ;;
*:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
+ case "$UNAME_MACHINE" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
V*) echo vax-dec-vms ; exit ;;
@@ -1387,25 +1414,28 @@ EOF
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
exit ;;
i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
+ echo "$UNAME_MACHINE"-pc-rdos
exit ;;
i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
+ echo "$UNAME_MACHINE"-pc-aros
exit ;;
x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
+ echo "$UNAME_MACHINE"-unknown-esx
exit ;;
amd64:Isilon\ OneFS:*:*)
echo x86_64-unknown-onefs
exit ;;
+ *:Unleashed:*:*)
+ echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+ exit ;;
esac
echo "$0: unable to guess system type" >&2
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
mips:Linux | mips64:Linux)
# If we got here on MIPS GNU/Linux, output extra information.
cat >&2 <<EOF
@@ -1447,16 +1477,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
EOF
exit 1
# Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index af3c41559897f01d2404b58b4fde1241e8ecf7d0..be202c1a9e79567b62ac71c96ee9f2bec8f40324 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
-# Copyright 1996-2017 Free Software Foundation, Inc.
+# Copyright 1996-2019 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
diff --git a/build-aux/config.sub b/build-aux/config.sub
index fb5794786954f321c766ea3d3c33b7ca6b5eb343..a8f3f7e7cde8d60f4956d7e7fc0e56dc6609cf9a 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2017 Free Software Foundation, Inc.
+# Copyright 1992-2019 Free Software Foundation, Inc.
-timestamp='2017-11-04'
+timestamp='2019-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,12 +89,12 @@ while test $# -gt 0 ; do
- ) # Use stdin as input.
break ;;
-* )
- echo "$me: invalid option $1$help"
+ echo "$me: invalid option $1$help" >&2
exit 1 ;;
*local*)
# First pass through any local machine types.
- echo $1
+ echo "$1"
exit ;;
* )
@@ -110,1251 +110,1160 @@ case $# in
exit 1;;
esac
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | cloudabi*-eabi* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
-esac
+# Split fields of configuration type
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
- -sun*os*)
- # Prevent following clause from handling this invalid input.
- ;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze*)
- os=
- basic_machine=$1
- ;;
- -bluegene*)
- os=-cnk
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- ;;
- -scout)
- ;;
- -wrs)
- os=-vxworks
- basic_machine=$1
- ;;
- -chorusos*)
- os=-chorusos
- basic_machine=$1
- ;;
- -chorusrdb)
- os=-chorusrdb
- basic_machine=$1
- ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco6)
- os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
- os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2.[4-9]*)
- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2v[4-9]*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5v6*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -clix*)
- basic_machine=clipper-intergraph
- ;;
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -lynx*178)
- os=-lynxos178
- ;;
- -lynx*5)
- os=-lynxos5
+# Separate into logical components for further validation
+case $1 in
+ *-*-*-*-*)
+ echo Invalid configuration \`"$1"\': more than four components >&2
+ exit 1
;;
- -lynx*)
- os=-lynxos
+ *-*-*-*)
+ basic_machine=$field1-$field2
+ os=$field3-$field4
;;
- -ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ *-*-*)
+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+ # parts
+ maybe_os=$field2-$field3
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+ | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+ | storm-chaos* | os2-emx* | rtmk-nova*)
+ basic_machine=$field1
+ os=$maybe_os
+ ;;
+ android-linux)
+ basic_machine=$field1-unknown
+ os=linux-android
+ ;;
+ *)
+ basic_machine=$field1-$field2
+ os=$field3
+ ;;
+ esac
;;
- -psos*)
- os=-psos
+ *-*)
+ # A lone config we happen to match not fitting any pattern
+ case $field1-$field2 in
+ decstation-3100)
+ basic_machine=mips-dec
+ os=
+ ;;
+ *-*)
+ # Second component is usually, but not always the OS
+ case $field2 in
+ # Prevent following clause from handling this valid os
+ sun*os*)
+ basic_machine=$field1
+ os=$field2
+ ;;
+ # Manufacturers
+ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+ | unicom* | ibm* | next | hp | isi* | apollo | altos* \
+ | convergent* | ncr* | news | 32* | 3600* | 3100* \
+ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+ | ultra | tti* | harris | dolphin | highlevel | gould \
+ | cbm | ns | masscomp | apple | axis | knuth | cray \
+ | microblaze* | sim | cisco \
+ | oki | wec | wrs | winbond)
+ basic_machine=$field1-$field2
+ os=
+ ;;
+ *)
+ basic_machine=$field1
+ os=$field2
+ ;;
+ esac
+ ;;
+ esac
;;
- -mint | -mint[0-9]*)
- basic_machine=m68k-atari
- os=-mint
+ *)
+ # Convert single-component short-hands not valid as part of
+ # multi-component configurations.
+ case $field1 in
+ 386bsd)
+ basic_machine=i386-pc
+ os=bsd
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=udi
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=scout
+ ;;
+ alliant)
+ basic_machine=fx80-alliant
+ os=
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ os=
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=bsd
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=sysv
+ ;;
+ amiga)
+ basic_machine=m68k-unknown
+ os=
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ os=amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ os=sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=bsd
+ ;;
+ aros)
+ basic_machine=i386-pc
+ os=aros
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=dynix
+ ;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=linux
+ ;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=cegcc
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=bsd
+ ;;
+ cray)
+ basic_machine=j90-cray
+ os=unicos
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ os=
+ ;;
+ da30)
+ basic_machine=m68k-da30
+ os=
+ ;;
+ decstation | pmax | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ os=
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=sysv3
+ ;;
+ dicos)
+ basic_machine=i686-pc
+ os=dicos
+ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=msdosdjgpp
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=ebmon
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=ose
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ os=go32
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=sysv3
+ ;;
+ hp300)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=hpux
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=proelf
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=mach
+ ;;
+ vsta)
+ basic_machine=i386-pc
+ os=vsta
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=sysv
+ ;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=linux
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=sysv
+ ;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=mingw64
+ ;;
+ mingw32)
+ basic_machine=i686-pc
+ os=mingw32
+ ;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=mingw32ce
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=coff
+ ;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=morphos
+ ;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=moxiebox
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ os=msdos
+ ;;
+ msys)
+ basic_machine=i686-pc
+ os=msys
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=mvs
+ ;;
+ nacl)
+ basic_machine=le32-unknown
+ os=nacl
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-pc
+ os=netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ os=linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=sysv
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=nonstopux
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=os400
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=os68k
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=osf
+ ;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=linux
+ ;;
+ pw32)
+ basic_machine=i586-unknown
+ os=pw32
+ ;;
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=rdos
+ ;;
+ rdos32)
+ basic_machine=i386-pc
+ os=rdos
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=coff
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=udi
+ ;;
+ sei)
+ basic_machine=mips-sei
+ os=seiux
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ os=
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=sysv2
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ os=
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ os=sysv4
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ os=
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=sunos4
+ ;;
+ sun3)
+ basic_machine=m68k-sun
+ os=
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=sunos4
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ os=
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=solaris2
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ os=
+ ;;
+ sv1)
+ basic_machine=sv1-cray
+ os=unicos
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=dynix
+ ;;
+ t3e)
+ basic_machine=alphaev5-cray
+ os=unicos
+ ;;
+ t90)
+ basic_machine=t90-cray
+ os=unicos
+ ;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=tops20
+ ;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=tpf
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ os=none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=vms
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=vxworks
+ ;;
+ xbox)
+ basic_machine=i686-pc
+ os=mingw32
+ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=unicos
+ ;;
+ *)
+ basic_machine=$1
+ os=
+ ;;
+ esac
;;
esac
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
- | aarch64 | aarch64_be \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
- | avr | avr32 \
- | ba \
- | be32 | be64 \
- | bfin \
- | c4x | c8051 | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | e2k | epiphany \
- | fido | fr30 | frv | ft32 \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | hexagon \
- | i370 | i860 | i960 | ia16 | ia64 \
- | ip2k | iq2000 \
- | k1om \
- | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
- | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa32r6 | mipsisa32r6el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64r6 | mipsisa64r6el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
- | nds32 | nds32le | nds32be \
- | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
- | open8 | or1k | or1knd | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pru \
- | pyramid \
- | riscv32 | riscv64 \
- | rl78 | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu \
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- | visium \
- | wasm32 \
- | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- c54x)
- basic_machine=tic54x-unknown
- ;;
- c55x)
- basic_machine=tic55x-unknown
- ;;
- c6x)
- basic_machine=tic6x-unknown
- ;;
- leon|leon[3-9])
- basic_machine=sparc-$basic_machine
+ # Here we handle the default manufacturer of certain CPU types. It is in
+ # some cases the only manufacturer, in others, it is the most popular.
+ w89k)
+ cpu=hppa1.1
+ vendor=winbond
;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
+ op50n)
+ cpu=hppa1.1
+ vendor=oki
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ op60c)
+ cpu=hppa1.1
+ vendor=oki
;;
- ms1)
- basic_machine=mt-unknown
+ ibm*)
+ cpu=i370
+ vendor=ibm
;;
-
- strongarm | thumb | xscale)
- basic_machine=arm-unknown
- ;;
- xgate)
- basic_machine=$basic_machine-unknown
- os=-none
+ orion105)
+ cpu=clipper
+ vendor=highlevel
;;
- xscaleeb)
- basic_machine=armeb-unknown
+ mac | mpw | mac-mpw)
+ cpu=m68k
+ vendor=apple
;;
-
- xscaleel)
- basic_machine=armel-unknown
+ pmac | pmac-mpw)
+ cpu=powerpc
+ vendor=apple
;;
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
- i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
- | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- | ba-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | c8051-* | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | e2k-* | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | hexagon-* \
- | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
- | ip2k-* | iq2000-* \
- | k1om-* \
- | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | microblaze-* | microblazeel-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
- | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
- | mips64vr5900-* | mips64vr5900el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa32r6-* | mipsisa32r6el-* \
- | mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64r6-* | mipsisa64r6el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipsr5900-* | mipsr5900el-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
- | nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* | nios2eb-* | nios2el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | open8-* \
- | or1k*-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pru-* \
- | pyramid-* \
- | riscv32-* | riscv64-* \
- | rl78-* | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
- | tahoe-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile*-* \
- | tron-* \
- | ubicom32-* \
- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
- | vax-* \
- | visium-* \
- | wasm32-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
- 386bsd)
- basic_machine=i386-unknown
- os=-bsd
- ;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
+ cpu=m68000
+ vendor=att
;;
3b*)
- basic_machine=we32k-att
- ;;
- a29khif)
- basic_machine=a29k-amd
- os=-udi
- ;;
- abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
- ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
- altos | altos3068)
- basic_machine=m68k-altos
- ;;
- am29k)
- basic_machine=a29k-none
- os=-bsd
- ;;
- amd64)
- basic_machine=x86_64-pc
- ;;
- amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
- ;;
- amiga | amiga-*)
- basic_machine=m68k-unknown
- ;;
- amigaos | amigados)
- basic_machine=m68k-unknown
- os=-amigaos
- ;;
- amigaunix | amix)
- basic_machine=m68k-unknown
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
- apollo68bsd)
- basic_machine=m68k-apollo
- os=-bsd
- ;;
- aros)
- basic_machine=i386-pc
- os=-aros
- ;;
- asmjs)
- basic_machine=asmjs-unknown
- ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
- ;;
- balance)
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
+ cpu=we32k
+ vendor=att
;;
bluegene*)
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
- c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
- ;;
- convex-c2)
- basic_machine=c2-convex
- os=-bsd
- ;;
- convex-c32)
- basic_machine=c32-convex
- os=-bsd
- ;;
- convex-c34)
- basic_machine=c34-convex
- os=-bsd
- ;;
- convex-c38)
- basic_machine=c38-convex
- os=-bsd
- ;;
- cray | j90)
- basic_machine=j90-cray
- os=-unicos
- ;;
- craynv)
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
- cr16 | cr16-*)
- basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- crisv32 | crisv32-* | etraxfs*)
- basic_machine=crisv32-axis
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
- crx)
- basic_machine=crx-unknown
- os=-elf
- ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
+ cpu=powerpc
+ vendor=ibm
+ os=cnk
;;
decsystem10* | dec10*)
- basic_machine=pdp10-dec
- os=-tops10
+ cpu=pdp10
+ vendor=dec
+ os=tops10
;;
decsystem20* | dec20*)
- basic_machine=pdp10-dec
- os=-tops20
+ cpu=pdp10
+ vendor=dec
+ os=tops20
;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
- ;;
- delta88)
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
- ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
+ cpu=m68k
+ vendor=motorola
;;
dpx2*)
- basic_machine=m68k-bull
- os=-sysv3
- ;;
- e500v[12])
- basic_machine=powerpc-unknown
- os=$os"spe"
- ;;
- e500v[12]-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=$os"spe"
- ;;
- ebmon29k)
- basic_machine=a29k-amd
- os=-ebmon
- ;;
- elxsi)
- basic_machine=elxsi-elxsi
- os=-bsd
+ cpu=m68k
+ vendor=bull
+ os=sysv3
;;
encore | umax | mmax)
- basic_machine=ns32k-encore
+ cpu=ns32k
+ vendor=encore
;;
- es1800 | OSE68k | ose68k | ose | OSE)
- basic_machine=m68k-ericsson
- os=-ose
+ elxsi)
+ cpu=elxsi
+ vendor=elxsi
+ os=${os:-bsd}
;;
fx2800)
- basic_machine=i860-alliant
+ cpu=i860
+ vendor=alliant
;;
genix)
- basic_machine=ns32k-ns
- ;;
- gmicro)
- basic_machine=tron-gmicro
- os=-sysv
- ;;
- go32)
- basic_machine=i386-pc
- os=-go32
+ cpu=ns32k
+ vendor=ns
;;
h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- h8300hms)
- basic_machine=h8300-hitachi
- os=-hms
- ;;
- h8300xray)
- basic_machine=h8300-hitachi
- os=-xray
- ;;
- h8500hms)
- basic_machine=h8500-hitachi
- os=-hms
- ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
- ;;
- hp300-*)
- basic_machine=m68k-hp
- ;;
- hp300bsd)
- basic_machine=m68k-hp
- os=-bsd
- ;;
- hp300hpux)
- basic_machine=m68k-hp
- os=-hpux
+ cpu=hppa1.1
+ vendor=hitachi
+ os=hiuxwe2
;;
hp3k9[0-9][0-9] | hp9[0-9][0-9])
- basic_machine=hppa1.0-hp
+ cpu=hppa1.0
+ vendor=hp
;;
hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
+ cpu=m68000
+ vendor=hp
;;
hp9k3[2-9][0-9])
- basic_machine=m68k-hp
+ cpu=m68k
+ vendor=hp
;;
hp9k6[0-9][0-9] | hp6[0-9][0-9])
- basic_machine=hppa1.0-hp
+ cpu=hppa1.0
+ vendor=hp
;;
hp9k7[0-79][0-9] | hp7[0-79][0-9])
- basic_machine=hppa1.1-hp
+ cpu=hppa1.1
+ vendor=hp
;;
hp9k78[0-9] | hp78[0-9])
# FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
+ cpu=hppa1.1
+ vendor=hp
;;
hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
# FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
+ cpu=hppa1.1
+ vendor=hp
;;
hp9k8[0-9][13679] | hp8[0-9][13679])
- basic_machine=hppa1.1-hp
+ cpu=hppa1.1
+ vendor=hp
;;
hp9k8[0-9][0-9] | hp8[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hppa-next)
- os=-nextstep3
- ;;
- hppaosf)
- basic_machine=hppa1.1-hp
- os=-osf
- ;;
- hppro)
- basic_machine=hppa1.1-hp
- os=-proelf
- ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
+ cpu=hppa1.0
+ vendor=hp
;;
i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ os=sysv32
;;
i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ os=sysv4
;;
i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ os=sysv
;;
i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
- i386mach)
- basic_machine=i386-mach
- os=-mach
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ os=solaris2
;;
- i386-vsta | vsta)
- basic_machine=i386-unknown
- os=-vsta
+ j90 | j90-cray)
+ cpu=j90
+ vendor=cray
+ os=${os:-unicos}
;;
iris | iris4d)
- basic_machine=mips-sgi
+ cpu=mips
+ vendor=sgi
case $os in
- -irix*)
+ irix*)
;;
*)
- os=-irix4
+ os=irix4
;;
esac
;;
- isi68 | isi)
- basic_machine=m68k-isi
- os=-sysv
- ;;
- leon-*|leon[3-9]-*)
- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
- ;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
- magnum | m3230)
- basic_machine=mips-mips
- os=-sysv
- ;;
- merlin)
- basic_machine=ns32k-utek
- os=-sysv
- ;;
- microblaze*)
- basic_machine=microblaze-xilinx
- ;;
- mingw64)
- basic_machine=x86_64-pc
- os=-mingw64
- ;;
- mingw32)
- basic_machine=i686-pc
- os=-mingw32
- ;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
miniframe)
- basic_machine=m68000-convergent
- ;;
- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
- monitor)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- morphos)
- basic_machine=powerpc-unknown
- os=-morphos
- ;;
- moxiebox)
- basic_machine=moxie-unknown
- os=-moxiebox
- ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
- ;;
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
- msys)
- basic_machine=i686-pc
- os=-msys
- ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
- ;;
- nacl)
- basic_machine=le32-unknown
- os=-nacl
+ cpu=m68000
+ vendor=convergent
;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
- netbsd386)
- basic_machine=i386-unknown
- os=-netbsd
- ;;
- netwinder)
- basic_machine=armv4l-rebel
- os=-linux
- ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
- ;;
- news1000)
- basic_machine=m68030-sony
- os=-newsos
+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ cpu=m68k
+ vendor=atari
+ os=mint
;;
news-3600 | risc-news)
- basic_machine=mips-sony
- os=-newsos
- ;;
- necv70)
- basic_machine=v70-nec
- os=-sysv
+ cpu=mips
+ vendor=sony
+ os=newsos
;;
next | m*-next)
- basic_machine=m68k-next
+ cpu=m68k
+ vendor=next
case $os in
- -nextstep* )
+ nextstep* )
;;
- -ns2*)
- os=-nextstep2
+ ns2*)
+ os=nextstep2
;;
*)
- os=-nextstep3
+ os=nextstep3
;;
esac
;;
- nh3000)
- basic_machine=m68k-harris
- os=-cxux
- ;;
- nh[45]000)
- basic_machine=m88k-harris
- os=-cxux
- ;;
- nindy960)
- basic_machine=i960-intel
- os=-nindy
- ;;
- mon960)
- basic_machine=i960-intel
- os=-mon960
- ;;
- nonstopux)
- basic_machine=mips-compaq
- os=-nonstopux
- ;;
np1)
- basic_machine=np1-gould
- ;;
- neo-tandem)
- basic_machine=neo-tandem
- ;;
- nse-tandem)
- basic_machine=nse-tandem
- ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
- nsx-tandem)
- basic_machine=nsx-tandem
+ cpu=np1
+ vendor=gould
;;
op50n-* | op60c-*)
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
- openrisc | openrisc-*)
- basic_machine=or32-unknown
- ;;
- os400)
- basic_machine=powerpc-ibm
- os=-os400
- ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
- ;;
- os68k)
- basic_machine=m68k-none
- os=-os68k
+ cpu=hppa1.1
+ vendor=oki
+ os=proelf
;;
pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- paragon)
- basic_machine=i860-intel
- os=-osf
- ;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
+ cpu=hppa1.1
+ vendor=hitachi
+ os=hiuxwe2
;;
pbd)
- basic_machine=sparc-tti
+ cpu=sparc
+ vendor=tti
;;
pbb)
- basic_machine=m68k-tti
+ cpu=m68k
+ vendor=tti
;;
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
- pc98)
- basic_machine=i386-pc
- ;;
- pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
- pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2 | pentiumiii | pentium3)
- basic_machine=i686-pc
- ;;
- pentium4)
- basic_machine=i786-pc
- ;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ pc532)
+ cpu=ns32k
+ vendor=pc532
;;
pn)
- basic_machine=pn-gould
- ;;
- power) basic_machine=power-ibm
+ cpu=pn
+ vendor=gould
;;
- ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
- ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle)
- basic_machine=powerpcle-unknown
- ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64) basic_machine=powerpc64-unknown
- ;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64le | powerpc64little)
- basic_machine=powerpc64le-unknown
- ;;
- ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ power)
+ cpu=power
+ vendor=ibm
;;
ps2)
- basic_machine=i386-ibm
- ;;
- pw32)
- basic_machine=i586-unknown
- os=-pw32
- ;;
- rdos | rdos64)
- basic_machine=x86_64-pc
- os=-rdos
- ;;
- rdos32)
- basic_machine=i386-pc
- os=-rdos
- ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
+ cpu=i386
+ vendor=ibm
;;
rm[46]00)
- basic_machine=mips-siemens
+ cpu=mips
+ vendor=siemens
;;
rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
- s390 | s390-*)
- basic_machine=s390-ibm
- ;;
- s390x | s390x-*)
- basic_machine=s390x-ibm
- ;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
- sb1)
- basic_machine=mipsisa64sb1-unknown
- ;;
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
+ cpu=romp
+ vendor=ibm
;;
sde)
- basic_machine=mipsisa32-sde
- os=-elf
+ cpu=mipsisa32
+ vendor=sde
+ os=${os:-elf}
;;
- sei)
- basic_machine=mips-sei
- os=-seiux
+ simso-wrs)
+ cpu=sparclite
+ vendor=wrs
+ os=vxworks
;;
- sequent)
- basic_machine=i386-sequent
+ tower | tower-32)
+ cpu=m68k
+ vendor=ncr
;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
+ vpp*|vx|vx-*)
+ cpu=f301
+ vendor=fujitsu
;;
- sh5el)
- basic_machine=sh5le-unknown
+ w65)
+ cpu=w65
+ vendor=wdc
;;
- sh64)
- basic_machine=sh64-unknown
+ w89k-*)
+ cpu=hppa1.1
+ vendor=winbond
+ os=proelf
;;
- sparclite-wrs | simso-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
+ none)
+ cpu=none
+ vendor=none
;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
+ leon|leon[3-9])
+ cpu=sparc
+ vendor=$basic_machine
;;
- spur)
- basic_machine=spur-unknown
+ leon-*|leon[3-9]-*)
+ cpu=sparc
+ vendor=`echo "$basic_machine" | sed 's/-.*//'`
;;
- st2000)
- basic_machine=m68k-tandem
+
+ *-*)
+ IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
;;
- stratus)
- basic_machine=i860-stratus
- os=-sysv4
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ cpu=$basic_machine
+ vendor=pc
;;
- strongarm-* | thumb-*)
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ # These rules are duplicated from below for sake of the special case above;
+ # i.e. things that normalized to x86 arches should also default to "pc"
+ pc98)
+ cpu=i386
+ vendor=pc
;;
- sun2)
- basic_machine=m68000-sun
+ x64 | amd64)
+ cpu=x86_64
+ vendor=pc
;;
- sun2os3)
- basic_machine=m68000-sun
- os=-sunos3
+ # Recognize the basic CPU types without company name.
+ *)
+ cpu=$basic_machine
+ vendor=unknown
;;
- sun2os4)
- basic_machine=m68000-sun
- os=-sunos4
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+ # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+ # some cases the only manufacturer, in others, it is the most popular.
+ craynv-unknown)
+ vendor=cray
+ os=${os:-unicosmp}
;;
- sun3os3)
- basic_machine=m68k-sun
- os=-sunos3
+ c90-unknown | c90-cray)
+ vendor=cray
+ os=${os:-unicos}
;;
- sun3os4)
- basic_machine=m68k-sun
- os=-sunos4
+ fx80-unknown)
+ vendor=alliant
;;
- sun4os3)
- basic_machine=sparc-sun
- os=-sunos3
+ romp-unknown)
+ vendor=ibm
;;
- sun4os4)
- basic_machine=sparc-sun
- os=-sunos4
+ mmix-unknown)
+ vendor=knuth
;;
- sun4sol2)
- basic_machine=sparc-sun
- os=-solaris2
+ microblaze-unknown | microblazeel-unknown)
+ vendor=xilinx
;;
- sun3 | sun3-*)
- basic_machine=m68k-sun
+ rs6000-unknown)
+ vendor=ibm
;;
- sun4)
- basic_machine=sparc-sun
+ vax-unknown)
+ vendor=dec
;;
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
+ pdp11-unknown)
+ vendor=dec
;;
- sv1)
- basic_machine=sv1-cray
- os=-unicos
+ we32k-unknown)
+ vendor=att
;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
+ cydra-unknown)
+ vendor=cydrome
;;
- t3e)
- basic_machine=alphaev5-cray
- os=-unicos
+ i370-ibm*)
+ vendor=ibm
;;
- t90)
- basic_machine=t90-cray
- os=-unicos
+ orion-unknown)
+ vendor=highlevel
;;
- tile*)
- basic_machine=$basic_machine-unknown
- os=-linux-gnu
+ xps-unknown | xps100-unknown)
+ cpu=xps100
+ vendor=honeywell
;;
- tx39)
- basic_machine=mipstx39-unknown
+
+ # Here we normalize CPU types with a missing or matching vendor
+ dpx20-unknown | dpx20-bull)
+ cpu=rs6000
+ vendor=bull
+ os=${os:-bosx}
;;
- tx39el)
- basic_machine=mipstx39el-unknown
+
+ # Here we normalize CPU types irrespective of the vendor
+ amd64-*)
+ cpu=x86_64
;;
- toad1)
- basic_machine=pdp10-xkl
- os=-tops20
+ blackfin-*)
+ cpu=bfin
+ os=linux
;;
- tower | tower-32)
- basic_machine=m68k-ncr
+ c54x-*)
+ cpu=tic54x
;;
- tpf)
- basic_machine=s390x-ibm
- os=-tpf
+ c55x-*)
+ cpu=tic55x
;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
+ c6x-*)
+ cpu=tic6x
;;
- ultra3)
- basic_machine=a29k-nyu
- os=-sym1
+ e500v[12]-*)
+ cpu=powerpc
+ os=$os"spe"
;;
- v810 | necv810)
- basic_machine=v810-nec
- os=-none
+ mips3*-*)
+ cpu=mips64
;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
+ ms1-*)
+ cpu=mt
;;
- vms)
- basic_machine=vax-dec
- os=-vms
+ m68knommu-*)
+ cpu=m68k
+ os=linux
;;
- vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
+ m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+ cpu=s12z
;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
+ openrisc-*)
+ cpu=or32
;;
- vxworks68)
- basic_machine=m68k-wrs
- os=-vxworks
+ parisc-*)
+ cpu=hppa
+ os=linux
;;
- vxworks29k)
- basic_machine=a29k-wrs
- os=-vxworks
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ cpu=i586
;;
- wasm32)
- basic_machine=wasm32-unknown
+ pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+ cpu=i686
;;
- w65*)
- basic_machine=w65-wdc
- os=-none
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ cpu=i686
;;
- w89k-*)
- basic_machine=hppa1.1-winbond
- os=-proelf
+ pentium4-*)
+ cpu=i786
;;
- x64)
- basic_machine=x86_64-pc
+ pc98-*)
+ cpu=i386
;;
- xbox)
- basic_machine=i686-pc
- os=-mingw32
+ ppc-* | ppcbe-*)
+ cpu=powerpc
;;
- xps | xps100)
- basic_machine=xps100-honeywell
+ ppcle-* | powerpclittle-*)
+ cpu=powerpcle
;;
- xscale-* | xscalee[bl]-*)
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ppc64-*)
+ cpu=powerpc64
;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
+ ppc64le-* | powerpc64little-*)
+ cpu=powerpc64le
;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
+ sb1-*)
+ cpu=mipsisa64sb1
;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
+ sb1el-*)
+ cpu=mipsisa64sb1el
;;
- none)
- basic_machine=none-none
- os=-none
+ sh5e[lb]-*)
+ cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
- w89k)
- basic_machine=hppa1.1-winbond
+ spur-*)
+ cpu=spur
;;
- op50n)
- basic_machine=hppa1.1-oki
+ strongarm-* | thumb-*)
+ cpu=arm
;;
- op60c)
- basic_machine=hppa1.1-oki
+ tx39-*)
+ cpu=mipstx39
;;
- romp)
- basic_machine=romp-ibm
+ tx39el-*)
+ cpu=mipstx39el
;;
- mmix)
- basic_machine=mmix-knuth
+ x64-*)
+ cpu=x86_64
;;
- rs6000)
- basic_machine=rs6000-ibm
+ xscale-* | xscalee[bl]-*)
+ cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
;;
- vax)
- basic_machine=vax-dec
+
+ # Recognize the canonical CPU Types that limit and/or modify the
+ # company names they are paired with.
+ cr16-*)
+ os=${os:-elf}
;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
+ crisv32-* | etraxfs*-*)
+ cpu=crisv32
+ vendor=axis
;;
- pdp11)
- basic_machine=pdp11-dec
+ cris-* | etrax*-*)
+ cpu=cris
+ vendor=axis
;;
- we32k)
- basic_machine=we32k-att
+ crx-*)
+ os=${os:-elf}
;;
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
+ neo-tandem)
+ cpu=neo
+ vendor=tandem
;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
+ nse-tandem)
+ cpu=nse
+ vendor=tandem
;;
- cydra)
- basic_machine=cydra-cydrome
+ nsr-tandem)
+ cpu=nsr
+ vendor=tandem
;;
- orion)
- basic_machine=orion-highlevel
+ nsv-tandem)
+ cpu=nsv
+ vendor=tandem
;;
- orion105)
- basic_machine=clipper-highlevel
+ nsx-tandem)
+ cpu=nsx
+ vendor=tandem
;;
- mac | mpw | mac-mpw)
- basic_machine=m68k-apple
+ s390-*)
+ cpu=s390
+ vendor=ibm
;;
- pmac | pmac-mpw)
- basic_machine=powerpc-apple
+ s390x-*)
+ cpu=s390x
+ vendor=ibm
;;
- *-unknown)
- # Make sure to match an already-canonicalized machine name.
+ tile*-*)
+ os=${os:-linux-gnu}
;;
+
*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
+ # Recognize the canonical CPU types that are allowed with any
+ # company name.
+ case $cpu in
+ 1750a | 580 \
+ | a29k \
+ | aarch64 | aarch64_be \
+ | abacus \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+ | alphapca5[67] | alpha64pca5[67] \
+ | am33_2.0 \
+ | amdgcn \
+ | arc | arceb \
+ | arm | arm[lb]e | arme[lb] | armv* \
+ | avr | avr32 \
+ | asmjs \
+ | ba \
+ | be32 | be64 \
+ | bfin | bs2000 \
+ | c[123]* | c30 | [cjt]90 | c4x \
+ | c8051 | clipper | craynv | csky | cydra \
+ | d10v | d30v | dlx | dsp16xx \
+ | e2k | elxsi | epiphany \
+ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+ | h8300 | h8500 \
+ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
+ | i370 | i*86 | i860 | i960 | ia16 | ia64 \
+ | ip2k | iq2000 \
+ | k1om \
+ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle \
+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
+ | m88110 | m88k | maxq | mb | mcore | mep | metag \
+ | microblaze | microblazeel \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
+ | mipstx39 | mipstx39el \
+ | mmix \
+ | mn10200 | mn10300 \
+ | moxie \
+ | mt \
+ | msp430 \
+ | nds32 | nds32le | nds32be \
+ | nfp \
+ | nios | nios2 | nios2eb | nios2el \
+ | none | np1 | ns16k | ns32k \
+ | open8 \
+ | or1k* \
+ | or32 \
+ | orion \
+ | pdp10 | pdp11 | pj | pjl | pn | power \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+ | pru \
+ | pyramid \
+ | riscv | riscv32 | riscv64 \
+ | rl78 | romp | rs6000 | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+ | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+ | spu \
+ | tahoe \
+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+ | tron \
+ | ubicom32 \
+ | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+ | vax \
+ | visium \
+ | wasm32 \
+ | we32k \
+ | x86 | x86_64 | xc16x | xgate | xps100 \
+ | xstormy16 | xtensa* \
+ | ymp \
+ | z8k | z80)
+ ;;
+
+ *)
+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+ exit 1
+ ;;
+ esac
;;
esac
# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
- *-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+case $vendor in
+ digital*)
+ vendor=dec
;;
- *-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ commodore*)
+ vendor=cbm
;;
*)
;;
@@ -1362,200 +1271,246 @@ esac
# Decode manufacturer-specific aliases for certain operating systems.
-if [ x"$os" != x"" ]
+if [ x$os != x ]
then
case $os in
# First match some system type aliases that might get confused
# with valid system types.
- # -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
+ # solaris* is a basic system type, with this one exception.
+ auroraux)
+ os=auroraux
;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ bluegene*)
+ os=cnk
;;
- -solaris)
- os=-solaris2
+ solaris1 | solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
- -svr4*)
- os=-sysv4
+ solaris)
+ os=solaris2
;;
- -unixware*)
- os=-sysv4.2uw
+ unixware*)
+ os=sysv4.2uw
;;
- -gnu/linux*)
+ gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
+ # es1800 is here to avoid being matched by es* (a different OS)
+ es1800*)
+ os=ose
+ ;;
+ # Some version numbers need modification
+ chorusos*)
+ os=chorusos
+ ;;
+ isc)
+ os=isc2.2
+ ;;
+ sco6)
+ os=sco5v6
+ ;;
+ sco5)
+ os=sco3.2v5
+ ;;
+ sco4)
+ os=sco3.2v4
+ ;;
+ sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ ;;
+ sco3.2v[4-9]* | sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ ;;
+ scout)
+ # Don't match below
+ ;;
+ sco*)
+ os=sco3.2v2
+ ;;
+ psos*)
+ os=psos
+ ;;
# Now accept the basic system types.
# The portable systems comes first.
# Each alternative MUST end in a * to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* | -plan9* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* | -sortix* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
+ # sysv* is not here because it comes later, after sysvr4.
+ gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ | sym* | kopensolaris* | plan9* \
+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+ | aos* | aros* | cloudabi* | sortix* \
+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+ | knetbsd* | mirbsd* | netbsd* \
+ | bitrig* | openbsd* | solidbsd* | libertybsd* \
+ | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+ | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
+ | chorusrdb* | cegcc* | glidix* \
+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+ | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
+ | linux-newlib* | linux-musl* | linux-uclibc* \
+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+ | interix* | uwin* | mks* | rhapsody* | darwin* \
+ | openstep* | oskit* | conix* | pw32* | nonstopux* \
+ | storm-chaos* | tops10* | tenex* | tops20* | its* \
+ | os2* | vos* | palmos* | uclinux* | nucleus* \
+ | morphos* | superux* | rtmk* | windiss* \
+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+ | midnightbsd* | amdhsa* | unleashed* | emscripten*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
- -qnx*)
- case $basic_machine in
- x86-* | i*86-*)
+ qnx*)
+ case $cpu in
+ x86 | i*86)
;;
*)
- os=-nto$os
+ os=nto-$os
;;
esac
;;
- -nto-qnx*)
+ hiux*)
+ os=hiuxwe2
;;
- -nto*)
- os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ nto-qnx*)
;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ nto*)
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
+ sim | xray | os68k* | v88r* \
+ | windows* | osx | abug | netware* | os9* \
+ | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
;;
- -linux-dietlibc)
- os=-linux-dietlibc
+ linux-dietlibc)
+ os=linux-dietlibc
;;
- -linux*)
+ linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
- -sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ lynx*178)
+ os=lynxos178
+ ;;
+ lynx*5)
+ os=lynxos5
;;
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ lynx*)
+ os=lynxos
;;
- -opened*)
- os=-openedition
+ mac*)
+ os=`echo "$os" | sed -e 's|mac|macos|'`
;;
- -os400*)
- os=-os400
+ opened*)
+ os=openedition
;;
- -wince*)
- os=-wince
+ os400*)
+ os=os400
;;
- -osfrose*)
- os=-osfrose
+ sunos5*)
+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
;;
- -osf*)
- os=-osf
+ sunos6*)
+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
;;
- -utek*)
- os=-bsd
+ wince*)
+ os=wince
;;
- -dynix*)
- os=-bsd
+ utek*)
+ os=bsd
;;
- -acis*)
- os=-aos
+ dynix*)
+ os=bsd
;;
- -atheos*)
- os=-atheos
+ acis*)
+ os=aos
;;
- -syllable*)
- os=-syllable
+ atheos*)
+ os=atheos
;;
- -386bsd)
- os=-bsd
+ syllable*)
+ os=syllable
;;
- -ctix* | -uts*)
- os=-sysv
+ 386bsd)
+ os=bsd
+ ;;
+ ctix* | uts*)
+ os=sysv
;;
- -nova*)
- os=-rtmk-nova
+ nova*)
+ os=rtmk-nova
;;
- -ns2)
- os=-nextstep2
+ ns2)
+ os=nextstep2
;;
- -nsk*)
- os=-nsk
+ nsk*)
+ os=nsk
;;
# Preserve the version number of sinix5.
- -sinix5.*)
+ sinix5.*)
os=`echo $os | sed -e 's|sinix|sysv|'`
;;
- -sinix*)
- os=-sysv4
- ;;
- -tpf*)
- os=-tpf
+ sinix*)
+ os=sysv4
;;
- -triton*)
- os=-sysv3
+ tpf*)
+ os=tpf
;;
- -oss*)
- os=-sysv3
+ triton*)
+ os=sysv3
;;
- -svr4)
- os=-sysv4
+ oss*)
+ os=sysv3
;;
- -svr3)
- os=-sysv3
+ svr4*)
+ os=sysv4
;;
- -sysvr4)
- os=-sysv4
+ svr3)
+ os=sysv3
;;
- # This must come after -sysvr4.
- -sysv*)
+ sysvr4)
+ os=sysv4
;;
- -ose*)
- os=-ose
+ # This must come after sysvr4.
+ sysv*)
;;
- -es1800*)
- os=-ose
+ ose*)
+ os=ose
;;
- -xenix)
- os=-xenix
+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+ os=mint
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
+ zvmoe)
+ os=zvmoe
;;
- -aros*)
- os=-aros
+ dicos*)
+ os=dicos
;;
- -zvmoe)
- os=-zvmoe
+ pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $cpu in
+ arm*)
+ os=eabi
+ ;;
+ *)
+ os=elf
+ ;;
+ esac
;;
- -dicos*)
- os=-dicos
+ nacl*)
;;
- -nacl*)
+ ios)
;;
- -ios)
+ none)
;;
- -none)
+ *-eabi)
;;
*)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
exit 1
;;
esac
@@ -1571,264 +1526,265 @@ else
# will signal an error saying that MANUFACTURER isn't an operating
# system, and we'll never get to this point.
-case $basic_machine in
+case $cpu-$vendor in
score-*)
- os=-elf
+ os=elf
;;
spu-*)
- os=-elf
+ os=elf
;;
*-acorn)
- os=-riscix1.2
+ os=riscix1.2
;;
arm*-rebel)
- os=-linux
+ os=linux
;;
arm*-semi)
- os=-aout
+ os=aout
;;
c4x-* | tic4x-*)
- os=-coff
+ os=coff
;;
c8051-*)
- os=-elf
+ os=elf
+ ;;
+ clipper-intergraph)
+ os=clix
;;
hexagon-*)
- os=-elf
+ os=elf
;;
tic54x-*)
- os=-coff
+ os=coff
;;
tic55x-*)
- os=-coff
+ os=coff
;;
tic6x-*)
- os=-coff
+ os=coff
;;
# This must come before the *-dec entry.
pdp10-*)
- os=-tops20
+ os=tops20
;;
pdp11-*)
- os=-none
+ os=none
;;
*-dec | vax-*)
- os=-ultrix4.2
+ os=ultrix4.2
;;
m68*-apollo)
- os=-domain
+ os=domain
;;
i386-sun)
- os=-sunos4.0.2
+ os=sunos4.0.2
;;
m68000-sun)
- os=-sunos3
+ os=sunos3
;;
m68*-cisco)
- os=-aout
+ os=aout
;;
mep-*)
- os=-elf
+ os=elf
;;
mips*-cisco)
- os=-elf
+ os=elf
;;
mips*-*)
- os=-elf
+ os=elf
;;
or32-*)
- os=-coff
+ os=coff
;;
*-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
+ os=sysv3
;;
sparc-* | *-sun)
- os=-sunos4.1.1
+ os=sunos4.1.1
;;
pru-*)
- os=-elf
+ os=elf
;;
*-be)
- os=-beos
- ;;
- *-haiku)
- os=-haiku
+ os=beos
;;
*-ibm)
- os=-aix
+ os=aix
;;
*-knuth)
- os=-mmixware
+ os=mmixware
;;
*-wec)
- os=-proelf
+ os=proelf
;;
*-winbond)
- os=-proelf
+ os=proelf
;;
*-oki)
- os=-proelf
+ os=proelf
;;
*-hp)
- os=-hpux
+ os=hpux
;;
*-hitachi)
- os=-hiux
+ os=hiux
;;
i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
- os=-sysv
+ os=sysv
;;
*-cbm)
- os=-amigaos
+ os=amigaos
;;
*-dg)
- os=-dgux
+ os=dgux
;;
*-dolphin)
- os=-sysv3
+ os=sysv3
;;
m68k-ccur)
- os=-rtu
+ os=rtu
;;
m88k-omron*)
- os=-luna
+ os=luna
;;
*-next)
- os=-nextstep
+ os=nextstep
;;
*-sequent)
- os=-ptx
+ os=ptx
;;
*-crds)
- os=-unos
+ os=unos
;;
*-ns)
- os=-genix
+ os=genix
;;
i370-*)
- os=-mvs
- ;;
- *-next)
- os=-nextstep3
+ os=mvs
;;
*-gould)
- os=-sysv
+ os=sysv
;;
*-highlevel)
- os=-bsd
+ os=bsd
;;
*-encore)
- os=-bsd
+ os=bsd
;;
*-sgi)
- os=-irix
+ os=irix
;;
*-siemens)
- os=-sysv4
+ os=sysv4
;;
*-masscomp)
- os=-rtu
+ os=rtu
;;
f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
+ os=uxpv
;;
*-rom68k)
- os=-coff
+ os=coff
;;
*-*bug)
- os=-coff
+ os=coff
;;
*-apple)
- os=-macos
+ os=macos
;;
*-atari*)
- os=-mint
+ os=mint
+ ;;
+ *-wrs)
+ os=vxworks
;;
*)
- os=-none
+ os=none
;;
esac
fi
# Here we handle the case where we know the os, and the CPU type, but not the
# manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
- *-unknown)
+case $vendor in
+ unknown)
case $os in
- -riscix*)
+ riscix*)
vendor=acorn
;;
- -sunos*)
+ sunos*)
vendor=sun
;;
- -cnk*|-aix*)
+ cnk*|-aix*)
vendor=ibm
;;
- -beos*)
+ beos*)
vendor=be
;;
- -hpux*)
+ hpux*)
vendor=hp
;;
- -mpeix*)
+ mpeix*)
vendor=hp
;;
- -hiux*)
+ hiux*)
vendor=hitachi
;;
- -unos*)
+ unos*)
vendor=crds
;;
- -dgux*)
+ dgux*)
vendor=dg
;;
- -luna*)
+ luna*)
vendor=omron
;;
- -genix*)
+ genix*)
vendor=ns
;;
- -mvs* | -opened*)
+ clix*)
+ vendor=intergraph
+ ;;
+ mvs* | opened*)
vendor=ibm
;;
- -os400*)
+ os400*)
vendor=ibm
;;
- -ptx*)
+ ptx*)
vendor=sequent
;;
- -tpf*)
+ tpf*)
vendor=ibm
;;
- -vxsim* | -vxworks* | -windiss*)
+ vxsim* | vxworks* | windiss*)
vendor=wrs
;;
- -aux*)
+ aux*)
vendor=apple
;;
- -hms*)
+ hms*)
vendor=hitachi
;;
- -mpw* | -macos*)
+ mpw* | macos*)
vendor=apple
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
vendor=atari
;;
- -vos*)
+ vos*)
vendor=stratus
;;
esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
;;
esac
-echo $basic_machine$os
+echo "$cpu-$vendor-$os"
exit
# Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/build-aux/depcomp b/build-aux/depcomp
index 5ff3c6feb4ba8c9cacfae53687d24683becc3d34..65cbf7093a1e4c4a2da08ac8dcd725f8376c344c 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2017-09-16.17; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -783,7 +783,7 @@ exit 0
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 3c94bd56a0bc5aae4acf80ce1d5d4c52956da9e0..deddef24466eb6b0d8ff695c5d6504df8ed647c8 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,13 +3,13 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"'
if 0;
# Convert git log output to ChangeLog format.
-my $VERSION = '2017-09-13 06:45'; # UTC
+my $VERSION = '2018-03-07 03:47'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
-# Copyright (C) 2008-2017 Free Software Foundation, Inc.
+# Copyright (C) 2008-2019 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -491,7 +491,7 @@ sub git_dir_option($)
# Local Variables:
# mode: perl
# indent-tabs-mode: nil
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "my $VERSION = '"
# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
# time-stamp-time-zone: "UTC0"
diff --git a/build-aux/install-sh b/build-aux/install-sh
index ac159ceda40d78bbd6606879377a1c7ca7adad1c..8175c640fe6288a75cc846567ea5506086f326f4 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2017-09-23.17; # UTC
+scriptversion=2018-03-11.20; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -332,34 +332,43 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # Note that $RANDOM variable is not portable (e.g. dash); Use it
+ # here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ # Because "mkdir -p" follows existing symlinks and we likely work
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directory is successfully created first before we actually test
+ # 'mkdir -p' feature.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
@@ -501,7 +510,7 @@ do
done
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/build-aux/mdate-sh b/build-aux/mdate-sh
index 34de97554a83ab98dcc12ae485e219bcb047a80b..8c7a5901a0690aded843445b891b91f3fe8002df 100755
--- a/build-aux/mdate-sh
+++ b/build-aux/mdate-sh
@@ -1,9 +1,9 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-scriptversion=2017-09-22.02; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1995-2017 Free Software Foundation, Inc.
+# Copyright (C) 1995-2018 Free Software Foundation, Inc.
# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
#
# This program is free software; you can redistribute it and/or modify
@@ -220,7 +220,7 @@ echo $day $month $year
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/build-aux/missing b/build-aux/missing
index cdea514931f558be2bcc47ef2d52e14ab395520b..f62bbae306c7e1bc28896aab8fe7bfb700a9a33e 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@ give_advice ()
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 022c3f5b3701213bb2dcdbb3ebce10fe83482534..66a832e0b4f2479b9d792a5a596eb3f5bf120fb7 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -3,12 +3,9 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2017-09-11.18}
+\def\texinfoversion{2018-12-28.17}
%
-% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
-% Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990-2018 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -244,17 +241,7 @@
%
\def\finalout{\overfullrule=0pt }
-% Do @cropmarks to get crop marks.
-%
-\newif\ifcropmarks
-\let\cropmarks = \cropmarkstrue
-%
-% Dimensions to add cropmarks at corners.
-% Added by P. A. MacKay, 12 Nov. 1986
-%
\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
-\newdimen\cornerlong \cornerlong=1pc
-\newdimen\cornerthick \cornerthick=.3pt
\newdimen\topandbottommargin \topandbottommargin=.75in
% Output a mark which sets \thischapter, \thissection and \thiscolor.
@@ -328,12 +315,12 @@
\newbox\footlinebox
% \onepageout takes a vbox as an argument.
-% \shipout a vbox for a single page, adding an optional header, footer,
-% cropmarks, and footnote. This also causes index entries for this page
-% to be written to the auxiliary files.
+% \shipout a vbox for a single page, adding an optional header, footer
+% and footnote. This also causes index entries for this page to be written
+% to the auxiliary files.
%
\def\onepageout#1{%
- \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
+ \hoffset=\normaloffset
%
\ifodd\pageno \advance\hoffset by \bindingoffset
\else \advance\hoffset by -\bindingoffset\fi
@@ -386,25 +373,6 @@
% Do this early so pdf references go to the beginning of the page.
\ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
%
- \ifcropmarks \vbox to \outervsize\bgroup
- \hsize = \outerhsize
- \vskip-\topandbottommargin
- \vtop to0pt{%
- \line{\ewtop\hfil\ewtop}%
- \nointerlineskip
- \line{%
- \vbox{\moveleft\cornerthick\nstop}%
- \hfill
- \vbox{\moveright\cornerthick\nstop}%
- }%
- \vss}%
- \vskip\topandbottommargin
- \line\bgroup
- \hfil % center the page within the outer (page) hsize.
- \ifodd\pageno\hskip\bindingoffset\fi
- \vbox\bgroup
- \fi
- %
\unvbox\headlinebox
\pagebody{#1}%
\ifdim\ht\footlinebox > 0pt
@@ -415,22 +383,6 @@
\unvbox\footlinebox
\fi
%
- \ifcropmarks
- \egroup % end of \vbox\bgroup
- \hfil\egroup % end of (centering) \line\bgroup
- \vskip\topandbottommargin plus1fill minus1fill
- \boxmaxdepth = \cornerthick
- \vbox to0pt{\vss
- \line{%
- \vbox{\moveleft\cornerthick\nsbot}%
- \hfill
- \vbox{\moveright\cornerthick\nsbot}%
- }%
- \nointerlineskip
- \line{\ewbot\hfil\ewbot}%
- }%
- \egroup % \vbox from first cropmarks clause
- \fi
}% end of \shipout\vbox
}% end of group with \indexdummies
\advancepageno
@@ -451,17 +403,6 @@
\ifr@ggedbottom \kern-\dimen@ \vfil \fi}
}
-% Here are the rules for the cropmarks. Note that they are
-% offset so that the space between them is truly \outerhsize or \outervsize
-% (P. A. MacKay, 12 November, 1986)
-%
-\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
-\def\nstop{\vbox
- {\hrule height\cornerthick depth\cornerlong width\cornerthick}}
-\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong}
-\def\nsbot{\vbox
- {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
-
% Argument parsing
@@ -1528,6 +1469,9 @@ output) for that.)}
\startlink attr{/Border [0 0 0]}%
user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
\endgroup}
+ % \pdfgettoks - Surround page numbers in #1 with @pdflink. #1 may
+ % be a simple number, or a list of numbers in the case of an index
+ % entry.
\def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
\def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
@@ -2235,6 +2179,20 @@ end
\font\smallersy=cmsy8
\def\smallerecsize{0800}
+% Fonts for math mode superscripts (7pt).
+\def\sevennominalsize{7pt}
+\setfont\sevenrm\rmshape{7}{1000}{OT1}
+\setfont\seventt\ttshape{10}{700}{OT1TT}
+\setfont\sevenbf\bfshape{10}{700}{OT1}
+\setfont\sevenit\itshape{7}{1000}{OT1IT}
+\setfont\sevensl\slshape{10}{700}{OT1}
+\setfont\sevensf\sfshape{10}{700}{OT1}
+\setfont\sevensc\scshape{10}{700}{OT1}
+\setfont\seventtsl\ttslshape{10}{700}{OT1TT}
+\font\seveni=cmmi7
+\font\sevensy=cmsy7
+\def\sevenecsize{0700}
+
% Fonts for title page (20.4pt):
\def\titlenominalsize{20pt}
\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
@@ -2369,6 +2327,20 @@ end
\font\smallersy=cmsy8
\def\smallerecsize{0800}
+% Fonts for math mode superscripts (7pt).
+\def\sevennominalsize{7pt}
+\setfont\sevenrm\rmshape{7}{1000}{OT1}
+\setfont\seventt\ttshape{10}{700}{OT1TT}
+\setfont\sevenbf\bfshape{10}{700}{OT1}
+\setfont\sevenit\itshape{7}{1000}{OT1IT}
+\setfont\sevensl\slshape{10}{700}{OT1}
+\setfont\sevensf\sfshape{10}{700}{OT1}
+\setfont\sevensc\scshape{10}{700}{OT1}
+\setfont\seventtsl\ttslshape{10}{700}{OT1TT}
+\font\seveni=cmmi7
+\font\sevensy=cmsy7
+\def\sevenecsize{0700}
+
% Fonts for title page (20.4pt):
\def\titlenominalsize{20pt}
\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
@@ -2503,13 +2475,20 @@ end
% In order for the font changes to affect most math symbols and letters,
-% we have to define the \textfont of the standard families. We don't
-% bother to reset \scriptfont and \scriptscriptfont; awaiting user need.
+% we have to define the \textfont of the standard families.
+% We don't bother to reset \scriptscriptfont; awaiting user need.
%
\def\resetmathfonts{%
\textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont
\textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont
\textfont\ttfam=\ttfont \textfont\sffam=\sffont
+ %
+ % Fonts for superscript. Note that the 7pt fonts are used regardless
+ % of the current font size.
+ \scriptfont0=\sevenrm \scriptfont1=\seveni \scriptfont2=\sevensy
+ \scriptfont\itfam=\sevenit \scriptfont\slfam=\sevensl
+ \scriptfont\bffam=\sevenbf \scriptfont\ttfam=\seventt
+ \scriptfont\sffam=\sevensf
}
%
@@ -2519,6 +2498,9 @@ end
% to also set the current \fam for math mode. Our \STYLE (e.g., \rm)
% commands hardwire \STYLEfont to set the current font.
%
+% The fonts used for \ifont are for "math italics" (\itfont is for italics
+% in regular text). \syfont is also used in math mode only.
+%
% Each font-changing command also sets the names \lsize (one size lower)
% and \lllsize (three sizes lower). These relative commands are used
% in, e.g., the LaTeX logo and acronyms.
@@ -2619,26 +2601,11 @@ end
% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
% define and register \INITMACRO to be called on markup style changes.
% \INITMACRO can check \currentmarkupstyle for the innermost
-% style and the set of \ifmarkupSTYLE switches for all styles
-% currently in effect.
-\newif\ifmarkupvar
-\newif\ifmarkupsamp
-\newif\ifmarkupkey
-%\newif\ifmarkupfile % @file == @samp.
-%\newif\ifmarkupoption % @option == @samp.
-\newif\ifmarkupcode
-\newif\ifmarkupkbd
-%\newif\ifmarkupenv % @env == @code.
-%\newif\ifmarkupcommand % @command == @code.
-\newif\ifmarkuptex % @tex (and part of @math, for now).
-\newif\ifmarkupexample
-\newif\ifmarkupverb
-\newif\ifmarkupverbatim
+% style.
\let\currentmarkupstyle\empty
\def\setupmarkupstyle#1{%
- \csname markup#1true\endcsname
\def\currentmarkupstyle{#1}%
\markupstylesetup
}
@@ -2700,11 +2667,15 @@ end
% lilypond developers report. xpdf does work with the regular 0x27.
%
\def\codequoteright{%
- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
- '%
+ \ifmonospace
+ \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
+ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+ '%
+ \else \char'15 \fi
\else \char'15 \fi
- \else \char'15 \fi
+ \else
+ '%
+ \fi
}
%
% and a similar option for the left quote char vs. a grave accent.
@@ -2712,13 +2683,17 @@ end
% the code environments to do likewise.
%
\def\codequoteleft{%
- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
- % [Knuth] pp. 380,381,391
- % \relax disables Spanish ligatures ?` and !` of \tt font.
- \relax`%
+ \ifmonospace
+ \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
+ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+ % [Knuth] pp. 380,381,391
+ % \relax disables Spanish ligatures ?` and !` of \tt font.
+ \relax`%
+ \else \char'22 \fi
\else \char'22 \fi
- \else \char'22 \fi
+ \else
+ \relax`%
+ \fi
}
% Commands to set the quote options.
@@ -5969,24 +5944,30 @@ end
% Split the last of the double-column material.
\savemarks
\balancecolumns
- %
+ }%
+ \eject % call the \output just set
+ \ifdim\pagetotal=0pt
% Having called \balancecolumns once, we do not
% want to call it again. Therefore, reset \output to its normal
% definition right away.
\global\output = {\onepageout{\pagecontents\PAGE}}%
- }%
- \eject
- \endgroup % started in \begindoublecolumns
- \restoremarks
- % Leave the double-column material on the current page, no automatic
- % page break.
- \box\balancedcolumns
- %
- % \pagegoal was set to the doubled \vsize above, since we restarted
- % the current page. We're now back to normal single-column
- % typesetting, so reset \pagegoal to the normal \vsize.
- \global\vsize = \txipageheight %
- \pagegoal = \txipageheight %
+ %
+ \endgroup % started in \begindoublecolumns
+ \restoremarks
+ % Leave the double-column material on the current page, no automatic
+ % page break.
+ \box\balancedcolumns
+ %
+ % \pagegoal was set to the doubled \vsize above, since we restarted
+ % the current page. We're now back to normal single-column
+ % typesetting, so reset \pagegoal to the normal \vsize.
+ \global\vsize = \txipageheight %
+ \pagegoal = \txipageheight %
+ \else
+ % We had some left-over material. This might happen when \doublecolumnout
+ % is called in \balancecolumns. Try again.
+ \expandafter\enddoublecolumns
+ \fi
}
\newbox\balancedcolumns
\setbox\balancedcolumns=\vbox{shouldnt see this}%
@@ -6001,6 +5982,7 @@ end
\ifdim\dimen@<5\baselineskip
% Don't split a short final column in two.
\setbox2=\vbox{}%
+ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
\else
\divide\dimen@ by 2 % target to split to
\dimen@ii = \dimen@
@@ -6016,15 +5998,15 @@ end
\repeat
}%
% Now the left column is in box 1, and the right column in box 3.
+ %
% Check whether the left column has come out higher than the page itself.
% (Note that we have doubled \vsize for the double columns, so
% the actual height of the page is 0.5\vsize).
\ifdim2\ht1>\vsize
- % Just split the last of the double column material roughly in half.
- \setbox2=\box0
- \setbox0 = \vsplit2 to \dimen@ii
- \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}%
- \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}%
+ % It appears that we have been called upon to balance too much material.
+ % Output some of it with \doublecolumnout, leaving the rest on the page.
+ \setbox\PAGE=\box0
+ \doublecolumnout
\else
% Compare the heights of the two columns.
\ifdim4\ht1>5\ht3
@@ -6037,10 +6019,10 @@ end
\setbox2=\vbox to\ht1{\unvbox3\unskip}%
\setbox0=\vbox to\ht1{\unvbox1\unskip}%
\fi
+ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
\fi
\fi
%
- \global\setbox\balancedcolumns=\vbox{\pagesofar}%
}
\catcode`\@ = \other
@@ -7963,6 +7945,7 @@ end
\gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
\gdef\magicamp{\let&=\amprm}
}
+\let\ampchar\&
\newcount\parencount
@@ -11677,7 +11660,7 @@ directory should work if nowhere else does.}
@markupsetuprqdefault
@c Local variables:
-@c eval: (add-hook 'write-file-hooks 'time-stamp)
+@c eval: (add-hook 'before-save-hook 'time-stamp)
@c page-delimiter: "^\\\\message\\|emacs-page"
@c time-stamp-start: "def\\\\texinfoversion{"
@c time-stamp-format: "%:y-%02m-%02d.%02H"
diff --git a/build-aux/ylwrap b/build-aux/ylwrap
index 8f072a8e97c00490c74a591edc511af919584adf..7c2d927f7f67970737afa04378850c0c9859688f 100755
--- a/build-aux/ylwrap
+++ b/build-aux/ylwrap
@@ -3,7 +3,7 @@
scriptversion=2013-01-12.17; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# Written by Tom Tromey <tromey@cygnus.com>.
#
diff --git a/config.h.in b/config.h.in
index 5d2301dc0546dde1947e0d1d8beca96d3b0c396f..a954dee8bad65c7d95eae3caf22f759ead9fd8d6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,80 +1,5 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* CPU and C ABI indicator */
-#ifndef __i386__
-#undef __i386__
-#endif
-#ifndef __x86_64_x32__
-#undef __x86_64_x32__
-#endif
-#ifndef __x86_64__
-#undef __x86_64__
-#endif
-#ifndef __alpha__
-#undef __alpha__
-#endif
-#ifndef __arm__
-#undef __arm__
-#endif
-#ifndef __armhf__
-#undef __armhf__
-#endif
-#ifndef __arm64_ilp32__
-#undef __arm64_ilp32__
-#endif
-#ifndef __arm64__
-#undef __arm64__
-#endif
-#ifndef __hppa__
-#undef __hppa__
-#endif
-#ifndef __hppa64__
-#undef __hppa64__
-#endif
-#ifndef __ia64_ilp32__
-#undef __ia64_ilp32__
-#endif
-#ifndef __ia64__
-#undef __ia64__
-#endif
-#ifndef __m68k__
-#undef __m68k__
-#endif
-#ifndef __mips__
-#undef __mips__
-#endif
-#ifndef __mipsn32__
-#undef __mipsn32__
-#endif
-#ifndef __mips64__
-#undef __mips64__
-#endif
-#ifndef __powerpc__
-#undef __powerpc__
-#endif
-#ifndef __powerpc64__
-#undef __powerpc64__
-#endif
-#ifndef __powerpc64_elfv2__
-#undef __powerpc64_elfv2__
-#endif
-#ifndef __s390__
-#undef __s390__
-#endif
-#ifndef __s390x__
-#undef __s390x__
-#endif
-#ifndef __sh__
-#undef __sh__
-#endif
-#ifndef __sparc__
-#undef __sparc__
-#endif
-#ifndef __sparc64__
-#undef __sparc64__
-#endif
-
-
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
@@ -168,6 +93,10 @@
/* Define if struct dirent has a member d_ino that actually works. */
#undef D_INO_IN_DIRENT
+/* Enable the use of error_print_progname to print program name with error
+ messages. See comment to function tar_print_progname in src/tar.c */
+#undef ENABLE_ERROR_PRINT_PROGNAME
+
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
@@ -269,6 +198,10 @@
whether the gnulib module fchownat shall be considered present. */
#undef GNULIB_FCHOWNAT
+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
+ whether the gnulib module fcntl-safer shall be considered present. */
+#undef GNULIB_FCNTL_SAFER
+
/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
whether the gnulib module fdopendir shall be considered present. */
#undef GNULIB_FDOPENDIR
@@ -281,6 +214,10 @@
whether the gnulib module fd-safer-flag shall be considered present. */
#undef GNULIB_FD_SAFER_FLAG
+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
+ whether the gnulib module fnmatch-gnu shall be considered present. */
+#undef GNULIB_FNMATCH_GNU
+
/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
whether the gnulib module fscanf shall be considered present. */
#undef GNULIB_FSCANF
@@ -301,6 +238,10 @@
whether the gnulib module openat shall be considered present. */
#undef GNULIB_OPENAT
+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
+ whether the gnulib module openat-safer shall be considered present. */
+#undef GNULIB_OPENAT_SAFER
+
/* enable some gnulib portability checks */
#undef GNULIB_PORTCHECK
@@ -387,6 +328,9 @@
/* Define to 1 when the gnulib module fdopendir should be tested. */
#undef GNULIB_TEST_FDOPENDIR
+/* Define to 1 when the gnulib module fnmatch should be tested. */
+#undef GNULIB_TEST_FNMATCH
+
/* Define to 1 when the gnulib module fseek should be tested. */
#undef GNULIB_TEST_FSEEK
@@ -729,6 +673,10 @@
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
+/* Define to 1 if you have the Mac OS X function
+ CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES
+
/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
the CoreFoundation framework. */
#undef HAVE_CFPREFERENCESCOPYAPPVALUE
@@ -963,6 +911,10 @@
don't. */
#undef HAVE_DECL_WCWIDTH
+/* Define to 1 if you have the declaration of `_fseeki64', and to 0 if you
+ don't. */
+#undef HAVE_DECL__FSEEKI64
+
/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
don't. */
#undef HAVE_DECL__SNPRINTF
@@ -1026,6 +978,12 @@
/* Define to 1 if you have the `flockfile' function. */
#undef HAVE_FLOCKFILE
+/* Define to 1 if you have the `fnmatch' function. */
+#undef HAVE_FNMATCH
+
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#undef HAVE_FNMATCH_H
+
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
#undef HAVE_FSEEKO
@@ -1075,7 +1033,7 @@
/* Define to 1 if you have the `getopt_long_only' function. */
#undef HAVE_GETOPT_LONG_ONLY
-/* Define to 1 if you have the `getpagesize' function. */
+/* Define to 1 if the system has the 'getpagesize' function. */
#undef HAVE_GETPAGESIZE
/* Define to 1 if you have the `getppriv' function. */
@@ -1163,6 +1121,10 @@
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
+/* Define if localtime-like functions can loop forever on extreme arguments.
+ */
+#undef HAVE_LOCALTIME_INFLOOP_BUG
+
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
@@ -1248,9 +1210,6 @@
concept. */
#undef HAVE_MSVC_INVALID_PARAMETER_HANDLER
-/* Define to 1 if you have the `nanotime' function. */
-#undef HAVE_NANOTIME
-
/* Define to 1 if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H
@@ -1303,610 +1262,6 @@
/* Define to 1 if you have the `rawmemchr' function. */
#undef HAVE_RAWMEMCHR
-/* Define to 1 if alphasort is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ALPHASORT
-
-/* Define to 1 if atoll is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ATOLL
-
-/* Define to 1 if btowc is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_BTOWC
-
-/* Define to 1 if canonicalize_file_name is declared even after undefining
- macros. */
-#undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
-
-/* Define to 1 if chdir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_CHDIR
-
-/* Define to 1 if chown is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_CHOWN
-
-/* Define to 1 if closedir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_CLOSEDIR
-
-/* Define to 1 if dirfd is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DIRFD
-
-/* Define to 1 if dprintf is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DPRINTF
-
-/* Define to 1 if dup is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DUP
-
-/* Define to 1 if dup2 is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DUP2
-
-/* Define to 1 if dup3 is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DUP3
-
-/* Define to 1 if duplocale is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_DUPLOCALE
-
-/* Define to 1 if endusershell is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ENDUSERSHELL
-
-/* Define to 1 if environ is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ENVIRON
-
-/* Define to 1 if euidaccess is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_EUIDACCESS
-
-/* Define to 1 if faccessat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FACCESSAT
-
-/* Define to 1 if fchdir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FCHDIR
-
-/* Define to 1 if fchmodat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FCHMODAT
-
-/* Define to 1 if fchownat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FCHOWNAT
-
-/* Define to 1 if fcntl is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FCNTL
-
-/* Define to 1 if fdatasync is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FDATASYNC
-
-/* Define to 1 if fdopendir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FDOPENDIR
-
-/* Define to 1 if ffs is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FFS
-
-/* Define to 1 if ffsl is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FFSL
-
-/* Define to 1 if ffsll is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FFSLL
-
-/* Define to 1 if fpurge is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FPURGE
-
-/* Define to 1 if fseeko is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FSEEKO
-
-/* Define to 1 if fstat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FSTAT
-
-/* Define to 1 if fstatat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FSTATAT
-
-/* Define to 1 if fsync is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FSYNC
-
-/* Define to 1 if ftello is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FTELLO
-
-/* Define to 1 if ftruncate is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FTRUNCATE
-
-/* Define to 1 if futimens is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_FUTIMENS
-
-/* Define to 1 if getcwd is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETCWD
-
-/* Define to 1 if getdelim is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETDELIM
-
-/* Define to 1 if getdomainname is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETDOMAINNAME
-
-/* Define to 1 if getdtablesize is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETDTABLESIZE
-
-/* Define to 1 if getgroups is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETGROUPS
-
-/* Define to 1 if gethostname is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETHOSTNAME
-
-/* Define to 1 if getline is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETLINE
-
-/* Define to 1 if getloadavg is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETLOADAVG
-
-/* Define to 1 if getlogin is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETLOGIN
-
-/* Define to 1 if getlogin_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETLOGIN_R
-
-/* Define to 1 if getpagesize is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETPAGESIZE
-
-/* Define to 1 if gets is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETS
-
-/* Define to 1 if getsubopt is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETSUBOPT
-
-/* Define to 1 if gettimeofday is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETTIMEOFDAY
-
-/* Define to 1 if getusershell is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GETUSERSHELL
-
-/* Define to 1 if grantpt is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GRANTPT
-
-/* Define to 1 if group_member is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_GROUP_MEMBER
-
-/* Define to 1 if imaxabs is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_IMAXABS
-
-/* Define to 1 if imaxdiv is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_IMAXDIV
-
-/* Define to 1 if initstate is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_INITSTATE
-
-/* Define to 1 if initstate_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_INITSTATE_R
-
-/* Define to 1 if isatty is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ISATTY
-
-/* Define to 1 if iswctype is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_ISWCTYPE
-
-/* Define to 1 if lchmod is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_LCHMOD
-
-/* Define to 1 if lchown is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_LCHOWN
-
-/* Define to 1 if link is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_LINK
-
-/* Define to 1 if linkat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_LINKAT
-
-/* Define to 1 if lseek is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_LSEEK
-
-/* Define to 1 if lstat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_LSTAT
-
-/* Define to 1 if mbrlen is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MBRLEN
-
-/* Define to 1 if mbrtowc is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MBRTOWC
-
-/* Define to 1 if mbsinit is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MBSINIT
-
-/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MBSNRTOWCS
-
-/* Define to 1 if mbsrtowcs is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MBSRTOWCS
-
-/* Define to 1 if memmem is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MEMMEM
-
-/* Define to 1 if mempcpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MEMPCPY
-
-/* Define to 1 if memrchr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MEMRCHR
-
-/* Define to 1 if mkdirat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKDIRAT
-
-/* Define to 1 if mkdtemp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKDTEMP
-
-/* Define to 1 if mkfifo is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKFIFO
-
-/* Define to 1 if mkfifoat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKFIFOAT
-
-/* Define to 1 if mknod is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKNOD
-
-/* Define to 1 if mknodat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKNODAT
-
-/* Define to 1 if mkostemp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKOSTEMP
-
-/* Define to 1 if mkostemps is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKOSTEMPS
-
-/* Define to 1 if mkstemp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKSTEMP
-
-/* Define to 1 if mkstemps is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_MKSTEMPS
-
-/* Define to 1 if nl_langinfo is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_NL_LANGINFO
-
-/* Define to 1 if openat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_OPENAT
-
-/* Define to 1 if opendir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_OPENDIR
-
-/* Define to 1 if pclose is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PCLOSE
-
-/* Define to 1 if pipe is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PIPE
-
-/* Define to 1 if pipe2 is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PIPE2
-
-/* Define to 1 if popen is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_POPEN
-
-/* Define to 1 if posix_openpt is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_POSIX_OPENPT
-
-/* Define to 1 if pread is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PREAD
-
-/* Define to 1 if pthread_sigmask is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PTHREAD_SIGMASK
-
-/* Define to 1 if ptsname is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PTSNAME
-
-/* Define to 1 if ptsname_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PTSNAME_R
-
-/* Define to 1 if pwrite is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_PWRITE
-
-/* Define to 1 if qsort_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_QSORT_R
-
-/* Define to 1 if random is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_RANDOM
-
-/* Define to 1 if random_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_RANDOM_R
-
-/* Define to 1 if rawmemchr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_RAWMEMCHR
-
-/* Define to 1 if readdir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_READDIR
-
-/* Define to 1 if readlink is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_READLINK
-
-/* Define to 1 if readlinkat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_READLINKAT
-
-/* Define to 1 if reallocarray is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_REALLOCARRAY
-
-/* Define to 1 if realpath is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_REALPATH
-
-/* Define to 1 if renameat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_RENAMEAT
-
-/* Define to 1 if rewinddir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_REWINDDIR
-
-/* Define to 1 if rmdir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_RMDIR
-
-/* Define to 1 if rpmatch is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_RPMATCH
-
-/* Define to 1 if scandir is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SCANDIR
-
-/* Define to 1 if secure_getenv is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SECURE_GETENV
-
-/* Define to 1 if setenv is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETENV
-
-/* Define to 1 if sethostname is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETHOSTNAME
-
-/* Define to 1 if setlocale is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETLOCALE
-
-/* Define to 1 if setstate is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETSTATE
-
-/* Define to 1 if setstate_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETSTATE_R
-
-/* Define to 1 if setusershell is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SETUSERSHELL
-
-/* Define to 1 if sigaction is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SIGACTION
-
-/* Define to 1 if sigaddset is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SIGADDSET
-
-/* Define to 1 if sigdelset is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SIGDELSET
-
-/* Define to 1 if sigemptyset is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SIGEMPTYSET
-
-/* Define to 1 if sigfillset is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SIGFILLSET
-
-/* Define to 1 if sigismember is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SIGISMEMBER
-
-/* Define to 1 if sigpending is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SIGPENDING
-
-/* Define to 1 if sigprocmask is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SIGPROCMASK
-
-/* Define to 1 if sleep is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SLEEP
-
-/* Define to 1 if snprintf is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SNPRINTF
-
-/* Define to 1 if srandom is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SRANDOM
-
-/* Define to 1 if srandom_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SRANDOM_R
-
-/* Define to 1 if stat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STAT
-
-/* Define to 1 if stpcpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STPCPY
-
-/* Define to 1 if stpncpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STPNCPY
-
-/* Define to 1 if strcasecmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRCASECMP
-
-/* Define to 1 if strcasestr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRCASESTR
-
-/* Define to 1 if strchrnul is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRCHRNUL
-
-/* Define to 1 if strdup is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRDUP
-
-/* Define to 1 if strerror_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRERROR_R
-
-/* Define to 1 if strncasecmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRNCASECMP
-
-/* Define to 1 if strncat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRNCAT
-
-/* Define to 1 if strndup is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRNDUP
-
-/* Define to 1 if strnlen is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRNLEN
-
-/* Define to 1 if strpbrk is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRPBRK
-
-/* Define to 1 if strsep is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRSEP
-
-/* Define to 1 if strsignal is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRSIGNAL
-
-/* Define to 1 if strtod is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRTOD
-
-/* Define to 1 if strtoimax is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRTOIMAX
-
-/* Define to 1 if strtok_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRTOK_R
-
-/* Define to 1 if strtoll is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRTOLL
-
-/* Define to 1 if strtoull is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRTOULL
-
-/* Define to 1 if strtoumax is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRTOUMAX
-
-/* Define to 1 if strverscmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_STRVERSCMP
-
-/* Define to 1 if symlink is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SYMLINK
-
-/* Define to 1 if symlinkat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_SYMLINKAT
-
-/* Define to 1 if tmpfile is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_TMPFILE
-
-/* Define to 1 if towctrans is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_TOWCTRANS
-
-/* Define to 1 if truncate is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_TRUNCATE
-
-/* Define to 1 if ttyname_r is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_TTYNAME_R
-
-/* Define to 1 if unlink is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_UNLINK
-
-/* Define to 1 if unlinkat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_UNLINKAT
-
-/* Define to 1 if unlockpt is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_UNLOCKPT
-
-/* Define to 1 if unsetenv is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_UNSETENV
-
-/* Define to 1 if usleep is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_USLEEP
-
-/* Define to 1 if utime is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_UTIME
-
-/* Define to 1 if utimensat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_UTIMENSAT
-
-/* Define to 1 if vdprintf is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_VDPRINTF
-
-/* Define to 1 if vsnprintf is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_VSNPRINTF
-
-/* Define to 1 if wcpcpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCPCPY
-
-/* Define to 1 if wcpncpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCPNCPY
-
-/* Define to 1 if wcrtomb is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCRTOMB
-
-/* Define to 1 if wcscasecmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCASECMP
-
-/* Define to 1 if wcscat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCAT
-
-/* Define to 1 if wcschr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCHR
-
-/* Define to 1 if wcscmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCMP
-
-/* Define to 1 if wcscoll is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCOLL
-
-/* Define to 1 if wcscpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCPY
-
-/* Define to 1 if wcscspn is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSCSPN
-
-/* Define to 1 if wcsdup is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSDUP
-
-/* Define to 1 if wcsftime is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSFTIME
-
-/* Define to 1 if wcslen is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSLEN
-
-/* Define to 1 if wcsncasecmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCASECMP
-
-/* Define to 1 if wcsncat is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCAT
-
-/* Define to 1 if wcsncmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCMP
-
-/* Define to 1 if wcsncpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNCPY
-
-/* Define to 1 if wcsnlen is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNLEN
-
-/* Define to 1 if wcsnrtombs is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSNRTOMBS
-
-/* Define to 1 if wcspbrk is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSPBRK
-
-/* Define to 1 if wcsrchr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSRCHR
-
-/* Define to 1 if wcsrtombs is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSRTOMBS
-
-/* Define to 1 if wcsspn is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSSPN
-
-/* Define to 1 if wcsstr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSSTR
-
-/* Define to 1 if wcstok is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSTOK
-
-/* Define to 1 if wcswidth is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSWIDTH
-
-/* Define to 1 if wcsxfrm is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCSXFRM
-
-/* Define to 1 if wctob is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCTOB
-
-/* Define to 1 if wctrans is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCTRANS
-
-/* Define to 1 if wctype is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCTYPE
-
-/* Define to 1 if wcwidth is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WCWIDTH
-
-/* Define to 1 if wmemchr is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMCHR
-
-/* Define to 1 if wmemcmp is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMCMP
-
-/* Define to 1 if wmemcpy is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMCPY
-
-/* Define to 1 if wmemmove is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMMOVE
-
-/* Define to 1 if wmemset is declared even after undefining macros. */
-#undef HAVE_RAW_DECL_WMEMSET
-
-/* Define to 1 if _Exit is declared even after undefining macros. */
-#undef HAVE_RAW_DECL__EXIT
-
/* Define to 1 if you have the `readdir' function. */
#undef HAVE_READDIR
@@ -1925,6 +1280,9 @@
/* Define to 1 if you have the `renameat' function. */
#undef HAVE_RENAMEAT
+/* Define to 1 if you have the `renameat2' function. */
+#undef HAVE_RENAMEAT2
+
/* Define to 1 if you have the `rewinddir' function. */
#undef HAVE_REWINDDIR
@@ -2294,6 +1652,9 @@
#endif
+/* Define to 1 if the compiler supports the keyword '__inline'. */
+#undef HAVE___INLINE
+
/* Define as const if the declaration of iconv() needs const. */
#undef ICONV_CONST
@@ -2587,6 +1948,11 @@
#ifndef _XOPEN_SOURCE
# undef _XOPEN_SOURCE
#endif
+/* Enable X/Open compliant socket functions that do not require linking
+ with -lxnet on HP-UX 11.11. */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
@@ -2627,6 +1993,9 @@
/* Define to the program name of xz compressor program */
#undef XZ_PROGRAM
+/* Define to the program name of zstd compressor program */
+#undef ZSTD_PROGRAM
+
/* Enable large inode numbers on Mac OS X 10.5. */
#undef _DARWIN_USE_64_BIT_INODE
@@ -2649,12 +2018,15 @@
#undef _NETBSD_SOURCE
/* The _Noreturn keyword of C11. */
-#if ! (defined _Noreturn \
- || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
- || 0x5110 <= __SUNPRO_C)
+#ifndef _Noreturn
+# if 201103 <= (defined __cplusplus ? __cplusplus : 0)
+# define _Noreturn [[noreturn]]
+# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
+ || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+ /* _Noreturn works as-is. */
+# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
# define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
+# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0)
# define _Noreturn __declspec (noreturn)
# else
# define _Noreturn
@@ -2709,7 +2081,8 @@
if isdigit is mistakenly implemented via a static inline function,
a program containing an extern inline function that calls isdigit
may not work since the C standard prohibits extern inline functions
- from calling static functions. This bug is known to occur on:
+ from calling static functions (ISO C 99 section 6.7.4.(3).
+ This bug is known to occur on:
OS X 10.8 and earlier; see:
https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html
@@ -2722,7 +2095,18 @@
OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
for clang but remains for g++; see <https://trac.macports.org/ticket/41033>.
- Assume DragonFly and FreeBSD will be similar. */
+ Assume DragonFly and FreeBSD will be similar.
+
+ GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+ inline semantics, unless -fgnu89-inline is used. It defines a macro
+ __GNUC_STDC_INLINE__ to indicate this situation or a macro
+ __GNUC_GNU_INLINE__ to indicate the opposite situation.
+ GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline
+ semantics but warns, unless -fgnu89-inline is used:
+ warning: C99 inline functions are not supported; using GNU89
+ warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute
+ It defines a macro __GNUC_GNU_INLINE__ to indicate this situation.
+ */
#if (((defined __APPLE__ && defined __MACH__) \
|| defined __DragonFly__ || defined __FreeBSD__) \
&& (defined __header_inline \
@@ -2787,9 +2171,6 @@
/* Always use our fgetfilecon wrapper. */
#undef fgetfilecon
-/* Define to a replacement function name for fnmatch(). */
-#undef fnmatch
-
/* Always use our getfilecon wrapper. */
#undef getfilecon
@@ -2965,6 +2346,13 @@
# define _GL_ATTRIBUTE_CONST /* empty */
#endif
+/* The __malloc__ attribute was added in gcc 3. */
+#if 3 <= __GNUC__
+# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+#else
+# define _GL_ATTRIBUTE_MALLOC /* empty */
+#endif
+
/* Define as a macro for copying va_list variables. */
#undef va_copy
diff --git a/configure b/configure
index c8cc0a248931c9af129d2a965ede1052180d9a83..81b35017cb6def0e0cd6fb8cca9ce980f2b74ffb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU tar 1.30.
+# Generated by GNU Autoconf 2.69 for GNU tar 1.32.
#
# Report bugs to <bug-tar@gnu.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNU tar'
PACKAGE_TARNAME='tar'
-PACKAGE_VERSION='1.30'
-PACKAGE_STRING='GNU tar 1.30'
+PACKAGE_VERSION='1.32'
+PACKAGE_STRING='GNU tar 1.32'
PACKAGE_BUGREPORT='bug-tar@gnu.org'
PACKAGE_URL='http://www.gnu.org/software/tar/'
@@ -735,6 +735,7 @@ SELINUX_CONTEXT_H
NEXT_AS_FIRST_DIRECTIVE_SELINUX_SELINUX_H
NEXT_SELINUX_SELINUX_H
LIB_SELINUX
+GLIBC21
REPLACE_RAISE
REPLACE_PTHREAD_SIGMASK
HAVE_SIGHANDLER_T
@@ -845,17 +846,22 @@ HAVE_WCHAR_T
HAVE_MAX_ALIGN_T
REPLACE_NULL
REPLACE_STRUCT_LCONV
+REPLACE_FREELOCALE
REPLACE_DUPLOCALE
+REPLACE_NEWLOCALE
REPLACE_SETLOCALE
REPLACE_LOCALECONV
+HAVE_FREELOCALE
HAVE_DUPLOCALE
+HAVE_NEWLOCALE
+GNULIB_LOCALENAME
GNULIB_DUPLOCALE
GNULIB_SETLOCALE
GNULIB_LOCALECONV
LOCALCHARSET_TESTS_ENVIRONMENT
-GLIBC21
HAVE_LANGINFO_YESEXPR
HAVE_LANGINFO_ERA
+HAVE_LANGINFO_ALTMON
HAVE_LANGINFO_T_FMT_AMPM
HAVE_LANGINFO_CODESET
HAVE_LANGINFO_H
@@ -891,6 +897,7 @@ INT64_MAX_EQ_LONG_MAX
INT32_MAX_LT_INTMAX_MAX
REPLACE_STRTOUMAX
REPLACE_STRTOIMAX
+HAVE_IMAXDIV_T
HAVE_DECL_STRTOUMAX
HAVE_DECL_STRTOIMAX
HAVE_DECL_IMAXDIV
@@ -933,8 +940,6 @@ GL_GENERATE_LIMITS_H_TRUE
LIMITS_H
NEXT_AS_FIRST_DIRECTIVE_LIMITS_H
NEXT_LIMITS_H
-HOST_CPU_C_ABI
-HOST_CPU
REPLACE_LOCALTIME
REPLACE_GMTIME
REPLACE_TZSET
@@ -1089,6 +1094,12 @@ GNULIB_DPRINTF
GL_GENERATE_FNMATCH_H_FALSE
GL_GENERATE_FNMATCH_H_TRUE
FNMATCH_H
+HAVE_FNMATCH_H
+NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H
+NEXT_FNMATCH_H
+REPLACE_FNMATCH
+HAVE_FNMATCH
+GNULIB_FNMATCH
REPLACE_ITOLD
GL_GENERATE_FLOAT_H_FALSE
GL_GENERATE_FLOAT_H_TRUE
@@ -1209,6 +1220,7 @@ REPLACE_LINKAT
REPLACE_LINK
REPLACE_LCHOWN
REPLACE_ISATTY
+REPLACE_GETPASS
REPLACE_GETPAGESIZE
REPLACE_GETGROUPS
REPLACE_GETLOGIN_R
@@ -1225,6 +1237,7 @@ REPLACE_CHOWN
HAVE_SYS_PARAM_H
HAVE_OS_H
HAVE_DECL_TTYNAME_R
+HAVE_DECL_TRUNCATE
HAVE_DECL_SETHOSTNAME
HAVE_DECL_GETUSERSHELL
HAVE_DECL_GETPAGESIZE
@@ -1236,7 +1249,6 @@ HAVE_DECL_FCHDIR
HAVE_DECL_ENVIRON
HAVE_USLEEP
HAVE_UNLINKAT
-HAVE_TRUNCATE
HAVE_SYMLINKAT
HAVE_SYMLINK
HAVE_SLEEP
@@ -1251,6 +1263,7 @@ HAVE_LINKAT
HAVE_LINK
HAVE_LCHOWN
HAVE_GROUP_MEMBER
+HAVE_GETPASS
HAVE_GETPAGESIZE
HAVE_GETLOGIN
HAVE_GETHOSTNAME
@@ -1293,6 +1306,7 @@ GNULIB_LCHOWN
GNULIB_ISATTY
GNULIB_GROUP_MEMBER
GNULIB_GETUSERSHELL
+GNULIB_GETPASS
GNULIB_GETPAGESIZE
GNULIB_GETLOGIN_R
GNULIB_GETLOGIN
@@ -1623,6 +1637,7 @@ with_lzip
with_lzma
with_lzop
with_xz
+with_zstd
with_gnu_ld
enable_rpath
with_libiconv_prefix
@@ -2187,7 +2202,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU tar 1.30 to adapt to many kinds of systems.
+\`configure' configures GNU tar 1.32 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2257,7 +2272,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU tar 1.30:";;
+ short | recursive ) echo "Configuration of GNU tar 1.32:";;
esac
cat <<\_ACEOF
@@ -2302,6 +2317,7 @@ Optional Packages:
--with-lzma=PROG use PROG as lzma compressor program
--with-lzop=PROG use PROG as lzop compressor program
--with-xz=PROG use PROG as xz compressor program
+ --with-zstd=PROG use PROG as zstd compressor program
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
@@ -2407,7 +2423,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU tar configure 1.30
+GNU tar configure 1.32
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3116,7 +3132,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU tar $as_me 1.30, which was
+It was created by GNU tar $as_me 1.32, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3439,6 +3455,8 @@ as_fn_append ac_func_list " lchmod"
as_fn_append ac_func_list " fcntl"
as_fn_append ac_func_list " symlink"
as_fn_append ac_func_list " mempcpy"
+as_fn_append ac_header_list " fnmatch.h"
+as_fn_append ac_func_list " fnmatch"
as_fn_append ac_func_list " isblank"
as_fn_append ac_func_list " iswctype"
as_fn_append ac_func_list " mbsrtowcs"
@@ -3459,7 +3477,6 @@ as_fn_append ac_header_list " sys/cdefs.h"
as_fn_append ac_func_list " getprogname"
as_fn_append ac_func_list " getexecname"
as_fn_append ac_func_list " gettimeofday"
-as_fn_append ac_func_list " nanotime"
as_fn_append ac_header_list " limits.h"
as_fn_append ac_header_list " wchar.h"
as_fn_append ac_header_list " stdint.h"
@@ -3478,7 +3495,6 @@ as_fn_append ac_func_list " mbrtowc"
as_fn_append ac_header_list " sys/mman.h"
as_fn_append ac_func_list " mprotect"
as_fn_append ac_func_list " mkdirat"
-as_fn_append ac_func_list " mkfifo"
as_fn_append ac_func_list " mkfifoat"
as_fn_append ac_func_list " mknodat"
as_fn_append ac_func_list " mknod"
@@ -3487,6 +3503,7 @@ as_fn_append ac_func_list " nl_langinfo"
as_fn_append ac_header_list " priv.h"
as_fn_append ac_header_list " malloc.h"
as_fn_append ac_func_list " renameat"
+as_fn_append ac_func_list " renameat2"
as_fn_append ac_header_list " selinux/selinux.h"
as_fn_append ac_func_list " setenv"
as_fn_append ac_func_list " sleep"
@@ -3515,6 +3532,7 @@ as_fn_append ac_header_list " netdb.h"
as_fn_append ac_header_list " sys/wait.h"
as_fn_append ac_header_list " pwd.h"
as_fn_append ac_header_list " grp.h"
+as_fn_append ac_func_list " mkfifo"
as_fn_append ac_func_list " setlocale"
as_fn_append ac_func_list " fsync"
gt_needs="$gt_needs need-formatstring-macros"
@@ -3619,7 +3637,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
ac_config_headers="$ac_config_headers config.h"
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -3791,8 +3809,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -3811,7 +3829,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4105,7 +4123,7 @@ fi
# Define the identity of the package.
PACKAGE='tar'
- VERSION='1.30'
+ VERSION='1.32'
cat >>confdefs.h <<_ACEOF
@@ -4139,8 +4157,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4314,6 +4332,7 @@ END
fi
fi
+
# Enable silent rules by default:
# Check whether --enable-silent-rules was given.
if test "${enable_silent_rules+set}" = set; then :
@@ -6351,6 +6370,8 @@ $as_echo "$ac_cv_should_define__xopen_source" >&6; }
test $ac_cv_should_define__xopen_source = yes &&
$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+ $as_echo "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
@@ -6933,6 +6954,7 @@ fi
# Code from module fchownat:
# Code from module fcntl:
# Code from module fcntl-h:
+ # Code from module fcntl-safer:
# Code from module fd-hook:
# Code from module fd-safer-flag:
# Code from module fdopendir:
@@ -6945,6 +6967,7 @@ fi
# Code from module float:
# Code from module fnmatch:
# Code from module fnmatch-gnu:
+ # Code from module fnmatch-h:
# Code from module fpending:
# Code from module fprintftime:
# Code from module fseek:
@@ -6973,7 +6996,6 @@ fi
# Code from module hard-locale:
# Code from module hash:
# Code from module havelib:
- # Code from module host-cpu-c-abi:
# Code from module human:
# Code from module include_next:
# Code from module intprops:
@@ -6985,6 +7007,7 @@ fi
# Code from module largefile:
# Code from module lchown:
+ # Code from module libc-config:
# Code from module limits-h:
# Code from module link:
# Code from module link-follow:
@@ -7030,7 +7053,9 @@ fi
# Code from module openat:
# Code from module openat-die:
# Code from module openat-h:
+ # Code from module openat-safer:
# Code from module opendir:
+ # Code from module opendirat:
# Code from module parse-datetime:
# Code from module pathmax:
# Code from module priv-set:
@@ -7048,7 +7073,7 @@ fi
# Code from module regex:
# Code from module rename:
# Code from module renameat:
- # Code from module renameat2:
+ # Code from module renameatu:
# Code from module rewinddir:
# Code from module rmdir:
# Code from module root-uid:
@@ -8111,17 +8136,17 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
typedef int *int_ptr;
- int foo (int_ptr $ac_kw ip) { return ip[0]; }
- int bar (int [$ac_kw]); /* Catch GCC bug 14050. */
- int bar (int ip[$ac_kw]) { return ip[0]; }
+ int foo (int_ptr $ac_kw ip) { return ip[0]; }
+ int bar (int [$ac_kw]); /* Catch GCC bug 14050. */
+ int bar (int ip[$ac_kw]) { return ip[0]; }
int
main ()
{
int s[1];
- int *$ac_kw t = s;
- t[0] = 0;
- return foo (t) + bar (t);
+ int *$ac_kw t = s;
+ t[0] = 0;
+ return foo (t) + bar (t);
;
return 0;
@@ -8693,7 +8718,8 @@ int main () { return zero(); }
_ACEOF
save_ac_compile="$ac_compile"
ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if echo '#include "conftest.c"' >conftest1.c &&
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8714,7 +8740,8 @@ int zero (void) { return 0; }
_ACEOF
ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if echo '#include "conftest.c"' >conftest2.c &&
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8727,7 +8754,7 @@ _ACEOF
fi
fi
ac_compile="$save_ac_compile"
- rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
+ rm -f conftest12.c conftest12.$ac_objext conftest$ac_exeext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
@@ -8809,7 +8836,7 @@ int main () {
return 1;
#else
/* Check whether the given locale name is recognized by the system. */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# if defined _WIN32 && !defined __CYGWIN__
/* On native Windows, setlocale(category, "") looks at the system settings,
not at the environment variables. Also, when an encoding suffix such
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
@@ -9143,7 +9170,7 @@ nocrash_init (void)
}
}
}
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#elif defined _WIN32 && ! defined __CYGWIN__
/* Avoid a crash on native Windows. */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -9288,6 +9315,7 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
GNULIB_GETLOGIN=0;
GNULIB_GETLOGIN_R=0;
GNULIB_GETPAGESIZE=0;
+ GNULIB_GETPASS=0;
GNULIB_GETUSERSHELL=0;
GNULIB_GROUP_MEMBER=0;
GNULIB_ISATTY=0;
@@ -9330,6 +9358,7 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
HAVE_GETHOSTNAME=1;
HAVE_GETLOGIN=1;
HAVE_GETPAGESIZE=1;
+ HAVE_GETPASS=1;
HAVE_GROUP_MEMBER=1;
HAVE_LCHOWN=1;
HAVE_LINK=1;
@@ -9344,7 +9373,6 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
HAVE_SLEEP=1;
HAVE_SYMLINK=1;
HAVE_SYMLINKAT=1;
- HAVE_TRUNCATE=1;
HAVE_UNLINKAT=1;
HAVE_USLEEP=1;
HAVE_DECL_ENVIRON=1;
@@ -9356,6 +9384,7 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
HAVE_DECL_GETPAGESIZE=1;
HAVE_DECL_GETUSERSHELL=1;
HAVE_DECL_SETHOSTNAME=1;
+ HAVE_DECL_TRUNCATE=1;
HAVE_DECL_TTYNAME_R=1;
HAVE_OS_H=0;
HAVE_SYS_PARAM_H=0;
@@ -9372,6 +9401,7 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
REPLACE_GETLOGIN_R=0;
REPLACE_GETGROUPS=0;
REPLACE_GETPAGESIZE=0;
+ REPLACE_GETPASS=0;
REPLACE_ISATTY=0;
REPLACE_LCHOWN=0;
REPLACE_LINK=0;
@@ -9419,12 +9449,14 @@ if ${ac_cv_func_chown_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in # ((
- # Guess yes on glibc systems.
- *-gnu*) ac_cv_func_chown_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) ac_cv_func_chown_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) ac_cv_func_chown_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) ac_cv_func_chown_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) ac_cv_func_chown_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) ac_cv_func_chown_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) ac_cv_func_chown_works="guessing no" ;;
esac
else
@@ -9852,11 +9884,10 @@ $as_echo "$gl_cv_pragma_columns" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
$as_echo_n "checking if environ is properly declared... " >&6; }
- if ${gt_cv_var_environ_declaration+:} false; then :
+if ${gt_cv_var_environ_declaration+:} false; then :
$as_echo_n "(cached) " >&6
else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if HAVE_UNISTD_H
#include <unistd.h>
@@ -9864,7 +9895,7 @@ else
/* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>. */
#include <stdlib.h>
- extern struct { int foo; } environ;
+ extern struct { int foo; } environ;
int
main ()
{
@@ -9880,8 +9911,7 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
$as_echo "$gt_cv_var_environ_declaration" >&6; }
if test $gt_cv_var_environ_declaration = yes; then
@@ -10352,7 +10382,10 @@ else
echo >conftest.file
if test "$cross_compiling" = yes; then :
case "$host_os" in
- *-gnu*)
+ linux-* | linux)
+ # Guess yes on Linux systems.
+ gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+ *-gnu* | gnu*)
# Guess yes on glibc systems.
gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
mingw*)
@@ -10626,6 +10659,165 @@ _ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
+$as_echo_n "checking for promoted mode_t type... " >&6; }
+if ${gl_cv_promoted_mode_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+int
+main ()
+{
+typedef int array[2 * (sizeof (mode_t) < sizeof (int)) - 1];
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_promoted_mode_t='int'
+else
+ gl_cv_promoted_mode_t='mode_t'
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
+$as_echo "$gl_cv_promoted_mode_t" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define PROMOTED_MODE_T $gl_cv_promoted_mode_t
+_ACEOF
+
+
+
+
+
+ GNULIB_FNMATCH=0;
+ HAVE_FNMATCH=1;
+ REPLACE_FNMATCH=0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ if test $gl_cv_have_include_next = yes; then
+ gl_cv_next_fnmatch_h='<'fnmatch.h'>'
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <fnmatch.h>" >&5
+$as_echo_n "checking absolute name of <fnmatch.h>... " >&6; }
+if ${gl_cv_next_fnmatch_h+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ if test $ac_cv_header_fnmatch_h = yes; then
+
+
+
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <fnmatch.h>
+_ACEOF
+ case "$host_os" in
+ aix*) gl_absname_cpp="$ac_cpp -C" ;;
+ *) gl_absname_cpp="$ac_cpp" ;;
+ esac
+
+ case "$host_os" in
+ mingw*)
+ gl_dirsep_regex='[/\\]'
+ ;;
+ *)
+ gl_dirsep_regex='\/'
+ ;;
+ esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+ gl_header_literal_regex=`echo 'fnmatch.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
+ p
+ q
+ }'
+
+ gl_cv_absolute_fnmatch_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+ sed -n "$gl_absolute_header_sed"`
+
+ gl_header=$gl_cv_absolute_fnmatch_h
+ gl_cv_next_fnmatch_h='"'$gl_header'"'
+ else
+ gl_cv_next_fnmatch_h='<'fnmatch.h'>'
+ fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fnmatch_h" >&5
+$as_echo "$gl_cv_next_fnmatch_h" >&6; }
+ fi
+ NEXT_FNMATCH_H=$gl_cv_next_fnmatch_h
+
+ if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+ gl_next_as_first_directive='<'fnmatch.h'>'
+ else
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+ gl_next_as_first_directive=$gl_cv_next_fnmatch_h
+ fi
+ NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H=$gl_next_as_first_directive
+
+
+
+
+
+
+
+ if test $ac_cv_header_fnmatch_h = yes; then
+ HAVE_FNMATCH_H=1
+ else
+ HAVE_FNMATCH_H=0
+ fi
+
+
+ FNMATCH_H=''
+ if false; then
+ FNMATCH_H=fnmatch.h
+ else
+ if test $ac_cv_header_fnmatch_h != yes; then
+ FNMATCH_H=fnmatch.h
+ fi
+ fi
+
+
+ if test -n "$FNMATCH_H"; then
+ GL_GENERATE_FNMATCH_H_TRUE=
+ GL_GENERATE_FNMATCH_H_FALSE='#'
+else
+ GL_GENERATE_FNMATCH_H_TRUE='#'
+ GL_GENERATE_FNMATCH_H_FALSE=
+fi
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
@@ -11220,44 +11412,7 @@ fi
- for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat mknod mknodat stat utimensat; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/stat.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -11273,12 +11428,12 @@ if ${gl_cv_func_getcwd_null+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_getcwd_null="guessing yes";;
- # Guess yes on Cygwin.
- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
- # If we don't know, assume the worst.
- *) gl_cv_func_getcwd_null="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on Cygwin.
+ cygwin*) gl_cv_func_getcwd_null="guessing yes";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_getcwd_null="guessing no";;
esac
else
@@ -11299,7 +11454,7 @@ int
main ()
{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* mingw cwd does not start with '/', but getcwd does allocate.
However, mingw fails to honor non-zero size. */
#else
@@ -11806,7 +11961,7 @@ nocrash_init (void)
}
}
}
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#elif defined _WIN32 && ! defined __CYGWIN__
/* Avoid a crash on native Windows. */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -12032,8 +12187,6 @@ $as_echo "$gl_cv_func_getopt_long_gnu" >&6; }
-
-
GNULIB_GETTIMEOFDAY=0;
HAVE_GETTIMEOFDAY=1;
HAVE_STRUCT_TIMEVAL=1;
@@ -12234,48 +12387,7 @@ $as_echo "$gl_cv_sys_struct_timeval_tv_sec" >&6; }
fi
- for gl_func in gettimeofday; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#include <time.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -12314,341 +12426,6 @@ fi
REPLACE_LOCALTIME=0;
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifdef _MSC_VER
-MicrosoftCompiler
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "MicrosoftCompiler" >/dev/null 2>&1; then :
- gl_asmext='asm'
- gl_c_asm_opt='-c -Fa'
-
-else
- gl_asmext='s'
- gl_c_asm_opt='-S'
-
-fi
-rm -f conftest*
-
-
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking host CPU and C ABI" >&5
-$as_echo_n "checking host CPU and C ABI... " >&6; }
-if ${gl_cv_host_cpu_c_abi+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case "$host_cpu" in
-
- i[4567]86 )
- gl_cv_host_cpu_c_abi=i386
- ;;
-
- x86_64 )
- # On x86_64 systems, the C compiler may be generating code in one of
- # these ABIs:
- # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
- # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
- # with native Windows (mingw, MSVC).
- # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
- # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if (defined __x86_64__ || defined __amd64__ \
- || defined _M_X64 || defined _M_AMD64)
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined __ILP32__ || defined _ILP32
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_host_cpu_c_abi=x86_64-x32
-else
- gl_cv_host_cpu_c_abi=x86_64
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- gl_cv_host_cpu_c_abi=i386
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ;;
-
- alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] )
- gl_cv_host_cpu_c_abi=alpha
- ;;
-
- arm* | aarch64 )
- # Assume arm with EABI.
- # On arm64 systems, the C compiler may be generating code in one of
- # these ABIs:
- # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
- # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
- # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __aarch64__
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined __ILP32__ || defined _ILP32
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_host_cpu_c_abi=arm64-ilp32
-else
- gl_cv_host_cpu_c_abi=arm64
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- # Don't distinguish little-endian and big-endian arm, since they
- # don't require different machine code for simple operations and
- # since the user can distinguish them through the preprocessor
- # defines __ARMEL__ vs. __ARMEB__.
- # But distinguish arm which passes floating-point arguments and
- # return values in integer registers (r0, r1, ...) - this is
- # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which
- # passes them in float registers (s0, s1, ...) and double registers
- # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer
- # sets the preprocessor defines __ARM_PCS (for the first case) and
- # __ARM_PCS_VFP (for the second case), but older GCC does not.
- echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c
- # Look for a reference to the register d0 in the .s file.
- { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; } >/dev/null 2>&1
- if LC_ALL=C grep -E 'd0,' conftest.$gl_asmext >/dev/null; then
- gl_cv_host_cpu_c_abi=armhf
- else
- gl_cv_host_cpu_c_abi=arm
- fi
- rm -f conftest*
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ;;
-
- hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
- # On hppa, the C compiler may be generating 32-bit code or 64-bit
- # code. In the latter case, it defines _LP64 and __LP64__.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __LP64__
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_host_cpu_c_abi=hppa64
-else
- gl_cv_host_cpu_c_abi=hppa
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ;;
-
- ia64* )
- # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
- # 32-bit code. In the latter case, it defines _ILP32.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef _ILP32
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_host_cpu_c_abi=ia64-ilp32
-else
- gl_cv_host_cpu_c_abi=ia64
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ;;
-
- mips* )
- # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
- # at 32.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_host_cpu_c_abi=mips64
-else
- # In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but
- # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIN32.
- # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but
- # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIO32.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if (_MIPS_SIM == _ABIN32)
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_host_cpu_c_abi=mipsn32
-else
- gl_cv_host_cpu_c_abi=mips
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ;;
-
- powerpc* )
- # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
- # No need to distinguish them here; the caller may distinguish
- # them based on the OS.
- # On powerpc64 systems, the C compiler may still be generating
- # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
- # be generating 64-bit code.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined __powerpc64__ || defined _ARCH_PPC64
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # On powerpc64, there are two ABIs on Linux: The AIX compatible
- # one and the ELFv2 one. The latter defines _CALL_ELF=2.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined _CALL_ELF && _CALL_ELF == 2
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_host_cpu_c_abi=powerpc64-elfv2
-else
- gl_cv_host_cpu_c_abi=powerpc64
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-else
- gl_cv_host_cpu_c_abi=powerpc
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ;;
-
- rs6000 )
- gl_cv_host_cpu_c_abi=powerpc
- ;;
-
- s390* )
- # On s390x, the C compiler may be generating 64-bit (= s390x) code
- # or 31-bit (= s390) code.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined __LP64__ || defined __s390x__
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_host_cpu_c_abi=s390x
-else
- gl_cv_host_cpu_c_abi=s390
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ;;
-
- sparc | sparc64 )
- # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
- # C compiler still generates 32-bit code.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined __sparcv9 || defined __arch64__
- int ok;
- #else
- error fail
- #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_host_cpu_c_abi=sparc64
-else
- gl_cv_host_cpu_c_abi=sparc
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ;;
-
- *)
- gl_cv_host_cpu_c_abi="$host_cpu"
- ;;
- esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi" >&5
-$as_echo "$gl_cv_host_cpu_c_abi" >&6; }
-
- HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'`
- HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi"
-
-
-
- # This was
- # AC_DEFINE_UNQUOTED([__${HOST_CPU}__])
- # AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__])
- # earlier, but KAI C++ 3.2d doesn't like this.
- sed -e 's/-/_/g' >> confdefs.h <<EOF
-#ifndef __${HOST_CPU}__
-#define __${HOST_CPU}__ 1
-#endif
-#ifndef __${HOST_CPU_C_ABI}__
-#define __${HOST_CPU_C_ABI}__ 1
-#endif
-EOF
-
-
-
-
@@ -12730,18 +12507,21 @@ $as_echo "$gl_cv_next_limits_h" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether limits.h has ULLONG_WIDTH etc." >&5
-$as_echo_n "checking whether limits.h has ULLONG_WIDTH etc.... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc." >&5
+$as_echo_n "checking whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.... " >&6; }
if ${gl_cv_header_limits_width+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
- #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
- #endif
- #include <limits.h>
- int ullw = ULLONG_WIDTH;
+ #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+ #endif
+ #include <limits.h>
+ long long llm = LLONG_MAX;
+ int wb = WORD_BIT;
+ int ullw = ULLONG_WIDTH;
+
int
main ()
{
@@ -13844,7 +13624,9 @@ _ACEOF
;;
esac
- LIMITS_H=limits.h
+
+
+ LIMITS_H='limits.h'
if test -n "$LIMITS_H"; then
GL_GENERATE_LIMITS_H_TRUE=
GL_GENERATE_LIMITS_H_FALSE='#'
@@ -13858,6 +13640,7 @@ fi
+
if test -n "$STDINT_H"; then
GL_GENERATE_STDINT_H_TRUE=
GL_GENERATE_STDINT_H_FALSE='#'
@@ -13878,6 +13661,7 @@ fi
HAVE_DECL_IMAXDIV=1;
HAVE_DECL_STRTOIMAX=1;
HAVE_DECL_STRTOUMAX=1;
+ HAVE_IMAXDIV_T=1;
REPLACE_STRTOIMAX=0;
REPLACE_STRTOUMAX=0;
INT32_MAX_LT_INTMAX_MAX=1;
@@ -13974,44 +13758,7 @@ $as_echo "$gl_cv_next_inttypes_h" >&6; }
- for gl_func in imaxabs imaxdiv strtoimax strtoumax; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <inttypes.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -14409,55 +14156,7 @@ $as_echo "$gl_cv_type_wctrans_t" >&6; }
fi
- for gl_func in wctype iswctype wctrans towctrans ; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# include <wchar.h>
-#endif
-#include <wctype.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -14527,50 +14226,18 @@ $as_echo "$gl_cv_macro_O_CLOEXEC" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
-$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
-if ${ac_cv_gnu_library_2_1+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
- Lucky GNU user
- #endif
-#endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Lucky" >/dev/null 2>&1; then :
- ac_cv_gnu_library_2_1=yes
-else
- ac_cv_gnu_library_2_1=no
-fi
-rm -f conftest*
-
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
-$as_echo "$ac_cv_gnu_library_2_1" >&6; }
-
- GLIBC21="$ac_cv_gnu_library_2_1"
-
-
-
GNULIB_LOCALECONV=0;
GNULIB_SETLOCALE=0;
GNULIB_DUPLOCALE=0;
- HAVE_DUPLOCALE=1;
+ GNULIB_LOCALENAME=0;
+ HAVE_NEWLOCALE=1;
+ HAVE_DUPLOCALE=1;
+ HAVE_FREELOCALE=1;
REPLACE_LOCALECONV=0;
REPLACE_SETLOCALE=0;
+ REPLACE_NEWLOCALE=0;
REPLACE_DUPLOCALE=0;
+ REPLACE_FREELOCALE=0;
REPLACE_STRUCT_LCONV=0;
@@ -14615,19 +14282,49 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
STDDEF_H=
- ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include <stddef.h>
-"
-if test "x$ac_cv_type_max_align_t" = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
+$as_echo_n "checking for good max_align_t... " >&6; }
+if ${gl_cv_type_max_align_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stddef.h>
+ unsigned int s = sizeof (max_align_t);
+ #if defined __GNUC__ || defined __IBM__ALIGNOF__
+ int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1];
+ int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1];
+ #endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_type_max_align_t=yes
else
- HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h
+ gl_cv_type_max_align_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
+$as_echo "$gl_cv_type_max_align_t" >&6; }
+ if test $gl_cv_type_max_align_t = no; then
+ HAVE_MAX_ALIGN_T=0
+ STDDEF_H=stddef.h
+ fi
if test $gt_cv_c_wchar_t = no; then
HAVE_WCHAR_T=0
STDDEF_H=stddef.h
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
if ${gl_cv_decl_null_works+:} false; then :
@@ -14660,6 +14357,7 @@ $as_echo "$gl_cv_decl_null_works" >&6; }
STDDEF_H=stddef.h
fi
+
if test -n "$STDDEF_H"; then
GL_GENERATE_STDDEF_H_TRUE=
GL_GENERATE_STDDEF_H_FALSE='#'
@@ -14759,7 +14457,7 @@ else
int
main ()
{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
choke me
#endif
@@ -14800,7 +14498,7 @@ else
if test "$cross_compiling" = yes; then :
case "$host_os" in
# Guess yes on platforms where we know the result.
- *-gnu* | freebsd* | netbsd* | openbsd* \
+ *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
| hpux* | solaris* | cygwin* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
@@ -14887,7 +14585,7 @@ int main ()
return 1;
#else
/* Check whether the given locale name is recognized by the system. */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# if defined _WIN32 && !defined __CYGWIN__
/* On native Windows, setlocale(category, "") looks at the system settings,
not at the environment variables. Also, when an encoding suffix such
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
@@ -15036,7 +14734,7 @@ int main ()
return 1;
#else
/* Check whether the given locale name is recognized by the system. */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# if defined _WIN32 && !defined __CYGWIN__
/* On native Windows, setlocale(category, "") looks at the system settings,
not at the environment variables. Also, when an encoding suffix such
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
@@ -15173,7 +14871,7 @@ int main () {
variables, and all locales use the UTF-8 encoding. */
#if !(defined __BEOS__ || defined __HAIKU__)
/* Check whether the given locale name is recognized by the system. */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# if defined _WIN32 && !defined __CYGWIN__
/* On native Windows, setlocale(category, "") looks at the system settings,
not at the environment variables. Also, when an encoding suffix such
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
@@ -15618,8 +15316,6 @@ $as_echo "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time_t is signed" >&5
$as_echo_n "checking whether time_t is signed... " >&6; }
if ${gl_cv_time_t_is_signed+:} false; then :
@@ -16025,41 +15721,6 @@ $as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
-$as_echo_n "checking for promoted mode_t type... " >&6; }
-if ${gl_cv_promoted_mode_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-int
-main ()
-{
-typedef int array[2 * (sizeof (mode_t) < sizeof (int)) - 1];
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_promoted_mode_t='int'
-else
- gl_cv_promoted_mode_t='mode_t'
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
-$as_echo "$gl_cv_promoted_mode_t" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define PROMOTED_MODE_T $gl_cv_promoted_mode_t
-_ACEOF
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
if ${ac_cv_header_stdbool_h+:} false; then :
@@ -16184,7 +15845,7 @@ fi
# parse-datetime.y works with bison only.
- : ${YACC='bison -y'}
+ : ${YACC='bison -o y.tab.c'}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compound literals" >&5
@@ -16244,6 +15905,45 @@ $as_echo "#define HAVE_COMPOUND_LITERALS 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
+$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
+if ${ac_cv_gnu_library_2_1+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+ Lucky GNU user
+ #endif
+#endif
+#ifdef __UCLIBC__
+ Lucky user
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "Lucky" >/dev/null 2>&1; then :
+ ac_cv_gnu_library_2_1=yes
+else
+ ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
+
+ GLIBC21="$ac_cv_gnu_library_2_1"
+
+
+
+
+
@@ -16425,7 +16125,7 @@ else
if test "$cross_compiling" = yes; then :
case "$host_os" in
# Guess yes on glibc systems.
- *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
@@ -16556,12 +16256,12 @@ if ${gl_cv_func_strerror_0_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_strerror_0_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_strerror_0_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_strerror_0_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_strerror_0_works="guessing no" ;;
esac
else
@@ -16685,44 +16385,7 @@ $as_echo "$gl_cv_next_string_h" >&6; }
- for gl_func in ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r strerror_r strsignal strverscmp; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -16816,48 +16479,7 @@ $as_echo "$gl_cv_next_strings_h" >&6; }
- for gl_func in ffs strcasecmp strncasecmp; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- /* Minix 3.1.8 has a bug: <sys/types.h> must be included before
- <strings.h>. */
- #include <sys/types.h>
- #include <strings.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
ac_fn_c_check_decl "$LINENO" "strndup" "ac_cv_have_decl_strndup" "$ac_includes_default"
@@ -17922,7 +17544,7 @@ done
if test $ac_cv_header_sys_acl_h = yes; then
ac_save_LIBS=$LIBS
- if test $use_acl = 0; then
+ if test $use_acl = 0; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_get_file" >&5
$as_echo_n "checking for library containing acl_get_file... " >&6; }
if ${ac_cv_search_acl_get_file+:} false; then :
@@ -18765,8 +18387,8 @@ $as_echo "$gl_cv___builtin_expect" >&6; }
HAVE_REALPATH=0
else
case "$gl_cv_func_realpath_works" in
- *yes) ;;
- *) REPLACE_REALPATH=1 ;;
+ *yes) ;;
+ *) REPLACE_REALPATH=1 ;;
esac
fi
else
@@ -18870,7 +18492,7 @@ else
# undef PATH_MAX
# define PATH_MAX 1024
#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# undef PATH_MAX
# define PATH_MAX 260
#endif
@@ -19191,37 +18813,9 @@ $as_echo "#define GNULIB_TEST_CLOSEDIR 1" >>confdefs.h
:
- if test "x$datarootdir" = x; then
- datarootdir='${datadir}'
-
- fi
- if test "x$docdir" = x; then
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-
- fi
- if test "x$htmldir" = x; then
- htmldir='${docdir}'
-
- fi
- if test "x$dvidir" = x; then
- dvidir='${docdir}'
-
- fi
- if test "x$pdfdir" = x; then
- pdfdir='${docdir}'
-
- fi
- if test "x$psdir" = x; then
- psdir='${docdir}'
-
- fi
if test "x$lispdir" = x; then
lispdir='${datarootdir}/emacs/site-lisp'
- fi
- if test "x$localedir" = x; then
- localedir='${datarootdir}/locale'
-
fi
if test "x$runstatedir" = x; then
runstatedir='${localstatedir}/run'
@@ -19385,44 +18979,7 @@ $as_echo "$gl_cv_next_dirent_h" >&6; }
- for gl_func in alphasort closedir dirfd fdopendir opendir readdir rewinddir scandir; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <dirent.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -20081,10 +19638,10 @@ if ${ac_cv_func_getgroups_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in # ((
- # Guess yes on glibc systems.
- *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) ac_cv_func_getgroups_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) ac_cv_func_getgroups_works="guessing no" ;;
esac
else
@@ -20094,7 +19651,7 @@ $ac_includes_default
int
main ()
{
-/* On Ultrix 4.3, getgroups (0, 0) always fails. */
+/* On NeXTstep 3.2, getgroups (0, 0) always fails. */
return getgroups (0, 0) == -1;
;
return 0;
@@ -20316,12 +19873,14 @@ if ${gl_cv_func_open_directory_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_open_directory_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_open_directory_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_open_directory_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_open_directory_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_open_directory_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_open_directory_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_open_directory_works="guessing no" ;;
esac
else
@@ -20868,44 +20427,17 @@ $as_echo "$gl_cv_next_fcntl_h" >&6; }
- for gl_func in fcntl openat; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <fcntl.h>
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
+
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_FCNTL_SAFER 1
+_ACEOF
@@ -21404,108 +20936,110 @@ fi
-
- FNMATCH_H=
gl_fnmatch_required_lowercase=`
echo $gl_fnmatch_required | LC_ALL=C tr '[A-Z]' '[a-z]'
`
- gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working $gl_fnmatch_required fnmatch" >&5
+
+ if test $ac_cv_func_fnmatch = no; then
+ HAVE_FNMATCH=0
+ else
+ gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working $gl_fnmatch_required fnmatch" >&5
$as_echo_n "checking for working $gl_fnmatch_required fnmatch... " >&6; }
if eval \${$gl_fnmatch_cache_var+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test $gl_fnmatch_required = GNU; then
- gl_fnmatch_gnu_start=
- gl_fnmatch_gnu_end=
- else
- gl_fnmatch_gnu_start='#if 0'
- gl_fnmatch_gnu_end='#endif'
- fi
- if test "$cross_compiling" = yes; then :
+ if test $gl_fnmatch_required = GNU; then
+ gl_fnmatch_gnu_start=
+ gl_fnmatch_gnu_end=
+ else
+ gl_fnmatch_gnu_start='#if 0'
+ gl_fnmatch_gnu_end='#endif'
+ fi
+ if test "$cross_compiling" = yes; then :
eval "$gl_fnmatch_cache_var=\"guessing no\""
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <fnmatch.h>
- static int
- y (char const *pattern, char const *string, int flags)
- {
- return fnmatch (pattern, string, flags) == 0;
- }
- static int
- n (char const *pattern, char const *string, int flags)
- {
- return fnmatch (pattern, string, flags) == FNM_NOMATCH;
- }
+ static int
+ y (char const *pattern, char const *string, int flags)
+ {
+ return fnmatch (pattern, string, flags) == 0;
+ }
+ static int
+ n (char const *pattern, char const *string, int flags)
+ {
+ return fnmatch (pattern, string, flags) == FNM_NOMATCH;
+ }
int
main ()
{
char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]";
- char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]";
- static char const A_1[] = { 'A' - 1, 0 };
- static char const A01[] = { 'A' + 1, 0 };
- static char const a_1[] = { 'a' - 1, 0 };
- static char const a01[] = { 'a' + 1, 0 };
- static char const bs_1[] = { '\\\\' - 1, 0 };
- static char const bs01[] = { '\\\\' + 1, 0 };
- int result = 0;
- if (!n ("a*", "", 0))
- return 1;
- if (!y ("a*", "abc", 0))
- return 1;
- if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */
- return 1;
- if (!n ("d*/*1", "d/s/1", FNM_PATHNAME))
- return 2;
- if (!y ("a\\\\bc", "abc", 0))
- return 3;
- if (!n ("a\\\\bc", "abc", FNM_NOESCAPE))
- return 3;
- if (!y ("*x", ".x", 0))
- return 4;
- if (!n ("*x", ".x", FNM_PERIOD))
- return 4;
- if (!y (Apat, "\\\\", 0))
- return 5;
- if (!y (Apat, "A", 0))
- return 5;
- if (!y (apat, "\\\\", 0))
- return 5;
- if (!y (apat, "a", 0))
- return 5;
- if (!(n (Apat, A_1, 0) == ('A' < '\\\\')))
- return 5;
- if (!(n (apat, a_1, 0) == ('a' < '\\\\')))
- return 5;
- if (!(y (Apat, A01, 0) == ('A' < '\\\\')))
- return 5;
- if (!(y (apat, a01, 0) == ('a' < '\\\\')))
- return 5;
- if (!(y (Apat, bs_1, 0) == ('A' < '\\\\')))
- return 5;
- if (!(y (apat, bs_1, 0) == ('a' < '\\\\')))
- return 5;
- if (!(n (Apat, bs01, 0) == ('A' < '\\\\')))
- return 5;
- if (!(n (apat, bs01, 0) == ('a' < '\\\\')))
- return 5;
- $gl_fnmatch_gnu_start
- if (!y ("xxXX", "xXxX", FNM_CASEFOLD))
- result |= 8;
- if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH))
- result |= 16;
- if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME))
- result |= 32;
- if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR))
- result |= 64;
- if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR))
- result |= 64;
- if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR))
- result |= 64;
- $gl_fnmatch_gnu_end
- return result;
+ char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]";
+ static char const A_1[] = { 'A' - 1, 0 };
+ static char const A01[] = { 'A' + 1, 0 };
+ static char const a_1[] = { 'a' - 1, 0 };
+ static char const a01[] = { 'a' + 1, 0 };
+ static char const bs_1[] = { '\\\\' - 1, 0 };
+ static char const bs01[] = { '\\\\' + 1, 0 };
+ int result = 0;
+ if (!n ("a*", "", 0))
+ return 1;
+ if (!y ("a*", "abc", 0))
+ return 1;
+ if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */
+ return 1;
+ if (!n ("d*/*1", "d/s/1", FNM_PATHNAME))
+ return 2;
+ if (!y ("a\\\\bc", "abc", 0))
+ return 3;
+ if (!n ("a\\\\bc", "abc", FNM_NOESCAPE))
+ return 3;
+ if (!y ("*x", ".x", 0))
+ return 4;
+ if (!n ("*x", ".x", FNM_PERIOD))
+ return 4;
+ if (!y (Apat, "\\\\", 0))
+ return 5;
+ if (!y (Apat, "A", 0))
+ return 5;
+ if (!y (apat, "\\\\", 0))
+ return 5;
+ if (!y (apat, "a", 0))
+ return 5;
+ if (!(n (Apat, A_1, 0) == ('A' < '\\\\')))
+ return 5;
+ if (!(n (apat, a_1, 0) == ('a' < '\\\\')))
+ return 5;
+ if (!(y (Apat, A01, 0) == ('A' < '\\\\')))
+ return 5;
+ if (!(y (apat, a01, 0) == ('a' < '\\\\')))
+ return 5;
+ if (!(y (Apat, bs_1, 0) == ('A' < '\\\\')))
+ return 5;
+ if (!(y (apat, bs_1, 0) == ('a' < '\\\\')))
+ return 5;
+ if (!(n (Apat, bs01, 0) == ('A' < '\\\\')))
+ return 5;
+ if (!(n (apat, bs01, 0) == ('a' < '\\\\')))
+ return 5;
+ $gl_fnmatch_gnu_start
+ if (!y ("xxXX", "xXxX", FNM_CASEFOLD))
+ result |= 8;
+ if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH))
+ result |= 16;
+ if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME))
+ result |= 32;
+ if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR))
+ result |= 64;
+ if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR))
+ result |= 64;
+ if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR))
+ result |= 64;
+ $gl_fnmatch_gnu_end
+ return result;
;
return 0;
@@ -21525,13 +21059,15 @@ fi
eval ac_res=\$$gl_fnmatch_cache_var
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
- if test "$gl_fnmatch_result" = yes; then
- rm -f "$gl_source_base/fnmatch.h"
- else
- FNMATCH_H=fnmatch.h
+ eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
+ if test "$gl_fnmatch_result" != yes; then
+ REPLACE_FNMATCH=1
+ fi
fi
+ if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
+
+ FNMATCH_H='fnmatch.h'
if test -n "$FNMATCH_H"; then
GL_GENERATE_FNMATCH_H_TRUE=
GL_GENERATE_FNMATCH_H_FALSE='#'
@@ -21541,22 +21077,19 @@ else
fi
- if test -n "$FNMATCH_H"; then
-
+ fi
+ if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
- gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext"
+ gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext"
-cat >>confdefs.h <<_ACEOF
-#define fnmatch ${gl_fnmatch_required_lowercase}_fnmatch
-_ACEOF
ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h>
@@ -21580,22 +21113,32 @@ _ACEOF
- if test -n "$FNMATCH_H"; then
+ GNULIB_FNMATCH=1
+$as_echo "#define GNULIB_TEST_FNMATCH 1" >>confdefs.h
- gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext"
-cat >>confdefs.h <<_ACEOF
-#define fnmatch ${gl_fnmatch_required_lowercase}_fnmatch
-_ACEOF
+
+
+ if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
+
+
+
+
+
+
+
+
+ gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext"
+
ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h>
@@ -21616,6 +21159,14 @@ _ACEOF
fi
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_FNMATCH_GNU 1
+_ACEOF
+
+
+
+
+
fp_headers='
#include <stdio.h>
#if HAVE_STDIO_EXT_H
@@ -21789,6 +21340,19 @@ _ACEOF
fi
done
+ if test $ac_cv_func__fseeki64 = yes; then
+ ac_fn_c_check_decl "$LINENO" "_fseeki64" "ac_cv_have_decl__fseeki64" "$ac_includes_default"
+if test "x$ac_cv_have_decl__fseeki64" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL__FSEEKI64 $ac_have_decl
+_ACEOF
+
+ fi
fi
@@ -21811,8 +21375,8 @@ $as_echo "#define GNULIB_TEST_FSEEKO 1" >>confdefs.h
case "$host_os" in
- mingw*)
- REPLACE_FSTAT=1
+ mingw* | solaris*)
+ REPLACE_FSTAT=1
;;
esac
@@ -21885,6 +21449,7 @@ $as_echo "#define GNULIB_TEST_FSTAT 1" >>confdefs.h
+
if test $ac_cv_func_fstatat = no; then
HAVE_FSTATAT=0
else
@@ -21929,15 +21494,20 @@ $as_echo "$gl_cv_func_fstatat_zero_flag" >&6; }
case $gl_cv_func_fstatat_zero_flag+$gl_cv_func_lstat_dereferences_slashed_symlink in
*yes+*yes) ;;
- *) REPLACE_FSTATAT=1
- case $gl_cv_func_fstatat_zero_flag in
- *yes)
+ *) REPLACE_FSTATAT=1 ;;
+ esac
+
+ case $host_os in
+ solaris*)
+ REPLACE_FSTATAT=1 ;;
+ esac
+
+ case $REPLACE_FSTATAT,$gl_cv_func_fstatat_zero_flag in
+ 1,*yes)
$as_echo "#define HAVE_WORKING_FSTATAT_ZERO_FLAG 1" >>confdefs.h
;;
- esac
- ;;
esac
fi
@@ -22086,10 +21656,22 @@ else
# Arrange for deletion of the temporary directory this test creates.
ac_clean_files="$ac_clean_files confdir3"
if test "$cross_compiling" = yes; then :
- case "$host_os" in
- aix*) gl_cv_func_getcwd_path_max='no, it has the AIX bug';;
- *) gl_cv_func_getcwd_path_max=no;;
+ # Cross-compilation guesses:
+ case "$host_os" in
+ aix*) # On AIX, it has the AIX bug.
+ gl_cv_func_getcwd_path_max='no, it has the AIX bug' ;;
+ gnu*) # On Hurd, it is 'yes'.
+ gl_cv_func_getcwd_path_max=yes ;;
+ linux* | kfreebsd*)
+ # On older Linux+glibc it's 'no, but it is partly working',
+ # on newer Linux+glibc it's 'yes'.
+ # On Linux+musl libc, it's 'no, but it is partly working'.
+ # On kFreeBSD+glibc, it's 'no, but it is partly working'.
+ gl_cv_func_getcwd_path_max='no, but it is partly working' ;;
+ *) # If we don't know, assume the worst.
+ gl_cv_func_getcwd_path_max=no ;;
esac
+
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -22123,7 +21705,7 @@ else
# undef PATH_MAX
# define PATH_MAX 1024
#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# undef PATH_MAX
# define PATH_MAX 260
#endif
@@ -22314,16 +21896,44 @@ $as_echo "$gl_cv_func_getcwd_path_max" >&6; }
- for ac_func in getpagesize
-do :
- ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPAGESIZE 1
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5
+$as_echo_n "checking for getpagesize... " >&6; }
+if ${gl_cv_func_getpagesize+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <unistd.h>
+int
+main ()
+{
+return getpagesize();
+ ;
+ return 0;
+}
+
_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gl_cv_func_getpagesize=yes
+else
+ gl_cv_func_getpagesize=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getpagesize" >&5
+$as_echo "$gl_cv_func_getpagesize" >&6; }
+
+ if test $gl_cv_func_getpagesize = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
+_ACEOF
+
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getcwd aborts when 4k < cwd_length < 16k" >&5
$as_echo_n "checking whether getcwd aborts when 4k < cwd_length < 16k... " >&6; }
@@ -22366,7 +21976,7 @@ else
# undef PATH_MAX
# define PATH_MAX 1024
#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# undef PATH_MAX
# define PATH_MAX 260
#endif
@@ -22894,10 +22504,10 @@ if ${ac_cv_func_getgroups_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in # ((
- # Guess yes on glibc systems.
- *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) ac_cv_func_getgroups_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) ac_cv_func_getgroups_works="guessing no" ;;
esac
else
@@ -22907,7 +22517,7 @@ $ac_includes_default
int
main ()
{
-/* On Ultrix 4.3, getgroups (0, 0) always fails. */
+/* On NeXTstep 3.2, getgroups (0, 0) always fails. */
return getgroups (0, 0) == -1;
;
return 0;
@@ -22960,10 +22570,10 @@ if ${gl_cv_func_getgroups_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_getgroups_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_getgroups_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_getgroups_works="guessing no" ;;
esac
else
@@ -23220,18 +22830,37 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
- for ac_func in getpagesize
-do :
- ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPAGESIZE 1
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5
+$as_echo_n "checking for getpagesize... " >&6; }
+if ${gl_cv_func_getpagesize+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <unistd.h>
+int
+main ()
+{
+return getpagesize();
+ ;
+ return 0;
+}
+
_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gl_cv_func_getpagesize=yes
+else
+ gl_cv_func_getpagesize=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getpagesize" >&5
+$as_echo "$gl_cv_func_getpagesize" >&6; }
- if test $ac_cv_func_getpagesize = no; then
+ if test $gl_cv_func_getpagesize = no; then
HAVE_GETPAGESIZE=0
for ac_header in OS.h
do :
@@ -23426,12 +23055,12 @@ else
if test "$cross_compiling" = yes; then :
# When cross-compiling:
case "$host_os" in
- # Guess all is fine on glibc systems.
- *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_gettimeofday_clobber="guessing yes" ;;
+ # Guess all is fine on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_gettimeofday_clobber="guessing yes" ;;
esac
else
@@ -23639,10 +23268,6 @@ $as_echo "#define GNULIB_TEST_GROUP_MEMBER 1" >>confdefs.h
- :
-
-
-
:
@@ -24063,12 +23688,13 @@ $as_echo "$gl_cv_next_langinfo_h" >&6; }
HAVE_LANGINFO_CODESET=0
HAVE_LANGINFO_T_FMT_AMPM=0
+ HAVE_LANGINFO_ALTMON=0
HAVE_LANGINFO_ERA=0
HAVE_LANGINFO_YESEXPR=0
if test $ac_cv_header_langinfo_h = yes; then
HAVE_LANGINFO_H=1
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5
$as_echo_n "checking whether langinfo.h defines CODESET... " >&6; }
if ${gl_cv_header_langinfo_codeset+:} false; then :
$as_echo_n "(cached) " >&6
@@ -24130,6 +23756,37 @@ $as_echo "$gl_cv_header_langinfo_t_fmt_ampm" >&6; }
if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then
HAVE_LANGINFO_T_FMT_AMPM=1
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ALTMON_1" >&5
+$as_echo_n "checking whether langinfo.h defines ALTMON_1... " >&6; }
+if ${gl_cv_header_langinfo_altmon+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <langinfo.h>
+int a = ALTMON_1;
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_header_langinfo_altmon=yes
+else
+ gl_cv_header_langinfo_altmon=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_altmon" >&5
+$as_echo "$gl_cv_header_langinfo_altmon" >&6; }
+ if test $gl_cv_header_langinfo_altmon = yes; then
+ HAVE_LANGINFO_ALTMON=1
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ERA" >&5
$as_echo_n "checking whether langinfo.h defines ERA... " >&6; }
if ${gl_cv_header_langinfo_era+:} false; then :
@@ -24202,44 +23859,8 @@ $as_echo "$gl_cv_header_langinfo_yesexpr" >&6; }
- for gl_func in nl_langinfo; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <langinfo.h>
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -24303,6 +23924,39 @@ $as_echo "#define GNULIB_TEST_LCHOWN 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
+$as_echo_n "checking whether the compiler supports the __inline keyword... " >&6; }
+if ${gl_cv_c___inline+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+typedef int foo_t;
+ static __inline foo_t foo (void) { return 0; }
+int
+main ()
+{
+return foo ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_c___inline=yes
+else
+ gl_cv_c___inline=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
+$as_echo "$gl_cv_c___inline" >&6; }
+ if test $gl_cv_c___inline = yes; then
+
+$as_echo "#define HAVE___INLINE 1" >>confdefs.h
+
+ fi
+
+
@@ -24321,10 +23975,12 @@ else
fi
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_link_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_link_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_link_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_link_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_link_works="guessing no" ;;
esac
else
@@ -24444,10 +24100,10 @@ else
echo > conftest.file
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # On glibc/Linux we know the result.
- linux*-gnu*) gl_cv_func_link_follows_symlink="guessing no" ;;
- # Otherwise, we don't know.
- *) gl_cv_func_link_follows_symlink=unknown ;;
+ # On glibc/Linux we know the result.
+ linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;;
+ # Otherwise, we don't know.
+ *) gl_cv_func_link_follows_symlink=unknown ;;
esac
else
@@ -24582,10 +24238,14 @@ if ${gl_cv_func_linkat_slash+:} false; then :
else
rm -rf conftest.a conftest.b conftest.c conftest.d conftest.e conftest.s
if test "$cross_compiling" = yes; then :
- # Guess yes on glibc systems, no otherwise.
+
case "$host_os" in
- *-gnu*) gl_cv_func_linkat_slash="guessing yes";;
- *) gl_cv_func_linkat_slash="guessing no";;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_linkat_slash="guessing yes";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_linkat_slash="guessing yes";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_linkat_slash="guessing no";;
esac
else
@@ -24717,12 +24377,7 @@ $as_echo "#define GNULIB_TEST_LINKAT 1" >>confdefs.h
-
-
-
-
-
- LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+ LOCALCHARSET_TESTS_ENVIRONMENT=
@@ -24915,48 +24570,7 @@ $as_echo "$gl_cv_next_locale_h" >&6; }
- for gl_func in setlocale duplocale; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <locale.h>
-/* Some systems provide declarations in a non-standard header. */
-#if HAVE_XLOCALE_H
-# include <xlocale.h>
-#endif
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -25136,10 +24750,11 @@ $as_echo "#define GNULIB_TEST_LSEEK 1" >>confdefs.h
+
if test $ac_cv_func_lstat = yes; then
- case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
- *no)
+ case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in
+ solaris* | *no)
REPLACE_LSTAT=1
;;
esac
@@ -25198,7 +24813,7 @@ else
if test "$cross_compiling" = yes; then :
case "$host_os" in
# Guess yes on platforms where we know the result.
- *-gnu* | freebsd* | netbsd* | openbsd* \
+ *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
| hpux* | solaris* | cygwin* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
@@ -25852,12 +25467,11 @@ if ${gl_cv_func_mbrtowc_empty_input+:} false; then :
else
case "$host_os" in
- # Guess no on AIX and glibc systems.
- aix* | *-gnu*)
- gl_cv_func_mbrtowc_empty_input="guessing no" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
- *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+ # Guess no on AIX and glibc systems.
+ aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+ *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
esac
if test "$cross_compiling" = yes; then :
:
@@ -26010,6 +25624,7 @@ $as_echo "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
gl_LIBOBJS="$gl_LIBOBJS mbrtowc.$ac_objext"
+
:
fi
@@ -26808,10 +26423,12 @@ else
rm -rf conftest.dir
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;;
- # Guess yes on MSVC, no on mingw.
- mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;;
+ # Guess yes on MSVC, no on mingw.
+ mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef _MSC_VER
@@ -26827,9 +26444,9 @@ else
fi
rm -f conftest*
- ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;;
+ ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;;
esac
else
@@ -26877,12 +26494,12 @@ else
rm -rf conftest.dir
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
esac
else
@@ -27024,10 +26641,41 @@ $as_echo "#define GNULIB_TEST_MKDTEMP 1" >>confdefs.h
- if test $ac_cv_func_mkfifo = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mkfifo" >&5
+$as_echo_n "checking for mkfifo... " >&6; }
+if ${gl_cv_func_mkfifo+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/stat.h>
+int
+main ()
+{
+return mkfifo("/",0);
+ ;
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gl_cv_func_mkfifo=yes
+else
+ gl_cv_func_mkfifo=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mkfifo" >&5
+$as_echo "$gl_cv_func_mkfifo" >&6; }
+ if test $gl_cv_func_mkfifo = no; then
HAVE_MKFIFO=0
else
+$as_echo "#define HAVE_MKFIFO 1" >>confdefs.h
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkfifo rejects trailing slashes" >&5
$as_echo_n "checking whether mkfifo rejects trailing slashes... " >&6; }
if ${gl_cv_func_mkfifo_works+:} false; then :
@@ -27039,10 +26687,12 @@ else
fi
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_mkfifo_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_mkfifo_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_mkfifo_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_mkfifo_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_mkfifo_works="guessing no" ;;
esac
else
@@ -27197,10 +26847,12 @@ if ${gl_cv_func_mknod_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_mknod_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_mknod_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_mknod_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_mknod_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_mknod_works="guessing no" ;;
esac
else
@@ -27461,8 +27113,11 @@ cat >>confdefs.h <<_ACEOF
#define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS
_ACEOF
- if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \
- && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then
+ if test $HAVE_LANGINFO_CODESET = 1 \
+ && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \
+ && test $HAVE_LANGINFO_ALTMON = 1 \
+ && test $HAVE_LANGINFO_ERA = 1 \
+ && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then
:
else
REPLACE_NL_LANGINFO=1
@@ -27758,6 +27413,16 @@ $as_echo "#define GNULIB_TEST_OPENAT 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_OPENAT_SAFER 1
+_ACEOF
+
+
+
+
+
for ac_func in opendir
do :
ac_fn_c_check_func "$LINENO" "opendir" "ac_cv_func_opendir"
@@ -28168,10 +27833,12 @@ else
ln -s conftest.link conftest.lnk2
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_readlink_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_readlink_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_readlink_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_readlink_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_readlink_works="guessing no" ;;
esac
else
@@ -28576,6 +28243,17 @@ int result = 0;
if (! REG_STARTEND)
result |= 64;
+ /* Matching with the compiled form of this regexp would provoke
+ an assertion failure prior to glibc-2.28:
+ regexec.c:1375: pop_fail_stack: Assertion 'num >= 0' failed
+ With glibc-2.28, compilation fails and reports the invalid
+ back reference. */
+ re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+ memset (®ex, 0, sizeof regex);
+ s = re_compile_pattern ("0|()0|\\1|0", 10, ®ex);
+ if (!s || strcmp (s, "Invalid back reference"))
+ result |= 64;
+
#if 0
/* It would be nice to reject hosts whose regoff_t values are too
narrow (including glibc on hosts with 64-bit ptrdiff_t and
@@ -28734,12 +28412,14 @@ else
fi
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_rename_slash_dst_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rename_slash_dst_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_rename_slash_dst_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rename_slash_dst_works="guessing no" ;;
esac
else
@@ -28805,12 +28485,14 @@ else
fi
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rename_slash_src_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rename_slash_src_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rename_slash_src_works="guessing no" ;;
esac
else
@@ -28874,12 +28556,14 @@ else
set x `ls -i conftest.f conftest.f1` && test "" = ""; then
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_rename_link_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rename_link_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rename_link_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_rename_link_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rename_link_works="guessing no" ;;
esac
else
@@ -28957,12 +28641,14 @@ else
as_fn_error $? "cannot create temporary files" "$LINENO" 5
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rename_dest_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_rename_dest_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rename_dest_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rename_dest_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_rename_dest_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_rename_dest_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rename_dest_works="guessing no" ;;
esac
else
@@ -29193,12 +28879,14 @@ else
touch conftest.file
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rmdir_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_rmdir_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rmdir_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rmdir_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_rmdir_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_rmdir_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rmdir_works="guessing no" ;;
esac
else
@@ -29569,10 +29257,10 @@ if ${gl_cv_func_setenv_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_setenv_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_setenv_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_setenv_works="guessing no" ;;
esac
else
@@ -29758,44 +29446,7 @@ fi
- for gl_func in pthread_sigmask sigaction sigaddset sigdelset sigemptyset sigfillset sigismember sigpending sigprocmask; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <signal.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -29918,12 +29569,12 @@ if ${gl_cv_func_sleep_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_sleep_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_sleep_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_sleep_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_sleep_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_sleep_works="guessing no" ;;
esac
else
@@ -30248,10 +29899,12 @@ else
fi
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_stat_file_slash="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_stat_file_slash="guessing no" ;;
esac
else
@@ -30296,6 +29949,10 @@ $as_echo "$gl_cv_func_stat_file_slash" >&6; }
$as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
;;
esac
+ case $host_os in
+ solaris*)
+ REPLACE_FSTAT=1 ;;
+ esac
;;
esac
@@ -30565,11 +30222,10 @@ fi
NEXT_STDARG_H='<stdarg.h>'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
$as_echo_n "checking for va_copy... " >&6; }
- if ${gl_cv_func_va_copy+:} false; then :
+if ${gl_cv_func_va_copy+:} false; then :
$as_echo_n "(cached) " >&6
else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
int
@@ -30590,9 +30246,9 @@ else
gl_cv_func_va_copy=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_va_copy" >&5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_va_copy" >&5
$as_echo "$gl_cv_func_va_copy" >&6; }
if test $gl_cv_func_va_copy = no; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30774,19 +30430,49 @@ fi
STDDEF_H=
- ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include <stddef.h>
-"
-if test "x$ac_cv_type_max_align_t" = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
+$as_echo_n "checking for good max_align_t... " >&6; }
+if ${gl_cv_type_max_align_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stddef.h>
+ unsigned int s = sizeof (max_align_t);
+ #if defined __GNUC__ || defined __IBM__ALIGNOF__
+ int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1];
+ int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1];
+ #endif
+
+int
+main ()
+{
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_type_max_align_t=yes
else
- HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h
+ gl_cv_type_max_align_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
+$as_echo "$gl_cv_type_max_align_t" >&6; }
+ if test $gl_cv_type_max_align_t = no; then
+ HAVE_MAX_ALIGN_T=0
+ STDDEF_H=stddef.h
+ fi
if test $gt_cv_c_wchar_t = no; then
HAVE_WCHAR_T=0
STDDEF_H=stddef.h
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
if ${gl_cv_decl_null_works+:} false; then :
@@ -30819,6 +30505,7 @@ $as_echo "$gl_cv_decl_null_works" >&6; }
STDDEF_H=stddef.h
fi
+
if test -n "$STDDEF_H"; then
GL_GENERATE_STDDEF_H_TRUE=
GL_GENERATE_STDDEF_H_FALSE='#'
@@ -30993,7 +30680,7 @@ else
/* For non-mingw systems, compilation will trivially succeed.
For mingw, compilation will succeed for older mingw (system
printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */
- #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \
+ #if (defined _WIN32 && ! defined __CYGWIN__) && \
(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1];
#endif
@@ -31058,44 +30745,7 @@ _ACEOF
- for gl_func in dprintf fpurge fseeko ftello getdelim getline gets pclose popen renameat snprintf tmpfile vdprintf vsnprintf; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -31173,50 +30823,7 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; }
- for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#if HAVE_SYS_LOADAVG_H
-# include <sys/loadavg.h>
-#endif
-#if HAVE_RANDOM_H
-# include <random.h>
-#endif
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -31516,10 +31123,10 @@ if ${gl_cv_func_working_strerror+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_working_strerror="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_working_strerror="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_working_strerror="guessing no" ;;
esac
else
@@ -32176,10 +31783,12 @@ if ${gl_cv_func_symlink_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_symlink_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_symlink_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_symlink_works="guessing no" ;;
esac
else
@@ -32266,10 +31875,12 @@ if ${gl_cv_func_symlinkat_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_symlinkat_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_symlinkat_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_symlinkat_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_symlinkat_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_symlinkat_works="guessing no" ;;
esac
else
@@ -32451,44 +32062,7 @@ fi
- for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat mknod mknodat stat utimensat; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/stat.h>
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -32743,6 +32317,60 @@ $as_echo "#define GNULIB_TEST_TIME_R 1" >>confdefs.h
+ # Mac OS X 10.6 loops forever with some time_t values.
+ # See Bug#27706, Bug#27736, and
+ # https://lists.gnu.org/r/bug-gnulib/2017-07/msg00142.html
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime loops forever near extrema" >&5
+$as_echo_n "checking whether localtime loops forever near extrema... " >&6; }
+if ${gl_cv_func_localtime_infloop_bug+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gl_cv_func_localtime_infloop_bug=no
+ if test "$cross_compiling" = yes; then :
+ gl_cv_func_localtime_infloop_bug="guessing no"
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <time.h>
+
+int
+main ()
+{
+
+ time_t t = -67768038400666600;
+ struct tm *tm;
+ char *tz = getenv ("TZ");
+ if (! (tz && strcmp (tz, "QQQ0") == 0))
+ return 0;
+ alarm (2);
+ tm = localtime (&t);
+ /* Use TM and *TM to suppress over-optimization. */
+ return tm && tm->tm_isdst;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ (TZ=QQQ0 ./conftest$EXEEXT) >/dev/null 2>&1 ||
+ gl_cv_func_localtime_infloop_bug=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_localtime_infloop_bug" >&5
+$as_echo "$gl_cv_func_localtime_infloop_bug" >&6; }
+ if test "$gl_cv_func_localtime_infloop_bug" = yes; then
+
+$as_echo "#define HAVE_LOCALTIME_INFLOOP_BUG 1" >>confdefs.h
+
+ fi
+
ac_fn_c_check_type "$LINENO" "timezone_t" "ac_cv_type_timezone_t" "#include <time.h>
"
if test "x$ac_cv_type_timezone_t" = xyes; then :
@@ -32846,12 +32474,12 @@ if ${gl_cv_func_tzset_clobber+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess all is fine on glibc systems.
- *-gnu*) gl_cv_func_tzset_clobber="guessing no" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_tzset_clobber="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_tzset_clobber="guessing yes" ;;
+ # Guess all is fine on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_tzset_clobber="guessing no" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_tzset_clobber="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_tzset_clobber="guessing yes" ;;
esac
else
@@ -33038,56 +32666,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
- for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat truncate ttyname_r unlink unlinkat usleep; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-/* Some systems declare various items in the wrong headers. */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <fcntl.h>
-# include <stdio.h>
-# include <stdlib.h>
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-# include <io.h>
-# endif
-#endif
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -33158,7 +32737,7 @@ fi
|| { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
&& { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
|| { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
- && test $LIBUNISTRING_VERSION_SUBMINOR -lt 6
+ && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8
}
}
}
@@ -33193,12 +32772,14 @@ else
fi
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_unlink_honors_slashes="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_unlink_honors_slashes="guessing no" ;;
esac
else
@@ -33668,6 +33249,7 @@ $as_echo "#define GNULIB_TEST_UTIME 1" >>confdefs.h
+
if test $gl_cv_have_include_next = yes; then
gl_cv_next_utime_h='<'utime.h'>'
else
@@ -33746,14 +33328,19 @@ $as_echo "$gl_cv_next_utime_h" >&6; }
UTIME_H=''
- if test $ac_cv_header_utime_h != yes; then
- UTIME_H=utime.h
- else
- case "$host_os" in
- mingw*) UTIME_H=utime.h
- ;;
- esac
- fi
+ if false; then
+ UTIME_H=utime.h
+ else
+ if test $ac_cv_header_utime_h != yes; then
+ UTIME_H=utime.h
+ else
+ case "$host_os" in
+ mingw*) UTIME_H=utime.h
+ ;;
+ esac
+ fi
+ fi
+
if test -n "$UTIME_H"; then
GL_GENERATE_UTIME_H_TRUE=
@@ -33765,44 +33352,7 @@ fi
- for gl_func in utime; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <utime.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -33819,10 +33369,12 @@ else
touch conftest.file
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_futimesat_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_futimesat_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_futimesat_works="guessing no" ;;
esac
else
@@ -34459,54 +34011,7 @@ $as_echo "$gl_cv_next_wchar_h" >&6; }
- for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime ; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-#endif
-#include <wchar.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -35120,55 +34625,7 @@ $as_echo "$gl_cv_type_wctrans_t" >&6; }
fi
- for gl_func in wctype iswctype wctrans towctrans ; do
- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# include <wchar.h>
-#endif
-#include <wctype.h>
-
-int
-main ()
-{
-#undef $gl_func
- (void) $gl_func;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_gl_Symbol=yes"
-else
- eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
- eval ac_cv_have_decl_$gl_func=yes
-fi
- done
@@ -35248,9 +34705,9 @@ else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc and AIX 7 systems.
- *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
- *) gl_cv_func_wcwidth_works="guessing no";;
+ # Guess yes on glibc and AIX 7 systems.
+ *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
+ *) gl_cv_func_wcwidth_works="guessing no";;
esac
else
@@ -35324,6 +34781,10 @@ $as_echo "$gl_cv_func_wcwidth_works" >&6; }
gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext"
+
+
+ :
+
fi
@@ -35450,6 +34911,18 @@ done
LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
+
+if test $ac_cv_lib_error_at_line = no; then
+ # This means that the error() function is not present in libc, so
+ # the one from gnulib will be used instead. This function precedes
+ # error messages it prints with the program name as returned by getprogname()
+ # call, instead of using the name set by set_program_name.
+ # Install workaround.
+
+$as_echo "#define ENABLE_ERROR_PRINT_PROGNAME 1" >>confdefs.h
+
+fi
+
# paxutils modules
@@ -35511,6 +34984,8 @@ fi
+
+
# Set LIB_SETSOCKOPT to -lnsl -lsocket if necessary.
pu_save_LIBS=$LIBS
LIB_SETSOCKOPT=
@@ -36069,13 +35544,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wno-missing-field-initializers is supported" >&5
$as_echo_n "checking whether -Wno-missing-field-initializers is supported... " >&6; }
- if ${gl_cv_cc_nomfi_supported+:} false; then :
+if ${gl_cv_cc_nomfi_supported+:} false; then :
$as_echo_n "(cached) " >&6
else
-
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -36092,29 +35566,28 @@ else
gl_cv_cc_nomfi_supported=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$gl_save_CFLAGS"
-fi
+ CFLAGS="$gl_save_CFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_supported" >&5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_supported" >&5
$as_echo "$gl_cv_cc_nomfi_supported" >&6; }
if test "$gl_cv_cc_nomfi_supported" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wno-missing-field-initializers is needed" >&5
$as_echo_n "checking whether -Wno-missing-field-initializers is needed... " >&6; }
- if ${gl_cv_cc_nomfi_needed+:} false; then :
+if ${gl_cv_cc_nomfi_needed+:} false; then :
$as_echo_n "(cached) " >&6
else
-
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -W -Werror"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -W -Werror"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int f (void)
- {
- typedef struct { int a; int b; } s_t;
- s_t s1 = { 0, };
- return s1.b;
- }
+ {
+ typedef struct { int a; int b; } s_t;
+ s_t s1 = { 0, };
+ return s1.b;
+ }
int
main ()
@@ -36130,23 +35603,21 @@ else
gl_cv_cc_nomfi_needed=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$gl_save_CFLAGS"
+ CFLAGS="$gl_save_CFLAGS"
fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_needed" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_needed" >&5
$as_echo "$gl_cv_cc_nomfi_needed" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wuninitialized is supported" >&5
$as_echo_n "checking whether -Wuninitialized is supported... " >&6; }
- if ${gl_cv_cc_uninitialized_supported+:} false; then :
+if ${gl_cv_cc_uninitialized_supported+:} false; then :
$as_echo_n "(cached) " >&6
else
-
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Werror -Wuninitialized"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror -Wuninitialized"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -36163,10 +35634,10 @@ else
gl_cv_cc_uninitialized_supported=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$gl_save_CFLAGS"
-fi
+ CFLAGS="$gl_save_CFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_uninitialized_supported" >&5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_uninitialized_supported" >&5
$as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
fi
@@ -36175,18 +35646,17 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
# To compare this list to your installed GCC's, run this Bash command:
#
# comm -3 \
- # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \
- # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort |
- # grep -v -x -F -f <(
- # awk '/^[^#]/ {print ws}' ../build-aux/gcc-warning.spec))
+ # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\) .*/\1/p' manywarnings.m4; \
+ # awk '/^[^#]/ {print ws}' ../build-aux/gcc-warning.spec) | sort) \
+ # <(LC_ALL=C gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort)
gl_manywarn_set=
for gl_manywarn_item in -fno-common \
-W \
- -Wabi \
-Waddress \
-Waggressive-loop-optimizations \
-Wall \
+ -Wattribute-alias \
-Wattributes \
-Wbad-function-cast \
-Wbool-compare \
@@ -36194,8 +35664,9 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
-Wbuiltin-declaration-mismatch \
-Wbuiltin-macro-redefined \
-Wcast-align \
+ -Wcast-align=strict \
+ -Wcast-function-type \
-Wchar-subscripts \
- -Wchkp \
-Wclobbered \
-Wcomment \
-Wcomments \
@@ -36229,6 +35700,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
-Wframe-address \
-Wfree-nonheap-object \
-Whsa \
+ -Wif-not-aligned \
-Wignored-attributes \
-Wignored-qualifiers \
-Wimplicit \
@@ -36242,7 +35714,6 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
-Wint-to-pointer-cast \
-Winvalid-memory-model \
-Winvalid-pch \
- -Wjump-misses-init \
-Wlogical-not-parentheses \
-Wlogical-op \
-Wmain \
@@ -36250,6 +35721,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
-Wmemset-elt-size \
-Wmemset-transposed-args \
-Wmisleading-indentation \
+ -Wmissing-attributes \
-Wmissing-braces \
-Wmissing-declarations \
-Wmissing-field-initializers \
@@ -36257,6 +35729,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
-Wmissing-parameter-type \
-Wmissing-prototypes \
-Wmultichar \
+ -Wmultistatement-macros \
-Wnarrowing \
-Wnested-externs \
-Wnonnull \
@@ -36271,6 +35744,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
-Woverride-init \
-Wpacked \
-Wpacked-bitfield-compat \
+ -Wpacked-not-aligned \
-Wparentheses \
-Wpointer-arith \
-Wpointer-compare \
@@ -36288,20 +35762,23 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
-Wshift-count-overflow \
-Wshift-negative-value \
-Wsizeof-array-argument \
+ -Wsizeof-pointer-div \
-Wsizeof-pointer-memaccess \
-Wstack-protector \
-Wstrict-aliasing \
-Wstrict-overflow \
-Wstrict-prototypes \
+ -Wstringop-truncation \
+ -Wsuggest-attribute=cold \
-Wsuggest-attribute=const \
-Wsuggest-attribute=format \
+ -Wsuggest-attribute=malloc \
-Wsuggest-attribute=noreturn \
-Wsuggest-attribute=pure \
-Wsuggest-final-methods \
-Wsuggest-final-types \
-Wswitch \
-Wswitch-bool \
- -Wswitch-default \
-Wswitch-unreachable \
-Wsync-nand \
-Wsystem-headers \
@@ -37139,6 +36616,22 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
+
+
+
+# Check whether --with-zstd was given.
+if test "${with_zstd+set}" = set; then :
+ withval=$with_zstd; tar_cv_compressor_zstd=${withval}
+else
+ tar_cv_compressor_zstd=zstd
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define ZSTD_PROGRAM "$tar_cv_compressor_zstd"
+_ACEOF
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default archive format" >&5
$as_echo_n "checking for default archive format... " >&6; }
@@ -37468,17 +36961,243 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
-$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; }
-if ${acl_cv_libdirstems+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
+$as_echo_n "checking 32-bit host C ABI... " >&6; }
+if ${gl_cv_host_cpu_c_abi_32bit+:} false; then :
$as_echo_n "(cached) " >&6
else
- acl_libdirstem=lib
- acl_libdirstem2=
- case "$host_os" in
- solaris*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+ if test -n "$gl_cv_host_cpu_c_abi"; then
+ case "$gl_cv_host_cpu_c_abi" in
+ i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+ gl_cv_host_cpu_c_abi_32bit=yes ;;
+ *)
+ gl_cv_host_cpu_c_abi_32bit=no ;;
+ esac
+ else
+ case "$host_cpu" in
+
+ i[4567]86 )
+ gl_cv_host_cpu_c_abi_32bit=yes
+ ;;
+
+ x86_64 )
+ # On x86_64 systems, the C compiler may be generating code in one of
+ # these ABIs:
+ # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
+ # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
+ # with native Windows (mingw, MSVC).
+ # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if (defined __x86_64__ || defined __amd64__ \
+ || defined _M_X64 || defined _M_AMD64) \
+ && !(defined __ILP32__ || defined _ILP32)
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_host_cpu_c_abi_32bit=no
+else
+ gl_cv_host_cpu_c_abi_32bit=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+
+ arm* | aarch64 )
+ # Assume arm with EABI.
+ # On arm64 systems, the C compiler may be generating code in one of
+ # these ABIs:
+ # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
+ # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_host_cpu_c_abi_32bit=no
+else
+ gl_cv_host_cpu_c_abi_32bit=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+
+ hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
+ # On hppa, the C compiler may be generating 32-bit code or 64-bit
+ # code. In the latter case, it defines _LP64 and __LP64__.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __LP64__
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_host_cpu_c_abi_32bit=no
+else
+ gl_cv_host_cpu_c_abi_32bit=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+
+ ia64* )
+ # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
+ # 32-bit code. In the latter case, it defines _ILP32.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef _ILP32
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_host_cpu_c_abi_32bit=yes
+else
+ gl_cv_host_cpu_c_abi_32bit=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+
+ mips* )
+ # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
+ # at 32.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_host_cpu_c_abi_32bit=no
+else
+ gl_cv_host_cpu_c_abi_32bit=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+
+ powerpc* )
+ # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
+ # No need to distinguish them here; the caller may distinguish
+ # them based on the OS.
+ # On powerpc64 systems, the C compiler may still be generating
+ # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
+ # be generating 64-bit code.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined __powerpc64__ || defined _ARCH_PPC64
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_host_cpu_c_abi_32bit=no
+else
+ gl_cv_host_cpu_c_abi_32bit=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+
+ rs6000 )
+ gl_cv_host_cpu_c_abi_32bit=yes
+ ;;
+
+ riscv32 | riscv64 )
+ # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
+ # Size of 'long' and 'void *':
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined __LP64__
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_host_cpu_c_abi_32bit=no
+else
+ gl_cv_host_cpu_c_abi_32bit=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+
+ s390* )
+ # On s390x, the C compiler may be generating 64-bit (= s390x) code
+ # or 31-bit (= s390) code.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined __LP64__ || defined __s390x__
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_host_cpu_c_abi_32bit=no
+else
+ gl_cv_host_cpu_c_abi_32bit=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+
+ sparc | sparc64 )
+ # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
+ # C compiler still generates 32-bit code.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined __sparcv9 || defined __arch64__
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_host_cpu_c_abi_32bit=no
+else
+ gl_cv_host_cpu_c_abi_32bit=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ;;
+
+ *)
+ gl_cv_host_cpu_c_abi_32bit=no
+ ;;
+ esac
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
+$as_echo "$gl_cv_host_cpu_c_abi_32bit" >&6; }
+
+ HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
+
+
+
+
+
+ case "$host_os" in
+ solaris*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
$as_echo_n "checking for 64-bit host... " >&6; }
if ${gl_cv_solaris_64bit+:} false; then :
$as_echo_n "(cached) " >&6
@@ -37486,10 +37205,10 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef _LP64
- int ok;
- #else
- error fail
- #endif
+ int ok;
+ #else
+ error fail
+ #endif
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
@@ -37501,8 +37220,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; }
- if test $gl_cv_solaris_64bit = yes; then
+$as_echo "$gl_cv_solaris_64bit" >&6; };;
+ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; }
+if ${acl_cv_libdirstems+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ acl_libdirstem=lib
+ acl_libdirstem2=
+ case "$host_os" in
+ solaris*)
+ if test $gl_cv_solaris_64bit = yes; then
acl_libdirstem=lib/64
case "$host_cpu" in
sparc*) acl_libdirstem2=lib/sparcv9 ;;
@@ -37511,37 +37241,33 @@ $as_echo "$gl_cv_solaris_64bit" >&6; }
fi
;;
*)
- case "$gl_cv_host_cpu_c_abi" in
- i386 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | s390 | sparc)
- ;;
- *) # x86_64 | arm64 | hppa64 | ia64 | mips64 | powerpc64* | s390x | sparc64 | ...
- searchpath=`(if test -f /usr/bin/gcc \
- && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
- LC_ALL=C /usr/bin/gcc -print-search-dirs; \
- else \
- LC_ALL=C $CC -print-search-dirs; \
- fi) 2>/dev/null \
- | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= }"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- */../ | */.. )
- # Better ignore directories of this form. They are misleading.
- ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
- fi
- done
- IFS="$acl_save_IFS"
- fi
- ;;
- esac
+ if test "$HOST_CPU_C_ABI_32BIT" != yes; then
+ searchpath=`(if test -f /usr/bin/gcc \
+ && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
+ LC_ALL=C /usr/bin/gcc -print-search-dirs; \
+ else \
+ LC_ALL=C $CC -print-search-dirs; \
+ fi) 2>/dev/null \
+ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+ fi
;;
esac
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
@@ -37564,7 +37290,6 @@ $as_echo "$acl_cv_libdirstems" >&6; }
-
use_additional=yes
acl_save_prefix="$prefix"
@@ -37602,7 +37327,7 @@ if test "${with_libiconv_prefix+set}" = set; then :
additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem"
if test "$acl_libdirstem2" != "$acl_libdirstem" \
- && ! test -d "$withval/$acl_libdirstem"; then
+ && test ! -d "$withval/$acl_libdirstem"; then
additional_libdir="$withval/$acl_libdirstem2"
fi
fi
@@ -38024,7 +37749,6 @@ fi
-
am_save_CPPFLAGS="$CPPFLAGS"
for element in $INCICONV; do
@@ -38730,9 +38454,6 @@ $as_echo "no" >&6; }
fi
- test -n "$localedir" || localedir='${datadir}/locale'
-
-
test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
@@ -38830,9 +38551,45 @@ $as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+$as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; }
+if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyPreferredLanguages();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_func_CFLocaleCopyPreferredLanguages=yes
+else
+ gt_cv_func_CFLocaleCopyPreferredLanguages=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
+
fi
INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+ || test $gt_cv_func_CFLocaleCopyCurrent = yes \
+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
fi
@@ -39193,7 +38950,6 @@ $as_echo "$LIBICONV" >&6; }
-
use_additional=yes
acl_save_prefix="$prefix"
@@ -39231,7 +38987,7 @@ if test "${with_libintl_prefix+set}" = set; then :
additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem"
if test "$acl_libdirstem2" != "$acl_libdirstem" \
- && ! test -d "$withval/$acl_libdirstem"; then
+ && test ! -d "$withval/$acl_libdirstem"; then
additional_libdir="$withval/$acl_libdirstem2"
fi
fi
@@ -39647,7 +39403,6 @@ fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
$as_echo_n "checking for GNU gettext in libintl... " >&6; }
if eval \${$gt_func_gnugettext_libintl+:} false; then :
@@ -40028,6 +39783,10 @@ if test -z "${GL_GENERATE_FNMATCH_H_TRUE}" && test -z "${GL_GENERATE_FNMATCH_H_F
as_fn_error $? "conditional \"GL_GENERATE_FNMATCH_H\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${GL_GENERATE_FNMATCH_H_TRUE}" && test -z "${GL_GENERATE_FNMATCH_H_FALSE}"; then
+ as_fn_error $? "conditional \"GL_GENERATE_FNMATCH_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then
as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -40522,7 +40281,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU tar $as_me 1.30, which was
+This file was extended by GNU tar $as_me 1.32, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -40590,7 +40349,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNU tar config.status 1.30
+GNU tar config.status 1.32
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -40711,9 +40470,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
- # from automake < 1.5.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
+ OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
# Capture the value of LINGUAS because we need it to compute CATALOGS.
LINGUAS="${LINGUAS-%UNSET%}"
@@ -41466,14 +41224,11 @@ $as_echo X"$file" |
if test -n "$OBSOLETE_ALL_LINGUAS"; then
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
fi
# Compute POFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
diff --git a/configure.ac b/configure.ac
index 0bddbeb6ff0929b3e2714a79b3c1501e02f14eb0..75fb2e4fb4e4d350e4523081832d9f4f67de2203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# Configure template for GNU tar. -*- autoconf -*-
-# Copyright 1991, 1994-2010, 2013-2017 Free Software Foundation, Inc.
+# Copyright 1991, 1994-2010, 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -17,7 +17,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/>.
-AC_INIT([GNU tar], [1.30], [bug-tar@gnu.org])
+AC_INIT([GNU tar], [1.32], [bug-tar@gnu.org])
AC_CONFIG_SRCDIR([src/tar.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
@@ -102,6 +102,18 @@ gt_TYPE_SSIZE_T
# gnulib modules
gl_INIT
+
+if test $ac_cv_lib_error_at_line = no; then
+ # This means that the error() function is not present in libc, so
+ # the one from gnulib will be used instead. This function precedes
+ # error messages it prints with the program name as returned by getprogname()
+ # call, instead of using the name set by set_program_name.
+ # Install workaround.
+ AC_DEFINE([ENABLE_ERROR_PRINT_PROGNAME],[1],
+ [Enable the use of error_print_progname to print program name with error messages.
+ See comment to function tar_print_progname in src/tar.c])
+fi
+
# paxutils modules
tar_PAXUTILS
@@ -250,6 +262,7 @@ TAR_COMPR_PROGRAM(lzip)
TAR_COMPR_PROGRAM(lzma)
TAR_COMPR_PROGRAM(lzop)
TAR_COMPR_PROGRAM(xz)
+TAR_COMPR_PROGRAM(zstd)
AC_MSG_CHECKING(for default archive format)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cb69b743b86df53695a6582fdc11bb4431e3946e..7ac6808166a36a64b0bbc4e8545c8cd83927cabf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,6 @@
# Makefile for GNU tar documentation.
-# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2013-2014, 2016-2017
-# Free Software Foundation, Inc.
+# Copyright 1994-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b30772eaad1dcfe1a16e76d3cf3ed610ec2b712d..572d5c70ef3fc0aa54cf94d1fb0376931c265f2d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,8 +16,7 @@
# Makefile for GNU tar documentation.
-# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2013-2014, 2016-2017
-# Free Software Foundation, Inc.
+# Copyright 1994-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -34,7 +33,17 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -97,15 +106,11 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(tar_TEXINFOS) $(top_srcdir)/build-aux/mdate-sh \
- $(srcdir)/version.texi $(srcdir)/stamp-vti \
- $(top_srcdir)/build-aux/texinfo.tex $(dist_man_MANS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+ $(top_srcdir)/m4/__inline.m4 \
$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \
- $(top_srcdir)/m4/asm-underscore.m4 \
$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \
$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \
$(top_srcdir)/m4/canonicalize.m4 \
@@ -125,11 +130,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/extern-inline.m4 \
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \
- $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \
- $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filenamecat.m4 \
- $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
- $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
+ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
+ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
+ $(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fileblocks.m4 \
+ $(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
+ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
+ $(top_srcdir)/m4/fnmatch_h.m4 $(top_srcdir)/m4/fpending.m4 \
$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
$(top_srcdir)/m4/futimens.m4 \
@@ -143,7 +149,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 \
$(top_srcdir)/m4/group-member.m4 \
- $(top_srcdir)/m4/hard-locale.m4 \
$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/human.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \
$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \
@@ -238,6 +243,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/version.texi \
+ $(srcdir)/stamp-vti $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -335,6 +342,9 @@ man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(dist_man_MANS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
+ $(tar_TEXINFOS) $(top_srcdir)/build-aux/mdate-sh \
+ $(top_srcdir)/build-aux/texinfo.tex
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
@@ -426,6 +436,7 @@ GNULIB_FFSL = @GNULIB_FFSL@
GNULIB_FFSLL = @GNULIB_FFSLL@
GNULIB_FGETC = @GNULIB_FGETC@
GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FNMATCH = @GNULIB_FNMATCH@
GNULIB_FOPEN = @GNULIB_FOPEN@
GNULIB_FPRINTF = @GNULIB_FPRINTF@
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
@@ -458,6 +469,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
@@ -474,6 +486,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALENAME = @GNULIB_LOCALENAME@
GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_LSTAT = @GNULIB_LSTAT@
@@ -712,6 +725,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -735,6 +749,9 @@ HAVE_FEATURES_H = @HAVE_FEATURES_H@
HAVE_FFS = @HAVE_FFS@
HAVE_FFSL = @HAVE_FFSL@
HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FNMATCH = @HAVE_FNMATCH@
+HAVE_FNMATCH_H = @HAVE_FNMATCH_H@
+HAVE_FREELOCALE = @HAVE_FREELOCALE@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSTATAT = @HAVE_FSTATAT@
HAVE_FSYNC = @HAVE_FSYNC@
@@ -747,13 +764,16 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
HAVE_GETLOGIN = @HAVE_GETLOGIN@
HAVE_GETOPT_H = @HAVE_GETOPT_H@
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -786,6 +806,7 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -856,7 +877,6 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
HAVE_TIMEGM = @HAVE_TIMEGM@
HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
HAVE_TZSET = @HAVE_TZSET@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
@@ -911,8 +931,6 @@ HAVE_WMEMSET = @HAVE_WMEMSET@
HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
HAVE__BOOL = @HAVE__BOOL@
HAVE__EXIT = @HAVE__EXIT@
-HOST_CPU = @HOST_CPU@
-HOST_CPU_C_ABI = @HOST_CPU_C_ABI@
INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
@@ -957,6 +975,7 @@ NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
+NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
@@ -984,6 +1003,7 @@ NEXT_DIRENT_H = @NEXT_DIRENT_H@
NEXT_ERRNO_H = @NEXT_ERRNO_H@
NEXT_FCNTL_H = @NEXT_FCNTL_H@
NEXT_FLOAT_H = @NEXT_FLOAT_H@
+NEXT_FNMATCH_H = @NEXT_FNMATCH_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
@@ -1044,9 +1064,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@
REPLACE_FDOPEN = @REPLACE_FDOPEN@
REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FNMATCH = @REPLACE_FNMATCH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREELOCALE = @REPLACE_FREELOCALE@
REPLACE_FREOPEN = @REPLACE_FREOPEN@
REPLACE_FSEEK = @REPLACE_FSEEK@
REPLACE_FSEEKO = @REPLACE_FSEEKO@
@@ -1064,6 +1086,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
REPLACE_GMTIME = @REPLACE_GMTIME@
REPLACE_ISATTY = @REPLACE_ISATTY@
@@ -1094,6 +1117,7 @@ REPLACE_MKNOD = @REPLACE_MKNOD@
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
REPLACE_MKTIME = @REPLACE_MKTIME@
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@
REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
@@ -1315,7 +1339,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnits doc/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1388,15 +1411,16 @@ $(srcdir)/stamp-vti: tar.texi $(top_srcdir)/configure
echo "@set UPDATED $$1 $$2 $$3"; \
echo "@set UPDATED-MONTH $$2 $$3"; \
echo "@set EDITION $(VERSION)"; \
- echo "@set VERSION $(VERSION)") > vti.tmp
- @cmp -s vti.tmp $(srcdir)/version.texi \
- || (echo "Updating $(srcdir)/version.texi"; \
- cp vti.tmp $(srcdir)/version.texi)
- -@rm -f vti.tmp
+ echo "@set VERSION $(VERSION)") > vti.tmp$$$$ && \
+ (cmp -s vti.tmp$$$$ $(srcdir)/version.texi \
+ || (echo "Updating $(srcdir)/version.texi" && \
+ cp vti.tmp$$$$ $(srcdir)/version.texi.tmp$$$$ && \
+ mv $(srcdir)/version.texi.tmp$$$$ $(srcdir)/version.texi)) && \
+ rm -f vti.tmp$$$$ $(srcdir)/version.texi.$$$$
@cp $(srcdir)/version.texi $@
mostlyclean-vti:
- -rm -f vti.tmp
+ -rm -f vti.tmp* $(srcdir)/version.texi.tmp*
maintainer-clean-vti:
-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
@@ -1835,6 +1859,8 @@ uninstall-man: uninstall-man1 uninstall-man8
uninstall-html-am uninstall-info-am uninstall-man \
uninstall-man1 uninstall-man8 uninstall-pdf-am uninstall-ps-am
+.PRECIOUS: Makefile
+
header.texi: $(top_srcdir)/src/tar.h
sed -f $(srcdir)/texify.sed $(top_srcdir)/src/tar.h \
diff --git a/doc/dumpdir.texi b/doc/dumpdir.texi
index 7000e9b162e14561779a8bfac9fbfdf64b5f6dc6..4a57817588648c194e81d62e08d6f91475ef3120 100644
--- a/doc/dumpdir.texi
+++ b/doc/dumpdir.texi
@@ -1,6 +1,5 @@
@c This is part of the paxutils manual.
-@c Copyright (C) 2006-2007, 2014, 2016-2017 Free Software Foundation,
-@c Inc.
+@c Copyright (C) 2006-2019 Free Software Foundation, Inc.
@c Written by Sergey Poznyakoff
@c This file is distributed under GFDL 1.1 or any later version
@c published by the Free Software Foundation.
diff --git a/doc/fdl.texi b/doc/fdl.texi
index e89851d5076cd0ab7edccf947833a5be1b5a025c..d1b4b8b358155da8214516a6c7e68935b87dcadd 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -5,8 +5,7 @@
@c hence no sectioning command or @node.
@display
-Copyright @copyright{} 2000-2002, 2007-2008, 2014, 2016-2017 Free
-Software Foundation, Inc.
+Copyright @copyright{} 2000-2019 Free Software Foundation, Inc.
@uref{http://fsf.org/}
Everyone is permitted to copy and distribute verbatim copies
diff --git a/doc/gendocs_template b/doc/gendocs_template
index 7600a89e41eca48720caf9212d06ddeefbcb75a4..55e9b3e2a92cf34c97136c4be878406b42c15703 100755
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -106,7 +106,7 @@ Please send broken links and other corrections (or suggestions) to
</p>
<p>
-Copyright 2004, 2013-2014, 2016-2017 Free Software Foundation, Inc.,
+Copyright 2004-2019 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02111, USA
<br />
Verbatim copying and distribution of this entire article is
diff --git a/doc/genfile.texi b/doc/genfile.texi
index 58aa593a91a521de643e3356a9a42be1da49c58c..f65ecc386f68467ae2d40f95c98bdf4a490d7248 100644
--- a/doc/genfile.texi
+++ b/doc/genfile.texi
@@ -1,5 +1,5 @@
@c This is part of the paxutils manual.
-@c Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+@c Copyright (C) 2005, 2006, 2009, 2108 Free Software Foundation, Inc.
@c Written by Sergey Poznyakoff
@c This file is distributed under GFDL 1.1 or any later version
@c published by the Free Software Foundation.
@@ -283,13 +283,43 @@ genfile --stat=name,atime *
@cindex Exec Mode, @command{genfile}
This mode is designed for testing the behavior of @code{paxutils}
-commands when some of the files change during archiving. It is an
-experimental mode.
-
- The @samp{Exec Mode} is toggled by @option{--run} command line
-option (or its alias @option{-r}). The non-optional arguments to
-@command{getopt} give the command line to be executed. Normally,
-it should contain at least the @option{--checkpoint} option.
+commands when some of the files change during archiving. It supposes
+that the command being executed supports @option{--checkpoint} and
+@option{--checkpoint-action} options (@pxref{checkpoints,
+Checkpoints,,tar,GNU tar}).
+
+ The @samp{Exec Mode} is enabled by @option{--run} command line
+option (or its alias @option{-r}). The non-optional arguments
+supply the command line to be executed. @command{Genfile} modifies
+this command line by inserting the following options between the
+command name and first argument:
+
+@example
+--checkpoint=@var{n}
+--checkpoint-action "echo=genfile checkpoint %u"
+--checkpoint-action "wait=SIGUSR1"
+@end example
+
+ Here, @var{n} stands for the checkpoint granularity (for GNU
+@command{tar}, it is the number of archive records read or written
+between each pair of checkpoints). The default value is 1. This
+value can be changed using the optional argument to the @option{--run}
+option. For example, to run actions on each 10th checkpoint:
+
+@example
+genfile --run=10 ...
+@end example
+
+ If the command line contains options, it must be preceded by a
+double-dash (@samp{--}), which will prevent these options from being
+interpreted by @command{genfile} itself. For example:
+
+@example
+genfile --run --checkpoint=2 --truncate foo -- tar -c -f a.tar .
+@end example
+
+ Notice also, that when running @command{tar}, its command line may
+not contain traditional options (cluster of letters without dash).
A set of options is provided for defining checkpoint values and
actions to be executed upon reaching them. Checkpoint values are
@@ -334,36 +364,6 @@ connected to descriptor 1. All messages it prints to file descriptor
2, except checkpoint notifications, are forwarded to standard
error.
- @command{Genfile} exits with the exit status of the executed command.
-
- For compatibility with previous @command{genfile} versions, the
-@option{--run} option takes an optional argument. If used this way,
-its argument supplies the command line to be executed. There should
-be no non-optional arguments in the @command{genfile} command line.
-
- The actual command line is constructed by inserting
-the @option{--checkpoint} option between the command name and its
-first argument (if any). Due to this, the argument to @option{--run}
-may not use traditional @command{tar} option syntax, i.e., the
-following is wrong:
-
-@smallexample
-# Wrong!
-genfile --run='tar cf foo bar'
-@end smallexample
-
-@noindent
-
-Use the following syntax instead:
-
-@smallexample
-genfile --run='tar -cf foo bar' @var{actions}...
-@end smallexample
-
-The above command line is equivalent to
-
-@smallexample
-genfile @var{actions}... -- tar -cf foo bar
-@end smallexample
+ In exec mode, @command{genfile} exits with the exit status of the
+executed command.
-Notice, that the use of compatibility mode is deprecated.
diff --git a/doc/header.texi b/doc/header.texi
index 7c303d5f40859be17022f75cfea867f884e4fa3e..a4c433f81f578859ec5a97af0a9843faadbe637f 100644
--- a/doc/header.texi
+++ b/doc/header.texi
@@ -1,7 +1,6 @@
@comment GNU tar Archive Format description.
@comment
-@comment Copyright 1988-1989, 1991-1997, 2000-2001, 2003-2007, 2012-2014,
-@comment 2016-2017 Free Software Foundation, Inc.
+@comment Copyright 1988-2019 Free Software Foundation, Inc.
@comment
@comment This file is part of GNU tar.
@comment
diff --git a/doc/intern.texi b/doc/intern.texi
index bfb7c37cd12e62a35543e486bdc91097356c65d8..bc4abd722767ee34f57d0ba90d5bf62f71a3bb98 100644
--- a/doc/intern.texi
+++ b/doc/intern.texi
@@ -1,5 +1,5 @@
@c This is part of the paxutils manual.
-@c Copyright (C) 2006, 2014, 2016-2017 Free Software Foundation, Inc.
+@c Copyright (C) 2006-2019 Free Software Foundation, Inc.
@c This file is distributed under GFDL 1.1 or any later version
@c published by the Free Software Foundation.
diff --git a/doc/mastermenu.el b/doc/mastermenu.el
index d7dfb003dba8d50ae2f8d889e0fcf52914a5c2a9..db2d4a92609061c62d65d8fc738853d0fd2c7dd2 100644
--- a/doc/mastermenu.el
+++ b/doc/mastermenu.el
@@ -1,7 +1,6 @@
;;; mastermenu.el --- Redefinition of texinfo-master-menu-list
-;; Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-;; Inc.
+;; Copyright 2006-2019 Free Software Foundation, Inc.
;; Author: Sergey Poznyakoff
;; Maintainer: bug-tar@gnu.org
diff --git a/doc/parse-datetime.texi b/doc/parse-datetime.texi
index 9568a4a472b76ff23b4b566ab62f19b7cd203c84..193575edcafbffcdfcf6370e02805a6c3e7b343a 100644
--- a/doc/parse-datetime.texi
+++ b/doc/parse-datetime.texi
@@ -1,6 +1,6 @@
@c GNU date syntax documentation
-@c Copyright (C) 1994-2006, 2009-2017 Free Software Foundation, Inc.
+@c Copyright (C) 1994-2006, 2009-2019 Free Software Foundation, Inc.
@c Permission is granted to copy, distribute and/or modify this document
@c under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/doc/recipes.texi b/doc/recipes.texi
index da259da3918c7a76cd84ea13ec44fcbfedf62dc6..d4def4a92fec5884492fde287ef97ab8d1f83044 100644
--- a/doc/recipes.texi
+++ b/doc/recipes.texi
@@ -1,5 +1,5 @@
@c This is part of the GNU tar manual.
-@c Copyright (C) 2017 Free Software Foundation, Inc.
+@c Copyright (C) 2017-2019 Free Software Foundation, Inc.
@c This file is distributed under GFDL 1.3 or any later version
@c published by the Free Software Foundation.
diff --git a/doc/rendition.texi b/doc/rendition.texi
index 774599379829610ce84930d0a15d33539842fa3e..1eb81c6755c0e2d53c64d42be5b2eec656798fe7 100644
--- a/doc/rendition.texi
+++ b/doc/rendition.texi
@@ -1,6 +1,5 @@
@c This is part of GNU tar manual.
-@c Copyright 1992, 1994-1997, 1999-2004, 2006, 2013-2014, 2016-2017 Free
-@c Software Foundation, Inc.
+@c Copyright 1992-2019 Free Software Foundation, Inc.
@c See file tar.texi for copying conditions.
@c This file contains support for 'renditions' by Fran@,{c}ois Pinard
diff --git a/doc/rmt.8 b/doc/rmt.8
index 7550277179089e677abbbdfb33e331d53089dc40..574352e2b1fc437f6615214f9d5369e137e39649 100644
--- a/doc/rmt.8
+++ b/doc/rmt.8
@@ -1,5 +1,5 @@
.\" This file is part of GNU tar. -*- nroff -*-
-.\" Copyright 2013 Free Software Foundation, Inc.
+.\" Copyright 2013, 2018 Free Software Foundation, Inc.
.\"
.\" GNU tar is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
@@ -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 RMT 1 "January 27, 2014" "RMT" "GNU TAR Manual"
+.TH RMT 8 "March 24, 2018" "RMT" "GNU TAR Manual"
.SH NAME
rmt \- remote magnetic tape server
.SH SYNOPSIS
@@ -237,7 +237,7 @@ command appeared in 4.2BSD. The GNU
.BR rmt
is written from scratch, using the BSD specification.
.SH COPYRIGHT
-Copyright \(co 2013 Free Software Foundation, Inc.
+Copyright \(co 2013, 2018 Free Software Foundation, Inc.
.br
.na
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
diff --git a/doc/snapshot.texi b/doc/snapshot.texi
index 8ebfb781688ca5819143c3a2cd0eda773533d324..fe2cf31b228aa467c8fe40293989adfd98390aaf 100644
--- a/doc/snapshot.texi
+++ b/doc/snapshot.texi
@@ -1,6 +1,5 @@
@c This is part of the paxutils manual.
-@c Copyright (C) 2005, 2007, 2014, 2016-2017 Free Software Foundation,
-@c Inc.
+@c Copyright (C) 2005-2019 Free Software Foundation, Inc.
@c Written by Sergey Poznyakoff
@c This file is distributed under GFDL 1.1 or any later version
@c published by the Free Software Foundation.
@@ -147,7 +146,7 @@ is compiled. To see the specific ranges allowed for a particular
@option{--show-snapshot-field-ranges} option:
@smallexample
-$ @kbd{tar --show-shapshot-field-ranges}
+$ @kbd{tar --show-snapshot-field-ranges}
This tar's snapshot file field ranges are
(field name => [ min, max ]):
diff --git a/doc/sparse.texi b/doc/sparse.texi
index 84fe2b0c53fb2fb53a517fe4d9442dd75f919a08..9cf14b941d96949a80382339197eaf58d1d02067 100644
--- a/doc/sparse.texi
+++ b/doc/sparse.texi
@@ -1,5 +1,5 @@
@c This is part of the paxutils manual.
-@c Copyright (C) 2006, 2014, 2016-2017 Free Software Foundation, Inc.
+@c Copyright (C) 2006-2019 Free Software Foundation, Inc.
@c This file is distributed under GFDL 1.1 or any later version
@c published by the Free Software Foundation.
@@ -218,12 +218,12 @@ The real name of the sparse file is stored in the variable
variable @code{GNU.sparse.realsize}.
The sparse map itself is stored in the file data block, preceding the actual
-file data. It consists of a series of octal numbers of arbitrary length, delimited
+file data. It consists of a series of decimal numbers delimited
by newlines. The map is padded with nulls to the nearest block boundary.
-The first number gives the number of entries in the map. Following are map entries,
-each one consisting of two numbers giving the offset and size of the
-data block it describes.
+The first number gives the number of entries in the map. Following are
+map entries, each one consisting of two numbers giving the offset and
+size of the data block it describes.
The format is designed in such a way that non-posix aware @command{tar}s and @command{tar}s not
supporting @code{GNU.sparse.*} keywords will extract each sparse file
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 0b31161260877adab32e60fcc7cdde186a85e365..1b3ab5e46fbc1e33f3491e319275ba14f36d8f4d 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 16 December 2017
-@set UPDATED-MONTH December 2017
-@set EDITION 1.30
-@set VERSION 1.30
+@set UPDATED 4 February 2019
+@set UPDATED-MONTH February 2019
+@set EDITION 1.32
+@set VERSION 1.32
diff --git a/doc/tar-snapshot-edit.texi b/doc/tar-snapshot-edit.texi
index e8e77726b1bbeacc10a65296d7f1745661c4c170..85f58cec9b18e228924aa814f63989601bb0e640 100644
--- a/doc/tar-snapshot-edit.texi
+++ b/doc/tar-snapshot-edit.texi
@@ -1,5 +1,5 @@
@c This is part of the paxutils manual.
-@c Copyright (C) 2007, 2014, 2016-2017 Free Software Foundation, Inc.
+@c Copyright (C) 2007-2019 Free Software Foundation, Inc.
@c This file is distributed under GFDL 1.1 or any later version
@c published by the Free Software Foundation.
diff --git a/doc/tar.1 b/doc/tar.1
index ddf4fdcf3f46c91de907da17d96a1a668af62b5e..0ad69b7404c6d5ad7a2b3102fff93ff879b90036 100644
--- a/doc/tar.1
+++ b/doc/tar.1
@@ -1,5 +1,5 @@
.\" This file is part of GNU tar. -*- nroff -*-
-.\" Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+.\" Copyright 2013-2019 Free Software Foundation, Inc.
.\"
.\" GNU tar is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
@@ -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 "November 16, 2017" "TAR" "GNU TAR Manual"
+.TH TAR 1 "February 4, 2019" "TAR" "GNU TAR Manual"
.SH NAME
tar \- an archiving utility
.SH SYNOPSIS
@@ -111,7 +111,7 @@ into the archive file
verbosely listing the files being archived:
.PP
.EX
-.B tar cfv a.tar /etc
+.B tar cfv etc.tar /etc
.EE
.PP
In
@@ -133,9 +133,9 @@ The example command above written in the
could look like:
.PP
.EX
-.B tar -cvf a.tar /etc
+.B tar -cvf etc.tar /etc
or
-.B tar -c -v -f a.tar /etc
+.B tar -c -v -f etc.tar /etc
.EE
.PP
In
@@ -152,11 +152,11 @@ method.
Here are several ways of writing the example command in this style:
.PP
.EX
-.B tar --create --file a.tar --verbose /etc
+.B tar --create --file etc.tar --verbose /etc
.EE
or (abbreviating some options):
.EX
-.B tar --cre --file=a.tar --verb /etc
+.B tar --cre --file=etc.tar --verb /etc
.EE
.PP
The options in all three styles can be intermixed, although doing so
@@ -256,7 +256,7 @@ exist when creating an archive, it will be created and all files will
be added to the resulting archive (the \fBlevel 0\fR dump). To create
incremental archives of non-zero level \fBN\fR, create a copy of the
snapshot file created during the level \fBN-1\fR, and use it as
-\fIFILE\fR.
+\fIFILE\fR.
When listing or extracting, the actual contents of \fIFILE\fR is not
inspected, it is needed only due to syntactical requirements. It is
@@ -287,7 +287,7 @@ effect only if the archive is open for reading (e.g. with
.B \-\-list
or
.B \-\-extract
-options).
+options).
.TP
\fB\-\-no\-check\-device\fR
Do not check device numbers when creating incremental archives.
@@ -383,7 +383,7 @@ Extract files to standard output.
Pipe extracted files to \fICOMMAND\fR. The argument is the pathname
of an external program, optionally with command line arguments. The
program will be invoked and the contents of the file being extracted
-supplied to it on its standard output. Additional data will be
+supplied to it on its standard input. Additional data will be
supplied via the following environment variables:
.RS
.TP
@@ -465,7 +465,7 @@ Format of the archive being processed. One of:
.BR v7 .
.B TAR_SUBCOMMAND
A short option (with a leading dash) describing the operation \fBtar\fR is
-executing.
+executing.
.RE
.SS Handling of file attributes
.TP
@@ -562,9 +562,6 @@ stored in archive with owner name \fINEWUSR\fR and UID \fINEWUID\fR.
\fB\-p\fR, \fB\-\-preserve\-permissions\fR, \fB\-\-same\-permissions\fR
extract information about file permissions (default for superuser)
.TP
-\fB\-\-preserve\fR
-Same as both \fB\-p\fR and \fB\-s\fR.
-.TP
\fB\-\-same\-owner\fR
Try extracting files with the same ownership as exists in the archive
(default for superuser).
@@ -694,7 +691,7 @@ executing.
.B TAR_FD
File descriptor which can be used to communicate the new volume name
to
-.BR tar .
+.BR tar .
.RE
.RS
@@ -732,7 +729,7 @@ When this option is used in conjunction with
.BR \-\-multi\-volume ,
.B tar
will keep track of which volume of a multi-volume archive it is
-working in \fIFILE\fR.
+working in \fIFILE\fR.
.SS Device blocking
.TP
\fB\-b\fR, \fB\-\-blocking\-factor\fR=\fIBLOCKS\fR
@@ -740,7 +737,7 @@ Set record size to \fIBLOCKS\fRx\fB512\fR bytes.
.TP
\fB\-B\fR, \fB\-\-read\-full\-records\fR
When listing or extracting, accept incomplete input records after
-end-of-file marker.
+end-of-file marker.
.TP
\fB\-i\fR, \fB\-\-ignore\-zeros\fR
Ignore zeroed blocks in archive. Normally two consecutive 512-blocks
@@ -831,6 +828,10 @@ Filter the archive through
\fB\-Z\fR, \fB\-\-compress\fR, \fB\-\-uncompress\fR
Filter the archive through
.BR compress (1).
+.TP
+\fB\-\-zstd\fR
+Filter the archive through
+.BR zstd (1).
.SS Local file selection
.TP
\fB\-\-add\-file\fR=\fIFILE\fR
@@ -1102,7 +1103,7 @@ Show file or archive names after transformation by \fB\-\-strip\fR and
Print total bytes after processing the archive. If \fISIGNAL\fR is
given, print total bytes when this signal is delivered. Allowed
signals are:
-.BR SIGHUP ,
+.BR SIGHUP ,
.BR SIGQUIT ,
.BR SIGINT ,
.BR SIGUSR1 ", and"
@@ -1113,7 +1114,11 @@ The \fBSIG\fR prefix can be omitted.
Print file modification times in UTC.
.TP
\fB\-v\fR, \fB\-\-verbose\fR
-Verbosely list files processed.
+Verbosely list files processed. Each instance of this option on the
+command line increases the verbosity level by one. The maximum
+verbosity level is 3. For a detailed discussion of how various
+verbosity levels affect tar's output, please refer to \fBGNU Tar
+Manual\fR, subsection 2.5.1 "\fBThe \-\-verbose Option\fR".
.TP
\fB\-\-warning\fR=\fIKEYWORD\fR
Enable or disable warning messages identified by \fIKEYWORD\fR. The
@@ -1205,7 +1210,7 @@ default (unless \fB\-\-verbose\fR is used). A common example of what
you can get when using this warning is:
.EX
-$ \fBtar --warning=decompress-program -x -f archive.Z
+$ tar --warning=decompress-program -x -f archive.Z
tar (child): cannot run compress: No such file or directory
tar (child): trying gzip
.EE
@@ -1296,8 +1301,8 @@ failure during backup to a remote device.
.BR lzop (1),
.BR rmt (8),
.BR symlink (7),
-.BR tar (5),
-.BR xz (1).
+.BR xz (1),
+.BR zstd (1).
.PP
Complete \fBtar\fR manual: run
.B info tar
@@ -1328,4 +1333,3 @@ There is NO WARRANTY, to the extent permitted by law.
.\" time-stamp-end: "\""
.\" time-stamp-line-limit: 20
.\" end:
-
diff --git a/doc/tar.info b/doc/tar.info
index 2981e585ae35402995372b7763240e66d3a566ab..e96e91404411757e3d4d8d422ed9b2708f72ad13 100644
--- a/doc/tar.info
+++ b/doc/tar.info
@@ -1,6 +1,6 @@
-This is tar.info, produced by makeinfo version 5.2 from tar.texi.
+This is tar.info, produced by makeinfo version 5.9.93 from tar.texi.
-This manual is for GNU 'tar' (version 1.30, 16 December 2017), which
+This manual is for GNU 'tar' (version 1.32, 4 February 2019), which
creates and extracts files from archives.
Copyright (C) 1992, 1994-1997, 1999-2001, 2003-2017 Free Software
@@ -28,442 +28,443 @@ END-INFO-DIR-ENTRY
Indirect:
-tar.info-1: 1138
-tar.info-2: 302401
+tar.info-1: 1140
+tar.info-2: 303214
Tag Table:
(Indirect)
-Node: Top1138
-Node: Introduction10521
-Node: Book Contents11308
-Node: Definitions13480
-Node: What tar Does15283
-Node: Naming tar Archives18050
-Node: Authors18771
-Node: Reports20584
-Node: Tutorial20941
-Node: assumptions21754
-Node: stylistic conventions24228
-Node: basic tar options24671
-Node: frequent operations28310
-Node: Two Frequent Options28960
-Node: file tutorial29591
-Node: verbose tutorial30949
-Ref: verbose member listing33163
-Node: help tutorial35931
-Node: create36286
-Node: prepare for examples37724
-Node: Creating the archive39493
-Node: create verbose43080
-Node: short create43900
-Node: create dir46635
-Node: list49343
-Ref: listing member and file names50878
-Node: list dir53497
-Node: extract54509
-Node: extracting archives55623
-Node: extracting files56128
-Ref: extracting files-Footnote-158014
-Node: extract dir58394
-Node: extracting untrusted archives60786
-Node: failing commands61666
-Node: going further63251
-Node: tar invocation63464
-Node: Synopsis65244
-Ref: exit status68566
-Node: using tar options70199
-Ref: TAR_OPTIONS71779
-Node: Styles72798
-Ref: Styles-Footnote-174297
-Node: Long Options74553
-Node: Short Options76725
-Ref: Short Options-Footnote-178533
-Node: Old Options78750
-Node: Mixing81513
-Ref: Mixing-Footnote-183879
-Node: All Options83999
-Node: Operation Summary84635
-Ref: --append84755
-Ref: --catenate84836
-Ref: --compare84908
-Ref: --concatenate85112
-Ref: --create85223
-Ref: --delete85292
-Ref: --diff85407
-Ref: --extract85464
-Ref: --get85567
-Ref: --list85626
-Ref: --update85695
-Node: Option Summary85906
-Ref: --absolute-names86061
-Ref: --acls86353
-Ref: --after-date86434
-Ref: --anchored86487
-Ref: --atime-preserve86620
-Ref: --auto-compress89136
-Ref: --backup89364
-Ref: --block-number89556
-Ref: --blocking-factor89731
-Ref: --bzip289884
-Ref: --check-device89992
-Ref: --checkpoint90187
-Ref: --checkpoint-action90630
-Ref: --check-links91789
-Ref: --compress92066
-Ref: --uncompress92066
-Ref: --clamp-mtime92271
-Ref: --confirmation92311
-Ref: --delay-directory-restore92380
-Ref: --dereference92583
-Ref: --directory92778
-Ref: --exclude93032
-Ref: --exclude-backups93152
-Ref: --exclude-from93242
-Ref: --exclude-caches93389
-Ref: --exclude-caches-under93598
-Ref: --exclude-caches-all93777
-Ref: --exclude-ignore93907
-Ref: --exclude-ignore-recursive94127
-Ref: --exclude-tag94371
-Ref: --exclude-tag-under94543
-Ref: --exclude-tag-all94734
-Ref: --exclude-vcs94864
-Ref: --exclude-vcs-ignores95024
-Ref: --file95417
-Ref: --files-from95618
-Ref: --force-local95822
-Ref: --format96014
-Ref: --full-time96689
-Ref: --group97369
-Ref: --group-map97696
-Ref: --gzip98088
-Ref: --gunzip98088
-Ref: --ungzip98088
-Ref: --hard-dereference98312
-Ref: --help98499
-Ref: --hole-detection98635
-Ref: --ignore-case98871
-Ref: --ignore-command-error98998
-Ref: --ignore-failed-read99110
-Ref: --ignore-zeros99252
-Ref: --incremental99397
-Ref: --index-file99663
-Ref: --info-script99749
-Ref: --new-volume-script99749
-Ref: --interactive100047
-Ref: --keep-directory-symlink100260
-Ref: --keep-newer-files100809
-Ref: --keep-old-files100952
-Ref: --label101165
-Ref: --level101454
-Ref: --listed-incremental101894
-Ref: --lzip102259
-Ref: --lzma102360
-Ref: --mode102562
-Ref: --mtime102855
-Ref: --multi-volume103535
-Ref: --newer103741
-Ref: --newer-mtime104020
-Ref: --no-acls104245
-Ref: --no-anchored104339
-Ref: --no-auto-compress104476
-Ref: --no-check-device104628
-Ref: --no-delay-directory-restore104811
-Ref: --no-ignore-case105060
-Ref: --no-ignore-command-error105153
-Ref: --no-null105309
-Ref: --no-overwrite-dir105515
-Ref: --no-quote-chars105659
-Ref: --no-recursion105840
-Ref: --no-same-owner105946
-Ref: --no-same-permissions106130
-Ref: --no-seek106333
-Ref: --no-selinux106552
-Ref: --no-unquote106653
-Ref: --no-verbatim-files-from106791
-Ref: --no-wildcards107292
-Ref: --no-wildcards-match-slash107376
-Ref: --no-xattrs107478
-Ref: --null107581
-Ref: --numeric-owner107932
-Ref: --occurrence108584
-Ref: --old-archive109152
-Ref: --one-file-system109201
-Ref: --one-top-level109379
-Ref: --overwrite110015
-Ref: --overwrite-dir110158
-Ref: --owner110304
-Ref: --owner-map110667
-Ref: --pax-option111043
-Ref: --portability111350
-Ref: --posix111415
-Ref: --preserve-order111457
-Ref: --preserve-permissions111522
-Ref: --same-permissions111522
-Ref: --quote-chars111937
-Ref: --quoting-style112090
-Ref: --read-full-records112413
-Ref: --record-size112579
-Ref: --recursion112932
-Ref: --recursive-unlink113037
-Ref: --remove-files113200
-Ref: --restrict113347
-Ref: --rmt-command113536
-Ref: --rsh-command113678
-Ref: --same-order113801
-Ref: --same-owner114094
-Ref: --seek114473
-Ref: --selinux114844
-Ref: --show-defaults114945
-Ref: --show-omitted-dirs115455
-Ref: --show-snapshot-field-ranges115610
-Ref: --show-transformed-names115807
-Ref: --show-stored-names115807
-Ref: --skip-old-files116197
-Ref: --sort116648
-Ref: --sparse117287
-Ref: --sparse-version117427
-Ref: --starting-file117653
-Ref: --strip-components117843
-Ref: --suffix118180
-Ref: --tape-length118300
-Ref: --test-label118725
-Ref: --to-command118878
-Ref: --to-stdout119038
-Ref: --totals119192
-Ref: --touch119424
-Ref: --transform119627
-Ref: --xform119627
-Ref: --unlink-first120241
-Ref: --unquote120405
-Ref: --use-compress-program120512
-Ref: --utc120691
-Ref: --verbatim-files-from120785
-Ref: --verbose121629
-Ref: --verify121882
-Ref: --version122001
-Ref: --volno-file122174
-Ref: --warning122362
-Ref: --wildcards122540
-Ref: --wildcards-match-slash122660
-Ref: --xattrs122752
-Ref: --xattrs-exclude122851
-Ref: --xattrs-include122978
-Ref: --xz123234
-Ref: Option Summary-Footnote-1123364
-Node: Short Option Summary123583
-Node: Position-Sensitive Options126486
-Ref: Position-Sensitive Options-Footnote-1129975
-Node: help130137
-Ref: help-Footnote-1133972
-Node: defaults134183
-Node: verbose135202
-Ref: totals137505
-Ref: Progress information139095
-Ref: show-omitted-dirs140074
-Ref: block-number140493
-Ref: verbose-Footnote-1141520
-Node: checkpoints141627
-Ref: checkpoint exec147692
-Node: warnings149721
-Node: interactive153323
-Node: external155422
-Node: operations157010
-Node: Basic tar157252
-Ref: Basic tar-Footnote-1160359
-Node: Advanced tar160503
-Node: Operations161348
-Node: append163243
-Ref: append-Footnote-1166340
-Node: appending files166527
-Node: multiple168264
-Node: update170986
-Node: how to update171963
-Node: concatenate173744
-Ref: concatenate-Footnote-1176992
-Node: delete177135
-Node: compare178909
-Node: create options180343
-Node: override180830
-Node: Extended File Attributes187891
-Node: Ignore Failed Read192519
-Node: extract options193124
-Node: Reading193957
-Node: read full records195457
-Node: Ignore Zeros195792
-Node: Writing196783
-Node: Dealing with Old Files197340
-Node: Overwrite Old Files200142
-Node: Keep Old Files201599
-Node: Keep Newer Files202406
-Node: Unlink First202696
-Node: Recursive Unlink203100
-Node: Data Modification Times203653
-Node: Setting Access Permissions204463
-Node: Directory Modification Times and Permissions205095
-Node: Writing to Standard Output208708
-Node: Writing to an External Program210243
-Node: remove files213833
-Node: Scarce214026
-Node: Starting File214274
-Node: Same Order215075
-Node: backup215911
-Node: looking ahead219003
-Node: Backups219823
-Node: Full Dumps221404
-Node: Incremental Dumps223213
-Ref: --level=0226127
-Ref: device numbers226660
-Ref: incremental-op230643
-Ref: Incremental Dumps-Footnote-1231017
-Ref: Incremental Dumps-Footnote-2231167
-Node: Backup Levels231655
-Node: Backup Parameters234042
-Node: General-Purpose Variables235223
-Ref: RSH238391
-Node: Magnetic Tape Control240275
-Node: User Hooks241614
-Node: backup-specs example242947
-Node: Scripted Backups244087
-Ref: Scripted Backups-Footnote-1246952
-Node: Scripted Restoration247336
-Node: Choosing249942
-Node: file251064
-Ref: remote-dev253700
-Ref: local and remote archives254085
-Node: Selecting Archive Members255116
-Ref: input name quoting255797
-Node: files257772
-Ref: verbatim-files-from260479
-Ref: no-verbatim-files-from260739
-Ref: files-Footnote-1261481
-Node: nul261639
-Node: exclude264097
-Ref: exclude-vcs-ignores265655
-Ref: exclude-vcs267368
-Ref: exclude-Footnote-1271304
-Ref: exclude-Footnote-2271558
-Node: problems with exclude271629
-Node: wildcards273679
-Node: controlling pattern-matching276262
-Ref: anchored patterns278903
-Ref: case-insensitive matches279173
-Ref: controlling pattern-matching-Footnote-1280250
-Node: quoting styles280467
-Ref: escape sequences280812
-Node: transform286756
-Ref: show-transformed-names288747
-Node: after294938
-Node: recurse298540
-Node: one302401
-Node: directory303834
-Node: absolute306933
-Ref: absolute-Footnote-1310260
-Node: Date input formats310611
-Node: General date syntax313007
-Node: Calendar date items315984
-Node: Time of day items317981
-Node: Time zone items320177
-Node: Combined date and time of day items321427
-Node: Day of week items322282
-Node: Relative items in date strings323290
-Node: Pure numbers in date strings326092
-Node: Seconds since the Epoch327073
-Node: Specifying time zone rules328693
-Node: Authors of parse_datetime331066
-Ref: Authors of get_date331245
-Node: Formats332208
-Node: Compression336883
-Node: gzip337175
-Ref: alternative decompression programs339386
-Ref: auto-compress342935
-Ref: use-compress-program343700
-Ref: gzip-Footnote-1345667
-Ref: gzip-Footnote-2345716
-Node: lbzip2345856
-Node: sparse346953
-Node: Attributes351497
-Node: Portability357159
-Node: Portable Names358645
-Node: dereference359350
-Node: hard links360477
-Ref: hard links-Footnote-1363362
-Node: old363418
-Node: ustar364601
-Node: gnu365204
-Node: posix366081
-Node: PAX keywords366562
-Node: Checksumming372560
-Node: Large or Negative Values374504
-Node: Other Tars376105
-Node: Split Recovery377241
-Node: Sparse Recovery380990
-Ref: extracting sparse v0x384619
-Ref: Sparse Recovery-Footnote-1387908
-Ref: Sparse Recovery-Footnote-2387931
-Node: cpio388052
-Node: Media392813
-Node: Device394764
-Ref: size-suffixes399555
-Node: Remote Tape Server400695
-Node: Common Problems and Solutions404359
-Node: Blocking404751
-Ref: Blocking-Footnote-1411235
-Node: Format Variations411339
-Node: Blocking Factor412254
-Node: Many423905
-Node: Tape Positioning427699
-Node: mt429575
-Node: Using Multiple Tapes431132
-Node: Multi-Volume Archives433198
-Ref: tape-length434683
-Ref: change volume prompt435238
-Ref: volno-file436105
-Ref: info-script436658
-Ref: Multi-Volume Archives-Footnote-1442243
-Ref: Multi-Volume Archives-Footnote-2442353
-Node: Tape Files442421
-Node: Tarcat443906
-Node: label444951
-Ref: --test-label option446539
-Ref: label-Footnote-1449990
-Ref: label-Footnote-2450099
-Ref: label-Footnote-3450232
-Node: verify450467
-Node: Write Protection453767
-Node: Reliability and security454597
-Node: Reliability454985
-Node: Permissions problems455763
-Node: Data corruption and repair456202
-Node: Race conditions457129
-Node: Security458868
-Node: Privacy459471
-Node: Integrity460720
-Node: Live untrusted data462931
-Node: Security rules of thumb465270
-Node: Changes466798
-Node: Recipes470387
-Node: copy directory hierarchy470672
-Node: intermediate directories471476
-Ref: intermediate directories-Footnote-1473841
-Node: Configuring Help Summary473965
-Node: Fixing Snapshot Files480481
-Node: Tar Internals483850
-Node: Standard484182
-Node: Extensions506324
-Node: Sparse Formats509614
-Node: Old GNU Format510903
-Node: PAX 0513290
-Node: PAX 1516404
-Node: Snapshot Files518132
-Node: Dumpdir523730
-Node: Genfile526960
-Node: Generate Mode528056
-Node: Status Mode533296
-Node: Exec Mode535098
-Node: Free Software Needs Free Documentation537944
-Node: GNU Free Documentation License542925
-Node: Index of Command Line Options568133
-Node: Index596359
+Node: Top1140
+Node: Introduction10522
+Node: Book Contents11309
+Node: Definitions13481
+Node: What tar Does15284
+Node: Naming tar Archives18051
+Node: Authors18772
+Node: Reports20585
+Node: Tutorial20942
+Node: assumptions21755
+Node: stylistic conventions24229
+Node: basic tar options24672
+Node: frequent operations28311
+Node: Two Frequent Options28961
+Node: file tutorial29592
+Node: verbose tutorial30950
+Ref: verbose member listing33164
+Node: help tutorial35932
+Node: create36287
+Node: prepare for examples37725
+Node: Creating the archive39494
+Node: create verbose43081
+Node: short create43901
+Node: create dir46636
+Node: list49344
+Ref: listing member and file names50879
+Node: list dir53498
+Node: extract54510
+Node: extracting archives55624
+Node: extracting files56129
+Ref: extracting files-Footnote-158015
+Node: extract dir58395
+Node: extracting untrusted archives60787
+Node: failing commands61667
+Node: going further63252
+Node: tar invocation63465
+Node: Synopsis65245
+Ref: exit status68567
+Node: using tar options70200
+Ref: TAR_OPTIONS71780
+Node: Styles72799
+Ref: Styles-Footnote-174298
+Node: Long Options74554
+Node: Short Options76726
+Ref: Short Options-Footnote-178534
+Node: Old Options78751
+Node: Mixing81514
+Ref: Mixing-Footnote-183880
+Node: All Options84000
+Node: Operation Summary84636
+Ref: --append84756
+Ref: --catenate84837
+Ref: --compare84909
+Ref: --concatenate85113
+Ref: --create85224
+Ref: --delete85293
+Ref: --diff85408
+Ref: --extract85465
+Ref: --get85568
+Ref: --list85627
+Ref: --update85696
+Node: Option Summary85907
+Ref: --absolute-names86062
+Ref: --acls86354
+Ref: --after-date86435
+Ref: --anchored86488
+Ref: --atime-preserve86621
+Ref: --auto-compress89137
+Ref: --backup89365
+Ref: --block-number89557
+Ref: --blocking-factor89732
+Ref: --bzip289885
+Ref: --check-device89993
+Ref: --checkpoint90188
+Ref: --checkpoint-action90631
+Ref: --check-links91902
+Ref: --compress92179
+Ref: --uncompress92179
+Ref: --clamp-mtime92384
+Ref: --confirmation92424
+Ref: --delay-directory-restore92493
+Ref: --dereference92696
+Ref: --directory92891
+Ref: --exclude93145
+Ref: --exclude-backups93265
+Ref: --exclude-from93355
+Ref: --exclude-caches93502
+Ref: --exclude-caches-under93711
+Ref: --exclude-caches-all93890
+Ref: --exclude-ignore94020
+Ref: --exclude-ignore-recursive94240
+Ref: --exclude-tag94484
+Ref: --exclude-tag-under94656
+Ref: --exclude-tag-all94847
+Ref: --exclude-vcs94977
+Ref: --exclude-vcs-ignores95137
+Ref: --file95530
+Ref: --files-from95731
+Ref: --force-local95935
+Ref: --format96127
+Ref: --full-time96802
+Ref: --group97482
+Ref: --group-map97809
+Ref: --gzip98201
+Ref: --gunzip98201
+Ref: --ungzip98201
+Ref: --hard-dereference98425
+Ref: --help98612
+Ref: --hole-detection98748
+Ref: --ignore-case98984
+Ref: --ignore-command-error99111
+Ref: --ignore-failed-read99223
+Ref: --ignore-zeros99365
+Ref: --incremental99510
+Ref: --index-file99776
+Ref: --info-script99862
+Ref: --new-volume-script99862
+Ref: --interactive100160
+Ref: --keep-directory-symlink100373
+Ref: --keep-newer-files100922
+Ref: --keep-old-files101065
+Ref: --label101278
+Ref: --level101567
+Ref: --listed-incremental102007
+Ref: --lzip102372
+Ref: --lzma102473
+Ref: --mode102675
+Ref: --mtime102968
+Ref: --multi-volume103648
+Ref: --newer103854
+Ref: --newer-mtime104133
+Ref: --no-acls104358
+Ref: --no-anchored104452
+Ref: --no-auto-compress104589
+Ref: --no-check-device104741
+Ref: --no-delay-directory-restore104924
+Ref: --no-ignore-case105173
+Ref: --no-ignore-command-error105266
+Ref: --no-null105422
+Ref: --no-overwrite-dir105628
+Ref: --no-quote-chars105772
+Ref: --no-recursion105953
+Ref: --no-same-owner106059
+Ref: --no-same-permissions106243
+Ref: --no-seek106446
+Ref: --no-selinux106665
+Ref: --no-unquote106766
+Ref: --no-verbatim-files-from106904
+Ref: --no-wildcards107405
+Ref: --no-wildcards-match-slash107489
+Ref: --no-xattrs107591
+Ref: --null107694
+Ref: --numeric-owner108045
+Ref: --occurrence108697
+Ref: --old-archive109265
+Ref: --one-file-system109314
+Ref: --one-top-level109492
+Ref: --overwrite110128
+Ref: --overwrite-dir110271
+Ref: --owner110417
+Ref: --owner-map110780
+Ref: --pax-option111156
+Ref: --portability111463
+Ref: --posix111528
+Ref: --preserve-order111570
+Ref: --preserve-permissions111635
+Ref: --same-permissions111635
+Ref: --quote-chars112050
+Ref: --quoting-style112203
+Ref: --read-full-records112526
+Ref: --record-size112692
+Ref: --recursion113045
+Ref: --recursive-unlink113150
+Ref: --remove-files113313
+Ref: --restrict113460
+Ref: --rmt-command113649
+Ref: --rsh-command113791
+Ref: --same-order113914
+Ref: --same-owner114207
+Ref: --seek114586
+Ref: --selinux114957
+Ref: --show-defaults115058
+Ref: --show-omitted-dirs115568
+Ref: --show-snapshot-field-ranges115723
+Ref: --show-transformed-names115920
+Ref: --show-stored-names115920
+Ref: --skip-old-files116310
+Ref: --sort116761
+Ref: --sparse117400
+Ref: --sparse-version117540
+Ref: --starting-file117766
+Ref: --strip-components117956
+Ref: --suffix118293
+Ref: --tape-length118413
+Ref: --test-label118838
+Ref: --to-command118991
+Ref: --to-stdout119151
+Ref: --totals119305
+Ref: --touch119537
+Ref: --transform119740
+Ref: --xform119740
+Ref: --unlink-first120354
+Ref: --unquote120518
+Ref: --use-compress-program120625
+Ref: --utc120804
+Ref: --verbatim-files-from120898
+Ref: --verbose121742
+Ref: --verify121995
+Ref: --version122114
+Ref: --volno-file122287
+Ref: --warning122475
+Ref: --wildcards122653
+Ref: --wildcards-match-slash122773
+Ref: --xattrs122865
+Ref: --xattrs-exclude122964
+Ref: --xattrs-include123091
+Ref: --xz123347
+Ref: Option Summary-Footnote-1123570
+Node: Short Option Summary123789
+Node: Position-Sensitive Options126701
+Ref: Position-Sensitive Options-Footnote-1130190
+Node: help130352
+Ref: help-Footnote-1134187
+Node: defaults134398
+Node: verbose135417
+Ref: totals137720
+Ref: Progress information139310
+Ref: show-omitted-dirs140289
+Ref: block-number140708
+Ref: verbose-Footnote-1141735
+Node: checkpoints141842
+Ref: checkpoint wait147907
+Ref: checkpoint exec148503
+Node: warnings150532
+Node: interactive154134
+Node: external156233
+Node: operations157821
+Node: Basic tar158063
+Ref: Basic tar-Footnote-1161170
+Node: Advanced tar161314
+Node: Operations162159
+Node: append164054
+Ref: append-Footnote-1167151
+Node: appending files167338
+Node: multiple169075
+Node: update171797
+Node: how to update172774
+Node: concatenate174555
+Ref: concatenate-Footnote-1177803
+Node: delete177946
+Node: compare179720
+Node: create options181154
+Node: override181641
+Node: Extended File Attributes188702
+Node: Ignore Failed Read193330
+Node: extract options193935
+Node: Reading194768
+Node: read full records196268
+Node: Ignore Zeros196603
+Node: Writing197594
+Node: Dealing with Old Files198151
+Node: Overwrite Old Files200953
+Node: Keep Old Files202410
+Node: Keep Newer Files203217
+Node: Unlink First203507
+Node: Recursive Unlink203911
+Node: Data Modification Times204464
+Node: Setting Access Permissions205274
+Node: Directory Modification Times and Permissions205906
+Node: Writing to Standard Output209519
+Node: Writing to an External Program211054
+Node: remove files214644
+Node: Scarce214837
+Node: Starting File215085
+Node: Same Order215886
+Node: backup216722
+Node: looking ahead219814
+Node: Backups220634
+Node: Full Dumps222215
+Node: Incremental Dumps224024
+Ref: --level=0226938
+Ref: device numbers227471
+Ref: incremental-op231454
+Ref: Incremental Dumps-Footnote-1231828
+Ref: Incremental Dumps-Footnote-2231978
+Node: Backup Levels232466
+Node: Backup Parameters234853
+Node: General-Purpose Variables236034
+Ref: RSH239202
+Node: Magnetic Tape Control241086
+Node: User Hooks242425
+Node: backup-specs example243758
+Node: Scripted Backups244898
+Ref: Scripted Backups-Footnote-1247763
+Node: Scripted Restoration248147
+Node: Choosing250753
+Node: file251875
+Ref: remote-dev254511
+Ref: local and remote archives254896
+Node: Selecting Archive Members255927
+Ref: input name quoting256608
+Node: files258583
+Ref: verbatim-files-from261290
+Ref: no-verbatim-files-from261550
+Ref: files-Footnote-1262292
+Node: nul262450
+Node: exclude264908
+Ref: exclude-vcs-ignores266466
+Ref: exclude-vcs268179
+Ref: exclude-Footnote-1272115
+Ref: exclude-Footnote-2272369
+Node: problems with exclude272440
+Node: wildcards274490
+Node: controlling pattern-matching277073
+Ref: anchored patterns279714
+Ref: case-insensitive matches279984
+Ref: controlling pattern-matching-Footnote-1281061
+Node: quoting styles281278
+Ref: escape sequences281623
+Node: transform287567
+Ref: show-transformed-names289558
+Node: after295749
+Node: recurse299351
+Node: one303214
+Node: directory304647
+Node: absolute307746
+Ref: absolute-Footnote-1311073
+Node: Date input formats311424
+Node: General date syntax313820
+Node: Calendar date items316797
+Node: Time of day items318794
+Node: Time zone items320990
+Node: Combined date and time of day items322240
+Node: Day of week items323095
+Node: Relative items in date strings324103
+Node: Pure numbers in date strings326905
+Node: Seconds since the Epoch327886
+Node: Specifying time zone rules329506
+Node: Authors of parse_datetime331879
+Ref: Authors of get_date332058
+Node: Formats333021
+Node: Compression337696
+Node: gzip337988
+Ref: alternative decompression programs340473
+Ref: auto-compress344072
+Ref: use-compress-program344907
+Ref: gzip-Footnote-1346874
+Ref: gzip-Footnote-2346923
+Node: lbzip2347063
+Node: sparse348160
+Node: Attributes352704
+Node: Portability358366
+Node: Portable Names359852
+Node: dereference360557
+Node: hard links361684
+Ref: hard links-Footnote-1364569
+Node: old364625
+Node: ustar365808
+Node: gnu366411
+Node: posix367288
+Node: PAX keywords367769
+Node: Checksumming373767
+Node: Large or Negative Values375711
+Node: Other Tars377312
+Node: Split Recovery378448
+Node: Sparse Recovery382197
+Ref: extracting sparse v0x385826
+Ref: Sparse Recovery-Footnote-1389115
+Ref: Sparse Recovery-Footnote-2389138
+Node: cpio389259
+Node: Media394020
+Node: Device395971
+Ref: size-suffixes400762
+Node: Remote Tape Server401902
+Node: Common Problems and Solutions405566
+Node: Blocking405958
+Ref: Blocking-Footnote-1412442
+Node: Format Variations412546
+Node: Blocking Factor413461
+Node: Many425112
+Node: Tape Positioning428906
+Node: mt430782
+Node: Using Multiple Tapes432339
+Node: Multi-Volume Archives434405
+Ref: tape-length435890
+Ref: change volume prompt436445
+Ref: volno-file437312
+Ref: info-script437865
+Ref: Multi-Volume Archives-Footnote-1443450
+Ref: Multi-Volume Archives-Footnote-2443560
+Node: Tape Files443628
+Node: Tarcat445113
+Node: label446158
+Ref: --test-label option447746
+Ref: label-Footnote-1451197
+Ref: label-Footnote-2451306
+Ref: label-Footnote-3451439
+Node: verify451674
+Node: Write Protection454974
+Node: Reliability and security455804
+Node: Reliability456192
+Node: Permissions problems456970
+Node: Data corruption and repair457409
+Node: Race conditions458336
+Node: Security460075
+Node: Privacy460678
+Node: Integrity461927
+Node: Live untrusted data464138
+Node: Security rules of thumb466477
+Node: Changes468005
+Node: Recipes471594
+Node: copy directory hierarchy471879
+Node: intermediate directories472683
+Ref: intermediate directories-Footnote-1475048
+Node: Configuring Help Summary475172
+Node: Fixing Snapshot Files481688
+Node: Tar Internals485057
+Node: Standard485389
+Node: Extensions507531
+Node: Sparse Formats510821
+Node: Old GNU Format512110
+Node: PAX 0514497
+Node: PAX 1517611
+Node: Snapshot Files519320
+Node: Dumpdir524918
+Node: Genfile528148
+Node: Generate Mode529244
+Node: Status Mode534484
+Node: Exec Mode536286
+Node: Free Software Needs Free Documentation539342
+Node: GNU Free Documentation License544323
+Node: Index of Command Line Options569498
+Node: Index597797
End Tag Table
diff --git a/doc/tar.info-1 b/doc/tar.info-1
index dc01ffba0baf41e8b43b2b7b5a899915f29ef0a0..5273a7bd6832ad377650af6551f58500d0d103e4 100644
--- a/doc/tar.info-1
+++ b/doc/tar.info-1
@@ -1,6 +1,6 @@
-This is tar.info, produced by makeinfo version 5.2 from tar.texi.
+This is tar.info, produced by makeinfo version 5.9.93 from tar.texi.
-This manual is for GNU 'tar' (version 1.30, 16 December 2017), which
+This manual is for GNU 'tar' (version 1.32, 4 February 2019), which
creates and extracts files from archives.
Copyright (C) 1992, 1994-1997, 1999-2001, 2003-2017 Free Software
@@ -32,7 +32,7 @@ File: tar.info, Node: Top, Next: Introduction, Up: (dir)
GNU tar: an archiver tool
*************************
-This manual is for GNU 'tar' (version 1.30, 16 December 2017), which
+This manual is for GNU 'tar' (version 1.32, 4 February 2019), which
creates and extracts files from archives.
Copyright (C) 1992, 1994-1997, 1999-2001, 2003-2017 Free Software
@@ -566,7 +566,7 @@ in version 1.11. Thomas Bushnell, n/BSG and Amy Gorin worked on a
tutorial and manual for GNU 'tar'. Franc,ois Pinard put version 1.11.8
of the manual together by taking information from all these sources and
merging them. Melissa Weisshaus finally edited and redesigned the book
-to create version 1.12. The book for versions from 1.14 up to 1.30 were
+to create version 1.12. The book for versions from 1.14 up to 1.32 were
edited by the current maintainer, Sergey Poznyakoff.
For version 1.12, Daniel Hagerty contributed a great deal of
@@ -1312,7 +1312,7 @@ Consider this example, run from your home directory:
/home/myself/practice/folk
/home/myself/practice/jazz
/home/myself/practice/collection.tar
- $ tar --test --file practice.tar
+ $ tar --list --file practice.tar
home/myself/practice/
home/myself/practice/blues
home/myself/practice/folk
@@ -1337,7 +1337,7 @@ GNU 'tar' show member names when creating archive by supplying
home/myself/practice/folk
home/myself/practice/jazz
home/myself/practice/collection.tar
- $ tar --test --file practice.tar
+ $ tar --list --file practice.tar
home/myself/practice/
home/myself/practice/blues
home/myself/practice/folk
@@ -1910,10 +1910,11 @@ function; they are interchangeable.
Short options which require arguments take their arguments
immediately following the option, usually separated by white space. It
is also possible to stick the argument right after the short option
-name, using no intervening space. For example, you might write '-f archive.tar'
-or '-farchive.tar' instead of using '--file=archive.tar'. Both
-'--file=ARCHIVE-NAME' and '-f ARCHIVE-NAME' denote the option which
-indicates a specific archive, here named 'archive.tar'.
+name, using no intervening space. For example, you might write
+'-f archive.tar' or '-farchive.tar' instead of using
+'--file=archive.tar'. Both '--file=ARCHIVE-NAME' and '-f ARCHIVE-NAME'
+denote the option which indicates a specific archive, here named
+'archive.tar'.
Short options which take optional arguments take their arguments
immediately following the option letter, _without any intervening white
@@ -1980,8 +1981,9 @@ Here, '20' is the argument of '-b' and '/dev/rmt0' is the argument of
with their corresponding arguments, and is often confusing. In the
command 'tar cvbf 20 /dev/rmt0', for example, '20' is the argument for
'-b', '/dev/rmt0' is the argument for '-f', and '-v' does not have a
-corresponding argument. Even using short options like in 'tar -c -v -b 20 -f /dev/rmt0'
-is clearer, putting all arguments next to the option they pertain to.
+corresponding argument. Even using short options like in
+'tar -c -v -b 20 -f /dev/rmt0' is clearer, putting all arguments next to
+the option they pertain to.
If you want to reorder the letters in the old option argument, be
sure to reorder any corresponding argument appropriately.
@@ -2305,6 +2307,12 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera
ttyout=STRING
Output STRING on the current console ('/dev/tty').
+ totals
+ Print statistics (see *note totals::).
+
+ wait=SIGNO
+ Wait for signal SIGNO.
+
Several '--checkpoint-action' options can be specified. The
supplied actions will be executed in order of their appearance in
the command line.
@@ -2628,7 +2636,7 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera
pattern specified in NAME. *Note Tape Files::.
'--level=N'
- Force incremental backup of level N. As of GNU 'tar' version 1.30,
+ Force incremental backup of level N. As of GNU 'tar' version 1.32,
the option '--level=0' truncates the snapshot file, thereby forcing
the level 0 dump. Other values of N are effectively ignored.
*Note --level=0::, for details and examples.
@@ -3125,8 +3133,8 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera
'--tape-length=NUM[SUF]'
'-L NUM[SUF]'
- Specifies the length of tapes that 'tar' is writing as being NUM x 1024
- bytes long. If optional SUF is given, it specifies a
+ Specifies the length of tapes that 'tar' is writing as being
+ NUM x 1024 bytes long. If optional SUF is given, it specifies a
multiplicative factor to be used instead of 1024. For example,
'-L2M' means 2 megabytes. *Note Table 9.1: size-suffixes, for a
list of allowed suffixes. *Note Using Multiple Tapes::, for a
@@ -3284,6 +3292,10 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera
Use 'xz' for compressing or decompressing the archives. *Note
gzip::.
+'--zstd'
+ Use 'zstd' for compressing or decompressing the archives. *Note
+ gzip::.
+
---------- Footnotes ----------
(1) Earlier versions of GNU 'tar' understood '-l' as a synonym for
@@ -3365,8 +3377,8 @@ Short Option Reference
-m *note --touch::.
--o When creating, *note --no-same-owner::, when extracting
- -- *note --portability::.
+-o When extracting, same as *note --no-same-owner::. When
+ creating, - *note --old-archive::.
The latter usage is deprecated. It is retained for
compatibility with the earlier versions of GNU 'tar'.
@@ -3530,8 +3542,8 @@ about its name, version, origin and legal status, all on standard
output, and then exit successfully. For example, 'tar --version' might
print:
- tar (GNU tar) 1.30
- Copyright (C) 2013-2017 Free Software Foundation, Inc.
+ tar (GNU tar) 1.32
+ Copyright (C) 2013-2019 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
@@ -3912,6 +3924,21 @@ checkpoint:
$ tar -c --checkpoint=1000 --checkpoint-action=sleep=30
+ The 'wait=SIGNO' action stops further execution until the signal
+SIGNO is delivered. Valid values for SIGNO are: 'SIGHUP', 'SIGQUIT',
+'SIGINT', 'SIGUSR1' and 'SIGUSR2'. The 'SIG' prefix is optional. For
+example:
+
+ $ tar -c -f arc --checkpoint=1000 --checkpoint-action wait=USR1 .
+
+ In this example, GNU 'tar' will stop archivation at each 1000th
+checkpoint. wait until the 'SIGUSR1' signal is delivered, and resume
+processing.
+
+ This action is used by the 'genfile' utility to perform modifications
+on the input files upon hitting certain checkpoints (*note genfile: Exec
+Mode.).
+
Finally, the 'exec' action executes a given external command. For
example:
@@ -6929,7 +6956,7 @@ options provide such possibility:
systems: 'CVS', 'RCS', 'SCCS', 'SVN', 'Arch', 'Bazaar',
'Mercurial', and 'Darcs'.
- As of version 1.30, the following files are excluded:
+ As of version 1.32, the following files are excluded:
* 'CVS/', and everything under it
* 'RCS/', and everything under it
@@ -7058,7 +7085,7 @@ entirely:
(1) According to the Bazaar docs, globbing-patterns are Korn-shell
style and regular expressions are perl-style. As of GNU 'tar' version
-1.30, these are treated as shell-style globs and posix extended regexps.
+1.32, these are treated as shell-style globs and posix extended regexps.
This will be fixed in future releases.
(2) Support for perl-style regexps will appear in future releases.
diff --git a/doc/tar.info-2 b/doc/tar.info-2
index e8494b817cc96a2c1e79d409e9936fc8565d94c6..c35abc4cf3189051e8fa3631dada19740e03fd5e 100644
--- a/doc/tar.info-2
+++ b/doc/tar.info-2
@@ -1,6 +1,6 @@
-This is tar.info, produced by makeinfo version 5.2 from tar.texi.
+This is tar.info, produced by makeinfo version 5.9.93 from tar.texi.
-This manual is for GNU 'tar' (version 1.30, 16 December 2017), which
+This manual is for GNU 'tar' (version 1.32, 4 February 2019), which
creates and extracts files from archives.
Copyright (C) 1992, 1994-1997, 1999-2001, 2003-2017 Free Software
@@ -750,7 +750,7 @@ v7
This format has traditionally been used by Automake when producing
Makefiles. This practice will change in the future, in the
meantime, however this means that projects containing file names
- more than 99 characters long will not be able to use GNU 'tar' 1.30
+ more than 99 characters long will not be able to use GNU 'tar' 1.32
and Automake prior to 1.9.
ustar
@@ -832,19 +832,27 @@ File: tar.info, Node: gzip, Next: sparse, Up: Compression
GNU 'tar' is able to create and read compressed archives. It supports a
wide variety of compression programs, namely: 'gzip', 'bzip2', 'lzip',
-'lzma', 'lzop', 'xz' and traditional 'compress'. The latter is
+'lzma', 'lzop', 'zstd', 'xz' and traditional 'compress'. The latter is
supported mostly for backward compatibility, and we recommend against
using it, because it is by far less effective than the other compression
programs(1).
Creating a compressed archive is simple: you just specify a
"compression option" along with the usual archive creation commands.
-The compression option is '-z' ('--gzip') to create a 'gzip' compressed
-archive, '-j' ('--bzip2') to create a 'bzip2' compressed archive,
-'--lzip' to create an lzip compressed archive, '-J' ('--xz') to create
-an XZ archive, '--lzma' to create an LZMA compressed archive, '--lzop'
-to create an LZOP archive, and '-Z' ('--compress') to use 'compress'
-program. For example:
+Available compression options are summarized in the table below:
+
+Long Short Archive format
+---------------------------------------------------------------------------
+'--gzip' '-z' 'gzip'
+'--bzip2' '-j' 'bzip2'
+'--xz' '-J' 'xz'
+'--lzip' 'lzip'
+'--lzma' 'lzma'
+'--lzop' 'lzop'
+'--zstd' 'zstd'
+'--compress' '-Z' 'compress'
+
+ For example:
$ tar czf archive.tar.gz .
@@ -881,7 +889,7 @@ a list of recognized suffixes).
Some compression programs are able to handle different compression
formats. GNU 'tar' uses this, if the principal decompressor for the
given format is not available. For example, if 'compress' is not
-installed, 'tar' will try to use 'gzip'. As of version 1.30 the
+installed, 'tar' will try to use 'gzip'. As of version 1.32 the
following alternatives are tried(2):
Format Main decompressor Alternatives
@@ -937,6 +945,9 @@ program:
'--lzop'
Filter the archive through 'lzop'.
+'--zstd'
+ Filter the archive through 'zstd'.
+
'-Z'
'--compress'
'--uncompress'
@@ -995,6 +1006,8 @@ compressed archives. These are:
'.tlz' 'lzma'
'.lzo' 'lzop'
'.xz' 'xz'
+ '.zst' 'zstd'
+ '.tzst' 'zstd'
'--use-compress-program=COMMAND'
'-I=COMMAND'
@@ -4936,9 +4949,9 @@ constructed using the following pattern:
'GNU.sparse.realsize'.
The sparse map itself is stored in the file data block, preceding the
-actual file data. It consists of a series of octal numbers of arbitrary
-length, delimited by newlines. The map is padded with nulls to the
-nearest block boundary.
+actual file data. It consists of a series of decimal numbers delimited
+by newlines. The map is padded with nulls to the nearest block
+boundary.
The first number gives the number of entries in the map. Following
are map entries, each one consisting of two numbers giving the offset
@@ -4963,13 +4976,13 @@ backups (*note Incremental Dumps::). It contains the status of the file
system at the time of the dump and is used to determine which files were
modified since the last backup.
- GNU 'tar' version 1.30 supports three snapshot file formats. The
+ GNU 'tar' version 1.32 supports three snapshot file formats. The
first format, called "format 0", is the one used by GNU 'tar' versions
up to and including 1.15.1. The second format, called "format 1" is an
extended version of this format, that contains more metadata and allows
for further extensions. It was used by alpha release version 1.15.90.
For alpha version 1.15.91 and stable releases version 1.16 up through
-1.30, the "format 2" is used.
+1.32, the "format 2" is used.
GNU 'tar' is able to read all three formats, but will create
snapshots only in format 2.
@@ -5028,7 +5041,7 @@ snapshots only in format 2.
2. 'Format 2' snapshot file begins with a format identifier, as
described for version 1, e.g.:
- GNU tar-1.30-2
+ GNU tar-1.32-2
This line is followed by newline. Rest of file consists of
records, separated by null (ASCII 0) characters. Thus, in contrast
@@ -5056,8 +5069,8 @@ snapshots only in format 2.
ino Number I-node number;
name String Directory name; in contrast to the
previous versions it is not quoted;
- contents Dumpdir Contents of the directory; *Note
- Dumpdir::, for a description of its
+ contents Dumpdir Contents of the directory;
+ *Note Dumpdir::, for a description of its
format.
Dumpdirs stored in snapshot files contain only records of types
@@ -5069,7 +5082,7 @@ snapshots only in format 2.
'tar' binary, you can use the '--show-snapshot-field-ranges'
option:
- $ tar --show-shapshot-field-ranges
+ $ tar --show-snapshot-field-ranges
This tar's snapshot file field ranges are
(field name => [ min, max ]):
@@ -5439,13 +5452,35 @@ F.3 Exec Mode
=============
This mode is designed for testing the behavior of 'paxutils' commands
-when some of the files change during archiving. It is an experimental
-mode.
+when some of the files change during archiving. It supposes that the
+command being executed supports '--checkpoint' and '--checkpoint-action'
+options (*note Checkpoints: (tar)checkpoints.).
+
+ The 'Exec Mode' is enabled by '--run' command line option (or its
+alias '-r'). The non-optional arguments supply the command line to be
+executed. 'Genfile' modifies this command line by inserting the
+following options between the command name and first argument:
+
+ --checkpoint=N
+ --checkpoint-action "echo=genfile checkpoint %u"
+ --checkpoint-action "wait=SIGUSR1"
+
+ Here, N stands for the checkpoint granularity (for GNU 'tar', it is
+the number of archive records read or written between each pair of
+checkpoints). The default value is 1. This value can be changed using
+the optional argument to the '--run' option. For example, to run
+actions on each 10th checkpoint:
+
+ genfile --run=10 ...
+
+ If the command line contains options, it must be preceded by a
+double-dash ('--'), which will prevent these options from being
+interpreted by 'genfile' itself. For example:
- The 'Exec Mode' is toggled by '--run' command line option (or its
-alias '-r'). The non-optional arguments to 'getopt' give the command
-line to be executed. Normally, it should contain at least the
-'--checkpoint' option.
+ genfile --run --checkpoint=2 --truncate foo -- tar -c -f a.tar .
+
+ Notice also, that when running 'tar', its command line may not
+contain traditional options (cluster of letters without dash).
A set of options is provided for defining checkpoint values and
actions to be executed upon reaching them. Checkpoint values are
@@ -5487,30 +5522,8 @@ exit status of the command.
connected to descriptor 1. All messages it prints to file descriptor 2,
except checkpoint notifications, are forwarded to standard error.
- 'Genfile' exits with the exit status of the executed command.
-
- For compatibility with previous 'genfile' versions, the '--run'
-option takes an optional argument. If used this way, its argument
-supplies the command line to be executed. There should be no
-non-optional arguments in the 'genfile' command line.
-
- The actual command line is constructed by inserting the
-'--checkpoint' option between the command name and its first argument
-(if any). Due to this, the argument to '--run' may not use traditional
-'tar' option syntax, i.e., the following is wrong:
-
- # Wrong!
- genfile --run='tar cf foo bar'
-
- Use the following syntax instead:
-
- genfile --run='tar -cf foo bar' ACTIONS...
-
- The above command line is equivalent to
-
- genfile ACTIONS... -- tar -cf foo bar
-
- Notice, that the use of compatibility mode is deprecated.
+ In exec mode, 'genfile' exits with the exit status of the executed
+command.
File: tar.info, Node: Free Software Needs Free Documentation, Next: GNU Free Documentation License, Prev: Genfile, Up: Top
@@ -5612,8 +5625,7 @@ Appendix H GNU Free Documentation License
Version 1.3, 3 November 2008
- Copyright (C) 2000-2002, 2007-2008, 2014, 2016-2017 Free
- Software Foundation, Inc.
+ Copyright (C) 2000-2019 Free Software Foundation, Inc.
<http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
@@ -6115,7 +6127,7 @@ Summary::.
* append, summary: Operation Summary. (line 6)
* atime-preserve: Attributes. (line 10)
* atime-preserve, summary: Option Summary. (line 25)
-* auto-compress: gzip. (line 150)
+* auto-compress: gzip. (line 161)
* auto-compress, summary: Option Summary. (line 71)
* backup: backup. (line 41)
* backup, summary: Option Summary. (line 78)
@@ -6129,21 +6141,21 @@ Summary::.
* check-device, described: Incremental Dumps. (line 107)
* check-device, summary: Option Summary. (line 103)
* check-links, described: hard links. (line 31)
-* check-links, summary: Option Summary. (line 155)
+* check-links, summary: Option Summary. (line 161)
* checkpoint: checkpoints. (line 6)
* checkpoint, defined: checkpoints. (line 13)
* checkpoint, summary: Option Summary. (line 108)
* checkpoint-action: checkpoints. (line 6)
* checkpoint-action, defined: checkpoints. (line 22)
* checkpoint-action, summary: Option Summary. (line 117)
-* clamp-mtime, summary: Option Summary. (line 172)
+* clamp-mtime, summary: Option Summary. (line 178)
* compare: compare. (line 6)
* compare, summary: Operation Summary. (line 16)
-* compress: gzip. (line 113)
-* compress, summary: Option Summary. (line 164)
+* compress: gzip. (line 124)
+* compress, summary: Option Summary. (line 170)
* concatenate: concatenate. (line 6)
* concatenate, summary: Operation Summary. (line 23)
-* confirmation, summary: Option Summary. (line 176)
+* confirmation, summary: Option Summary. (line 182)
* create, additional options: create options. (line 6)
* create, complementary notes: Basic tar. (line 11)
* create, introduced: Creating the archive.
@@ -6153,45 +6165,45 @@ Summary::.
* create, using with '--verify': verify. (line 24)
* delay-directory-restore: Directory Modification Times and Permissions.
(line 62)
-* delay-directory-restore, summary: Option Summary. (line 180)
+* delay-directory-restore, summary: Option Summary. (line 186)
* delete: delete. (line 6)
* delete, summary: Operation Summary. (line 34)
* delete, using before -append: append. (line 47)
* dereference: dereference. (line 6)
-* dereference, summary: Option Summary. (line 186)
+* dereference, summary: Option Summary. (line 192)
* diff, summary: Operation Summary. (line 39)
* directory: directory. (line 11)
-* directory, summary: Option Summary. (line 193)
+* directory, summary: Option Summary. (line 199)
* exclude: exclude. (line 6)
* exclude <1>: exclude. (line 9)
* exclude, potential problems with: problems with exclude.
(line 6)
-* exclude, summary: Option Summary. (line 201)
+* exclude, summary: Option Summary. (line 207)
* exclude-backups: exclude. (line 114)
-* exclude-backups, summary: Option Summary. (line 206)
+* exclude-backups, summary: Option Summary. (line 212)
* exclude-caches: exclude. (line 134)
-* exclude-caches, summary: Option Summary. (line 215)
+* exclude-caches, summary: Option Summary. (line 221)
* exclude-caches-all: exclude. (line 142)
-* exclude-caches-all, summary: Option Summary. (line 230)
+* exclude-caches-all, summary: Option Summary. (line 236)
* exclude-caches-under: exclude. (line 138)
-* exclude-caches-under, summary: Option Summary. (line 223)
+* exclude-caches-under, summary: Option Summary. (line 229)
* exclude-from: exclude. (line 6)
* exclude-from <1>: exclude. (line 20)
-* exclude-from, summary: Option Summary. (line 209)
+* exclude-from, summary: Option Summary. (line 215)
* exclude-ignore: exclude. (line 76)
-* exclude-ignore, summary: Option Summary. (line 235)
+* exclude-ignore, summary: Option Summary. (line 241)
* exclude-ignore-recursive: exclude. (line 81)
-* exclude-ignore-recursive, summary: Option Summary. (line 240)
+* exclude-ignore-recursive, summary: Option Summary. (line 246)
* exclude-tag: exclude. (line 151)
-* exclude-tag, summary: Option Summary. (line 245)
+* exclude-tag, summary: Option Summary. (line 251)
* exclude-tag-all: exclude. (line 159)
-* exclude-tag-all, summary: Option Summary. (line 257)
+* exclude-tag-all, summary: Option Summary. (line 263)
* exclude-tag-under: exclude. (line 155)
-* exclude-tag-under, summary: Option Summary. (line 251)
+* exclude-tag-under, summary: Option Summary. (line 257)
* exclude-vcs: exclude. (line 85)
-* exclude-vcs, summary: Option Summary. (line 262)
+* exclude-vcs, summary: Option Summary. (line 268)
* exclude-vcs-ignores: exclude. (line 42)
-* exclude-vcs-ignores, summary: Option Summary. (line 269)
+* exclude-vcs-ignores, summary: Option Summary. (line 275)
* extract: extract. (line 6)
* extract, additional options: extract options. (line 6)
* extract, complementary notes: Basic tar. (line 49)
@@ -6200,60 +6212,60 @@ Summary::.
(line 120)
* file: file. (line 6)
* file, short description: file. (line 15)
-* file, summary: Option Summary. (line 277)
+* file, summary: Option Summary. (line 283)
* file, tutorial: file tutorial. (line 6)
* files-from: files. (line 14)
-* files-from, summary: Option Summary. (line 284)
+* files-from, summary: Option Summary. (line 290)
* force-local, short description: Device. (line 70)
-* force-local, summary: Option Summary. (line 291)
-* format, summary: Option Summary. (line 297)
-* full-time, summary: Option Summary. (line 322)
+* force-local, summary: Option Summary. (line 297)
+* format, summary: Option Summary. (line 303)
+* full-time, summary: Option Summary. (line 328)
* get, summary: Operation Summary. (line 50)
* group: override. (line 99)
-* group, summary: Option Summary. (line 340)
-* group-map, summary: Option Summary. (line 350)
-* gunzip, summary: Option Summary. (line 360)
-* gzip: gzip. (line 91)
-* gzip, summary: Option Summary. (line 360)
+* group, summary: Option Summary. (line 346)
+* group-map, summary: Option Summary. (line 356)
+* gunzip, summary: Option Summary. (line 366)
+* gzip: gzip. (line 99)
+* gzip, summary: Option Summary. (line 366)
* hard-dereference, described: hard links. (line 59)
-* hard-dereference, summary: Option Summary. (line 369)
+* hard-dereference, summary: Option Summary. (line 375)
* help: help tutorial. (line 6)
* help, introduction: help. (line 26)
-* help, summary: Option Summary. (line 375)
+* help, summary: Option Summary. (line 381)
* hole-detection: sparse. (line 66)
-* hole-detection, summary: Option Summary. (line 381)
+* hole-detection, summary: Option Summary. (line 387)
* ignore-case: controlling pattern-matching.
(line 85)
-* ignore-case, summary: Option Summary. (line 386)
+* ignore-case, summary: Option Summary. (line 392)
* ignore-command-error: Writing to an External Program.
(line 111)
-* ignore-command-error, summary: Option Summary. (line 390)
+* ignore-command-error, summary: Option Summary. (line 396)
* ignore-failed-read: Ignore Failed Read. (line 7)
-* ignore-failed-read, summary: Option Summary. (line 394)
+* ignore-failed-read, summary: Option Summary. (line 400)
* ignore-zeros: Ignore Zeros. (line 6)
* ignore-zeros, short description: Blocking Factor. (line 152)
-* ignore-zeros, summary: Option Summary. (line 399)
-* incremental, summary: Option Summary. (line 405)
+* ignore-zeros, summary: Option Summary. (line 405)
+* incremental, summary: Option Summary. (line 411)
* incremental, using with '--list': Incremental Dumps. (line 185)
-* index-file, summary: Option Summary. (line 413)
+* index-file, summary: Option Summary. (line 419)
* info-script: Multi-Volume Archives.
(line 83)
* info-script, short description: Device. (line 121)
-* info-script, summary: Option Summary. (line 417)
+* info-script, summary: Option Summary. (line 423)
* interactive: interactive. (line 14)
-* interactive, summary: Option Summary. (line 426)
-* keep-directory-symlink, summary: Option Summary. (line 434)
+* interactive, summary: Option Summary. (line 432)
+* keep-directory-symlink, summary: Option Summary. (line 440)
* keep-newer-files: Keep Newer Files. (line 6)
-* keep-newer-files, summary: Option Summary. (line 448)
+* keep-newer-files, summary: Option Summary. (line 454)
* keep-old-files: Keep Old Files. (line 9)
* keep-old-files, introduced: Dealing with Old Files.
(line 16)
-* keep-old-files, summary: Option Summary. (line 453)
+* keep-old-files, summary: Option Summary. (line 459)
* label: Tape Files. (line 6)
* label <1>: label. (line 6)
-* label, summary: Option Summary. (line 462)
+* label, summary: Option Summary. (line 468)
* level, described: Incremental Dumps. (line 75)
-* level, summary: Option Summary. (line 470)
+* level, summary: Option Summary. (line 476)
* list: list. (line 6)
* list, summary: Operation Summary. (line 55)
* list, using with '--incremental': Incremental Dumps. (line 185)
@@ -6262,228 +6274,229 @@ Summary::.
* list, using with '--verbose': list. (line 34)
* list, using with file name arguments: list. (line 25)
* listed-incremental, described: Incremental Dumps. (line 14)
-* listed-incremental, summary: Option Summary. (line 480)
+* listed-incremental, summary: Option Summary. (line 486)
* listed-incremental, using with '--extract': Incremental Dumps.
(line 120)
* listed-incremental, using with '--list': Incremental Dumps.
(line 185)
-* lzip: gzip. (line 104)
-* lzip, summary: Option Summary. (line 489)
-* lzma: gzip. (line 107)
-* lzma, summary: Option Summary. (line 494)
-* lzop: gzip. (line 110)
+* lzip: gzip. (line 112)
+* lzip, summary: Option Summary. (line 495)
+* lzma: gzip. (line 115)
+* lzma, summary: Option Summary. (line 500)
+* lzop: gzip. (line 118)
* mode: override. (line 14)
-* mode, summary: Option Summary. (line 504)
+* mode, summary: Option Summary. (line 510)
* mtime: override. (line 30)
-* mtime, summary: Option Summary. (line 511)
+* mtime, summary: Option Summary. (line 517)
* multi-volume: Multi-Volume Archives.
(line 6)
* multi-volume, short description: Device. (line 88)
-* multi-volume, summary: Option Summary. (line 526)
+* multi-volume, summary: Option Summary. (line 532)
* new-volume-script: Multi-Volume Archives.
(line 83)
* new-volume-script, short description: Device. (line 121)
-* new-volume-script, summary: Option Summary. (line 417)
-* new-volume-script, summary <1>: Option Summary. (line 532)
+* new-volume-script, summary: Option Summary. (line 423)
+* new-volume-script, summary <1>: Option Summary. (line 538)
* newer: after. (line 24)
-* newer, summary: Option Summary. (line 536)
+* newer, summary: Option Summary. (line 542)
* newer-mtime: after. (line 35)
-* newer-mtime, summary: Option Summary. (line 545)
-* no-acls, summary: Option Summary. (line 551)
+* newer-mtime, summary: Option Summary. (line 551)
+* no-acls, summary: Option Summary. (line 557)
* no-anchored: controlling pattern-matching.
(line 78)
-* no-anchored, summary: Option Summary. (line 555)
-* no-auto-compress, summary: Option Summary. (line 559)
+* no-anchored, summary: Option Summary. (line 561)
+* no-auto-compress, summary: Option Summary. (line 565)
* no-check-device, described: Incremental Dumps. (line 103)
-* no-check-device, summary: Option Summary. (line 564)
+* no-check-device, summary: Option Summary. (line 570)
* no-delay-directory-restore: Directory Modification Times and Permissions.
(line 68)
-* no-delay-directory-restore, summary: Option Summary. (line 569)
+* no-delay-directory-restore, summary: Option Summary. (line 575)
* no-ignore-case: controlling pattern-matching.
(line 85)
-* no-ignore-case, summary: Option Summary. (line 575)
+* no-ignore-case, summary: Option Summary. (line 581)
* no-ignore-command-error: Writing to an External Program.
(line 116)
-* no-ignore-command-error, summary: Option Summary. (line 578)
+* no-ignore-command-error, summary: Option Summary. (line 584)
* no-null, described: nul. (line 15)
-* no-null, summary: Option Summary. (line 582)
-* no-overwrite-dir, summary: Option Summary. (line 588)
-* no-quote-chars, summary: Option Summary. (line 593)
+* no-null, summary: Option Summary. (line 588)
+* no-overwrite-dir, summary: Option Summary. (line 594)
+* no-quote-chars, summary: Option Summary. (line 599)
* no-recursion: recurse. (line 11)
-* no-recursion, summary: Option Summary. (line 598)
+* no-recursion, summary: Option Summary. (line 604)
* no-same-owner: Attributes. (line 63)
-* no-same-owner, summary: Option Summary. (line 603)
-* no-same-permissions, summary: Option Summary. (line 610)
-* no-seek, summary: Option Summary. (line 616)
-* no-selinux, summary: Option Summary. (line 622)
+* no-same-owner, summary: Option Summary. (line 609)
+* no-same-permissions, summary: Option Summary. (line 616)
+* no-seek, summary: Option Summary. (line 622)
+* no-selinux, summary: Option Summary. (line 628)
* no-unquote: Selecting Archive Members.
(line 42)
-* no-unquote, summary: Option Summary. (line 626)
+* no-unquote, summary: Option Summary. (line 632)
* no-verbatim-files-from: files. (line 75)
-* no-verbatim-files-from, summary: Option Summary. (line 630)
+* no-verbatim-files-from, summary: Option Summary. (line 636)
* no-wildcards: controlling pattern-matching.
(line 41)
-* no-wildcards, summary: Option Summary. (line 644)
+* no-wildcards, summary: Option Summary. (line 650)
* no-wildcards-match-slash: controlling pattern-matching.
(line 91)
-* no-wildcards-match-slash, summary: Option Summary. (line 647)
-* no-xattrs, summary: Option Summary. (line 650)
+* no-wildcards-match-slash, summary: Option Summary. (line 653)
+* no-xattrs, summary: Option Summary. (line 656)
* null, described: nul. (line 11)
-* null, summary: Option Summary. (line 654)
+* null, summary: Option Summary. (line 660)
* numeric-owner: Attributes. (line 69)
-* numeric-owner, summary: Option Summary. (line 667)
+* numeric-owner, summary: Option Summary. (line 673)
* occurrence, described: append. (line 34)
-* occurrence, summary: Option Summary. (line 685)
-* old-archive, summary: Option Summary. (line 700)
+* occurrence, summary: Option Summary. (line 691)
+* old-archive, summary: Option Summary. (line 706)
* one-file-system: one. (line 14)
-* one-file-system, summary: Option Summary. (line 703)
-* one-top-level, summary: Option Summary. (line 708)
+* one-file-system, summary: Option Summary. (line 709)
+* one-top-level, summary: Option Summary. (line 714)
* overwrite: Overwrite Old Files.
(line 6)
* overwrite, introduced: Dealing with Old Files.
(line 32)
-* overwrite, summary: Option Summary. (line 719)
+* overwrite, summary: Option Summary. (line 725)
* overwrite-dir: Overwrite Old Files.
(line 28)
* overwrite-dir, introduced: Dealing with Old Files.
(line 6)
-* overwrite-dir, summary: Option Summary. (line 724)
+* overwrite-dir, summary: Option Summary. (line 730)
* owner: override. (line 67)
-* owner, summary: Option Summary. (line 729)
-* owner-map, summary: Option Summary. (line 739)
+* owner, summary: Option Summary. (line 735)
+* owner-map, summary: Option Summary. (line 745)
* pax-option: PAX keywords. (line 6)
-* pax-option, summary: Option Summary. (line 749)
-* portability, summary: Option Summary. (line 755)
-* posix, summary: Option Summary. (line 759)
+* pax-option, summary: Option Summary. (line 755)
+* portability, summary: Option Summary. (line 761)
+* posix, summary: Option Summary. (line 765)
* preserve-order: Same Order. (line 6)
-* preserve-order, summary: Option Summary. (line 762)
+* preserve-order, summary: Option Summary. (line 768)
* preserve-permissions: Setting Access Permissions.
(line 10)
* preserve-permissions, short description: Attributes. (line 109)
-* preserve-permissions, summary: Option Summary. (line 766)
-* quote-chars, summary: Option Summary. (line 777)
+* preserve-permissions, summary: Option Summary. (line 772)
+* quote-chars, summary: Option Summary. (line 783)
* quoting-style: quoting styles. (line 36)
-* quoting-style, summary: Option Summary. (line 781)
+* quoting-style, summary: Option Summary. (line 787)
* read-full-records: Reading. (line 6)
* read-full-records <1>: read full records. (line 6)
* read-full-records, short description: Blocking Factor. (line 168)
-* read-full-records, summary: Option Summary. (line 788)
-* record-size, summary: Option Summary. (line 794)
+* read-full-records, summary: Option Summary. (line 794)
+* record-size, summary: Option Summary. (line 800)
* recursion: recurse. (line 22)
-* recursion, summary: Option Summary. (line 802)
+* recursion, summary: Option Summary. (line 808)
* recursive-unlink: Recursive Unlink. (line 6)
-* recursive-unlink, summary: Option Summary. (line 807)
+* recursive-unlink, summary: Option Summary. (line 813)
* remove-files: remove files. (line 6)
-* remove-files, summary: Option Summary. (line 812)
-* restrict, summary: Option Summary. (line 817)
-* rmt-command, summary: Option Summary. (line 823)
+* remove-files, summary: Option Summary. (line 818)
+* restrict, summary: Option Summary. (line 823)
+* rmt-command, summary: Option Summary. (line 829)
* rsh-command: Device. (line 73)
-* rsh-command, summary: Option Summary. (line 828)
+* rsh-command, summary: Option Summary. (line 834)
* same-order: Same Order. (line 6)
-* same-order, summary: Option Summary. (line 833)
+* same-order, summary: Option Summary. (line 839)
* same-owner: Attributes. (line 44)
-* same-owner, summary: Option Summary. (line 842)
+* same-owner, summary: Option Summary. (line 848)
* same-permissions: Setting Access Permissions.
(line 10)
* same-permissions, short description: Attributes. (line 109)
-* same-permissions, summary: Option Summary. (line 766)
-* same-permissions, summary <1>: Option Summary. (line 849)
-* seek, summary: Option Summary. (line 853)
-* selinux, summary: Option Summary. (line 863)
+* same-permissions, summary: Option Summary. (line 772)
+* same-permissions, summary <1>: Option Summary. (line 855)
+* seek, summary: Option Summary. (line 859)
+* selinux, summary: Option Summary. (line 869)
* show-defaults: defaults. (line 6)
-* show-defaults, summary: Option Summary. (line 867)
+* show-defaults, summary: Option Summary. (line 873)
* show-omitted-dirs: verbose. (line 105)
-* show-omitted-dirs, summary: Option Summary. (line 880)
+* show-omitted-dirs, summary: Option Summary. (line 886)
* show-snapshot-field-ranges: Snapshot Files. (line 111)
-* show-snapshot-field-ranges, summary: Option Summary. (line 885)
+* show-snapshot-field-ranges, summary: Option Summary. (line 891)
* show-stored-names: list. (line 68)
-* show-stored-names, summary: Option Summary. (line 891)
+* show-stored-names, summary: Option Summary. (line 897)
* show-transformed-names: transform. (line 45)
-* show-transformed-names, summary: Option Summary. (line 891)
+* show-transformed-names, summary: Option Summary. (line 897)
* skip-old-files, introduced: Dealing with Old Files.
(line 28)
-* skip-old-files, summary: Option Summary. (line 900)
-* sort, summary: Option Summary. (line 913)
+* skip-old-files, summary: Option Summary. (line 906)
+* sort, summary: Option Summary. (line 919)
* sparse: sparse. (line 24)
-* sparse, summary: Option Summary. (line 930)
+* sparse, summary: Option Summary. (line 936)
* sparse-version: sparse. (line 59)
-* sparse-version, summary: Option Summary. (line 936)
+* sparse-version, summary: Option Summary. (line 942)
* starting-file: Starting File. (line 6)
-* starting-file, summary: Option Summary. (line 942)
+* starting-file, summary: Option Summary. (line 948)
* strip-components: transform. (line 25)
-* strip-components, summary: Option Summary. (line 949)
+* strip-components, summary: Option Summary. (line 955)
* suffix: backup. (line 67)
-* suffix, summary: Option Summary. (line 960)
+* suffix, summary: Option Summary. (line 966)
* tape-length: Multi-Volume Archives.
(line 33)
* tape-length, short description: Device. (line 96)
-* tape-length, summary: Option Summary. (line 965)
+* tape-length, summary: Option Summary. (line 971)
* test-label: label. (line 35)
-* test-label, summary: Option Summary. (line 975)
+* test-label, summary: Option Summary. (line 982)
* to-command: Writing to an External Program.
(line 9)
-* to-command, summary: Option Summary. (line 980)
+* to-command, summary: Option Summary. (line 987)
* to-stdout: Writing to Standard Output.
(line 14)
-* to-stdout, summary: Option Summary. (line 985)
+* to-stdout, summary: Option Summary. (line 992)
* totals: verbose. (line 45)
-* totals, summary: Option Summary. (line 991)
+* totals, summary: Option Summary. (line 998)
* touch: Data Modification Times.
(line 15)
* touch <1>: Attributes. (line 33)
-* touch, summary: Option Summary. (line 997)
+* touch, summary: Option Summary. (line 1004)
* transform: transform. (line 74)
-* transform, summary: Option Summary. (line 1004)
-* uncompress: gzip. (line 113)
-* uncompress, summary: Option Summary. (line 164)
-* uncompress, summary <1>: Option Summary. (line 1018)
-* ungzip: gzip. (line 91)
-* ungzip, summary: Option Summary. (line 360)
-* ungzip, summary <1>: Option Summary. (line 1022)
+* transform, summary: Option Summary. (line 1011)
+* uncompress: gzip. (line 124)
+* uncompress, summary: Option Summary. (line 170)
+* uncompress, summary <1>: Option Summary. (line 1025)
+* ungzip: gzip. (line 99)
+* ungzip, summary: Option Summary. (line 366)
+* ungzip, summary <1>: Option Summary. (line 1029)
* unlink-first: Unlink First. (line 6)
* unlink-first, introduced: Dealing with Old Files.
(line 51)
-* unlink-first, summary: Option Summary. (line 1026)
+* unlink-first, summary: Option Summary. (line 1033)
* unquote: Selecting Archive Members.
(line 39)
-* unquote, summary: Option Summary. (line 1032)
+* unquote, summary: Option Summary. (line 1039)
* update: update. (line 6)
* update <1>: how to update. (line 6)
* update, summary: Operation Summary. (line 60)
* usage: help. (line 53)
-* use-compress-program: gzip. (line 172)
-* use-compress-program, summary: Option Summary. (line 1036)
-* utc, summary: Option Summary. (line 1042)
+* use-compress-program: gzip. (line 185)
+* use-compress-program, summary: Option Summary. (line 1043)
+* utc, summary: Option Summary. (line 1049)
* verbatim-files-from: files. (line 70)
-* verbatim-files-from, summary: Option Summary. (line 1047)
+* verbatim-files-from, summary: Option Summary. (line 1054)
* verbose: verbose. (line 18)
* verbose, introduced: verbose tutorial. (line 6)
-* verbose, summary: Option Summary. (line 1069)
+* verbose, summary: Option Summary. (line 1076)
* verbose, using with '--create': create verbose. (line 6)
* verbose, using with '--list': list. (line 34)
* verify, short description: verify. (line 8)
-* verify, summary: Option Summary. (line 1077)
+* verify, summary: Option Summary. (line 1084)
* verify, using with '--create': verify. (line 24)
* version: help. (line 6)
-* version, summary: Option Summary. (line 1083)
+* version, summary: Option Summary. (line 1090)
* volno-file: Multi-Volume Archives.
(line 74)
-* volno-file, summary: Option Summary. (line 1089)
+* volno-file, summary: Option Summary. (line 1096)
* warning, explained: warnings. (line 12)
-* warning, summary: Option Summary. (line 1095)
+* warning, summary: Option Summary. (line 1102)
* wildcards: controlling pattern-matching.
(line 38)
-* wildcards, summary: Option Summary. (line 1101)
+* wildcards, summary: Option Summary. (line 1108)
* wildcards-match-slash: controlling pattern-matching.
(line 91)
-* wildcards-match-slash, summary: Option Summary. (line 1105)
-* xattrs, summary: Option Summary. (line 1108)
-* xattrs-exclude, summary: Option Summary. (line 1112)
-* xattrs-include, summary: Option Summary. (line 1116)
+* wildcards-match-slash, summary: Option Summary. (line 1112)
+* xattrs, summary: Option Summary. (line 1115)
+* xattrs-exclude, summary: Option Summary. (line 1119)
+* xattrs-include, summary: Option Summary. (line 1123)
* xform: transform. (line 74)
-* xform, summary: Option Summary. (line 1004)
-* xz: gzip. (line 96)
-* xz, summary: Option Summary. (line 1122)
+* xform, summary: Option Summary. (line 1011)
+* xz: gzip. (line 104)
+* xz, summary: Option Summary. (line 1129)
+* zstd: gzip. (line 121)
File: tar.info, Node: Index, Prev: Index of Command Line Options, Up: Top
@@ -6522,7 +6535,7 @@ Appendix J Index
(line 23)
* all: warnings. (line 28)
* alone-zero-block: warnings. (line 33)
-* alternative decompression programs: gzip. (line 54)
+* alternative decompression programs: gzip. (line 62)
* am in date strings: Time of day items. (line 21)
* Appending files to an Archive: appending files. (line 6)
* appending files to existing archive: append. (line 6)
@@ -6600,7 +6613,7 @@ Appendix J Index
(line 40)
* contiguous-cast: warnings. (line 70)
* corrupted archives: Full Dumps. (line 8)
-* corrupted archives <1>: gzip. (line 140)
+* corrupted archives <1>: gzip. (line 151)
* Creation of the archive: create. (line 6)
* 'Current %s is newer or same age', warning message: warnings.
(line 76)
@@ -6670,7 +6683,7 @@ Appendix J Index
* Excluding files by file system: exclude. (line 6)
* Excluding files by name and pattern: exclude. (line 6)
* Exec Mode, 'genfile': Exec Mode. (line 6)
-* 'exec', checkpoint action: checkpoints. (line 151)
+* 'exec', checkpoint action: checkpoints. (line 166)
* existing backup method: backup. (line 59)
* existing-file: warnings. (line 66)
* exit status: Synopsis. (line 67)
@@ -6750,8 +6763,8 @@ Appendix J Index
* GNU.sparse.offset, extended header variable: PAX 0. (line 17)
* GNU.sparse.realsize, extended header variable: PAX 1. (line 24)
* GNU.sparse.size, extended header variable: PAX 0. (line 10)
-* gnupg, using with tar: gzip. (line 196)
-* gpg, using with tar: gzip. (line 196)
+* gnupg, using with tar: gzip. (line 209)
+* gpg, using with tar: gzip. (line 209)
* gzip: gzip. (line 6)
* hard links, dereferencing: hard links. (line 6)
* header-col: Configuring Help Summary.
@@ -6875,7 +6888,7 @@ Appendix J Index
(line 127)
* option syntax, traditional: Old Options. (line 6)
* optional arguments to long options: Long Options. (line 39)
-* optional arguments to short options: Short Options. (line 21)
+* optional arguments to short options: Short Options. (line 22)
* options for use with '--extract': extract options. (line 6)
* Options when reading archives: Reading. (line 6)
* Options, archive format specifying: Format Variations. (line 6)
@@ -6939,7 +6952,7 @@ Appendix J Index
* SCCS, excluding files: exclude. (line 85)
* short options: Short Options. (line 6)
* short options with mandatory arguments: Short Options. (line 13)
-* short options with optional arguments: Short Options. (line 21)
+* short options with optional arguments: Short Options. (line 22)
* short-opt-col: Configuring Help Summary.
(line 79)
* simple backup method: backup. (line 64)
@@ -7006,7 +7019,7 @@ Appendix J Index
* tar-snapshot-edit: Fixing Snapshot Files.
(line 17)
* tarcat: Tarcat. (line 6)
-* TAR_ARCHIVE, checkpoint script environment: checkpoints. (line 167)
+* TAR_ARCHIVE, checkpoint script environment: checkpoints. (line 182)
* TAR_ARCHIVE, info script environment variable: Multi-Volume Archives.
(line 105)
* TAR_ARCHIVE, to-command environment: Writing to an External Program.
@@ -7014,12 +7027,12 @@ Appendix J Index
* TAR_ATIME, to-command environment: Writing to an External Program.
(line 52)
* TAR_BLOCKING_FACTOR, checkpoint script environment: checkpoints.
- (line 170)
+ (line 185)
* TAR_BLOCKING_FACTOR, info script environment variable: Multi-Volume Archives.
(line 108)
* TAR_BLOCKING_FACTOR, to-command environment: Writing to an External Program.
(line 82)
-* TAR_CHECKPOINT, checkpoint script environment: checkpoints. (line 173)
+* TAR_CHECKPOINT, checkpoint script environment: checkpoints. (line 188)
* TAR_CTIME, to-command environment: Writing to an External Program.
(line 61)
* TAR_FD, info script environment variable: Multi-Volume Archives.
@@ -7028,7 +7041,7 @@ Appendix J Index
(line 40)
* TAR_FILETYPE, to-command environment: Writing to an External Program.
(line 24)
-* TAR_FORMAT, checkpoint script environment: checkpoints. (line 180)
+* TAR_FORMAT, checkpoint script environment: checkpoints. (line 195)
* TAR_FORMAT, info script environment variable: Multi-Volume Archives.
(line 118)
* TAR_FORMAT, to-command environment: Writing to an External Program.
@@ -7046,14 +7059,14 @@ Appendix J Index
(line 43)
* TAR_SIZE, to-command environment: Writing to an External Program.
(line 64)
-* TAR_SUBCOMMAND, checkpoint script environment: checkpoints. (line 176)
+* TAR_SUBCOMMAND, checkpoint script environment: checkpoints. (line 191)
* TAR_SUBCOMMAND, info script environment variable: Multi-Volume Archives.
(line 114)
* TAR_UID, to-command environment: Writing to an External Program.
(line 67)
* TAR_UNAME, to-command environment: Writing to an External Program.
(line 46)
-* TAR_VERSION, checkpoint script environment: checkpoints. (line 164)
+* TAR_VERSION, checkpoint script environment: checkpoints. (line 179)
* TAR_VERSION, info script environment variable: Multi-Volume Archives.
(line 102)
* TAR_VERSION, to-command environment: Writing to an External Program.
@@ -7090,7 +7103,7 @@ Appendix J Index
* Updating an archive: update. (line 6)
* usage-indent: Configuring Help Summary.
(line 155)
-* Using encrypted archives: gzip. (line 196)
+* Using encrypted archives: gzip. (line 209)
* ustar archive format: ustar. (line 6)
* v7 archive format: old. (line 6)
* VCS, excluding files: exclude. (line 85)
@@ -7110,6 +7123,7 @@ Appendix J Index
* Volume label, listing: label. (line 27)
* Volume number file: Multi-Volume Archives.
(line 74)
+* 'wait', checkpoint action: checkpoints. (line 151)
* week in date strings: Relative items in date strings.
(line 15)
* Where is the archive?: file. (line 6)
@@ -7126,4 +7140,5 @@ Appendix J Index
(line 15)
* yesterday in date strings: Relative items in date strings.
(line 29)
+* zstd: gzip. (line 6)
diff --git a/doc/tar.texi b/doc/tar.texi
index ce8508f523a8e62e0ef8f3b3b592d7c6b64f2871..71318f3e0fc67feb1a0ac24bde6640f2f89c685b 100644
--- a/doc/tar.texi
+++ b/doc/tar.texi
@@ -1464,7 +1464,7 @@ tar: Removing leading '/' from member names
/home/myself/practice/folk
/home/myself/practice/jazz
/home/myself/practice/collection.tar
-$ @kbd{tar --test --file practice.tar}
+$ @kbd{tar --list --file practice.tar}
home/myself/practice/
home/myself/practice/blues
home/myself/practice/folk
@@ -1495,7 +1495,7 @@ home/myself/practice/blues
home/myself/practice/folk
home/myself/practice/jazz
home/myself/practice/collection.tar
-$ @kbd{tar --test --file practice.tar}
+$ @kbd{tar --list --file practice.tar}
home/myself/practice/
home/myself/practice/blues
home/myself/practice/folk
@@ -2553,6 +2553,12 @@ Wait for @var{time} seconds.
@item ttyout=@var{string}
Output @var{string} on the current console (@file{/dev/tty}).
+
+@item totals
+Print statistics (see @pxref{totals}).
+
+@item wait=@var{signo}
+Wait for signal @var{signo}.
@end table
Several @option{--checkpoint-action} options can be specified. The
@@ -3713,6 +3719,9 @@ only attributes from the user namespace.
@itemx -J
Use @command{xz} for compressing or decompressing the archives. @xref{gzip}.
+@item --zstd
+Use @command{zstd} for compressing or decompressing the archives. @xref{gzip}.
+
@end table
@node Short Option Summary
@@ -3786,8 +3795,8 @@ them with the equivalent long option.
@item -m @tab @ref{--touch}.
-@item -o @tab When creating, @ref{--no-same-owner}, when extracting ---
-@ref{--portability}.
+@item -o @tab When extracting, same as @ref{--no-same-owner}. When creating,
+-- @ref{--old-archive}.
The latter usage is deprecated. It is retained for compatibility with
the earlier versions of @GNUTAR{}. In future releases
@@ -3968,7 +3977,7 @@ successfully. For example, @w{@samp{tar --version}} might print:
@smallexample
tar (GNU tar) @value{VERSION}
-Copyright (C) 2013-2017 Free Software Foundation, Inc.
+Copyright (C) 2013-2019 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
@@ -4449,6 +4458,25 @@ checkpoint:
$ @kbd{tar -c --checkpoint=1000 --checkpoint-action=sleep=30}
@end smallexample
+@anchor{checkpoint wait}
+@cindex @code{wait}, checkpoint action
+The @code{wait=@var{signo}} action stops further execution until the
+signal @var{signo} is delivered. Valid values for @var{signo} are:
+@code{SIGHUP}, @code{SIGQUIT}, @code{SIGINT}, @code{SIGUSR1} and
+@code{SIGUSR2}. The @samp{SIG} prefix is optional. For example:
+
+@example
+$ @kbd{tar -c -f arc --checkpoint=1000 --checkpoint-action wait=USR1 .}
+@end example
+
+In this example, @GNUTAR{} will stop archivation at each 1000th
+checkpoint. wait until the @samp{SIGUSR1} signal is delivered,
+and resume processing.
+
+This action is used by the @command{genfile} utility to perform
+modifications on the input files upon hitting certain checkpoints
+(@pxref{Exec Mode, genfile}).
+
@anchor{checkpoint exec}
@cindex @code{exec}, checkpoint action
Finally, the @code{exec} action executes a given external command.
@@ -5477,7 +5505,7 @@ reproducible archives given a common timestamp for generated files
while still retaining the original timestamps of untouched files.
@smallexample
-$ @kbd{tar -c -f archive.tar --clamp-mtime --mtime=@atchar{}$SOURCE_DATE_EPOCH .}
+$ @kbd{tar -c -f archive.tar --clamp-mtime --mtime=@@$SOURCE_DATE_EPOCH .}
@end smallexample
@item --owner=@var{user}
@@ -9520,24 +9548,32 @@ switch to @samp{posix}.
@cindex lzma
@cindex lzop
@cindex compress
+@cindex zstd
@GNUTAR{} is able to create and read compressed archives. It supports
a wide variety of compression programs, namely: @command{gzip},
@command{bzip2}, @command{lzip}, @command{lzma}, @command{lzop},
-@command{xz} and traditional @command{compress}. The latter is
-supported mostly for backward compatibility, and we recommend
+@command{zstd}, @command{xz} and traditional @command{compress}. The
+latter is supported mostly for backward compatibility, and we recommend
against using it, because it is by far less effective than the other
compression programs@footnote{It also had patent problems in the past.}.
Creating a compressed archive is simple: you just specify a
@dfn{compression option} along with the usual archive creation
-commands. The compression option is @option{-z} (@option{--gzip}) to
-create a @command{gzip} compressed archive, @option{-j}
-(@option{--bzip2}) to create a @command{bzip2} compressed archive,
-@option{--lzip} to create an @asis{lzip} compressed archive,
-@option{-J} (@option{--xz}) to create an @asis{XZ} archive,
-@option{--lzma} to create an @asis{LZMA} compressed
-archive, @option{--lzop} to create an @asis{LZOP} archive, and
-@option{-Z} (@option{--compress}) to use @command{compress} program.
+commands. Available compression options are summarized in the
+table below:
+
+@multitable @columnfractions 0.4 0.2 0.4
+@headitem Long @tab Short @tab Archive format
+@item @option{--gzip} @tab @option{-z} @tab @command{gzip}
+@item @option{--bzip2} @tab @option{-j} @tab @command{bzip2}
+@item @option{--xz} @tab @option{-J} @tab @command{xz}
+@item @option{--lzip} @tab @tab @command{lzip}
+@item @option{--lzma} @tab @tab @command{lzma}
+@item @option{--lzop} @tab @tab @command{lzop}
+@item @option{--zstd} @tab @tab @command{zstd}
+@item @option{--compress} @tab @option{-Z} @tab @command{compress}
+@end multitable
+
For example:
@smallexample
@@ -9658,6 +9694,10 @@ Filter the archive through @command{lzma}.
@item --lzop
Filter the archive through @command{lzop}.
+@opindex zstd
+@item --zstd
+Filter the archive through @command{zstd}.
+
@opindex compress
@opindex uncompress
@item -Z
@@ -9730,6 +9770,8 @@ suffix. The following suffixes are recognized:
@item @samp{.tlz} @tab @command{lzma}
@item @samp{.lzo} @tab @command{lzop}
@item @samp{.xz} @tab @command{xz}
+@item @samp{.zst} @tab @command{zstd}
+@item @samp{.tzst} @tab @command{zstd}
@end multitable
@anchor{use-compress-program}
diff --git a/doc/texify.sed b/doc/texify.sed
index f48f2051c3f87baedd31535fc4cd7d495e4c9683..b67c018c62b5c0de0097b2732d065e75770c4e5b 100644
--- a/doc/texify.sed
+++ b/doc/texify.sed
@@ -1,5 +1,4 @@
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/doc/value.texi b/doc/value.texi
index 790b199974af4d04292381a77999c5902302a1fe..b2e14485e2c8f7232c6829f9b760147b5a57188f 100644
--- a/doc/value.texi
+++ b/doc/value.texi
@@ -1,6 +1,5 @@
@c This is part of GNU tar manual.
-@c Copyright 1992, 1994-1997, 1999-2006, 2013-2014, 2016-2017 Free
-@c Software Foundation, Inc.
+@c Copyright 1992-2019 Free Software Foundation, Inc.
@c See file tar.texi for copying conditions.
@macro GNUTAR
diff --git a/doc/version.texi b/doc/version.texi
index 0b31161260877adab32e60fcc7cdde186a85e365..1b3ab5e46fbc1e33f3491e319275ba14f36d8f4d 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 16 December 2017
-@set UPDATED-MONTH December 2017
-@set EDITION 1.30
-@set VERSION 1.30
+@set UPDATED 4 February 2019
+@set UPDATED-MONTH February 2019
+@set EDITION 1.32
+@set VERSION 1.32
diff --git a/gnu/Makefile.am b/gnu/Makefile.am
index 276b528e7c3592d43c89ffd4dac92c9d15adedb4..acbf88d3c49f817db0b8ea030316db40ff342718 100644
--- a/gnu/Makefile.am
+++ b/gnu/Makefile.am
@@ -1,6 +1,6 @@
## DO NOT EDIT! GENERATED AUTOMATICALLY!
## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,9 +21,105 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --no-conditional-dependencies --no-libtool --macro-prefix=gl alloca areadlinkat-with-size argmatch argp argp-version-etc backupfile closeout configmake dirname error exclude exitfail extern-inline faccessat fchmodat fchownat fcntl-h fdopendir fdutimensat file-has-acl fileblocks fnmatch-gnu fprintftime fseeko fstatat full-write futimens getline getopt-gnu getpagesize gettext gettime gitlog-to-changelog hash human inttostr inttypes lchown linkat localcharset manywarnings mkdirat mkdtemp mkfifoat modechange obstack openat parse-datetime priv-set progname quote quotearg readlinkat renameat root-uid rpmatch safe-read savedir selinux-at setenv snprintf stat-time stdbool stdint stpcpy strdup-posix strerror strtoimax strtol strtoul strtoumax symlinkat timespec timespec-sub unlinkat unlinkdir unlocked-io utimensat version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax xvasprintf
-
-AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
+# Reproduce by:
+# gnulib-tool --import --local-dir=gl \
+# --lib=libgnu \
+# --source-base=gnu \
+# --m4-base=m4 \
+# --doc-base=doc \
+# --tests-base=tests \
+# --aux-dir=build-aux \
+# --no-conditional-dependencies \
+# --no-libtool \
+# --macro-prefix=gl \
+# --avoid=lock \
+# alloca \
+# areadlinkat-with-size \
+# argmatch \
+# argp \
+# argp-version-etc \
+# backupfile \
+# closeout \
+# configmake \
+# dirname \
+# error \
+# exclude \
+# exitfail \
+# extern-inline \
+# faccessat \
+# fchmodat \
+# fchownat \
+# fcntl-h \
+# fdopendir \
+# fdutimensat \
+# file-has-acl \
+# fileblocks \
+# fnmatch-gnu \
+# fprintftime \
+# fseeko \
+# fstatat \
+# full-write \
+# futimens \
+# getline \
+# getopt-gnu \
+# getpagesize \
+# gettext \
+# gettime \
+# gitlog-to-changelog \
+# hash \
+# human \
+# inttostr \
+# inttypes \
+# lchown \
+# linkat \
+# localcharset \
+# manywarnings \
+# mkdirat \
+# mkdtemp \
+# mkfifoat \
+# modechange \
+# obstack \
+# openat \
+# parse-datetime \
+# priv-set \
+# progname \
+# quote \
+# quotearg \
+# readlinkat \
+# renameat \
+# root-uid \
+# rpmatch \
+# safe-read \
+# savedir \
+# selinux-at \
+# setenv \
+# snprintf \
+# stat-time \
+# stdbool \
+# stdint \
+# stpcpy \
+# strdup-posix \
+# strerror \
+# strnlen \
+# strtoimax \
+# strtol \
+# strtoul \
+# strtoumax \
+# symlinkat \
+# timespec \
+# timespec-sub \
+# unlinkat \
+# unlinkdir \
+# unlocked-io \
+# utimensat \
+# version-etc-fsf \
+# xalloc \
+# xalloc-die \
+# xgetcwd \
+# xstrtoumax \
+# xvasprintf
+
+AUTOMAKE_OPTIONS = 1.11 gnits subdir-objects
SUBDIRS =
noinst_HEADERS =
@@ -611,6 +707,14 @@ EXTRA_DIST += fcntl.in.h
## end gnulib module fcntl-h
+## begin gnulib module fcntl-safer
+
+libgnu_a_SOURCES += creat-safer.c open-safer.c
+
+EXTRA_DIST += fcntl--.h fcntl-safer.h
+
+## end gnulib module fcntl-safer
+
## begin gnulib module fd-hook
libgnu_a_SOURCES += fd-hook.c
@@ -712,29 +816,46 @@ EXTRA_libgnu_a_SOURCES += float.c itold.c
## begin gnulib module fnmatch
+
+EXTRA_DIST += fnmatch.c fnmatch_loop.c
+
+EXTRA_libgnu_a_SOURCES += fnmatch.c fnmatch_loop.c
+
+## end gnulib module fnmatch
+
+## begin gnulib module fnmatch-h
+
BUILT_SOURCES += $(FNMATCH_H)
-# We need the following in order to create <fnmatch.h> when the system
-# doesn't have one that supports the required API.
+# We need the following in order to create <fnmatch.h>.
if GL_GENERATE_FNMATCH_H
-fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
+fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+ -e 's|@''HAVE_FNMATCH_H''@|$(HAVE_FNMATCH_H)|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+ -e 's|@''NEXT_FNMATCH_H''@|$(NEXT_FNMATCH_H)|g' \
+ -e 's/@''GNULIB_FNMATCH''@/$(GNULIB_FNMATCH)/g' \
+ -e 's|@''HAVE_FNMATCH''@|$(HAVE_FNMATCH)|g' \
+ -e 's|@''REPLACE_FNMATCH''@|$(REPLACE_FNMATCH)|g' \
+ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
< $(srcdir)/fnmatch.in.h; \
} > $@-t && \
- mv -f $@-t $@
+ mv $@-t $@
else
fnmatch.h: $(top_builddir)/config.status
rm -f $@
endif
MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
-EXTRA_DIST += fnmatch.c fnmatch.in.h fnmatch_loop.c
-
-EXTRA_libgnu_a_SOURCES += fnmatch.c fnmatch_loop.c
+EXTRA_DIST += fnmatch.in.h
-## end gnulib module fnmatch
+## end gnulib module fnmatch-h
## begin gnulib module fpending
@@ -864,7 +985,7 @@ BUILT_SOURCES += $(GETOPT_H) $(GETOPT_CDEFS_H)
# We need the following in order to create <getopt.h> when the system
# doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(top_builddir)/config.status
+getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -1038,6 +1159,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
-e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
-e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
-e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
+ -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \
-e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
-e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
-e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
@@ -1083,6 +1205,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
-e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
-e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
-e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
+ -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \
-e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
-e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
-e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
@@ -1107,6 +1230,13 @@ EXTRA_libgnu_a_SOURCES += lchown.c
## end gnulib module lchown
+## begin gnulib module libc-config
+
+
+EXTRA_DIST += cdefs.h libc-config.h
+
+## end gnulib module libc-config
+
## begin gnulib module limits-h
BUILT_SOURCES += $(LIMITS_H)
@@ -1155,75 +1285,9 @@ EXTRA_libgnu_a_SOURCES += at-func2.c linkat.c
## begin gnulib module localcharset
-libgnu_a_SOURCES += localcharset.h localcharset.c
-
-# We need the following in order to install a simple file in $(libdir)
-# which is shared with other installed packages. We use a list of referencing
-# packages so that "make uninstall" will remove the file if and only if it
-# is not used by another installed package.
-# On systems with glibc-2.1 or newer, the file is redundant, therefore we
-# avoid installing it.
-
-all-local: charset.alias ref-add.sed ref-del.sed
-
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-install-exec-local: install-exec-localcharset
-install-exec-localcharset: all-local
- if test $(GLIBC21) = no; then \
- case '$(host_os)' in \
- darwin[56]*) \
- need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
- need_charset_alias=false ;; \
- *) \
- need_charset_alias=true ;; \
- esac ; \
- else \
- need_charset_alias=false ; \
- fi ; \
- if $$need_charset_alias; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
- fi ; \
- if test -f $(charset_alias); then \
- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- rm -f $(charset_tmp) ; \
- else \
- if $$need_charset_alias; then \
- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- rm -f $(charset_tmp) ; \
- fi ; \
- fi
-
-uninstall-local: uninstall-localcharset
-uninstall-localcharset: all-local
- if test -f $(charset_alias); then \
- sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
- if grep '^# Packages using this file: $$' $(charset_tmp) \
- > /dev/null; then \
- rm -f $(charset_alias); \
- else \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
- fi; \
- rm -f $(charset_tmp); \
- fi
-
-charset.alias: config.charset
- $(AM_V_GEN)rm -f t-$@ $@ && \
- $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
- mv t-$@ $@
+libgnu_a_SOURCES += localcharset.c
-SUFFIXES += .sed .sin
-.sin.sed:
- $(AM_V_GEN)rm -f t-$@ $@ && \
- sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
- mv t-$@ $@
-
-CLEANFILES += charset.alias ref-add.sed ref-del.sed
-
-EXTRA_DIST += config.charset ref-add.sin ref-del.sin
+EXTRA_DIST += localcharset.h
## end gnulib module localcharset
@@ -1244,11 +1308,16 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
-e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
-e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
+ -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \
+ -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \
-e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
+ -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \
-e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
-e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
-e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
+ -e 's|@''REPLACE_NEWLOCALE''@|$(REPLACE_NEWLOCALE)|g' \
-e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+ -e 's|@''REPLACE_FREELOCALE''@|$(REPLACE_FREELOCALE)|g' \
-e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
@@ -1320,7 +1389,7 @@ EXTRA_libgnu_a_SOURCES += malloc.c
libgnu_a_SOURCES += malloca.c
-EXTRA_DIST += malloca.h malloca.valgrind
+EXTRA_DIST += malloca.h
## end gnulib module malloca
@@ -1568,6 +1637,14 @@ EXTRA_DIST += openat.h
## end gnulib module openat-h
+## begin gnulib module openat-safer
+
+libgnu_a_SOURCES += openat-safer.c
+
+EXTRA_DIST += fcntl--.h fcntl-safer.h
+
+## end gnulib module openat-safer
+
## begin gnulib module opendir
@@ -1577,6 +1654,14 @@ EXTRA_libgnu_a_SOURCES += opendir.c
## end gnulib module opendir
+## begin gnulib module opendirat
+
+libgnu_a_SOURCES += opendirat.c
+
+EXTRA_DIST += opendirat.h
+
+## end gnulib module opendirat
+
## begin gnulib module parse-datetime
# This rule overrides the Automake generated .y.c rule, to ensure that the
@@ -1728,15 +1813,15 @@ EXTRA_libgnu_a_SOURCES += renameat.c
## end gnulib module renameat
-## begin gnulib module renameat2
+## begin gnulib module renameatu
-libgnu_a_SOURCES += renameat2.c
+libgnu_a_SOURCES += renameatu.c
-EXTRA_DIST += at-func2.c renameat2.h
+EXTRA_DIST += at-func2.c renameatu.h
EXTRA_libgnu_a_SOURCES += at-func2.c
-## end gnulib module renameat2
+## end gnulib module renameatu
## begin gnulib module rewinddir
@@ -1776,7 +1861,7 @@ EXTRA_libgnu_a_SOURCES += rpmatch.c
libgnu_a_SOURCES += safe-read.c
-EXTRA_DIST += safe-read.h
+EXTRA_DIST += safe-read.h sys-limits.h
## end gnulib module safe-read
@@ -1784,7 +1869,7 @@ EXTRA_DIST += safe-read.h
libgnu_a_SOURCES += safe-write.c
-EXTRA_DIST += safe-read.c safe-write.h
+EXTRA_DIST += safe-read.c safe-write.h sys-limits.h
EXTRA_libgnu_a_SOURCES += safe-read.c
@@ -1890,8 +1975,8 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
- -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
- -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
+ -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \
+ -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \
-e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
-e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
-e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
@@ -2605,7 +2690,7 @@ strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
- -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \
+ -e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \
-e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
-e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
-e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
@@ -3022,6 +3107,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
-e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
-e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
+ -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \
-e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
-e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
-e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
@@ -3065,6 +3151,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
-e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
-e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+ -e 's|@''HAVE_GETPASS''@|$(HAVE_GETPASS)|g' \
-e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
-e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
-e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
@@ -3079,7 +3166,6 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
-e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
-e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
- -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \
-e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
-e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
-e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
@@ -3091,6 +3177,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
-e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
-e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
+ -e 's|@''HAVE_DECL_TRUNCATE''@|$(HAVE_DECL_TRUNCATE)|g' \
-e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
-e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
-e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
@@ -3108,6 +3195,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
-e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
-e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+ -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \
-e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
-e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
-e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
@@ -3249,7 +3337,7 @@ BUILT_SOURCES += $(UTIME_H)
# We need the following in order to create <utime.h> when the system
# doesn't have one that works with the given compiler.
if GL_GENERATE_UTIME_H
-utime.h: utime.in.h $(top_builddir)/config.status
+utime.h: utime.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
diff --git a/gnu/Makefile.in b/gnu/Makefile.in
index 28471b7ea986c76f5f9ba6e42bee02f3037244f3..7668e95d9750d7d828f82b2f16bdb0e075689003 100644
--- a/gnu/Makefile.in
+++ b/gnu/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -35,12 +35,118 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --no-conditional-dependencies --no-libtool --macro-prefix=gl alloca areadlinkat-with-size argmatch argp argp-version-etc backupfile closeout configmake dirname error exclude exitfail extern-inline faccessat fchmodat fchownat fcntl-h fdopendir fdutimensat file-has-acl fileblocks fnmatch-gnu fprintftime fseeko fstatat full-write futimens getline getopt-gnu getpagesize gettext gettime gitlog-to-changelog hash human inttostr inttypes lchown linkat localcharset manywarnings mkdirat mkdtemp mkfifoat modechange obstack openat parse-datetime priv-set progname quote quotearg readlinkat renameat root-uid rpmatch safe-read savedir selinux-at setenv snprintf stat-time stdbool stdint stpcpy strdup-posix strerror strtoimax strtol strtoul strtoumax symlinkat timespec timespec-sub unlinkat unlinkdir unlocked-io utimensat version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax xvasprintf
+# Reproduce by:
+# gnulib-tool --import --local-dir=gl \
+# --lib=libgnu \
+# --source-base=gnu \
+# --m4-base=m4 \
+# --doc-base=doc \
+# --tests-base=tests \
+# --aux-dir=build-aux \
+# --no-conditional-dependencies \
+# --no-libtool \
+# --macro-prefix=gl \
+# --avoid=lock \
+# alloca \
+# areadlinkat-with-size \
+# argmatch \
+# argp \
+# argp-version-etc \
+# backupfile \
+# closeout \
+# configmake \
+# dirname \
+# error \
+# exclude \
+# exitfail \
+# extern-inline \
+# faccessat \
+# fchmodat \
+# fchownat \
+# fcntl-h \
+# fdopendir \
+# fdutimensat \
+# file-has-acl \
+# fileblocks \
+# fnmatch-gnu \
+# fprintftime \
+# fseeko \
+# fstatat \
+# full-write \
+# futimens \
+# getline \
+# getopt-gnu \
+# getpagesize \
+# gettext \
+# gettime \
+# gitlog-to-changelog \
+# hash \
+# human \
+# inttostr \
+# inttypes \
+# lchown \
+# linkat \
+# localcharset \
+# manywarnings \
+# mkdirat \
+# mkdtemp \
+# mkfifoat \
+# modechange \
+# obstack \
+# openat \
+# parse-datetime \
+# priv-set \
+# progname \
+# quote \
+# quotearg \
+# readlinkat \
+# renameat \
+# root-uid \
+# rpmatch \
+# safe-read \
+# savedir \
+# selinux-at \
+# setenv \
+# snprintf \
+# stat-time \
+# stdbool \
+# stdint \
+# stpcpy \
+# strdup-posix \
+# strerror \
+# strnlen \
+# strtoimax \
+# strtol \
+# strtoul \
+# strtoumax \
+# symlinkat \
+# timespec \
+# timespec-sub \
+# unlinkat \
+# unlinkdir \
+# unlocked-io \
+# utimensat \
+# version-etc-fsf \
+# xalloc \
+# xalloc-die \
+# xgetcwd \
+# xstrtoumax \
+# xvasprintf
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -104,14 +210,11 @@ build_triplet = @build@
host_triplet = @host@
@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_1 = uniwidth/width.c
subdir = gnu
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am alloca.c \
- parse-datetime.c $(top_srcdir)/build-aux/depcomp \
- $(top_srcdir)/build-aux/ylwrap $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+ $(top_srcdir)/m4/__inline.m4 \
$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \
- $(top_srcdir)/m4/asm-underscore.m4 \
$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \
$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \
$(top_srcdir)/m4/canonicalize.m4 \
@@ -131,11 +234,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/extern-inline.m4 \
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \
- $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \
- $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filenamecat.m4 \
- $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
- $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
+ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
+ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
+ $(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fileblocks.m4 \
+ $(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
+ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
+ $(top_srcdir)/m4/fnmatch_h.m4 $(top_srcdir)/m4/fpending.m4 \
$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
$(top_srcdir)/m4/futimens.m4 \
@@ -149,7 +253,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 \
$(top_srcdir)/m4/group-member.m4 \
- $(top_srcdir)/m4/hard-locale.m4 \
$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/human.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \
$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \
@@ -244,6 +347,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -266,24 +371,25 @@ am__libgnu_a_SOURCES_DIST = acl-errno-valid.c acl-internal.c \
c-strcase.h c-strcasecmp.c c-strncasecmp.c careadlinkat.c \
cloexec.c close-stream.c closeout.c opendir-safer.c dirname.c \
basename.c dirname-lgpl.c basename-lgpl.c stripslash.c \
- exclude.c exitfail.c chmodat.c chownat.c fd-hook.c \
- fd-safer-flag.c dup-safer-flag.c fdutimensat.c file-has-acl.c \
- filenamecat-lgpl.c fprintftime.c full-write.h full-write.c \
- getprogname.h getprogname.c gettext.h gettime.c hard-locale.c \
- hash.c human.c imaxtostr.c inttostr.c offtostr.c uinttostr.c \
- umaxtostr.c localcharset.h localcharset.c malloca.c mbchar.c \
- mbscasecmp.c mbuiter.h mbuiter.c minmax.h modechange.c \
- nstrftime.c openat-die.c parse-datetime.y priv-set.c \
- progname.h progname.c quotearg.c renameat2.c safe-read.c \
- safe-write.c save-cwd.c savedir.c se-context.in.h \
- se-selinux.in.h se-context.c se-selinux.c size_max.h \
- stat-time.c statat.c strnlen1.h strnlen1.c tempname.c \
- timespec.c timespec-sub.c unistd.c dup-safer.c fd-safer.c \
- pipe-safer.c uniwidth/width.c unlinkdir.c utimens.c \
- version-etc.h version-etc.c version-etc-fsf.c wctype-h.c \
- xmalloc.c xalloc-die.c xgetcwd.c xsize.h xsize.c xstrndup.h \
- xstrndup.c xstrtol.c xstrtoul.c xstrtol-error.c xstrtoumax.c \
- xvasprintf.h xvasprintf.c xasprintf.c
+ exclude.c exitfail.c chmodat.c chownat.c creat-safer.c \
+ open-safer.c fd-hook.c fd-safer-flag.c dup-safer-flag.c \
+ fdutimensat.c file-has-acl.c filenamecat-lgpl.c fprintftime.c \
+ full-write.h full-write.c getprogname.h getprogname.c \
+ gettext.h gettime.c hard-locale.c hash.c human.c imaxtostr.c \
+ inttostr.c offtostr.c uinttostr.c umaxtostr.c localcharset.c \
+ malloca.c mbchar.c mbscasecmp.c mbuiter.h mbuiter.c minmax.h \
+ modechange.c nstrftime.c openat-die.c openat-safer.c \
+ opendirat.c parse-datetime.y priv-set.c progname.h progname.c \
+ quotearg.c renameatu.c safe-read.c safe-write.c save-cwd.c \
+ savedir.c se-context.in.h se-selinux.in.h se-context.c \
+ se-selinux.c size_max.h stat-time.c statat.c strnlen1.h \
+ strnlen1.c tempname.c timespec.c timespec-sub.c unistd.c \
+ dup-safer.c fd-safer.c pipe-safer.c uniwidth/width.c \
+ unlinkdir.c utimens.c version-etc.h version-etc.c \
+ version-etc-fsf.c wctype-h.c xmalloc.c xalloc-die.c xgetcwd.c \
+ xsize.h xsize.c xstrndup.h xstrndup.c xstrtol.c xstrtoul.c \
+ xstrtol-error.c xstrtoumax.c xvasprintf.h xvasprintf.c \
+ xasprintf.c
am__dirstamp = $(am__leading_dot)dirstamp
@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_1 = uniwidth/width.$(OBJEXT)
am_libgnu_a_OBJECTS = acl-errno-valid.$(OBJEXT) acl-internal.$(OBJEXT) \
@@ -303,30 +409,31 @@ am_libgnu_a_OBJECTS = acl-errno-valid.$(OBJEXT) acl-internal.$(OBJEXT) \
opendir-safer.$(OBJEXT) dirname.$(OBJEXT) basename.$(OBJEXT) \
dirname-lgpl.$(OBJEXT) basename-lgpl.$(OBJEXT) \
stripslash.$(OBJEXT) exclude.$(OBJEXT) exitfail.$(OBJEXT) \
- chmodat.$(OBJEXT) chownat.$(OBJEXT) fd-hook.$(OBJEXT) \
- fd-safer-flag.$(OBJEXT) dup-safer-flag.$(OBJEXT) \
- fdutimensat.$(OBJEXT) file-has-acl.$(OBJEXT) \
- filenamecat-lgpl.$(OBJEXT) fprintftime.$(OBJEXT) \
- full-write.$(OBJEXT) getprogname.$(OBJEXT) gettime.$(OBJEXT) \
- hard-locale.$(OBJEXT) hash.$(OBJEXT) human.$(OBJEXT) \
- imaxtostr.$(OBJEXT) inttostr.$(OBJEXT) offtostr.$(OBJEXT) \
- uinttostr.$(OBJEXT) umaxtostr.$(OBJEXT) localcharset.$(OBJEXT) \
- malloca.$(OBJEXT) mbchar.$(OBJEXT) mbscasecmp.$(OBJEXT) \
- mbuiter.$(OBJEXT) modechange.$(OBJEXT) nstrftime.$(OBJEXT) \
- openat-die.$(OBJEXT) parse-datetime.$(OBJEXT) \
- priv-set.$(OBJEXT) progname.$(OBJEXT) quotearg.$(OBJEXT) \
- renameat2.$(OBJEXT) safe-read.$(OBJEXT) safe-write.$(OBJEXT) \
- save-cwd.$(OBJEXT) savedir.$(OBJEXT) se-context.$(OBJEXT) \
- se-selinux.$(OBJEXT) stat-time.$(OBJEXT) statat.$(OBJEXT) \
- strnlen1.$(OBJEXT) tempname.$(OBJEXT) timespec.$(OBJEXT) \
- timespec-sub.$(OBJEXT) unistd.$(OBJEXT) dup-safer.$(OBJEXT) \
- fd-safer.$(OBJEXT) pipe-safer.$(OBJEXT) $(am__objects_1) \
- unlinkdir.$(OBJEXT) utimens.$(OBJEXT) version-etc.$(OBJEXT) \
- version-etc-fsf.$(OBJEXT) wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) \
- xalloc-die.$(OBJEXT) xgetcwd.$(OBJEXT) xsize.$(OBJEXT) \
- xstrndup.$(OBJEXT) xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) \
- xstrtol-error.$(OBJEXT) xstrtoumax.$(OBJEXT) \
- xvasprintf.$(OBJEXT) xasprintf.$(OBJEXT)
+ chmodat.$(OBJEXT) chownat.$(OBJEXT) creat-safer.$(OBJEXT) \
+ open-safer.$(OBJEXT) fd-hook.$(OBJEXT) fd-safer-flag.$(OBJEXT) \
+ dup-safer-flag.$(OBJEXT) fdutimensat.$(OBJEXT) \
+ file-has-acl.$(OBJEXT) filenamecat-lgpl.$(OBJEXT) \
+ fprintftime.$(OBJEXT) full-write.$(OBJEXT) \
+ getprogname.$(OBJEXT) gettime.$(OBJEXT) hard-locale.$(OBJEXT) \
+ hash.$(OBJEXT) human.$(OBJEXT) imaxtostr.$(OBJEXT) \
+ inttostr.$(OBJEXT) offtostr.$(OBJEXT) uinttostr.$(OBJEXT) \
+ umaxtostr.$(OBJEXT) localcharset.$(OBJEXT) malloca.$(OBJEXT) \
+ mbchar.$(OBJEXT) mbscasecmp.$(OBJEXT) mbuiter.$(OBJEXT) \
+ modechange.$(OBJEXT) nstrftime.$(OBJEXT) openat-die.$(OBJEXT) \
+ openat-safer.$(OBJEXT) opendirat.$(OBJEXT) \
+ parse-datetime.$(OBJEXT) priv-set.$(OBJEXT) progname.$(OBJEXT) \
+ quotearg.$(OBJEXT) renameatu.$(OBJEXT) safe-read.$(OBJEXT) \
+ safe-write.$(OBJEXT) save-cwd.$(OBJEXT) savedir.$(OBJEXT) \
+ se-context.$(OBJEXT) se-selinux.$(OBJEXT) stat-time.$(OBJEXT) \
+ statat.$(OBJEXT) strnlen1.$(OBJEXT) tempname.$(OBJEXT) \
+ timespec.$(OBJEXT) timespec-sub.$(OBJEXT) unistd.$(OBJEXT) \
+ dup-safer.$(OBJEXT) fd-safer.$(OBJEXT) pipe-safer.$(OBJEXT) \
+ $(am__objects_1) unlinkdir.$(OBJEXT) utimens.$(OBJEXT) \
+ version-etc.$(OBJEXT) version-etc-fsf.$(OBJEXT) \
+ wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) \
+ xgetcwd.$(OBJEXT) xsize.$(OBJEXT) xstrndup.$(OBJEXT) \
+ xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) xstrtol-error.$(OBJEXT) \
+ xstrtoumax.$(OBJEXT) xvasprintf.$(OBJEXT) xasprintf.$(OBJEXT)
libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
LTLIBRARIES = $(noinst_LTLIBRARIES)
AM_V_P = $(am__v_P_@AM_V@)
@@ -409,6 +516,9 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/build-aux/depcomp $(top_srcdir)/build-aux/ylwrap \
+ alloca.c parse-datetime.c
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -525,6 +635,7 @@ GNULIB_FFSL = @GNULIB_FFSL@
GNULIB_FFSLL = @GNULIB_FFSLL@
GNULIB_FGETC = @GNULIB_FGETC@
GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FNMATCH = @GNULIB_FNMATCH@
GNULIB_FOPEN = @GNULIB_FOPEN@
GNULIB_FPRINTF = @GNULIB_FPRINTF@
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
@@ -557,6 +668,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
@@ -573,6 +685,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALENAME = @GNULIB_LOCALENAME@
GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_LSTAT = @GNULIB_LSTAT@
@@ -811,6 +924,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -834,6 +948,9 @@ HAVE_FEATURES_H = @HAVE_FEATURES_H@
HAVE_FFS = @HAVE_FFS@
HAVE_FFSL = @HAVE_FFSL@
HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FNMATCH = @HAVE_FNMATCH@
+HAVE_FNMATCH_H = @HAVE_FNMATCH_H@
+HAVE_FREELOCALE = @HAVE_FREELOCALE@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSTATAT = @HAVE_FSTATAT@
HAVE_FSYNC = @HAVE_FSYNC@
@@ -846,13 +963,16 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
HAVE_GETLOGIN = @HAVE_GETLOGIN@
HAVE_GETOPT_H = @HAVE_GETOPT_H@
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -885,6 +1005,7 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -955,7 +1076,6 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
HAVE_TIMEGM = @HAVE_TIMEGM@
HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
HAVE_TZSET = @HAVE_TZSET@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
@@ -1010,8 +1130,6 @@ HAVE_WMEMSET = @HAVE_WMEMSET@
HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
HAVE__BOOL = @HAVE__BOOL@
HAVE__EXIT = @HAVE__EXIT@
-HOST_CPU = @HOST_CPU@
-HOST_CPU_C_ABI = @HOST_CPU_C_ABI@
INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
@@ -1056,6 +1174,7 @@ NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
+NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
@@ -1083,6 +1202,7 @@ NEXT_DIRENT_H = @NEXT_DIRENT_H@
NEXT_ERRNO_H = @NEXT_ERRNO_H@
NEXT_FCNTL_H = @NEXT_FCNTL_H@
NEXT_FLOAT_H = @NEXT_FLOAT_H@
+NEXT_FNMATCH_H = @NEXT_FNMATCH_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
@@ -1143,9 +1263,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@
REPLACE_FDOPEN = @REPLACE_FDOPEN@
REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FNMATCH = @REPLACE_FNMATCH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREELOCALE = @REPLACE_FREELOCALE@
REPLACE_FREOPEN = @REPLACE_FREOPEN@
REPLACE_FSEEK = @REPLACE_FSEEK@
REPLACE_FSEEKO = @REPLACE_FSEEKO@
@@ -1163,6 +1285,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
REPLACE_GMTIME = @REPLACE_GMTIME@
REPLACE_ISATTY = @REPLACE_ISATTY@
@@ -1193,6 +1316,7 @@ REPLACE_MKNOD = @REPLACE_MKNOD@
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
REPLACE_MKTIME = @REPLACE_MKTIME@
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@
REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
@@ -1372,7 +1496,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
+AUTOMAKE_OPTIONS = 1.11 gnits subdir-objects
SUBDIRS =
noinst_HEADERS =
noinst_LIBRARIES = libgnu.a
@@ -1399,39 +1523,40 @@ EXTRA_DIST = acl-internal.h acl.h acl_entries.c alignof.h alloca.c \
dirname.h dosname.h dup.c dup2.c errno.in.h error.c error.h \
euidaccess.c exclude.h exitfail.h at-func.c faccessat.c \
fchdir.c at-func.c fchmodat.c at-func.c fchownat.c fcntl.c \
- fcntl.in.h fd-hook.h fdopendir.c utimens.h fileblocks.c \
- filename.h filenamecat.h flexmember.h float.c float.in.h \
- itold.c fnmatch.c fnmatch.in.h fnmatch_loop.c fpending.c \
- fpending.h stdio-impl.h fprintftime.h fseek.c fseeko.c \
- stdio-impl.h fstat.c stat-w32.c stat-w32.h at-func.c fstatat.c \
- futimens.c getcwd.c getcwd-lgpl.c getdelim.c getdtablesize.c \
- getgroups.c getline.c getopt-cdefs.in.h getopt-core.h \
- getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h getopt.c \
- getopt.in.h getopt1.c getopt_int.h getpagesize.c \
- $(top_srcdir)/build-aux/config.rpath gettimeofday.c \
- $(top_srcdir)/build-aux/gitlog-to-changelog group-member.c \
- hard-locale.h hash.h $(top_srcdir)/build-aux/config.rpath \
- human.h intprops.h anytostr.c inttostr.h inttypes.in.h \
- iswblank.c langinfo.in.h lchown.c limits.in.h link.c \
- at-func2.c linkat.c config.charset ref-add.sin ref-del.sin \
- locale.in.h localeconv.c localtime-buffer.c localtime-buffer.h \
- lseek.c lstat.c malloc.c malloc.c malloca.h malloca.valgrind \
- mbchar.h mbrtowc.c mbsinit.c mbsrtowcs-impl.h \
- mbsrtowcs-state.c mbsrtowcs.c mbtowc-impl.h mbtowc.c memchr.c \
- memchr.valgrind mempcpy.c memrchr.c mkdir.c at-func.c \
- mkdirat.c mkdtemp.c mkfifo.c at-func.c mkfifoat.c mknodat.c \
- mknod.c mktime-internal.h mktime.c mktime-internal.h mktime.c \
- modechange.h msvc-inval.c msvc-inval.h msvc-nothrow.c \
+ fcntl.in.h fcntl--.h fcntl-safer.h fd-hook.h fdopendir.c \
+ utimens.h fileblocks.c filename.h filenamecat.h flexmember.h \
+ float.c float.in.h itold.c fnmatch.c fnmatch_loop.c \
+ fnmatch.in.h fpending.c fpending.h stdio-impl.h fprintftime.h \
+ fseek.c fseeko.c stdio-impl.h fstat.c stat-w32.c stat-w32.h \
+ at-func.c fstatat.c futimens.c getcwd.c getcwd-lgpl.c \
+ getdelim.c getdtablesize.c getgroups.c getline.c \
+ getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h \
+ getopt-pfx-ext.h getopt.c getopt.in.h getopt1.c getopt_int.h \
+ getpagesize.c $(top_srcdir)/build-aux/config.rpath \
+ gettimeofday.c $(top_srcdir)/build-aux/gitlog-to-changelog \
+ group-member.c hard-locale.h hash.h \
+ $(top_srcdir)/build-aux/config.rpath human.h intprops.h \
+ anytostr.c inttostr.h inttypes.in.h iswblank.c langinfo.in.h \
+ lchown.c cdefs.h libc-config.h limits.in.h link.c at-func2.c \
+ linkat.c localcharset.h locale.in.h localeconv.c \
+ localtime-buffer.c localtime-buffer.h lseek.c lstat.c malloc.c \
+ malloc.c malloca.h mbchar.h mbrtowc.c mbsinit.c \
+ mbsrtowcs-impl.h mbsrtowcs-state.c mbsrtowcs.c mbtowc-impl.h \
+ mbtowc.c memchr.c memchr.valgrind mempcpy.c memrchr.c mkdir.c \
+ at-func.c mkdirat.c mkdtemp.c mkfifo.c at-func.c mkfifoat.c \
+ mknodat.c mknod.c mktime-internal.h mktime.c mktime-internal.h \
+ mktime.c modechange.h msvc-inval.c msvc-inval.h msvc-nothrow.c \
msvc-nothrow.h nl_langinfo.c strftime.h obstack.c obstack.h \
- open.c openat.c openat.h dirent-private.h opendir.c \
- parse-datetime.c parse-datetime.h pathmax.h priv-set.h quote.h \
- quote.h quotearg.h raise.c rawmemchr.c rawmemchr.valgrind \
- read.c dirent-private.h readdir.c readlink.c at-func.c \
- readlinkat.c realloc.c regcomp.c regex.c regex.h \
- regex_internal.c regex_internal.h regexec.c rename.c \
- renameat.c at-func2.c renameat2.h dirent-private.h rewinddir.c \
- rmdir.c root-uid.h rpmatch.c safe-read.h safe-read.c \
- safe-write.h same-inode.h save-cwd.h savedir.h at-func.c \
+ open.c openat.c openat.h fcntl--.h fcntl-safer.h \
+ dirent-private.h opendir.c opendirat.h parse-datetime.c \
+ parse-datetime.h pathmax.h priv-set.h quote.h quote.h \
+ quotearg.h raise.c rawmemchr.c rawmemchr.valgrind read.c \
+ dirent-private.h readdir.c readlink.c at-func.c readlinkat.c \
+ realloc.c regcomp.c regex.c regex.h regex_internal.c \
+ regex_internal.h regexec.c rename.c renameat.c at-func2.c \
+ renameatu.h dirent-private.h rewinddir.c rmdir.c root-uid.h \
+ rpmatch.c safe-read.h sys-limits.h safe-read.c safe-write.h \
+ sys-limits.h same-inode.h save-cwd.h savedir.h at-func.c \
selinux-at.c selinux-at.h getfilecon.c setenv.c signal.in.h \
sleep.c _Noreturn.h arg-nonnull.h c++defs.h unused-parameter.h \
warn-on-use.h snprintf.c stat-w32.c stat-w32.h stat.c \
@@ -1462,7 +1587,7 @@ BUILT_SOURCES = $(ALLOCA_H) configmake.h dirent.h $(ERRNO_H) fcntl.h \
stdlib.h string.h strings.h sys/stat.h sys/time.h sys/types.h \
$(SYSEXITS_H) time.h unistd.h $(LIBUNISTRING_UNITYPES_H) \
$(LIBUNISTRING_UNIWIDTH_H) $(UTIME_H) wchar.h wctype.h
-SUFFIXES = .sed .sin
+SUFFIXES =
MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t dirent.h \
dirent.h-t errno.h errno.h-t fcntl.h fcntl.h-t float.h \
float.h-t fnmatch.h fnmatch.h-t getopt.h getopt.h-t \
@@ -1479,8 +1604,7 @@ MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t dirent.h \
unitypes.h-t uniwidth.h uniwidth.h-t utime.h utime.h-t wchar.h \
wchar.h-t wctype.h wctype.h-t
MOSTLYCLEANDIRS = selinux sys
-CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
- ref-del.sed
+CLEANFILES = configmake.h configmake.h-t
DISTCLEANFILES =
MAINTAINERCLEANFILES = parse-datetime.c
# No GNU Make output.
@@ -1497,24 +1621,25 @@ libgnu_a_SOURCES = acl-errno-valid.c acl-internal.c get-permissions.c \
c-strcase.h c-strcasecmp.c c-strncasecmp.c careadlinkat.c \
cloexec.c close-stream.c closeout.c opendir-safer.c dirname.c \
basename.c dirname-lgpl.c basename-lgpl.c stripslash.c \
- exclude.c exitfail.c chmodat.c chownat.c fd-hook.c \
- fd-safer-flag.c dup-safer-flag.c fdutimensat.c file-has-acl.c \
- filenamecat-lgpl.c fprintftime.c full-write.h full-write.c \
- getprogname.h getprogname.c gettext.h gettime.c hard-locale.c \
- hash.c human.c imaxtostr.c inttostr.c offtostr.c uinttostr.c \
- umaxtostr.c localcharset.h localcharset.c malloca.c mbchar.c \
- mbscasecmp.c mbuiter.h mbuiter.c minmax.h modechange.c \
- nstrftime.c openat-die.c parse-datetime.y priv-set.c \
- progname.h progname.c quotearg.c renameat2.c safe-read.c \
- safe-write.c save-cwd.c savedir.c se-context.in.h \
- se-selinux.in.h se-context.c se-selinux.c size_max.h \
- stat-time.c statat.c strnlen1.h strnlen1.c tempname.c \
- timespec.c timespec-sub.c unistd.c dup-safer.c fd-safer.c \
- pipe-safer.c $(am__append_1) unlinkdir.c utimens.c \
- version-etc.h version-etc.c version-etc-fsf.c wctype-h.c \
- xmalloc.c xalloc-die.c xgetcwd.c xsize.h xsize.c xstrndup.h \
- xstrndup.c xstrtol.c xstrtoul.c xstrtol-error.c xstrtoumax.c \
- xvasprintf.h xvasprintf.c xasprintf.c
+ exclude.c exitfail.c chmodat.c chownat.c creat-safer.c \
+ open-safer.c fd-hook.c fd-safer-flag.c dup-safer-flag.c \
+ fdutimensat.c file-has-acl.c filenamecat-lgpl.c fprintftime.c \
+ full-write.h full-write.c getprogname.h getprogname.c \
+ gettext.h gettime.c hard-locale.c hash.c human.c imaxtostr.c \
+ inttostr.c offtostr.c uinttostr.c umaxtostr.c localcharset.c \
+ malloca.c mbchar.c mbscasecmp.c mbuiter.h mbuiter.c minmax.h \
+ modechange.c nstrftime.c openat-die.c openat-safer.c \
+ opendirat.c parse-datetime.y priv-set.c progname.h progname.c \
+ quotearg.c renameatu.c safe-read.c safe-write.c save-cwd.c \
+ savedir.c se-context.in.h se-selinux.in.h se-context.c \
+ se-selinux.c size_max.h stat-time.c statat.c strnlen1.h \
+ strnlen1.c tempname.c timespec.c timespec-sub.c unistd.c \
+ dup-safer.c fd-safer.c pipe-safer.c $(am__append_1) \
+ unlinkdir.c utimens.c version-etc.h version-etc.c \
+ version-etc-fsf.c wctype-h.c xmalloc.c xalloc-die.c xgetcwd.c \
+ xsize.h xsize.c xstrndup.h xstrndup.c xstrtol.c xstrtoul.c \
+ xstrtol-error.c xstrtoumax.c xvasprintf.h xvasprintf.c \
+ xasprintf.c
libgnu_a_LIBADD = $(gl_LIBOBJS) @ALLOCA@
libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@
EXTRA_libgnu_a_SOURCES = acl_entries.c alloca.c at-func.c at-func.c \
@@ -1552,8 +1677,6 @@ EXTRA_libgnu_a_SOURCES = acl_entries.c alloca.c at-func.c at-func.c \
# Do not rely on a 'configure'-time test for this, since the expression
# might appear in an installed header, which is used by some other compiler.
HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
# Because this Makefile snippet defines a variable used by other
# gnulib Makefile snippets, it must be present in all makefiles that
@@ -1583,7 +1706,7 @@ all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .sed .sin .c .o .obj .y
+.SUFFIXES: .c .o .obj .y
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -1596,7 +1719,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gnu/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnits gnu/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1696,6 +1818,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closedir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creat-safer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirfd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-lgpl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname.Po@am__quote@
@@ -1790,12 +1913,15 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nstrftime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/offtostr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open-safer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-die.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-proc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-safer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendir-safer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendirat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-datetime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe-safer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-args.Po@am__quote@
@@ -1816,7 +1942,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rename.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renameat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renameat2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renameatu.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rewinddir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmdir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmatch.Po@am__quote@
@@ -2069,7 +2195,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
install: $(BUILT_SOURCES)
@@ -2140,7 +2266,7 @@ install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-exec-local
+install-exec-am:
install-html: install-html-recursive
@@ -2180,25 +2306,26 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-local
+uninstall-am:
.MAKE: $(am__recursive_targets) all check install install-am \
install-strip
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
- check check-am clean clean-generic clean-noinstLIBRARIES \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-generic clean-noinstLIBRARIES \
clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
distclean-compile distclean-generic distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-exec-local install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \
- uninstall-am uninstall-local
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-local pdf \
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
# We need the following in order to create <alloca.h> when the system
@@ -2354,21 +2481,31 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
@GL_GENERATE_FLOAT_H_FALSE@float.h: $(top_builddir)/config.status
@GL_GENERATE_FLOAT_H_FALSE@ rm -f $@
-# We need the following in order to create <fnmatch.h> when the system
-# doesn't have one that supports the required API.
-@GL_GENERATE_FNMATCH_H_TRUE@fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
+# We need the following in order to create <fnmatch.h>.
+@GL_GENERATE_FNMATCH_H_TRUE@fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
@GL_GENERATE_FNMATCH_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \
-@GL_GENERATE_FNMATCH_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_FNMATCH_H_TRUE@ sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+@GL_GENERATE_FNMATCH_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+@GL_GENERATE_FNMATCH_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''HAVE_FNMATCH_H''@|$(HAVE_FNMATCH_H)|g' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''NEXT_FNMATCH_H''@|$(NEXT_FNMATCH_H)|g' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e 's/@''GNULIB_FNMATCH''@/$(GNULIB_FNMATCH)/g' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''HAVE_FNMATCH''@|$(HAVE_FNMATCH)|g' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e 's|@''REPLACE_FNMATCH''@|$(REPLACE_FNMATCH)|g' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+@GL_GENERATE_FNMATCH_H_TRUE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@GL_GENERATE_FNMATCH_H_TRUE@ < $(srcdir)/fnmatch.in.h; \
@GL_GENERATE_FNMATCH_H_TRUE@ } > $@-t && \
-@GL_GENERATE_FNMATCH_H_TRUE@ mv -f $@-t $@
+@GL_GENERATE_FNMATCH_H_TRUE@ mv $@-t $@
@GL_GENERATE_FNMATCH_H_FALSE@fnmatch.h: $(top_builddir)/config.status
@GL_GENERATE_FNMATCH_H_FALSE@ rm -f $@
# We need the following in order to create <getopt.h> when the system
# doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(top_builddir)/config.status
+getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -2413,6 +2550,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
-e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
-e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
-e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
+ -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \
-e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
-e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
-e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
@@ -2440,6 +2578,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
-e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
-e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
-e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
+ -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \
-e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
-e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
-e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
@@ -2466,65 +2605,6 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
@GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status
@GL_GENERATE_LIMITS_H_FALSE@ rm -f $@
-# We need the following in order to install a simple file in $(libdir)
-# which is shared with other installed packages. We use a list of referencing
-# packages so that "make uninstall" will remove the file if and only if it
-# is not used by another installed package.
-# On systems with glibc-2.1 or newer, the file is redundant, therefore we
-# avoid installing it.
-
-all-local: charset.alias ref-add.sed ref-del.sed
-install-exec-local: install-exec-localcharset
-install-exec-localcharset: all-local
- if test $(GLIBC21) = no; then \
- case '$(host_os)' in \
- darwin[56]*) \
- need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
- need_charset_alias=false ;; \
- *) \
- need_charset_alias=true ;; \
- esac ; \
- else \
- need_charset_alias=false ; \
- fi ; \
- if $$need_charset_alias; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
- fi ; \
- if test -f $(charset_alias); then \
- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- rm -f $(charset_tmp) ; \
- else \
- if $$need_charset_alias; then \
- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- rm -f $(charset_tmp) ; \
- fi ; \
- fi
-
-uninstall-local: uninstall-localcharset
-uninstall-localcharset: all-local
- if test -f $(charset_alias); then \
- sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
- if grep '^# Packages using this file: $$' $(charset_tmp) \
- > /dev/null; then \
- rm -f $(charset_alias); \
- else \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
- fi; \
- rm -f $(charset_tmp); \
- fi
-
-charset.alias: config.charset
- $(AM_V_GEN)rm -f t-$@ $@ && \
- $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
- mv t-$@ $@
-.sin.sed:
- $(AM_V_GEN)rm -f t-$@ $@ && \
- sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
- mv t-$@ $@
-
# We need the following in order to create <locale.h> when the system
# doesn't have one that provides all definitions.
locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
@@ -2538,11 +2618,16 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
-e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
-e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
+ -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \
+ -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \
-e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
+ -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \
-e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
-e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
-e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
+ -e 's|@''REPLACE_NEWLOCALE''@|$(REPLACE_NEWLOCALE)|g' \
-e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+ -e 's|@''REPLACE_FREELOCALE''@|$(REPLACE_FREELOCALE)|g' \
-e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
@@ -2600,8 +2685,8 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
- -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
- -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
+ -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \
+ -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \
-e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
-e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
-e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
@@ -3044,7 +3129,7 @@ strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
- -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \
+ -e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \
-e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
-e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
-e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
@@ -3248,6 +3333,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
-e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
-e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
+ -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \
-e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
-e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
-e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
@@ -3291,6 +3377,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
-e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
-e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+ -e 's|@''HAVE_GETPASS''@|$(HAVE_GETPASS)|g' \
-e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
-e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
-e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
@@ -3305,7 +3392,6 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
-e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
-e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
- -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \
-e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
-e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
-e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
@@ -3317,6 +3403,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
-e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
-e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
+ -e 's|@''HAVE_DECL_TRUNCATE''@|$(HAVE_DECL_TRUNCATE)|g' \
-e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
-e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
-e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
@@ -3334,6 +3421,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
-e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
-e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+ -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \
-e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
-e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
-e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
@@ -3378,7 +3466,7 @@ uniwidth.h: uniwidth.in.h
# We need the following in order to create <utime.h> when the system
# doesn't have one that works with the given compiler.
-@GL_GENERATE_UTIME_H_TRUE@utime.h: utime.in.h $(top_builddir)/config.status
+@GL_GENERATE_UTIME_H_TRUE@utime.h: utime.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
@GL_GENERATE_UTIME_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \
@GL_GENERATE_UTIME_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@GL_GENERATE_UTIME_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
diff --git a/gnu/_Noreturn.h b/gnu/_Noreturn.h
index c44ad89b7c09315601bfb48467992f9fff797093..94fdfaf0220f98b42c569d0f9040ee6df3306ce4 100644
--- a/gnu/_Noreturn.h
+++ b/gnu/_Noreturn.h
@@ -1,8 +1,12 @@
-#if !defined _Noreturn && __STDC_VERSION__ < 201112
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
- || 0x5110 <= __SUNPRO_C)
+#ifndef _Noreturn
+# if 201103 <= (defined __cplusplus ? __cplusplus : 0)
+# define _Noreturn [[noreturn]]
+# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
+ || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+ /* _Noreturn works as-is. */
+# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
# define _Noreturn __attribute__ ((__noreturn__))
-# elif 1200 <= _MSC_VER
+# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0)
# define _Noreturn __declspec (noreturn)
# else
# define _Noreturn
diff --git a/gnu/acl-errno-valid.c b/gnu/acl-errno-valid.c
index 1e96974dd123fd8c38b79f93b54070ad8a459221..99ddf3bb0c3bb66fac6458ecdce939efea23e79d 100644
--- a/gnu/acl-errno-valid.c
+++ b/gnu/acl-errno-valid.c
@@ -1,6 +1,6 @@
/* Test whether ACLs are well supported on this system.
- Copyright 2013-2017 Free Software Foundation, Inc.
+ Copyright 2013-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/acl-internal.c b/gnu/acl-internal.c
index 63e6b6b997c274b769da659f5c6cb71826dc30de..cc42183f4437faa8a693673d6414e4b93a6aec47 100644
--- a/gnu/acl-internal.c
+++ b/gnu/acl-internal.c
@@ -1,6 +1,6 @@
/* Test whether a file has a nontrivial ACL. -*- coding: utf-8 -*-
- Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
#include "acl-internal.h"
-#if USE_ACL && HAVE_ACL_GET_FILE
+#if USE_ACL && HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
@@ -37,7 +37,7 @@ acl_extended_nontrivial (acl_t acl)
return (acl_entries (acl) > 0);
}
-# else /* Linux, FreeBSD, IRIX, Tru64 */
+# else /* Linux, FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */
/* ACL is an ACL, from a file, stored as type ACL_TYPE_ACCESS.
Return 1 if the given ACL is non-trivial.
@@ -51,7 +51,7 @@ acl_access_nontrivial (acl_t acl)
at least, allowing us to write
return (3 < acl_entries (acl));
but the following code is more robust. */
-# if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD */
+# if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Cygwin >= 2.5 */
acl_entry_t ace;
int got_one;
@@ -124,7 +124,7 @@ acl_default_nontrivial (acl_t acl)
# endif
-#elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+#elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin < 2.5, not HP-UX */
/* Test an ACL retrieved with GETACL.
Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.
@@ -355,7 +355,7 @@ acl_nontrivial (int count, struct acl_entry *entries)
struct acl_entry *ace = &entries[i];
if (ace->uid != ACL_NSUSER && ace->gid != ACL_NSGROUP)
- return 1;
+ return 1;
}
return 0;
}
@@ -479,7 +479,7 @@ void
free_permission_context (struct permission_context *ctx)
{
#if USE_ACL
-# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
if (ctx->acl)
acl_free (ctx->acl);
# if !HAVE_ACL_TYPE_EXTENDED
@@ -487,7 +487,7 @@ free_permission_context (struct permission_context *ctx)
acl_free (ctx->default_acl);
# endif
-# elif defined GETACL /* Solaris, Cygwin */
+# elif defined GETACL /* Solaris, Cygwin < 2.5 */
free (ctx->entries);
# ifdef ACE_GETACL
free (ctx->ace_entries);
diff --git a/gnu/acl-internal.h b/gnu/acl-internal.h
index ebd24217bb6da404467f8f24e70cc524a1c5c494..05833efaa8964b34c25edcf42333f9dc660a14c4 100644
--- a/gnu/acl-internal.h
+++ b/gnu/acl-internal.h
@@ -1,6 +1,6 @@
/* Internal implementation of access control lists. -*- coding: utf-8 -*-
- Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,7 +30,8 @@
# define GETACLCNT ACL_CNT
#endif
-/* On Linux, additional ACL related API is available in <acl/libacl.h>. */
+/* On Linux and Cygwin >= 2.5, additional ACL related API is available in
+ <acl/libacl.h>. */
#ifdef HAVE_ACL_LIBACL_H
# include <acl/libacl.h>
#endif
@@ -72,7 +73,7 @@ _GL_INLINE_HEADER_BEGIN
# if HAVE_ACL_GET_FILE
/* POSIX 1003.1e (draft 17 -- abandoned) specific version. */
-/* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+/* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
# ifndef MIN_ACL_ENTRIES
# define MIN_ACL_ENTRIES 4
@@ -122,7 +123,10 @@ rpl_acl_set_fd (int fd, acl_t acl)
# endif
/* Linux-specific */
-# ifndef HAVE_ACL_EXTENDED_FILE
+/* Cygwin >= 2.5 implements this function, but it returns 1 for all
+ directories, thus is unusable. */
+# if !defined HAVE_ACL_EXTENDED_FILE || defined __CYGWIN__
+# undef HAVE_ACL_EXTENDED_FILE
# define HAVE_ACL_EXTENDED_FILE false
# define acl_extended_file(name) (-1)
# endif
@@ -163,7 +167,7 @@ extern int acl_access_nontrivial (acl_t);
extern int acl_default_nontrivial (acl_t);
# endif
-# elif HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+# elif HAVE_FACL && defined GETACL /* Solaris, Cygwin < 2.5, not HP-UX */
/* Set to 0 if a file's mode is stored independently from the ACL. */
# if defined __CYGWIN__ /* Cygwin */
@@ -256,14 +260,14 @@ extern int acl_nontrivial (int count, struct acl *entries);
struct permission_context {
mode_t mode;
#if USE_ACL
-# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
acl_t acl;
# if !HAVE_ACL_TYPE_EXTENDED
acl_t default_acl;
# endif
bool acls_not_supported;
-# elif defined GETACL /* Solaris, Cygwin */
+# elif defined GETACL /* Solaris, Cygwin < 2.5 */
int count;
aclent_t *entries;
# ifdef ACE_GETACL
@@ -293,10 +297,6 @@ struct permission_context {
int get_permissions (const char *, int, mode_t, struct permission_context *);
int set_permissions (struct permission_context *, const char *, int);
-void free_permission_context (struct permission_context *)
-#if ! (defined USE_ACL && (HAVE_ACL_GET_FILE || defined GETACL))
- _GL_ATTRIBUTE_CONST
-#endif
- ;
+void free_permission_context (struct permission_context *);
_GL_INLINE_HEADER_END
diff --git a/gnu/acl.h b/gnu/acl.h
index d3b048022e39055f57a71eadc8da8a28e7986fcd..904606dfac73c7d8e5c8d6e02a6edfa3fd17a3fc 100644
--- a/gnu/acl.h
+++ b/gnu/acl.h
@@ -1,6 +1,6 @@
/* acl.c - access control lists
- Copyright (C) 2002, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/acl_entries.c b/gnu/acl_entries.c
index c7efaefd52f39548b9564025d73e421e565eeec3..19ac3c3bd9fc5976d3bdea59dbb50157164d4627 100644
--- a/gnu/acl_entries.c
+++ b/gnu/acl_entries.c
@@ -1,6 +1,6 @@
/* Return the number of entries in an ACL.
- Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
#include "acl-internal.h"
/* This file assumes POSIX-draft like ACLs
- (Linux, FreeBSD, Mac OS X, IRIX, Tru64). */
+ (Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5). */
/* Return the number of entries in ACL.
Return -1 and set errno upon failure to determine it. */
@@ -34,7 +34,7 @@ acl_entries (acl_t acl)
if (acl != NULL)
{
-#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X */
+#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X, Cygwin >= 2.5 */
# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
/* acl_get_entry returns 0 when it successfully fetches an entry,
and -1/EINVAL at the end. */
@@ -45,7 +45,7 @@ acl_entries (acl_t acl)
got_one >= 0;
got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace))
count++;
-# else /* Linux, FreeBSD */
+# else /* Linux, FreeBSD, Cygwin >= 2.5 */
/* acl_get_entry returns 1 when it successfully fetches an entry,
and 0 at the end. */
acl_entry_t ace;
diff --git a/gnu/alignof.h b/gnu/alignof.h
index 21761d7bede21258c334d59880c96f0c2cd2db48..46f4ad09586e300b30c25cfe53d1f173c05b1ac0 100644
--- a/gnu/alignof.h
+++ b/gnu/alignof.h
@@ -1,5 +1,5 @@
/* Determine alignment of types.
- Copyright (C) 2003-2004, 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003-2004, 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/alloca.in.h b/gnu/alloca.in.h
index 1881e74f5dc22927dee38f9406dcce8c6b46dc4d..ec81e119a0ff836079968f6d83bc4b3dba6497fe 100644
--- a/gnu/alloca.in.h
+++ b/gnu/alloca.in.h
@@ -1,6 +1,6 @@
/* Memory allocation on the stack.
- Copyright (C) 1995, 1999, 2001-2004, 2006-2017 Free Software Foundation,
+ Copyright (C) 1995, 1999, 2001-2004, 2006-2019 Free Software Foundation,
Inc.
This program is free software; you can redistribute it and/or modify it
diff --git a/gnu/allocator.h b/gnu/allocator.h
index fc3d646aa542f39ba831f6d9c23a05e4010fdc4f..5a632ba6ff358cd03a1e0199b5405f568ad31878 100644
--- a/gnu/allocator.h
+++ b/gnu/allocator.h
@@ -1,6 +1,6 @@
/* Memory allocators such as malloc+free.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/anytostr.c b/gnu/anytostr.c
index 9bf9e15f6c26d1a9f0efe414b6c24cc291867cf0..18902885f71c249fd89f13ffa6361c1f1ace1c4b 100644
--- a/gnu/anytostr.c
+++ b/gnu/anytostr.c
@@ -1,6 +1,6 @@
/* anytostr.c -- convert integers to printable strings
- Copyright (C) 2001, 2006, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2006, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/areadlink-with-size.c b/gnu/areadlink-with-size.c
index dbca6fcd8287c342625801e1e8ca7e1f7275a8f9..eacad3f613deb4f7805bfd0bac8edcd9a2796ca5 100644
--- a/gnu/areadlink-with-size.c
+++ b/gnu/areadlink-with-size.c
@@ -1,7 +1,7 @@
/* readlink wrapper to return the link name in malloc'd storage.
Unlike xreadlink and xreadlink_with_size, don't ever call exit.
- Copyright (C) 2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/areadlink.c b/gnu/areadlink.c
index f7609b1c3aff680fc9d83e80ec9b3d3cd10ae970..059435624db5ceddc827fa3fcc95092c401c680b 100644
--- a/gnu/areadlink.c
+++ b/gnu/areadlink.c
@@ -1,7 +1,7 @@
/* areadlink.c -- readlink wrapper to return the link name in malloc'd storage
Unlike xreadlink and xreadlink_with_size, don't ever call exit.
- Copyright (C) 2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/areadlink.h b/gnu/areadlink.h
index 87efd508d0cc7581049f266ebc163012449a1968..ddcd06d7d7af3c2102ed4ef928e8287c092d5036 100644
--- a/gnu/areadlink.h
+++ b/gnu/areadlink.h
@@ -1,6 +1,6 @@
/* Read symbolic links without size limitation.
- Copyright (C) 2001, 2003-2004, 2007, 2009-2017 Free Software Foundation,
+ Copyright (C) 2001, 2003-2004, 2007, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/areadlinkat-with-size.c b/gnu/areadlinkat-with-size.c
index fa3773fcb8037297cfe9d8d7e17577b7ffad042d..ed00b98e4df8b277b96837f05b471247cfb63307 100644
--- a/gnu/areadlinkat-with-size.c
+++ b/gnu/areadlinkat-with-size.c
@@ -1,7 +1,7 @@
/* readlinkat wrapper to return the link name in malloc'd storage.
Unlike xreadlinkat, only call exit on failure to change directory.
- Copyright (C) 2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/areadlinkat.c b/gnu/areadlinkat.c
index 65e7334afac61ceeef79f39ffb1e4d946d45e6d8..6dfbb6102394f14649be2a1fd85213456669898f 100644
--- a/gnu/areadlinkat.c
+++ b/gnu/areadlinkat.c
@@ -1,7 +1,7 @@
/* areadlinkat.c -- readlinkat wrapper to return malloc'd link name
Unlike xreadlinkat, only call exit on failure to change directory.
- Copyright (C) 2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/arg-nonnull.h b/gnu/arg-nonnull.h
index 61ee07127477470ac1f35c276b0e9fafa2b03985..ad8c26c225e7c0c0857ec5c12d395a2e098248ae 100644
--- a/gnu/arg-nonnull.h
+++ b/gnu/arg-nonnull.h
@@ -1,5 +1,5 @@
/* A C macro for declaring that specific arguments must not be NULL.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
diff --git a/gnu/argmatch.c b/gnu/argmatch.c
index 59858ec6818ee44050ba86350668de1625132e91..b9a3e400c41dc618b043c0a6bf1d0b59dbd9801f 100644
--- a/gnu/argmatch.c
+++ b/gnu/argmatch.c
@@ -1,6 +1,6 @@
/* argmatch.c -- find a match for a string in an array
- Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2017 Free Software
+ Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/argmatch.h b/gnu/argmatch.h
index 84508545057dcab81122c4c15a6b76739f4758bf..51d2885879d84423b4f20f4d8fa26fe6b544e8b9 100644
--- a/gnu/argmatch.h
+++ b/gnu/argmatch.h
@@ -1,6 +1,6 @@
/* argmatch.h -- definitions and prototypes for argmatch.c
- Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2017 Free Software
+ Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/argp-ba.c b/gnu/argp-ba.c
index c2aadf00abaa45909916f81e9a202c221fde3762..fcf60c82d17c65671c24dbe9663e63905e72ab12 100644
--- a/gnu/argp-ba.c
+++ b/gnu/argp-ba.c
@@ -1,5 +1,5 @@
/* Default definition for ARGP_PROGRAM_BUG_ADDRESS.
- Copyright (C) 1996-2017 Free Software Foundation, Inc.
+ Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-eexst.c b/gnu/argp-eexst.c
index 823e3077c0641ead0f44c2b5443994fd0865bb6e..06b025d469696cd3bb400e1db97e769aa9831c9b 100644
--- a/gnu/argp-eexst.c
+++ b/gnu/argp-eexst.c
@@ -1,5 +1,5 @@
/* Default definition for ARGP_ERR_EXIT_STATUS
- Copyright (C) 1997, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2009-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-fmtstream.c b/gnu/argp-fmtstream.c
index 92333fe7162cf11a629d5869e61b442a694c3daf..ba6a407f7cf960264c7ec788a087f55baf756776 100644
--- a/gnu/argp-fmtstream.c
+++ b/gnu/argp-fmtstream.c
@@ -1,5 +1,5 @@
/* Word-wrapping and line-truncating streams
- Copyright (C) 1997-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-fmtstream.h b/gnu/argp-fmtstream.h
index f6deebdccc6655a1d6d9568af7786ad0a63d69b4..0cc88525e43b9c185b0f2cb25eb13ed423900205 100644
--- a/gnu/argp-fmtstream.h
+++ b/gnu/argp-fmtstream.h
@@ -1,5 +1,5 @@
/* Word-wrapping and line-truncating streams.
- Copyright (C) 1997-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-fs-xinl.c b/gnu/argp-fs-xinl.c
index c88fd165840fc7af9c5a7df303f42e86e4614946..a2e843c877b11c0d5c8b0a74108600566b393de0 100644
--- a/gnu/argp-fs-xinl.c
+++ b/gnu/argp-fs-xinl.c
@@ -1,5 +1,5 @@
/* Real definitions for extern inline functions in argp-fmtstream.h
- Copyright (C) 1997-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-help.c b/gnu/argp-help.c
index 0a98c682b79dd675e531ce9838ef12084653e269..e5375a0f044d7257061a3977ab8f336211ce7cec 100644
--- a/gnu/argp-help.c
+++ b/gnu/argp-help.c
@@ -1,5 +1,5 @@
/* Hierarchical argument parsing help output
- Copyright (C) 1995-2017 Free Software Foundation, Inc.
+ Copyright (C) 1995-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-namefrob.h b/gnu/argp-namefrob.h
index a1c9a01a5c3f6d3c8bfae2a7240508cd79fc2fc6..2fb9ac49477c5c9056a46a84e4324d2129a6daf4 100644
--- a/gnu/argp-namefrob.h
+++ b/gnu/argp-namefrob.h
@@ -1,5 +1,5 @@
/* Name frobnication for compiling argp outside of glibc
- Copyright (C) 1997-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-parse.c b/gnu/argp-parse.c
index 9a86044cd60a100ff0e9fb4635270119dd25067d..6dec573101838aca97b0972bbb758217ae8fe15b 100644
--- a/gnu/argp-parse.c
+++ b/gnu/argp-parse.c
@@ -1,5 +1,5 @@
/* Hierarchical argument parsing, layered over getopt
- Copyright (C) 1995-2017 Free Software Foundation, Inc.
+ Copyright (C) 1995-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-pin.c b/gnu/argp-pin.c
index 7c05d1dd5ca77bec000ed8b1437350ba34ef79de..ece7423e3026e0be28c021900ff3633616c7e206 100644
--- a/gnu/argp-pin.c
+++ b/gnu/argp-pin.c
@@ -1,5 +1,5 @@
/* Full and short program names for argp module
- Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/argp-pv.c b/gnu/argp-pv.c
index 000bbb2187d7467535d88146c4a641989281bf8c..f76b365add31f5be5b0133097dc667715f917d60 100644
--- a/gnu/argp-pv.c
+++ b/gnu/argp-pv.c
@@ -1,5 +1,5 @@
/* Default definition for ARGP_PROGRAM_VERSION.
- Copyright (C) 1996-2017 Free Software Foundation, Inc.
+ Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-pvh.c b/gnu/argp-pvh.c
index c25d5c4b9c5736007001bb5990c1e92c970491f1..be73e335ff99544928c7eb9370a84f2ce940139e 100644
--- a/gnu/argp-pvh.c
+++ b/gnu/argp-pvh.c
@@ -1,5 +1,5 @@
/* Default definition for ARGP_PROGRAM_VERSION_HOOK.
- Copyright (C) 1996-2017 Free Software Foundation, Inc.
+ Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp-version-etc.c b/gnu/argp-version-etc.c
index 7562fb968c070086cb1a29a1b1158fd48eca8f19..0c7e0af7e28084fa307094ad7435073e2bd86291 100644
--- a/gnu/argp-version-etc.c
+++ b/gnu/argp-version-etc.c
@@ -1,5 +1,5 @@
/* Version hook for Argp.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/argp-version-etc.h b/gnu/argp-version-etc.h
index 0b8969d3d87d60d660be58cfb37e110ef0d9131c..b9a1d2eb5ce30f52e53b323da4296c993f89d516 100644
--- a/gnu/argp-version-etc.h
+++ b/gnu/argp-version-etc.h
@@ -1,5 +1,5 @@
/* Version hook for Argp.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/argp-xinl.c b/gnu/argp-xinl.c
index cfaf996b0eb55cec46243da368098d49d94e1b37..ebc032f6fb3c340a2619dcd975bd8e0942562d9f 100644
--- a/gnu/argp-xinl.c
+++ b/gnu/argp-xinl.c
@@ -1,5 +1,5 @@
/* Real definitions for extern inline functions in argp.h
- Copyright (C) 1997-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/argp.h b/gnu/argp.h
index 19813c8506da9ee2351c60744c9a331d334aa580..317ac034e01f93ba37f3ac7c785027dd6ebfbc05 100644
--- a/gnu/argp.h
+++ b/gnu/argp.h
@@ -1,5 +1,5 @@
/* Hierarchical argument parsing, layered over getopt.
- Copyright (C) 1995-2017 Free Software Foundation, Inc.
+ Copyright (C) 1995-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
diff --git a/gnu/asnprintf.c b/gnu/asnprintf.c
index b0a01fcbd1b03172a4195557f09373a221223bf9..d2a8c097205256735722d25e829052b3ea5865a4 100644
--- a/gnu/asnprintf.c
+++ b/gnu/asnprintf.c
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999, 2002, 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/asprintf.c b/gnu/asprintf.c
index 00bb9d743a9019365491b7f78787839bc4dbc3f9..6cbd062929e006c56ac909d756db5114cdc18370 100644
--- a/gnu/asprintf.c
+++ b/gnu/asprintf.c
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999, 2002, 2006-2007, 2009-2017 Free Software Foundation,
+ Copyright (C) 1999, 2002, 2006-2007, 2009-2019 Free Software Foundation,
Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/assure.h b/gnu/assure.h
index 342b126cb2dbedde4714fc43917a93b62fb78cd9..c21b6a6b806f598c862c574b7863f04fa36d44e4 100644
--- a/gnu/assure.h
+++ b/gnu/assure.h
@@ -1,6 +1,6 @@
/* Run-time assert-like macros.
- Copyright (C) 2014-2017 Free Software Foundation, Inc.
+ Copyright (C) 2014-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
#include <assert.h>
/* Check E's value at runtime, and report an error and abort if not.
- However, do nothng if NDEBUG is defined.
+ However, do nothing if NDEBUG is defined.
Unlike standard 'assert', this macro always compiles E even when NDEBUG
is defined, so as to catch typos and avoid some GCC warnings. */
diff --git a/gnu/at-func.c b/gnu/at-func.c
index 2a3e375e9a2d0e3f0247dbc04b8039701a9a70ef..d2e63191afeaa76ce758b925386ec7b11c819e42 100644
--- a/gnu/at-func.c
+++ b/gnu/at-func.c
@@ -1,5 +1,5 @@
/* Define at-style functions like fstatat, unlinkat, fchownat, etc.
- Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/at-func2.c b/gnu/at-func2.c
index fbf3f6cba29c3382a6b30151193782a4e10b5dcf..eaa256cb1e646006531e7b74730c2b546bf651a2 100644
--- a/gnu/at-func2.c
+++ b/gnu/at-func2.c
@@ -1,5 +1,5 @@
/* Define 2-FD at-style functions like linkat or renameat.
- Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/backup-find.c b/gnu/backup-find.c
index 4c087414260dbd39b09b29c4ea7c964dfdadb1b3..c038ae6dcf49d74d220fee4828af95c934603945 100644
--- a/gnu/backup-find.c
+++ b/gnu/backup-find.c
@@ -1,6 +1,6 @@
/* backupfile.c -- make Emacs style backup file names
- Copyright 2017 Free Software Foundation, Inc.
+ Copyright 2017-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,14 +24,16 @@
#include <stdlib.h>
-/* Return the name of a backup file for the existing file FILE,
- allocated with malloc. Report an error and exit if out of memory.
- Do not call this function if backup_type == no_backups. */
+/* Relative to DIR_FD, return the name of a backup file for the
+ existing file FILE, allocated with malloc. Report an error and
+ exit if out of memory. Do not call this function if
+ backup_type == no_backups. */
char *
-find_backup_file_name (char const *file, enum backup_type backup_type)
+find_backup_file_name (int dir_fd, char const *file,
+ enum backup_type backup_type)
{
- char *result = backupfile_internal (file, backup_type, false);
+ char *result = backupfile_internal (dir_fd, file, backup_type, false);
if (!result)
xalloc_die ();
return result;
diff --git a/gnu/backup-internal.h b/gnu/backup-internal.h
index 2401c07b09023a46cb017d4876234d6a6f0fa1d0..17714b2d4a8c31ae55e9cd3d9a9610f7c0f812ad 100644
--- a/gnu/backup-internal.h
+++ b/gnu/backup-internal.h
@@ -1,3 +1,3 @@
#include "backupfile.h"
#include <stdbool.h>
-extern char *backupfile_internal (char const *, enum backup_type, bool);
+extern char *backupfile_internal (int, char const *, enum backup_type, bool);
diff --git a/gnu/backupfile.c b/gnu/backupfile.c
index 22f54d3322568199b9f26ae5c1d22e00877f2e87..254c086145f0c0dddda97c649ecf2f8c2784eae3 100644
--- a/gnu/backupfile.c
+++ b/gnu/backupfile.c
@@ -1,6 +1,6 @@
/* backupfile.c -- make Emacs style backup file names
- Copyright (C) 1990-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1990-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,20 +23,26 @@
#include "backup-internal.h"
#include "dirname.h"
-#include "renameat2.h"
+#include "opendirat.h"
+#include "renameatu.h"
#include "xalloc-oversized.h"
-#include <fcntl.h>
#include <errno.h>
+#include <fcntl.h>
#include <stdbool.h>
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-
-#include <limits.h>
-
#include <unistd.h>
-#include "dirent--.h"
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+# define FALLTHROUGH ((void) 0)
+# else
+# define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
+
#ifndef _D_EXACT_NAMLEN
# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name)
#endif
@@ -48,9 +54,6 @@
#ifndef _POSIX_NAME_MAX
# define _POSIX_NAME_MAX 14
#endif
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
#if defined _XOPEN_NAME_MAX
# define NAME_MAX_MINIMUM _XOPEN_NAME_MAX
@@ -92,10 +95,15 @@ set_simple_backup_suffix (char const *s)
/* If FILE (which was of length FILELEN before an extension was
appended to it) is too long, replace the extension with the single
char E. If the result is still too long, remove the char just
- before E. */
+ before E.
+
+ If DIR_FD is nonnegative, it is a file descriptor for FILE's parent.
+ *NAME_MAX is either 0, or the cached result of a previous call for
+ FILE's parent's _PC_NAME_MAX. */
static void
-check_extension (char *file, size_t filelen, char e)
+check_extension (char *file, size_t filelen, char e,
+ int dir_fd, size_t *base_max)
{
char *base = last_component (file);
size_t baselen = base_len (base);
@@ -104,22 +112,34 @@ check_extension (char *file, size_t filelen, char e)
if (HAVE_DOS_FILE_NAMES || NAME_MAX_MINIMUM < baselen)
{
/* The new base name is long enough to require a pathconf check. */
- long name_max;
-
- /* Temporarily modify the buffer into its parent directory name,
- invoke pathconf on the directory, and then restore the buffer. */
- char tmp[sizeof "."];
- memcpy (tmp, base, sizeof ".");
- strcpy (base, ".");
- errno = 0;
- name_max = pathconf (file, _PC_NAME_MAX);
- if (0 <= name_max || errno == 0)
+ if (*base_max == 0)
{
- long size = baselen_max = name_max;
- if (name_max != size)
- baselen_max = SIZE_MAX;
+ long name_max;
+ if (dir_fd < 0)
+ {
+ /* Temporarily modify the buffer into its parent
+ directory name, invoke pathconf on the directory, and
+ then restore the buffer. */
+ char tmp[sizeof "."];
+ memcpy (tmp, base, sizeof ".");
+ strcpy (base, ".");
+ errno = 0;
+ name_max = pathconf (file, _PC_NAME_MAX);
+ name_max -= !errno;
+ memcpy (base, tmp, sizeof ".");
+ }
+ else
+ {
+ errno = 0;
+ name_max = fpathconf (dir_fd, _PC_NAME_MAX);
+ name_max -= !errno;
+ }
+
+ *base_max = (0 <= name_max && name_max <= SIZE_MAX ? name_max
+ : name_max < -1 ? NAME_MAX_MINIMUM : SIZE_MAX);
}
- memcpy (base, tmp, sizeof ".");
+
+ baselen_max = *base_max;
}
if (HAVE_DOS_FILE_NAMES && baselen_max <= 12)
@@ -167,8 +187,9 @@ enum numbered_backup_result
BACKUP_NOMEM
};
-/* *BUFFER contains a file name. Store into *BUFFER the next backup
- name for the named file, with a version number greater than all the
+/* Relative to DIR_FD, *BUFFER contains a file name.
+ Store into *BUFFER the next backup name for the named file,
+ with a version number greater than all the
existing numbered backups. Reallocate *BUFFER as necessary; its
initial allocated size is BUFFER_SIZE, which must be at least 4
bytes longer than the file name to make room for the initially
@@ -180,11 +201,11 @@ enum numbered_backup_result
*DIRPP is the destination directory. If *DIRPP is null, open the
destination directory and store the resulting stream into *DIRPP
- without closing the stream. */
+ and its file descriptor into *PNEW_FD without closing the stream. */
static enum numbered_backup_result
-numbered_backup (char **buffer, size_t buffer_size, size_t filelen,
- ptrdiff_t base_offset, DIR **dirpp)
+numbered_backup (int dir_fd, char **buffer, size_t buffer_size, size_t filelen,
+ ptrdiff_t base_offset, DIR **dirpp, int *pnew_fd)
{
enum numbered_backup_result result = BACKUP_IS_NEW;
DIR *dirp = *dirpp;
@@ -203,7 +224,7 @@ numbered_backup (char **buffer, size_t buffer_size, size_t filelen,
char tmp[sizeof "."];
memcpy (tmp, base, sizeof ".");
strcpy (base, ".");
- dirp = opendir (buf);
+ dirp = opendirat (dir_fd, buf, 0, pnew_fd);
if (!dirp && errno == ENOMEM)
result = BACKUP_NOMEM;
memcpy (base, tmp, sizeof ".");
@@ -283,13 +304,15 @@ numbered_backup (char **buffer, size_t buffer_size, size_t filelen,
return result;
}
-/* Return the name of the new backup file for the existing file FILE,
- allocated with malloc. If RENAME, also rename FILE to the new name.
+/* Relative to DIR_FD, return the name of the new backup file for the
+ existing file FILE, allocated with malloc.
+ If RENAME, also rename FILE to the new name.
On failure, return NULL and set errno.
Do not call this function if backup_type == no_backups. */
char *
-backupfile_internal (char const *file, enum backup_type backup_type, bool rename)
+backupfile_internal (int dir_fd, char const *file,
+ enum backup_type backup_type, bool rename)
{
ptrdiff_t base_offset = last_component (file) - file;
size_t filelen = base_offset + strlen (file + base_offset);
@@ -311,6 +334,8 @@ backupfile_internal (char const *file, enum backup_type backup_type, bool rename
return s;
DIR *dirp = NULL;
+ int sdir = -1;
+ size_t base_max = 0;
while (true)
{
memcpy (s, file, filelen + 1);
@@ -318,7 +343,8 @@ backupfile_internal (char const *file, enum backup_type backup_type, bool rename
if (backup_type == simple_backups)
memcpy (s + filelen, simple_backup_suffix, simple_backup_suffix_size);
else
- switch (numbered_backup (&s, ssize, filelen, base_offset, &dirp))
+ switch (numbered_backup (dir_fd, &s, ssize, filelen, base_offset,
+ &dirp, &sdir))
{
case BACKUP_IS_SAME_LENGTH:
break;
@@ -330,11 +356,9 @@ backupfile_internal (char const *file, enum backup_type backup_type, bool rename
memcpy (s + filelen, simple_backup_suffix,
simple_backup_suffix_size);
}
- check_extension (s, filelen, '~');
- break;
-
+ FALLTHROUGH;
case BACKUP_IS_LONGER:
- check_extension (s, filelen, '~');
+ check_extension (s, filelen, '~', sdir, &base_max);
break;
case BACKUP_NOMEM:
@@ -346,14 +370,13 @@ backupfile_internal (char const *file, enum backup_type backup_type, bool rename
if (! rename)
break;
- int sdir = dirp ? dirfd (dirp) : -1;
if (sdir < 0)
{
sdir = AT_FDCWD;
base_offset = 0;
}
unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
- if (renameat2 (AT_FDCWD, file, sdir, s + base_offset, flags) == 0)
+ if (renameatu (AT_FDCWD, file, sdir, s + base_offset, flags) == 0)
break;
int e = errno;
if (e != EEXIST)
diff --git a/gnu/backupfile.h b/gnu/backupfile.h
index c1c51c16c6106aff2ac70ff58f80328c51894bb3..beb968547b927179ed0b9a35a7eb7f5a1a54ed31 100644
--- a/gnu/backupfile.h
+++ b/gnu/backupfile.h
@@ -1,6 +1,6 @@
/* backupfile.h -- declarations for making Emacs style backup file names
- Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2017 Free Software
+ Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -17,11 +17,13 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. */
#ifndef BACKUPFILE_H_
-# define BACKUPFILE_H_
+#define BACKUPFILE_H_
-# ifdef __cplusplus
+#include <fcntl.h>
+
+#ifdef __cplusplus
extern "C" {
-# endif
+#endif
/* When to make backup files. */
@@ -41,21 +43,20 @@ enum backup_type
numbered_backups
};
-# define VALID_BACKUP_TYPE(Type) \
+#define VALID_BACKUP_TYPE(Type) \
((unsigned int) (Type) <= numbered_backups)
extern char const *simple_backup_suffix;
void set_simple_backup_suffix (char const *);
-char *backup_file_rename (char const *, enum backup_type);
-char *find_backup_file_name (char const *, enum backup_type);
+char *backup_file_rename (int, char const *, enum backup_type);
+char *find_backup_file_name (int, char const *, enum backup_type);
enum backup_type get_version (char const *context, char const *arg);
enum backup_type xget_version (char const *context, char const *arg);
-void addext (char *, char const *, int);
-# ifdef __cplusplus
+#ifdef __cplusplus
}
-# endif
+#endif
#endif /* ! BACKUPFILE_H_ */
diff --git a/gnu/basename-lgpl.c b/gnu/basename-lgpl.c
index e760df00d7f2b8b5f10ec05386e05473267d458f..0ae04ee5722bc7c9405e13e3ac09a4491e9d3afd 100644
--- a/gnu/basename-lgpl.c
+++ b/gnu/basename-lgpl.c
@@ -1,6 +1,6 @@
/* basename.c -- return the last element in a file name
- Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software
+ Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/basename.c b/gnu/basename.c
index 8ed46f23dc770329fcee6dfbd66cd1c528f99fd1..1b6e0ea59bd7edff75fcbd5b6769a81a8050ad95 100644
--- a/gnu/basename.c
+++ b/gnu/basename.c
@@ -1,6 +1,6 @@
/* basename.c -- return the last element in a file name
- Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software
+ Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/bitrotate.h b/gnu/bitrotate.h
index 1e25f753fbd85ea98e6974aa64439b03664c092c..862331e204b2611db52dbd2939845e8b4feea3b1 100644
--- a/gnu/bitrotate.h
+++ b/gnu/bitrotate.h
@@ -1,5 +1,5 @@
/* bitrotate.h - Rotate bits in integers
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/btowc.c b/gnu/btowc.c
index fa908b41d81fc9816dd32086b4723c6fc0ab84fa..9e2496d40212327f8b1589062266d857904de789 100644
--- a/gnu/btowc.c
+++ b/gnu/btowc.c
@@ -1,5 +1,5 @@
/* Convert unibyte character to wide character.
- Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2010-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/c++defs.h b/gnu/c++defs.h
index 09dcd3e0687114f52a47dd304b200b9775d7e252..87d0716723eefca93d243b6097ad9a8b8a485650 100644
--- a/gnu/c++defs.h
+++ b/gnu/c++defs.h
@@ -1,5 +1,5 @@
/* C++ compatible function declaration macros.
- Copyright (C) 2010-2017 Free Software Foundation, Inc.
+ Copyright (C) 2010-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
diff --git a/gnu/c-ctype.h b/gnu/c-ctype.h
index 9ad3c18d471778828efa40ea68e4ae26f97cbf10..4d521763843f3a82d940b33046bdb55ae4dad7ad 100644
--- a/gnu/c-ctype.h
+++ b/gnu/c-ctype.h
@@ -5,7 +5,7 @@
<ctype.h> functions' behaviour depends on the current locale set via
setlocale.
- Copyright (C) 2000-2003, 2006, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003, 2006, 2008-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/c-strcase.h b/gnu/c-strcase.h
index 220d21d34ec207d707f4c241bd67c7fc2a089fe7..b67c9b5da0e35146e23862dfc8c46fd1edd7089b 100644
--- a/gnu/c-strcase.h
+++ b/gnu/c-strcase.h
@@ -1,5 +1,5 @@
/* Case-insensitive string comparison functions in C locale.
- Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2017 Free Software
+ Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2019 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/c-strcasecmp.c b/gnu/c-strcasecmp.c
index b2880a2e6c7de6896993b4fa9683170ea60bc8e4..ec50f1abe763d51530a95795b86ff19e87763a09 100644
--- a/gnu/c-strcasecmp.c
+++ b/gnu/c-strcasecmp.c
@@ -1,5 +1,5 @@
/* c-strcasecmp.c -- case insensitive string comparator in C locale
- Copyright (C) 1998-1999, 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/c-strcaseeq.h b/gnu/c-strcaseeq.h
index 1f70e265c009083de41f4670eb2dad826223e78d..bcc81fc388dbe8555291c8ca7884e941c3049a61 100644
--- a/gnu/c-strcaseeq.h
+++ b/gnu/c-strcaseeq.h
@@ -1,5 +1,5 @@
/* Optimized case-insensitive string comparison in C locale.
- Copyright (C) 2001-2002, 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
diff --git a/gnu/c-strncasecmp.c b/gnu/c-strncasecmp.c
index 982e17915bc29a540a3c59fbe2e28a5e6caa1d3b..513c353f6c289be3428b363600f861cf04be6671 100644
--- a/gnu/c-strncasecmp.c
+++ b/gnu/c-strncasecmp.c
@@ -1,5 +1,5 @@
/* c-strncasecmp.c -- case insensitive string comparator in C locale
- Copyright (C) 1998-1999, 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/canonicalize-lgpl.c b/gnu/canonicalize-lgpl.c
index cd3396dbd2c3d20ce87331e24b8b302cded21482..4d1be6dc24b4d0a1f8005fb2d80597d33c6d2b93 100644
--- a/gnu/canonicalize-lgpl.c
+++ b/gnu/canonicalize-lgpl.c
@@ -1,5 +1,5 @@
/* Return the canonical absolute name of a given file.
- Copyright (C) 1996-2017 Free Software Foundation, Inc.
+ Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@ -95,7 +95,7 @@
static void
alloc_failed (void)
{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* Avoid errno problem without using the malloc or realloc modules; see:
https://lists.gnu.org/r/bug-gnulib/2016-08/msg00025.html */
errno = ENOMEM;
diff --git a/gnu/careadlinkat.c b/gnu/careadlinkat.c
index e2af54f0984604a7370e0389ae109d69a8dea563..e56d5030856ed3ed504ace8c02ba4eb96cd6fdf3 100644
--- a/gnu/careadlinkat.c
+++ b/gnu/careadlinkat.c
@@ -1,6 +1,6 @@
/* Read symbolic links into a buffer without size limitation, relative to fd.
- Copyright (C) 2001, 2003-2004, 2007, 2009-2017 Free Software Foundation,
+ Copyright (C) 2001, 2003-2004, 2007, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/careadlinkat.h b/gnu/careadlinkat.h
index d436c691eaa91bb1aa3bdd7430c7a8cb61b81554..68b69aa88939fba5498d8a46e5c31da690cb13b9 100644
--- a/gnu/careadlinkat.h
+++ b/gnu/careadlinkat.h
@@ -1,6 +1,6 @@
/* Read symbolic links into a buffer without size limitation, relative to fd.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/cdefs.h b/gnu/cdefs.h
new file mode 100644
index 0000000000000000000000000000000000000000..f7a106440640d114f9cc4e1c4bb444e2b301c22b
--- /dev/null
+++ b/gnu/cdefs.h
@@ -0,0 +1,514 @@
+/* Copyright (C) 1992-2019 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_CDEFS_H
+#define _SYS_CDEFS_H 1
+
+/* We are almost always included from features.h. */
+#ifndef _FEATURES_H
+# include <features.h>
+#endif
+
+/* The GNU libc does not support any K&R compilers or the traditional mode
+ of ISO C compilers anymore. Check for some of the combinations not
+ anymore supported. */
+#if defined __GNUC__ && !defined __STDC__
+# error "You need a ISO C conforming compiler to use the glibc headers"
+#endif
+
+/* Some user header file might have defined this before. */
+#undef __P
+#undef __PMT
+
+#ifdef __GNUC__
+
+/* All functions, except those with callbacks or those that
+ synchronize memory, are leaf functions. */
+# if __GNUC_PREREQ (4, 6) && !defined _LIBC
+# define __LEAF , __leaf__
+# define __LEAF_ATTR __attribute__ ((__leaf__))
+# else
+# define __LEAF
+# define __LEAF_ATTR
+# endif
+
+/* GCC can always grok prototypes. For C++ programs we add throw()
+ to help it optimize the function calls. But this works only with
+ gcc 2.8.x and egcs. For gcc 3.2 and up we even mark C functions
+ as non-throwing using a function attribute since programs can use
+ the -fexceptions options for C code as well. */
+# if !defined __cplusplus && __GNUC_PREREQ (3, 3)
+# define __THROW __attribute__ ((__nothrow__ __LEAF))
+# define __THROWNL __attribute__ ((__nothrow__))
+# define __NTH(fct) __attribute__ ((__nothrow__ __LEAF)) fct
+# define __NTHNL(fct) __attribute__ ((__nothrow__)) fct
+# else
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+# define __THROW throw ()
+# define __THROWNL throw ()
+# define __NTH(fct) __LEAF_ATTR fct throw ()
+# define __NTHNL(fct) fct throw ()
+# else
+# define __THROW
+# define __THROWNL
+# define __NTH(fct) fct
+# define __NTHNL(fct) fct
+# endif
+# endif
+
+#else /* Not GCC. */
+
+# if (defined __cplusplus \
+ || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+# define __inline inline
+# else
+# define __inline /* No inline functions. */
+# endif
+
+# define __THROW
+# define __THROWNL
+# define __NTH(fct) fct
+
+#endif /* GCC. */
+
+/* Compilers that are not clang may object to
+ #if defined __clang__ && __has_extension(...)
+ even though they do not need to evaluate the right-hand side of the &&. */
+#if defined __clang__ && defined __has_extension
+# define __glibc_clang_has_extension(ext) __has_extension (ext)
+#else
+# define __glibc_clang_has_extension(ext) 0
+#endif
+
+/* These two macros are not used in glibc anymore. They are kept here
+ only because some other projects expect the macros to be defined. */
+#define __P(args) args
+#define __PMT(args) args
+
+/* For these things, GCC behaves the ANSI way normally,
+ and the non-ANSI way under -traditional. */
+
+#define __CONCAT(x,y) x ## y
+#define __STRING(x) #x
+
+/* This is not a typedef so `const __ptr_t' does the right thing. */
+#define __ptr_t void *
+
+
+/* C++ needs to know that types and declarations are C, not C++. */
+#ifdef __cplusplus
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+#else
+# define __BEGIN_DECLS
+# define __END_DECLS
+#endif
+
+
+/* Fortify support. */
+#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
+#define __bos0(ptr) __builtin_object_size (ptr, 0)
+
+#if __GNUC_PREREQ (4,3)
+# define __warndecl(name, msg) \
+ extern void name (void) __attribute__((__warning__ (msg)))
+# define __warnattr(msg) __attribute__((__warning__ (msg)))
+# define __errordecl(name, msg) \
+ extern void name (void) __attribute__((__error__ (msg)))
+#else
+# define __warndecl(name, msg) extern void name (void)
+# define __warnattr(msg)
+# define __errordecl(name, msg) extern void name (void)
+#endif
+
+/* Support for flexible arrays.
+ Headers that should use flexible arrays only if they're "real"
+ (e.g. only if they won't affect sizeof()) should test
+ #if __glibc_c99_flexarr_available. */
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined __HP_cc
+# define __flexarr []
+# define __glibc_c99_flexarr_available 1
+#elif __GNUC_PREREQ (2,97)
+/* GCC 2.97 supports C99 flexible array members as an extension,
+ even when in C89 mode or compiling C++ (any version). */
+# define __flexarr []
+# define __glibc_c99_flexarr_available 1
+#elif defined __GNUC__
+/* Pre-2.97 GCC did not support C99 flexible arrays but did have
+ an equivalent extension with slightly different notation. */
+# define __flexarr [0]
+# define __glibc_c99_flexarr_available 1
+#else
+/* Some other non-C99 compiler. Approximate with [1]. */
+# define __flexarr [1]
+# define __glibc_c99_flexarr_available 0
+#endif
+
+
+/* __asm__ ("xyz") is used throughout the headers to rename functions
+ at the assembly language level. This is wrapped by the __REDIRECT
+ macro, in order to support compilers that can do this some other
+ way. When compilers don't support asm-names at all, we have to do
+ preprocessor tricks instead (which don't have exactly the right
+ semantics, but it's the best we can do).
+
+ Example:
+ int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid); */
+
+#if defined __GNUC__ && __GNUC__ >= 2
+
+# define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
+# ifdef __cplusplus
+# define __REDIRECT_NTH(name, proto, alias) \
+ name proto __THROW __asm__ (__ASMNAME (#alias))
+# define __REDIRECT_NTHNL(name, proto, alias) \
+ name proto __THROWNL __asm__ (__ASMNAME (#alias))
+# else
+# define __REDIRECT_NTH(name, proto, alias) \
+ name proto __asm__ (__ASMNAME (#alias)) __THROW
+# define __REDIRECT_NTHNL(name, proto, alias) \
+ name proto __asm__ (__ASMNAME (#alias)) __THROWNL
+# endif
+# define __ASMNAME(cname) __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
+# define __ASMNAME2(prefix, cname) __STRING (prefix) cname
+
+/*
+#elif __SOME_OTHER_COMPILER__
+
+# define __REDIRECT(name, proto, alias) name proto; \
+ _Pragma("let " #name " = " #alias)
+*/
+#endif
+
+/* GCC has various useful declarations that can be made with the
+ `__attribute__' syntax. All of the ways we use this do fine if
+ they are omitted for compilers that don't understand it. */
+#if !defined __GNUC__ || __GNUC__ < 2
+# define __attribute__(xyz) /* Ignore */
+#endif
+
+/* At some point during the gcc 2.96 development the `malloc' attribute
+ for functions was introduced. We don't want to use it unconditionally
+ (although this would be possible) since it generates warnings. */
+#if __GNUC_PREREQ (2,96)
+# define __attribute_malloc__ __attribute__ ((__malloc__))
+#else
+# define __attribute_malloc__ /* Ignore */
+#endif
+
+/* Tell the compiler which arguments to an allocation function
+ indicate the size of the allocation. */
+#if __GNUC_PREREQ (4, 3)
+# define __attribute_alloc_size__(params) \
+ __attribute__ ((__alloc_size__ params))
+#else
+# define __attribute_alloc_size__(params) /* Ignore. */
+#endif
+
+/* At some point during the gcc 2.96 development the `pure' attribute
+ for functions was introduced. We don't want to use it unconditionally
+ (although this would be possible) since it generates warnings. */
+#if __GNUC_PREREQ (2,96)
+# define __attribute_pure__ __attribute__ ((__pure__))
+#else
+# define __attribute_pure__ /* Ignore */
+#endif
+
+/* This declaration tells the compiler that the value is constant. */
+#if __GNUC_PREREQ (2,5)
+# define __attribute_const__ __attribute__ ((__const__))
+#else
+# define __attribute_const__ /* Ignore */
+#endif
+
+/* At some point during the gcc 3.1 development the `used' attribute
+ for functions was introduced. We don't want to use it unconditionally
+ (although this would be possible) since it generates warnings. */
+#if __GNUC_PREREQ (3,1)
+# define __attribute_used__ __attribute__ ((__used__))
+# define __attribute_noinline__ __attribute__ ((__noinline__))
+#else
+# define __attribute_used__ __attribute__ ((__unused__))
+# define __attribute_noinline__ /* Ignore */
+#endif
+
+/* Since version 3.2, gcc allows marking deprecated functions. */
+#if __GNUC_PREREQ (3,2)
+# define __attribute_deprecated__ __attribute__ ((__deprecated__))
+#else
+# define __attribute_deprecated__ /* Ignore */
+#endif
+
+/* Since version 4.5, gcc also allows one to specify the message printed
+ when a deprecated function is used. clang claims to be gcc 4.2, but
+ may also support this feature. */
+#if __GNUC_PREREQ (4,5) || \
+ __glibc_clang_has_extension (__attribute_deprecated_with_message__)
+# define __attribute_deprecated_msg__(msg) \
+ __attribute__ ((__deprecated__ (msg)))
+#else
+# define __attribute_deprecated_msg__(msg) __attribute_deprecated__
+#endif
+
+/* At some point during the gcc 2.8 development the `format_arg' attribute
+ for functions was introduced. We don't want to use it unconditionally
+ (although this would be possible) since it generates warnings.
+ If several `format_arg' attributes are given for the same function, in
+ gcc-3.0 and older, all but the last one are ignored. In newer gccs,
+ all designated arguments are considered. */
+#if __GNUC_PREREQ (2,8)
+# define __attribute_format_arg__(x) __attribute__ ((__format_arg__ (x)))
+#else
+# define __attribute_format_arg__(x) /* Ignore */
+#endif
+
+/* At some point during the gcc 2.97 development the `strfmon' format
+ attribute for functions was introduced. We don't want to use it
+ unconditionally (although this would be possible) since it
+ generates warnings. */
+#if __GNUC_PREREQ (2,97)
+# define __attribute_format_strfmon__(a,b) \
+ __attribute__ ((__format__ (__strfmon__, a, b)))
+#else
+# define __attribute_format_strfmon__(a,b) /* Ignore */
+#endif
+
+/* The nonnull function attribute marks pointer parameters that
+ must not be NULL. Do not define __nonnull if it is already defined,
+ for portability when this file is used in Gnulib. */
+#ifndef __nonnull
+# if __GNUC_PREREQ (3,3)
+# define __nonnull(params) __attribute__ ((__nonnull__ params))
+# else
+# define __nonnull(params)
+# endif
+#endif
+
+/* If fortification mode, we warn about unused results of certain
+ function calls which can lead to problems. */
+#if __GNUC_PREREQ (3,4)
+# define __attribute_warn_unused_result__ \
+ __attribute__ ((__warn_unused_result__))
+# if defined __USE_FORTIFY_LEVEL && __USE_FORTIFY_LEVEL > 0
+# define __wur __attribute_warn_unused_result__
+# endif
+#else
+# define __attribute_warn_unused_result__ /* empty */
+#endif
+#ifndef __wur
+# define __wur /* Ignore */
+#endif
+
+/* Forces a function to be always inlined. */
+#if __GNUC_PREREQ (3,2)
+/* The Linux kernel defines __always_inline in stddef.h (283d7573), and
+ it conflicts with this definition. Therefore undefine it first to
+ allow either header to be included first. */
+# undef __always_inline
+# define __always_inline __inline __attribute__ ((__always_inline__))
+#else
+# undef __always_inline
+# define __always_inline __inline
+#endif
+
+/* Associate error messages with the source location of the call site rather
+ than with the source location inside the function. */
+#if __GNUC_PREREQ (4,3)
+# define __attribute_artificial__ __attribute__ ((__artificial__))
+#else
+# define __attribute_artificial__ /* Ignore */
+#endif
+
+/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+ inline semantics, unless -fgnu89-inline is used. Using __GNUC_STDC_INLINE__
+ or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
+ older than 4.3 may define these macros and still not guarantee GNU inlining
+ semantics.
+
+ clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+ semantics, that can be checked fot by using the __GNUC_STDC_INLINE_ and
+ __GNUC_GNU_INLINE__ macro definitions. */
+#if (!defined __cplusplus || __GNUC_PREREQ (4,3) \
+ || (defined __clang__ && (defined __GNUC_STDC_INLINE__ \
+ || defined __GNUC_GNU_INLINE__)))
+# if defined __GNUC_STDC_INLINE__ || defined __cplusplus
+# define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
+# define __extern_always_inline \
+ extern __always_inline __attribute__ ((__gnu_inline__))
+# else
+# define __extern_inline extern __inline
+# define __extern_always_inline extern __always_inline
+# endif
+#endif
+
+#ifdef __extern_always_inline
+# define __fortify_function __extern_always_inline __attribute_artificial__
+#endif
+
+/* GCC 4.3 and above allow passing all anonymous arguments of an
+ __extern_always_inline function to some other vararg function. */
+#if __GNUC_PREREQ (4,3)
+# define __va_arg_pack() __builtin_va_arg_pack ()
+# define __va_arg_pack_len() __builtin_va_arg_pack_len ()
+#endif
+
+/* It is possible to compile containing GCC extensions even if GCC is
+ run in pedantic mode if the uses are carefully marked using the
+ `__extension__' keyword. But this is not generally available before
+ version 2.8. */
+#if !__GNUC_PREREQ (2,8)
+# define __extension__ /* Ignore */
+#endif
+
+/* __restrict is known in EGCS 1.2 and above. */
+#if !__GNUC_PREREQ (2,92)
+# if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+# define __restrict restrict
+# else
+# define __restrict /* Ignore */
+# endif
+#endif
+
+/* ISO C99 also allows to declare arrays as non-overlapping. The syntax is
+ array_name[restrict]
+ GCC 3.1 supports this. */
+#if __GNUC_PREREQ (3,1) && !defined __GNUG__
+# define __restrict_arr __restrict
+#else
+# ifdef __GNUC__
+# define __restrict_arr /* Not supported in old GCC. */
+# else
+# if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+# define __restrict_arr restrict
+# else
+/* Some other non-C99 compiler. */
+# define __restrict_arr /* Not supported. */
+# endif
+# endif
+#endif
+
+#if __GNUC__ >= 3
+# define __glibc_unlikely(cond) __builtin_expect ((cond), 0)
+# define __glibc_likely(cond) __builtin_expect ((cond), 1)
+#else
+# define __glibc_unlikely(cond) (cond)
+# define __glibc_likely(cond) (cond)
+#endif
+
+#ifdef __has_attribute
+# define __glibc_has_attribute(attr) __has_attribute (attr)
+#else
+# define __glibc_has_attribute(attr) 0
+#endif
+
+#if (!defined _Noreturn \
+ && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \
+ && !__GNUC_PREREQ (4,7))
+# if __GNUC_PREREQ (2,8)
+# define _Noreturn __attribute__ ((__noreturn__))
+# else
+# define _Noreturn
+# endif
+#endif
+
+#if __GNUC_PREREQ (8, 0)
+/* Describes a char array whose address can safely be passed as the first
+ argument to strncpy and strncat, as the char array is not necessarily
+ a NUL-terminated string. */
+# define __attribute_nonstring__ __attribute__ ((__nonstring__))
+#else
+# define __attribute_nonstring__
+#endif
+
+#if (!defined _Static_assert && !defined __cplusplus \
+ && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \
+ && (!__GNUC_PREREQ (4, 6) || defined __STRICT_ANSI__))
+# define _Static_assert(expr, diagnostic) \
+ extern int (*__Static_assert_function (void)) \
+ [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })]
+#endif
+
+/* The #ifndef lets Gnulib avoid including these on non-glibc
+ platforms, where the includes typically do not exist. */
+#ifndef __WORDSIZE
+# include <bits/wordsize.h>
+# include <bits/long-double.h>
+#endif
+
+#if defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH
+# define __LDBL_COMPAT 1
+# ifdef __REDIRECT
+# define __LDBL_REDIR1(name, proto, alias) __REDIRECT (name, proto, alias)
+# define __LDBL_REDIR(name, proto) \
+ __LDBL_REDIR1 (name, proto, __nldbl_##name)
+# define __LDBL_REDIR1_NTH(name, proto, alias) __REDIRECT_NTH (name, proto, alias)
+# define __LDBL_REDIR_NTH(name, proto) \
+ __LDBL_REDIR1_NTH (name, proto, __nldbl_##name)
+# define __LDBL_REDIR1_DECL(name, alias) \
+ extern __typeof (name) name __asm (__ASMNAME (#alias));
+# define __LDBL_REDIR_DECL(name) \
+ extern __typeof (name) name __asm (__ASMNAME ("__nldbl_" #name));
+# define __REDIRECT_LDBL(name, proto, alias) \
+ __LDBL_REDIR1 (name, proto, __nldbl_##alias)
+# define __REDIRECT_NTH_LDBL(name, proto, alias) \
+ __LDBL_REDIR1_NTH (name, proto, __nldbl_##alias)
+# endif
+#endif
+#if !defined __LDBL_COMPAT || !defined __REDIRECT
+# define __LDBL_REDIR1(name, proto, alias) name proto
+# define __LDBL_REDIR(name, proto) name proto
+# define __LDBL_REDIR1_NTH(name, proto, alias) name proto __THROW
+# define __LDBL_REDIR_NTH(name, proto) name proto __THROW
+# define __LDBL_REDIR_DECL(name)
+# ifdef __REDIRECT
+# define __REDIRECT_LDBL(name, proto, alias) __REDIRECT (name, proto, alias)
+# define __REDIRECT_NTH_LDBL(name, proto, alias) \
+ __REDIRECT_NTH (name, proto, alias)
+# endif
+#endif
+
+/* __glibc_macro_warning (MESSAGE) issues warning MESSAGE. This is
+ intended for use in preprocessor macros.
+
+ Note: MESSAGE must be a _single_ string; concatenation of string
+ literals is not supported. */
+#if __GNUC_PREREQ (4,8) || __glibc_clang_prereq (3,5)
+# define __glibc_macro_warning1(message) _Pragma (#message)
+# define __glibc_macro_warning(message) \
+ __glibc_macro_warning1 (GCC warning message)
+#else
+# define __glibc_macro_warning(msg)
+#endif
+
+/* Generic selection (ISO C11) is a C-only feature, available in GCC
+ since version 4.9. Previous versions do not provide generic
+ selection, even though they might set __STDC_VERSION__ to 201112L,
+ when in -std=c11 mode. Thus, we must check for !defined __GNUC__
+ when testing __STDC_VERSION__ for generic selection support.
+ On the other hand, Clang also defines __GNUC__, so a clang-specific
+ check is required to enable the use of generic selection. */
+#if !defined __cplusplus \
+ && (__GNUC_PREREQ (4, 9) \
+ || __glibc_clang_has_extension (c_generic_selections) \
+ || (!defined __GNUC__ && defined __STDC_VERSION__ \
+ && __STDC_VERSION__ >= 201112L))
+# define __HAVE_GENERIC_SELECTION 1
+#else
+# define __HAVE_GENERIC_SELECTION 0
+#endif
+
+#endif /* sys/cdefs.h */
diff --git a/gnu/chdir-long.c b/gnu/chdir-long.c
index 7e2e63c966491395e0a7b2a74a242caae034ae75..febdf59d4ecf39c97befb407ac60b58eac40bb34 100644
--- a/gnu/chdir-long.c
+++ b/gnu/chdir-long.c
@@ -1,5 +1,5 @@
/* provide a chdir function that tries not to fail due to ENAMETOOLONG
- Copyright (C) 2004-2017 Free Software Foundation, Inc.
+ Copyright (C) 2004-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/chdir-long.h b/gnu/chdir-long.h
index 3acd70db07b5a6f2e40d21a598fdf6f15252dcc4..43259d1b271537cd78c96fcca3c4b6e3492f8b2c 100644
--- a/gnu/chdir-long.h
+++ b/gnu/chdir-long.h
@@ -1,5 +1,5 @@
/* provide a chdir function that tries not to fail due to ENAMETOOLONG
- Copyright (C) 2004-2005, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2004-2005, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/chown.c b/gnu/chown.c
index 37d1a1fba79caf05703031c7999ea82b6ffef327..fc73e778137aea71b97be3ce9784933f02574ea9 100644
--- a/gnu/chown.c
+++ b/gnu/chown.c
@@ -1,7 +1,7 @@
/* provide consistent interface to chown for systems that don't interpret
an ID of -1 as meaning "don't change the corresponding ID".
- Copyright (C) 1997, 2004-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2004-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/cloexec.c b/gnu/cloexec.c
index 2b67a0102e74b3a759f0c77578770bfcfcc1f2be..db425766a0e1e5d0248bdfae9c81cea709102d1f 100644
--- a/gnu/cloexec.c
+++ b/gnu/cloexec.c
@@ -1,6 +1,6 @@
/* cloexec.c - set or clear the close-on-exec descriptor flag
- Copyright (C) 1991, 2004-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1991, 2004-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/cloexec.h b/gnu/cloexec.h
index d937a40681741ea0e3ca764eb3da1f93d7b05775..06ad945d8e2aa272d082ac0b8971d8f8e83d0114 100644
--- a/gnu/cloexec.h
+++ b/gnu/cloexec.h
@@ -1,6 +1,6 @@
/* cloexec.c - set or clear the close-on-exec descriptor flag
- Copyright (C) 2004, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/close-stream.c b/gnu/close-stream.c
index 19707626fa282778515f7b85bde8ed01f9096da2..5458c4f29f36f30dfbea11238ba1b954d704b27b 100644
--- a/gnu/close-stream.c
+++ b/gnu/close-stream.c
@@ -1,6 +1,6 @@
/* Close a stream, with nicer error checking than fclose's.
- Copyright (C) 1998-2002, 2004, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-2002, 2004, 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/close.c b/gnu/close.c
index 5b6bd3c7de13d8743ad1ab24737f509a1e7ada2c..40ce845bc33315ac9473a6b34562b7ce9a94af84 100644
--- a/gnu/close.c
+++ b/gnu/close.c
@@ -1,5 +1,5 @@
/* close replacement.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/closedir.c b/gnu/closedir.c
index 6b5e78c6ea5866c11e2d2eebaabb4425a29d793b..017fb682ce99ca756c1ccfdbca6f0848a9f168e6 100644
--- a/gnu/closedir.c
+++ b/gnu/closedir.c
@@ -1,5 +1,5 @@
/* Stop reading the entries of a directory.
- Copyright (C) 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/closeout.c b/gnu/closeout.c
index 82cba4cd1af80e074f1748b758b320aff8d1da57..4a604ec35d4b2854580d2ff4d5d2c45fb16021a3 100644
--- a/gnu/closeout.c
+++ b/gnu/closeout.c
@@ -1,6 +1,6 @@
/* Close standard output and standard error, exiting with a diagnostic on error.
- Copyright (C) 1998-2002, 2004, 2006, 2008-2017 Free Software Foundation,
+ Copyright (C) 1998-2002, 2004, 2006, 2008-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/closeout.h b/gnu/closeout.h
index fff76f11126ab1a7390752e5316c6f1b30640d2a..ac89f760a952691e3705d06e7d89f9a88eedac63 100644
--- a/gnu/closeout.h
+++ b/gnu/closeout.h
@@ -1,6 +1,6 @@
/* Close standard output and standard error.
- Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2017 Free Software
+ Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/config.charset b/gnu/config.charset
deleted file mode 100644
index e017fed4b54daee4eceec711ac2e6fc9bbff4b8b..0000000000000000000000000000000000000000
--- a/gnu/config.charset
+++ /dev/null
@@ -1,682 +0,0 @@
-#! /bin/sh
-# Output a system dependent table of character encoding aliases.
-#
-# Copyright (C) 2000-2004, 2006-2017 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, see <https://www.gnu.org/licenses/>.
-#
-# The table consists of lines of the form
-# ALIAS CANONICAL
-#
-# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
-# ALIAS is compared in a case sensitive way.
-#
-# CANONICAL is the GNU canonical name for this character encoding.
-# It must be an encoding supported by libiconv. Support by GNU libc is
-# also desirable. CANONICAL is case insensitive. Usually an upper case
-# MIME charset name is preferred.
-# The current list of GNU canonical charset names is as follows.
-#
-# name MIME? used by which systems
-# (darwin = Mac OS X, woe32 = native Windows)
-#
-# ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin cygwin
-# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
-# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
-# ISO-8859-3 Y glibc solaris cygwin
-# ISO-8859-4 Y osf solaris freebsd netbsd openbsd darwin
-# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
-# ISO-8859-6 Y glibc aix hpux solaris cygwin
-# ISO-8859-7 Y glibc aix hpux irix osf solaris netbsd openbsd darwin cygwin
-# ISO-8859-8 Y glibc aix hpux osf solaris cygwin
-# ISO-8859-9 Y glibc aix hpux irix osf solaris darwin cygwin
-# ISO-8859-13 glibc netbsd openbsd darwin cygwin
-# ISO-8859-14 glibc cygwin
-# ISO-8859-15 glibc aix osf solaris freebsd netbsd openbsd darwin cygwin
-# KOI8-R Y glibc solaris freebsd netbsd openbsd darwin
-# KOI8-U Y glibc freebsd netbsd openbsd darwin cygwin
-# KOI8-T glibc
-# CP437 dos
-# CP775 dos
-# CP850 aix osf dos
-# CP852 dos
-# CP855 dos
-# CP856 aix
-# CP857 dos
-# CP861 dos
-# CP862 dos
-# CP864 dos
-# CP865 dos
-# CP866 freebsd netbsd openbsd darwin dos
-# CP869 dos
-# CP874 woe32 dos
-# CP922 aix
-# CP932 aix cygwin woe32 dos
-# CP943 aix
-# CP949 osf darwin woe32 dos
-# CP950 woe32 dos
-# CP1046 aix
-# CP1124 aix
-# CP1125 dos
-# CP1129 aix
-# CP1131 darwin
-# CP1250 woe32
-# CP1251 glibc solaris netbsd openbsd darwin cygwin woe32
-# CP1252 aix woe32
-# CP1253 woe32
-# CP1254 woe32
-# CP1255 glibc woe32
-# CP1256 woe32
-# CP1257 woe32
-# GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin
-# EUC-JP Y glibc aix hpux irix osf solaris freebsd netbsd darwin
-# EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin
-# EUC-TW glibc aix hpux irix osf solaris netbsd
-# BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin cygwin
-# BIG5-HKSCS glibc solaris darwin
-# GBK glibc aix osf solaris darwin cygwin woe32 dos
-# GB18030 glibc solaris netbsd darwin
-# SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin
-# JOHAB glibc solaris woe32
-# TIS-620 glibc aix hpux osf solaris cygwin
-# VISCII Y glibc
-# TCVN5712-1 glibc
-# ARMSCII-8 glibc darwin
-# GEORGIAN-PS glibc cygwin
-# PT154 glibc
-# HP-ROMAN8 hpux
-# HP-ARABIC8 hpux
-# HP-GREEK8 hpux
-# HP-HEBREW8 hpux
-# HP-TURKISH8 hpux
-# HP-KANA8 hpux
-# DEC-KANJI osf
-# DEC-HANYU osf
-# UTF-8 Y glibc aix hpux osf solaris netbsd darwin cygwin
-#
-# Note: Names which are not marked as being a MIME name should not be used in
-# Internet protocols for information interchange (mail, news, etc.).
-#
-# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
-# must understand both names and treat them as equivalent.
-#
-# The first argument passed to this file is the canonical host specification,
-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-
-host="$1"
-os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
-echo "# This file contains a table of character encoding aliases,"
-echo "# suitable for operating system '${os}'."
-echo "# It was automatically generated from config.charset."
-# List of references, updated during installation:
-echo "# Packages using this file: "
-case "$os" in
- linux-gnulibc1*)
- # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
- # localcharset.c falls back to using the full locale name
- # from the environment variables.
- echo "C ASCII"
- echo "POSIX ASCII"
- for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
- en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
- en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
- es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
- et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
- fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
- it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
- sv_FI sv_SE; do
- echo "$l ISO-8859-1"
- echo "$l.iso-8859-1 ISO-8859-1"
- echo "$l.iso-8859-15 ISO-8859-15"
- echo "$l.iso-8859-15@euro ISO-8859-15"
- echo "$l@euro ISO-8859-15"
- echo "$l.cp-437 CP437"
- echo "$l.cp-850 CP850"
- echo "$l.cp-1252 CP1252"
- echo "$l.cp-1252@euro CP1252"
- #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
- echo "$l.utf-8 UTF-8"
- echo "$l.utf-8@euro UTF-8"
- done
- for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
- sl_SI sr sr_CS sr_YU; do
- echo "$l ISO-8859-2"
- echo "$l.iso-8859-2 ISO-8859-2"
- echo "$l.cp-852 CP852"
- echo "$l.cp-1250 CP1250"
- echo "$l.utf-8 UTF-8"
- done
- for l in mk mk_MK ru ru_RU; do
- echo "$l ISO-8859-5"
- echo "$l.iso-8859-5 ISO-8859-5"
- echo "$l.koi8-r KOI8-R"
- echo "$l.cp-866 CP866"
- echo "$l.cp-1251 CP1251"
- echo "$l.utf-8 UTF-8"
- done
- for l in ar ar_SA; do
- echo "$l ISO-8859-6"
- echo "$l.iso-8859-6 ISO-8859-6"
- echo "$l.cp-864 CP864"
- #echo "$l.cp-868 CP868" # not a commonly used encoding
- echo "$l.cp-1256 CP1256"
- echo "$l.utf-8 UTF-8"
- done
- for l in el el_GR gr gr_GR; do
- echo "$l ISO-8859-7"
- echo "$l.iso-8859-7 ISO-8859-7"
- echo "$l.cp-869 CP869"
- echo "$l.cp-1253 CP1253"
- echo "$l.cp-1253@euro CP1253"
- echo "$l.utf-8 UTF-8"
- echo "$l.utf-8@euro UTF-8"
- done
- for l in he he_IL iw iw_IL; do
- echo "$l ISO-8859-8"
- echo "$l.iso-8859-8 ISO-8859-8"
- echo "$l.cp-862 CP862"
- echo "$l.cp-1255 CP1255"
- echo "$l.utf-8 UTF-8"
- done
- for l in tr tr_TR; do
- echo "$l ISO-8859-9"
- echo "$l.iso-8859-9 ISO-8859-9"
- echo "$l.cp-857 CP857"
- echo "$l.cp-1254 CP1254"
- echo "$l.utf-8 UTF-8"
- done
- for l in lt lt_LT lv lv_LV; do
- #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
- echo "$l ISO-8859-13"
- done
- for l in ru_UA uk uk_UA; do
- echo "$l KOI8-U"
- done
- for l in zh zh_CN; do
- #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
- echo "$l GB2312"
- done
- for l in ja ja_JP ja_JP.EUC; do
- echo "$l EUC-JP"
- done
- for l in ko ko_KR; do
- echo "$l EUC-KR"
- done
- for l in th th_TH; do
- echo "$l TIS-620"
- done
- for l in fa fa_IR; do
- #echo "$l ISIRI-3342" # a broken encoding
- echo "$l.utf-8 UTF-8"
- done
- ;;
- linux* | *-gnu*)
- # With glibc-2.1 or newer, we don't need any canonicalization,
- # because glibc has iconv and both glibc and libiconv support all
- # GNU canonical names directly. Therefore, the Makefile does not
- # need to install the alias file at all.
- # The following applies only to glibc-2.0.x and older libcs.
- echo "ISO_646.IRV:1983 ASCII"
- ;;
- aix*)
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-6 ISO-8859-6"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-8 ISO-8859-8"
- echo "ISO8859-9 ISO-8859-9"
- echo "ISO8859-15 ISO-8859-15"
- echo "IBM-850 CP850"
- echo "IBM-856 CP856"
- echo "IBM-921 ISO-8859-13"
- echo "IBM-922 CP922"
- echo "IBM-932 CP932"
- echo "IBM-943 CP943"
- echo "IBM-1046 CP1046"
- echo "IBM-1124 CP1124"
- echo "IBM-1129 CP1129"
- echo "IBM-1252 CP1252"
- echo "IBM-eucCN GB2312"
- echo "IBM-eucJP EUC-JP"
- echo "IBM-eucKR EUC-KR"
- echo "IBM-eucTW EUC-TW"
- echo "big5 BIG5"
- echo "GBK GBK"
- echo "TIS-620 TIS-620"
- echo "UTF-8 UTF-8"
- ;;
- hpux*)
- echo "iso88591 ISO-8859-1"
- echo "iso88592 ISO-8859-2"
- echo "iso88595 ISO-8859-5"
- echo "iso88596 ISO-8859-6"
- echo "iso88597 ISO-8859-7"
- echo "iso88598 ISO-8859-8"
- echo "iso88599 ISO-8859-9"
- echo "iso885915 ISO-8859-15"
- echo "roman8 HP-ROMAN8"
- echo "arabic8 HP-ARABIC8"
- echo "greek8 HP-GREEK8"
- echo "hebrew8 HP-HEBREW8"
- echo "turkish8 HP-TURKISH8"
- echo "kana8 HP-KANA8"
- echo "tis620 TIS-620"
- echo "big5 BIG5"
- echo "eucJP EUC-JP"
- echo "eucKR EUC-KR"
- echo "eucTW EUC-TW"
- echo "hp15CN GB2312"
- #echo "ccdc ?" # what is this?
- echo "SJIS SHIFT_JIS"
- echo "utf8 UTF-8"
- ;;
- irix*)
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-9 ISO-8859-9"
- echo "eucCN GB2312"
- echo "eucJP EUC-JP"
- echo "eucKR EUC-KR"
- echo "eucTW EUC-TW"
- ;;
- osf*)
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-4 ISO-8859-4"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-8 ISO-8859-8"
- echo "ISO8859-9 ISO-8859-9"
- echo "ISO8859-15 ISO-8859-15"
- echo "cp850 CP850"
- echo "big5 BIG5"
- echo "dechanyu DEC-HANYU"
- echo "dechanzi GB2312"
- echo "deckanji DEC-KANJI"
- echo "deckorean EUC-KR"
- echo "eucJP EUC-JP"
- echo "eucKR EUC-KR"
- echo "eucTW EUC-TW"
- echo "GBK GBK"
- echo "KSC5601 CP949"
- echo "sdeckanji EUC-JP"
- echo "SJIS SHIFT_JIS"
- echo "TACTIS TIS-620"
- echo "UTF-8 UTF-8"
- ;;
- solaris*)
- echo "646 ASCII"
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-3 ISO-8859-3"
- echo "ISO8859-4 ISO-8859-4"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-6 ISO-8859-6"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-8 ISO-8859-8"
- echo "ISO8859-9 ISO-8859-9"
- echo "ISO8859-15 ISO-8859-15"
- echo "koi8-r KOI8-R"
- echo "ansi-1251 CP1251"
- echo "BIG5 BIG5"
- echo "Big5-HKSCS BIG5-HKSCS"
- echo "gb2312 GB2312"
- echo "GBK GBK"
- echo "GB18030 GB18030"
- echo "cns11643 EUC-TW"
- echo "5601 EUC-KR"
- echo "ko_KR.johap92 JOHAB"
- echo "eucJP EUC-JP"
- echo "PCK SHIFT_JIS"
- echo "TIS620.2533 TIS-620"
- #echo "sun_eu_greek ?" # what is this?
- echo "UTF-8 UTF-8"
- ;;
- freebsd*)
- # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
- # localcharset.c falls back to using the full locale name
- # from the environment variables.
- echo "C ASCII"
- echo "US-ASCII ASCII"
- for l in la_LN lt_LN; do
- echo "$l.ASCII ASCII"
- done
- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
- lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
- echo "$l.ISO_8859-1 ISO-8859-1"
- echo "$l.DIS_8859-15 ISO-8859-15"
- done
- for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
- echo "$l.ISO_8859-2 ISO-8859-2"
- done
- for l in la_LN lt_LT; do
- echo "$l.ISO_8859-4 ISO-8859-4"
- done
- for l in ru_RU ru_SU; do
- echo "$l.KOI8-R KOI8-R"
- echo "$l.ISO_8859-5 ISO-8859-5"
- echo "$l.CP866 CP866"
- done
- echo "uk_UA.KOI8-U KOI8-U"
- echo "zh_TW.BIG5 BIG5"
- echo "zh_TW.Big5 BIG5"
- echo "zh_CN.EUC GB2312"
- echo "ja_JP.EUC EUC-JP"
- echo "ja_JP.SJIS SHIFT_JIS"
- echo "ja_JP.Shift_JIS SHIFT_JIS"
- echo "ko_KR.EUC EUC-KR"
- ;;
- netbsd*)
- echo "646 ASCII"
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-4 ISO-8859-4"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-13 ISO-8859-13"
- echo "ISO8859-15 ISO-8859-15"
- echo "eucCN GB2312"
- echo "eucJP EUC-JP"
- echo "eucKR EUC-KR"
- echo "eucTW EUC-TW"
- echo "BIG5 BIG5"
- echo "SJIS SHIFT_JIS"
- ;;
- openbsd*)
- echo "646 ASCII"
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-4 ISO-8859-4"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-13 ISO-8859-13"
- echo "ISO8859-15 ISO-8859-15"
- ;;
- darwin[56]*)
- # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
- # localcharset.c falls back to using the full locale name
- # from the environment variables.
- echo "C ASCII"
- for l in en_AU en_CA en_GB en_US la_LN; do
- echo "$l.US-ASCII ASCII"
- done
- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
- nl_NL no_NO pt_PT sv_SE; do
- echo "$l ISO-8859-1"
- echo "$l.ISO8859-1 ISO-8859-1"
- echo "$l.ISO8859-15 ISO-8859-15"
- done
- for l in la_LN; do
- echo "$l.ISO8859-1 ISO-8859-1"
- echo "$l.ISO8859-15 ISO-8859-15"
- done
- for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
- echo "$l.ISO8859-2 ISO-8859-2"
- done
- for l in la_LN lt_LT; do
- echo "$l.ISO8859-4 ISO-8859-4"
- done
- for l in ru_RU; do
- echo "$l.KOI8-R KOI8-R"
- echo "$l.ISO8859-5 ISO-8859-5"
- echo "$l.CP866 CP866"
- done
- for l in bg_BG; do
- echo "$l.CP1251 CP1251"
- done
- echo "uk_UA.KOI8-U KOI8-U"
- echo "zh_TW.BIG5 BIG5"
- echo "zh_TW.Big5 BIG5"
- echo "zh_CN.EUC GB2312"
- echo "ja_JP.EUC EUC-JP"
- echo "ja_JP.SJIS SHIFT_JIS"
- echo "ko_KR.EUC EUC-KR"
- ;;
- darwin*)
- # Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is
- # useless:
- # - It returns the empty string when LANG is set to a locale of the
- # form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
- # LC_CTYPE file.
- # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
- # the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
- # - The documentation says:
- # "... all code that calls BSD system routines should ensure
- # that the const *char parameters of these routines are in UTF-8
- # encoding. All BSD system functions expect their string
- # parameters to be in UTF-8 encoding and nothing else."
- # It also says
- # "An additional caveat is that string parameters for files,
- # paths, and other file-system entities must be in canonical
- # UTF-8. In a canonical UTF-8 Unicode string, all decomposable
- # characters are decomposed ..."
- # but this is not true: You can pass non-decomposed UTF-8 strings
- # to file system functions, and it is the OS which will convert
- # them to decomposed UTF-8 before accessing the file system.
- # - The Apple Terminal application displays UTF-8 by default.
- # - However, other applications are free to use different encodings:
- # - xterm uses ISO-8859-1 by default.
- # - TextEdit uses MacRoman by default.
- # We prefer UTF-8 over decomposed UTF-8-MAC because one should
- # minimize the use of decomposed Unicode. Unfortunately, through the
- # Darwin file system, decomposed UTF-8 strings are leaked into user
- # space nevertheless.
- # Then there are also the locales with encodings other than US-ASCII
- # and UTF-8. These locales can be occasionally useful to users (e.g.
- # when grepping through ISO-8859-1 encoded text files), when all their
- # file names are in US-ASCII.
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-4 ISO-8859-4"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-9 ISO-8859-9"
- echo "ISO8859-13 ISO-8859-13"
- echo "ISO8859-15 ISO-8859-15"
- echo "KOI8-R KOI8-R"
- echo "KOI8-U KOI8-U"
- echo "CP866 CP866"
- echo "CP949 CP949"
- echo "CP1131 CP1131"
- echo "CP1251 CP1251"
- echo "eucCN GB2312"
- echo "GB2312 GB2312"
- echo "eucJP EUC-JP"
- echo "eucKR EUC-KR"
- echo "Big5 BIG5"
- echo "Big5HKSCS BIG5-HKSCS"
- echo "GBK GBK"
- echo "GB18030 GB18030"
- echo "SJIS SHIFT_JIS"
- echo "ARMSCII-8 ARMSCII-8"
- echo "PT154 PT154"
- #echo "ISCII-DEV ?"
- echo "* UTF-8"
- ;;
- beos* | haiku*)
- # BeOS and Haiku have a single locale, and it has UTF-8 encoding.
- echo "* UTF-8"
- ;;
- msdosdjgpp*)
- # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
- # localcharset.c falls back to using the full locale name
- # from the environment variables.
- echo "#"
- echo "# The encodings given here may not all be correct."
- echo "# If you find that the encoding given for your language and"
- echo "# country is not the one your DOS machine actually uses, just"
- echo "# correct it in this file, and send a mail to"
- echo "# Juan Manuel Guerrero <juan.guerrero@gmx.de>"
- echo "# and Bruno Haible <bruno@clisp.org>."
- echo "#"
- echo "C ASCII"
- # ISO-8859-1 languages
- echo "ca CP850"
- echo "ca_ES CP850"
- echo "da CP865" # not CP850 ??
- echo "da_DK CP865" # not CP850 ??
- echo "de CP850"
- echo "de_AT CP850"
- echo "de_CH CP850"
- echo "de_DE CP850"
- echo "en CP850"
- echo "en_AU CP850" # not CP437 ??
- echo "en_CA CP850"
- echo "en_GB CP850"
- echo "en_NZ CP437"
- echo "en_US CP437"
- echo "en_ZA CP850" # not CP437 ??
- echo "es CP850"
- echo "es_AR CP850"
- echo "es_BO CP850"
- echo "es_CL CP850"
- echo "es_CO CP850"
- echo "es_CR CP850"
- echo "es_CU CP850"
- echo "es_DO CP850"
- echo "es_EC CP850"
- echo "es_ES CP850"
- echo "es_GT CP850"
- echo "es_HN CP850"
- echo "es_MX CP850"
- echo "es_NI CP850"
- echo "es_PA CP850"
- echo "es_PY CP850"
- echo "es_PE CP850"
- echo "es_SV CP850"
- echo "es_UY CP850"
- echo "es_VE CP850"
- echo "et CP850"
- echo "et_EE CP850"
- echo "eu CP850"
- echo "eu_ES CP850"
- echo "fi CP850"
- echo "fi_FI CP850"
- echo "fr CP850"
- echo "fr_BE CP850"
- echo "fr_CA CP850"
- echo "fr_CH CP850"
- echo "fr_FR CP850"
- echo "ga CP850"
- echo "ga_IE CP850"
- echo "gd CP850"
- echo "gd_GB CP850"
- echo "gl CP850"
- echo "gl_ES CP850"
- echo "id CP850" # not CP437 ??
- echo "id_ID CP850" # not CP437 ??
- echo "is CP861" # not CP850 ??
- echo "is_IS CP861" # not CP850 ??
- echo "it CP850"
- echo "it_CH CP850"
- echo "it_IT CP850"
- echo "lt CP775"
- echo "lt_LT CP775"
- echo "lv CP775"
- echo "lv_LV CP775"
- echo "nb CP865" # not CP850 ??
- echo "nb_NO CP865" # not CP850 ??
- echo "nl CP850"
- echo "nl_BE CP850"
- echo "nl_NL CP850"
- echo "nn CP865" # not CP850 ??
- echo "nn_NO CP865" # not CP850 ??
- echo "no CP865" # not CP850 ??
- echo "no_NO CP865" # not CP850 ??
- echo "pt CP850"
- echo "pt_BR CP850"
- echo "pt_PT CP850"
- echo "sv CP850"
- echo "sv_SE CP850"
- # ISO-8859-2 languages
- echo "cs CP852"
- echo "cs_CZ CP852"
- echo "hr CP852"
- echo "hr_HR CP852"
- echo "hu CP852"
- echo "hu_HU CP852"
- echo "pl CP852"
- echo "pl_PL CP852"
- echo "ro CP852"
- echo "ro_RO CP852"
- echo "sk CP852"
- echo "sk_SK CP852"
- echo "sl CP852"
- echo "sl_SI CP852"
- echo "sq CP852"
- echo "sq_AL CP852"
- echo "sr CP852" # CP852 or CP866 or CP855 ??
- echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
- echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
- # ISO-8859-3 languages
- echo "mt CP850"
- echo "mt_MT CP850"
- # ISO-8859-5 languages
- echo "be CP866"
- echo "be_BE CP866"
- echo "bg CP866" # not CP855 ??
- echo "bg_BG CP866" # not CP855 ??
- echo "mk CP866" # not CP855 ??
- echo "mk_MK CP866" # not CP855 ??
- echo "ru CP866"
- echo "ru_RU CP866"
- echo "uk CP1125"
- echo "uk_UA CP1125"
- # ISO-8859-6 languages
- echo "ar CP864"
- echo "ar_AE CP864"
- echo "ar_DZ CP864"
- echo "ar_EG CP864"
- echo "ar_IQ CP864"
- echo "ar_IR CP864"
- echo "ar_JO CP864"
- echo "ar_KW CP864"
- echo "ar_MA CP864"
- echo "ar_OM CP864"
- echo "ar_QA CP864"
- echo "ar_SA CP864"
- echo "ar_SY CP864"
- # ISO-8859-7 languages
- echo "el CP869"
- echo "el_GR CP869"
- # ISO-8859-8 languages
- echo "he CP862"
- echo "he_IL CP862"
- # ISO-8859-9 languages
- echo "tr CP857"
- echo "tr_TR CP857"
- # Japanese
- echo "ja CP932"
- echo "ja_JP CP932"
- # Chinese
- echo "zh_CN GBK"
- echo "zh_TW CP950" # not CP938 ??
- # Korean
- echo "kr CP949" # not CP934 ??
- echo "kr_KR CP949" # not CP934 ??
- # Thai
- echo "th CP874"
- echo "th_TH CP874"
- # Other
- echo "eo CP850"
- echo "eo_EO CP850"
- ;;
-esac
diff --git a/gnu/creat-safer.c b/gnu/creat-safer.c
new file mode 100644
index 0000000000000000000000000000000000000000..243831d113065c1388446bf1a702d264f26d679c
--- /dev/null
+++ b/gnu/creat-safer.c
@@ -0,0 +1,31 @@
+/* Invoke creat, but avoid some glitches.
+
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Jim Meyering. */
+
+#include <config.h>
+
+#include "fcntl-safer.h"
+
+#include <fcntl.h>
+#include "unistd-safer.h"
+
+int
+creat_safer (char const *file, mode_t mode)
+{
+ return fd_safer (creat (file, mode));
+}
diff --git a/gnu/dirent--.h b/gnu/dirent--.h
index a033f555c1e25d54a2c0c246c88d6eec69628874..167d210bfdc5e3d1425af587311c3e1e64e0c968 100644
--- a/gnu/dirent--.h
+++ b/gnu/dirent--.h
@@ -1,6 +1,6 @@
/* Like dirent.h, but redefine some names to avoid glitches.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/dirent-private.h b/gnu/dirent-private.h
index c9bf3b29d3382b50d4dce4d15e19aada7bd84260..1eb1b357ce1c6fabbb36d0b079acd5ba0e3cc2b1 100644
--- a/gnu/dirent-private.h
+++ b/gnu/dirent-private.h
@@ -1,5 +1,5 @@
/* Private details of the DIR type.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/dirent-safer.h b/gnu/dirent-safer.h
index 35ff95e2395d9c78aa7bb575d7413ed7303eb56c..4d8e5ee922738baed78462e2acc74a5fa7ba1e4d 100644
--- a/gnu/dirent-safer.h
+++ b/gnu/dirent-safer.h
@@ -1,6 +1,6 @@
/* Invoke dirent-like functions, but avoid some glitches.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/dirent.in.h b/gnu/dirent.in.h
index 5b235731e0437105d948b41ae0c67b6eb26601bd..a3c8eb341e97e864cc7785f950e42826460b5a21 100644
--- a/gnu/dirent.in.h
+++ b/gnu/dirent.in.h
@@ -1,5 +1,5 @@
/* A GNU-like <dirent.h>.
- Copyright (C) 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/dirfd.c b/gnu/dirfd.c
index 7e38fabdac2a365b6f58ccf8463b0ce350eea384..bc858fd09dd2fd03596f48ec6b22a2ee46cb3d64 100644
--- a/gnu/dirfd.c
+++ b/gnu/dirfd.c
@@ -1,6 +1,6 @@
/* dirfd.c -- return the file descriptor associated with an open DIR*
- Copyright (C) 2001, 2006, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2006, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/dirname-lgpl.c b/gnu/dirname-lgpl.c
index 6791185dc73a9390a6b12d6e037fefe6f8f45b20..7cf89d8cf80e2d21c81c954a22e6de6cdf916b3d 100644
--- a/gnu/dirname-lgpl.c
+++ b/gnu/dirname-lgpl.c
@@ -1,6 +1,6 @@
/* dirname.c -- return all but the last element in a file name
- Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 Free Software
+ Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/dirname.c b/gnu/dirname.c
index 4b475ce916ff99d2cf9ba95a1e86cfe6e6e410fa..1e042a5cdc9643c7568219390b1b55f9ca4225e3 100644
--- a/gnu/dirname.c
+++ b/gnu/dirname.c
@@ -1,6 +1,6 @@
/* dirname.c -- return all but the last element in a file name
- Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 Free Software
+ Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/dirname.h b/gnu/dirname.h
index 05cab41f0b88c1134939e7f2a67bc13312bd72ec..579165947f742be281df8dba3bc658b585a9ab07 100644
--- a/gnu/dirname.h
+++ b/gnu/dirname.h
@@ -1,6 +1,6 @@
/* Take file names apart into directory and base names.
- Copyright (C) 1998, 2001, 2003-2006, 2009-2017 Free Software Foundation,
+ Copyright (C) 1998, 2001, 2003-2006, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ extern "C" {
#endif
# if GNULIB_DIRNAME
-char *base_name (char const *file);
+char *base_name (char const *file) _GL_ATTRIBUTE_MALLOC;
char *dir_name (char const *file);
# endif
diff --git a/gnu/dosname.h b/gnu/dosname.h
index 255d57e4d6be076a39d1e295c707a3305553e1c1..c0ab6848a58aa2e0352272872d4bc009886455f6 100644
--- a/gnu/dosname.h
+++ b/gnu/dosname.h
@@ -1,6 +1,6 @@
/* File names on MS-DOS/Windows systems.
- Copyright (C) 2000-2001, 2004-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2000-2001, 2004-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,9 +20,8 @@
#ifndef _DOSNAME_H
#define _DOSNAME_H
-#if (defined _WIN32 || defined __WIN32__ || \
- defined __MSDOS__ || defined __CYGWIN__ || \
- defined __EMX__ || defined __DJGPP__)
+#if (defined _WIN32 || defined __CYGWIN__ \
+ || defined __EMX__ || defined __MSDOS__ || defined __DJGPP__)
/* This internal macro assumes ASCII, but all hosts that support drive
letters use ASCII. */
# define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a' \
diff --git a/gnu/dup-safer-flag.c b/gnu/dup-safer-flag.c
index 5e286271bcd5e8181e9a359560245d18c9aa8f3f..485f7411bdb07198d363e4b96f47370a43960638 100644
--- a/gnu/dup-safer-flag.c
+++ b/gnu/dup-safer-flag.c
@@ -1,7 +1,7 @@
/* Duplicate a file descriptor result, avoiding clobbering
STD{IN,OUT,ERR}_FILENO, with specific flags.
- Copyright (C) 2001, 2004-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2004-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/dup-safer.c b/gnu/dup-safer.c
index a063e973a9e29b8886660a9c9d085eb56ef42202..c0c5f2a914b83f7e703054a74a618bbf4d24509a 100644
--- a/gnu/dup-safer.c
+++ b/gnu/dup-safer.c
@@ -1,6 +1,6 @@
/* Invoke dup, but avoid some glitches.
- Copyright (C) 2001, 2004-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2004-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/dup.c b/gnu/dup.c
index 098e25f7e920ea265e729706b64d1200d7b799c3..d37f920d858660c8fd074d1299c331b88c85ddb4 100644
--- a/gnu/dup.c
+++ b/gnu/dup.c
@@ -1,6 +1,6 @@
/* Duplicate an open file descriptor.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/dup2.c b/gnu/dup2.c
index 85c1a44401a10add957c0ed1f32de4159a0b4081..d3aafa458b5a793f6a7e9008caea3835d495cb18 100644
--- a/gnu/dup2.c
+++ b/gnu/dup2.c
@@ -1,6 +1,6 @@
/* Duplicate an open file descriptor to a specified file descriptor.
- Copyright (C) 1999, 2004-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2004-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
# undef dup2
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
/* Get declarations of the native Windows API functions. */
# define WIN32_LEAN_AND_MEAN
diff --git a/gnu/errno.in.h b/gnu/errno.in.h
index aaf5fecd73bc08cade57566d1e6dcc127ad4d2b9..3bd27f1cc9fb7e555aa3b048b0e3bc3aebd1bf40 100644
--- a/gnu/errno.in.h
+++ b/gnu/errno.in.h
@@ -1,6 +1,6 @@
/* A POSIX-like <errno.h>.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
/* On native Windows platforms, many macros are not defined. */
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
/* These are the same values as defined by MSVC 10, for interoperability. */
@@ -248,7 +248,7 @@
interoperability. */
# define EOWNERDEAD 58
# define ENOTRECOVERABLE 59
-# elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# elif defined _WIN32 && ! defined __CYGWIN__
/* We have a conflict here: pthreads-win32 defines these values
differently than MSVC 10. It's hairy to decide which one to use. */
# if defined __MINGW32__ && !defined USE_WINDOWS_THREADS
diff --git a/gnu/error.c b/gnu/error.c
index ce81a1eedd689de61d347094dbe5873b39dceb25..7e532f0e486c3dcb7512ef287ece0cf02e08d1b9 100644
--- a/gnu/error.c
+++ b/gnu/error.c
@@ -1,5 +1,5 @@
/* Error handler for noninteractive utilities
- Copyright (C) 1990-1998, 2000-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1990-1998, 2000-2007, 2009-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@ -93,7 +93,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
# include <fcntl.h>
# include <unistd.h>
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
/* Get declarations of the native Windows API functions. */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
@@ -131,7 +131,7 @@ int strerror_r (int errnum, char *buf, size_t buflen);
static int
is_open (int fd)
{
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
/* On native Windows: The initial state of unassigned standard file
descriptors is that they are open but point to an INVALID_HANDLE_VALUE.
There is no fcntl, and the gnulib replacement fcntl does not support
diff --git a/gnu/error.h b/gnu/error.h
index dc004ef61dfc52c635c24b3133de271ea343e055..3759f8ad44e9a01f467093ebb8b1990f4f7b3d18 100644
--- a/gnu/error.h
+++ b/gnu/error.h
@@ -1,5 +1,5 @@
/* Declaration for error-reporting function
- Copyright (C) 1995-1997, 2003, 2006, 2008-2017 Free Software Foundation,
+ Copyright (C) 1995-1997, 2003, 2006, 2008-2019 Free Software Foundation,
Inc.
This file is part of the GNU C Library.
diff --git a/gnu/euidaccess.c b/gnu/euidaccess.c
index 298c4459477a81fa01c0ff80f7073eaa4bd634a5..fece4cfc5e09dce5ddf5dcb2e8f6d0da5bcde3ea 100644
--- a/gnu/euidaccess.c
+++ b/gnu/euidaccess.c
@@ -1,6 +1,6 @@
/* euidaccess -- check if effective user id can access file
- Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2017 Free
+ Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2019 Free
Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -29,8 +29,11 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-
-#include "root-uid.h"
+#if defined _WIN32 && ! defined __CYGWIN__
+# include <io.h>
+#else
+# include "root-uid.h"
+#endif
#if HAVE_LIBGEN_H
# include <libgen.h>
@@ -84,7 +87,9 @@ euidaccess (const char *file, int mode)
return accessx (file, mode, ACC_SELF);
#elif HAVE_EACCESS /* FreeBSD */
return eaccess (file, mode);
-#else /* Mac OS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS */
+#elif defined _WIN32 && ! defined __CYGWIN__ /* mingw */
+ return _access (file, mode);
+#else /* Mac OS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, BeOS */
uid_t uid = getuid ();
gid_t gid = getgid ();
diff --git a/gnu/exclude.c b/gnu/exclude.c
index 50ecb3603c349698d1acb29c138eef86e1ee2b74..2140386526eb0f5184035831fc9693ef41d789c1 100644
--- a/gnu/exclude.c
+++ b/gnu/exclude.c
@@ -1,6 +1,6 @@
/* exclude.c -- exclude file names
- Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2017 Free Software
+ Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -146,20 +146,20 @@ fnmatch_pattern_has_wildcards (const char *str, int options)
{
switch (*str++)
{
- case '.':
- case '{':
- case '}':
- case '(':
- case ')':
- if (options & EXCLUDE_REGEX)
- return true;
- break;
+ case '.':
+ case '{':
+ case '}':
+ case '(':
+ case ')':
+ if (options & EXCLUDE_REGEX)
+ return true;
+ break;
case '\\':
- if (options & EXCLUDE_REGEX)
- continue;
- else
- str += ! (options & FNM_NOESCAPE) && *str;
+ if (options & EXCLUDE_REGEX)
+ continue;
+ else
+ str += ! (options & FNM_NOESCAPE) && *str;
break;
case '+': case '@': case '!':
@@ -287,10 +287,10 @@ free_exclude_segment (struct exclude_segment *seg)
{
case exclude_pattern:
for (i = 0; i < seg->v.pat.exclude_count; i++)
- {
- if (seg->v.pat.exclude[i].options & EXCLUDE_REGEX)
- regfree (&seg->v.pat.exclude[i].v.re);
- }
+ {
+ if (seg->v.pat.exclude[i].options & EXCLUDE_REGEX)
+ regfree (&seg->v.pat.exclude[i].v.re);
+ }
free (seg->v.pat.exclude);
break;
@@ -387,7 +387,7 @@ exclude_fnmatch (char const *pattern, char const *f, int options)
if (! (options & EXCLUDE_ANCHORED))
for (p = f; *p && ! matched; p++)
if (*p == '/' && p[1] != '/')
- matched = ((*matcher) (pattern, p + 1, options) == 0);
+ matched = ((*matcher) (pattern, p + 1, options) == 0);
return matched;
}
@@ -525,9 +525,9 @@ add_exclude (struct exclude *ex, char const *pattern, int options)
&& fnmatch_pattern_has_wildcards (pattern, options))
{
if (! (ex->head && ex->head->type == exclude_pattern
- && ((ex->head->options & EXCLUDE_INCLUDE)
- == (options & EXCLUDE_INCLUDE))))
- new_exclude_segment (ex, exclude_pattern, options);
+ && ((ex->head->options & EXCLUDE_INCLUDE)
+ == (options & EXCLUDE_INCLUDE))))
+ new_exclude_segment (ex, exclude_pattern, options);
seg = ex->head;
@@ -539,48 +539,48 @@ add_exclude (struct exclude *ex, char const *pattern, int options)
patopts->options = options;
if (options & EXCLUDE_REGEX)
- {
- int rc;
- int cflags = REG_NOSUB|REG_EXTENDED|
- ((options & FNM_CASEFOLD) ? REG_ICASE : 0);
-
- if (options & FNM_LEADING_DIR)
- {
- char *tmp;
- size_t len = strlen (pattern);
-
- while (len > 0 && ISSLASH (pattern[len-1]))
- --len;
-
- if (len == 0)
- rc = 1;
- else
- {
- tmp = xmalloc (len + 7);
- memcpy (tmp, pattern, len);
- strcpy (tmp + len, "(/.*)?");
- rc = regcomp (&patopts->v.re, tmp, cflags);
- free (tmp);
- }
- }
- else
- rc = regcomp (&patopts->v.re, pattern, cflags);
-
- if (rc)
- {
- pat->exclude_count--;
- return;
- }
- }
+ {
+ int rc;
+ int cflags = REG_NOSUB|REG_EXTENDED|
+ ((options & FNM_CASEFOLD) ? REG_ICASE : 0);
+
+ if (options & FNM_LEADING_DIR)
+ {
+ char *tmp;
+ size_t len = strlen (pattern);
+
+ while (len > 0 && ISSLASH (pattern[len-1]))
+ --len;
+
+ if (len == 0)
+ rc = 1;
+ else
+ {
+ tmp = xmalloc (len + 7);
+ memcpy (tmp, pattern, len);
+ strcpy (tmp + len, "(/.*)?");
+ rc = regcomp (&patopts->v.re, tmp, cflags);
+ free (tmp);
+ }
+ }
+ else
+ rc = regcomp (&patopts->v.re, pattern, cflags);
+
+ if (rc)
+ {
+ pat->exclude_count--;
+ return;
+ }
+ }
else
- {
- if (options & EXCLUDE_ALLOC)
- {
- pattern = xstrdup (pattern);
- exclude_add_pattern_buffer (ex, (char*) pattern);
- }
- patopts->v.pattern = pattern;
- }
+ {
+ if (options & EXCLUDE_ALLOC)
+ {
+ pattern = xstrdup (pattern);
+ exclude_add_pattern_buffer (ex, (char*) pattern);
+ }
+ patopts->v.pattern = pattern;
+ }
}
else
{
@@ -609,9 +609,9 @@ add_exclude (struct exclude *ex, char const *pattern, int options)
int
add_exclude_fp (void (*add_func) (struct exclude *, char const *, int, void *),
- struct exclude *ex, FILE *fp, int options,
- char line_end,
- void *data)
+ struct exclude *ex, FILE *fp, int options,
+ char line_end,
+ void *data)
{
char *buf = NULL;
char *p;
@@ -674,8 +674,8 @@ call_addfn (struct exclude *ex, char const *pattern, int options, void *data)
int
add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
- struct exclude *ex, char const *file_name, int options,
- char line_end)
+ struct exclude *ex, char const *file_name, int options,
+ char line_end)
{
bool use_stdin = file_name[0] == '-' && !file_name[1];
FILE *in;
diff --git a/gnu/exclude.h b/gnu/exclude.h
index 62cab7107bd90cdc64169165fab8cc9394d4f578..4ab00e3b1f53a47af73c7842b19c4116a9ced598 100644
--- a/gnu/exclude.h
+++ b/gnu/exclude.h
@@ -1,6 +1,6 @@
/* exclude.h -- declarations for excluding file names
- Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2017 Free
+ Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2019 Free
Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -48,13 +48,13 @@ struct exclude;
bool fnmatch_pattern_has_wildcards (const char *, int) _GL_ATTRIBUTE_PURE;
-struct exclude *new_exclude (void);
+struct exclude *new_exclude (void) _GL_ATTRIBUTE_MALLOC;
void free_exclude (struct exclude *);
void add_exclude (struct exclude *, char const *, int);
int add_exclude_file (void (*) (struct exclude *, char const *, int),
struct exclude *, char const *, int, char);
int add_exclude_fp (void (*) (struct exclude *, char const *, int, void *),
- struct exclude *, FILE *, int, char, void *);
+ struct exclude *, FILE *, int, char, void *);
bool excluded_file_name (struct exclude const *, char const *);
void exclude_add_pattern_buffer (struct exclude *ex, char *buf);
bool exclude_fnmatch (char const *, char const *, int);
diff --git a/gnu/exitfail.c b/gnu/exitfail.c
index b2d601211b154d507207b650b967601eaed72462..69b351372e5b4013d912694da24b62c8bc4c4b11 100644
--- a/gnu/exitfail.c
+++ b/gnu/exitfail.c
@@ -1,6 +1,6 @@
/* Failure exit status
- Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/exitfail.h b/gnu/exitfail.h
index 819919a76b7bd6d863855b0ee0334b5e901f0dba..480ad1a1663d303243be2483973d62d8c73bb034 100644
--- a/gnu/exitfail.h
+++ b/gnu/exitfail.h
@@ -1,6 +1,6 @@
/* Failure exit status
- Copyright (C) 2002, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/faccessat.c b/gnu/faccessat.c
index fa9235820dc310adcff25674a5043e557be983b3..6c63e61d83f48c99f6aeeb58e13575dfc50f7759 100644
--- a/gnu/faccessat.c
+++ b/gnu/faccessat.c
@@ -1,5 +1,5 @@
/* Check the access rights of a file relative to an open directory.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fchdir.c b/gnu/fchdir.c
index 1ce5d3f9d1f70336bfd527773ddeeaa9200fe04c..38ab802e0645e7289e2465ff2ab07dd7e03a9284 100644
--- a/gnu/fchdir.c
+++ b/gnu/fchdir.c
@@ -1,5 +1,5 @@
/* fchdir replacement.
- Copyright (C) 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fchmodat.c b/gnu/fchmodat.c
index 639831e794aeae9d58a298180195466655eba2a1..088d3c023b93241023bfd3596029e65075e753c4 100644
--- a/gnu/fchmodat.c
+++ b/gnu/fchmodat.c
@@ -1,5 +1,5 @@
/* Change the protections of file relative to an open directory.
- Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fchownat.c b/gnu/fchownat.c
index ff58216c63ca7733d7659463c4aa79794691641c..538d86d690705f68f88ae58b9756dff868e60c5b 100644
--- a/gnu/fchownat.c
+++ b/gnu/fchownat.c
@@ -4,7 +4,7 @@
when the buggy fchownat-with-AT_SYMLINK_NOFOLLOW operates on a symlink, it
mistakenly affects the symlink referent, rather than the symlink itself.
- Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fcntl--.h b/gnu/fcntl--.h
new file mode 100644
index 0000000000000000000000000000000000000000..9f22e68367f5b5e6346993a451b230d44ba9c4d8
--- /dev/null
+++ b/gnu/fcntl--.h
@@ -0,0 +1,32 @@
+/* Like fcntl.h, but redefine some names to avoid glitches.
+
+ Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Paul Eggert. */
+
+#include <fcntl.h>
+#include "fcntl-safer.h"
+
+#undef open
+#define open open_safer
+
+#undef creat
+#define creat creat_safer
+
+#if GNULIB_OPENAT_SAFER
+# undef openat
+# define openat openat_safer
+#endif
diff --git a/gnu/fcntl-safer.h b/gnu/fcntl-safer.h
new file mode 100644
index 0000000000000000000000000000000000000000..4a7734ee783ccbb52c9b5dee403bd3cf75303b6b
--- /dev/null
+++ b/gnu/fcntl-safer.h
@@ -0,0 +1,27 @@
+/* Invoke fcntl-like functions, but avoid some glitches.
+
+ Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Paul Eggert. */
+
+#include <sys/types.h>
+
+int open_safer (char const *, int, ...);
+int creat_safer (char const *, mode_t);
+
+#if GNULIB_OPENAT_SAFER
+int openat_safer (int, char const *, int, ...);
+#endif
diff --git a/gnu/fcntl.c b/gnu/fcntl.c
index 91efd12c2ba2b518049b1718f1f97362f37b85e9..f602fad6285108a7874384babf52b609e88a9079 100644
--- a/gnu/fcntl.c
+++ b/gnu/fcntl.c
@@ -1,6 +1,6 @@
/* Provide file descriptor control.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,12 +27,12 @@
#include <stdarg.h>
#include <unistd.h>
-#if !HAVE_FCNTL
-# define rpl_fcntl fcntl
+#ifdef __KLIBC__
+# define INCL_DOS
+# include <os2.h>
#endif
-#undef fcntl
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* Get declarations of the native Windows API functions. */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
@@ -166,93 +166,18 @@ dupfd (int oldfd, int newfd, int flags)
}
#endif /* W32 */
+/* Forward declarations, because we '#undef fcntl' in the middle of this
+ compilation unit. */
+/* Our implementation of fcntl (fd, F_DUPFD, target). */
+static int rpl_fcntl_DUPFD (int fd, int target);
+/* Our implementation of fcntl (fd, F_DUPFD_CLOEXEC, target). */
+static int rpl_fcntl_DUPFD_CLOEXEC (int fd, int target);
#ifdef __KLIBC__
-
-# define INCL_DOS
-# include <os2.h>
-
-static int
-klibc_fcntl (int fd, int action, /* arg */...)
-{
- va_list arg_ptr;
- int arg;
- struct stat sbuf;
- int result = -1;
-
- va_start (arg_ptr, action);
- arg = va_arg (arg_ptr, int);
- result = fcntl (fd, action, arg);
- /* EPERM for F_DUPFD, ENOTSUP for others */
- if (result == -1 && (errno == EPERM || errno == ENOTSUP)
- && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode))
- {
- ULONG ulMode;
-
- switch (action)
- {
- case F_DUPFD:
- /* Find available fd */
- while (fcntl (arg, F_GETFL) != -1 || errno != EBADF)
- arg++;
-
- result = dup2 (fd, arg);
- break;
-
- /* Using underlying APIs is right ? */
- case F_GETFD:
- if (DosQueryFHState (fd, &ulMode))
- break;
-
- result = (ulMode & OPEN_FLAGS_NOINHERIT) ? FD_CLOEXEC : 0;
- break;
-
- case F_SETFD:
- if (arg & ~FD_CLOEXEC)
- break;
-
- if (DosQueryFHState (fd, &ulMode))
- break;
-
- if (arg & FD_CLOEXEC)
- ulMode |= OPEN_FLAGS_NOINHERIT;
- else
- ulMode &= ~OPEN_FLAGS_NOINHERIT;
-
- /* Filter supported flags. */
- ulMode &= (OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR
- | OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT);
-
- if (DosSetFHState (fd, ulMode))
- break;
-
- result = 0;
- break;
-
- case F_GETFL:
- result = 0;
- break;
-
- case F_SETFL:
- if (arg != 0)
- break;
-
- result = 0;
- break;
-
- default :
- errno = EINVAL;
- break;
- }
- }
-
- va_end (arg_ptr);
-
- return result;
-}
-
-# define fcntl klibc_fcntl
+/* Adds support for fcntl on directories. */
+static int klibc_fcntl (int fd, int action, /* arg */...);
#endif
+
/* Perform the specified ACTION on the file descriptor FD, possibly
using the argument ARG further described below. This replacement
handles the following actions, and forwards all others on to the
@@ -273,110 +198,35 @@ klibc_fcntl (int fd, int action, /* arg */...)
return -1 and set errno. */
int
-rpl_fcntl (int fd, int action, /* arg */...)
+fcntl (int fd, int action, /* arg */...)
+#undef fcntl
+#ifdef __KLIBC__
+# define fcntl klibc_fcntl
+#endif
{
va_list arg;
int result = -1;
va_start (arg, action);
switch (action)
{
-
-#if !HAVE_FCNTL
case F_DUPFD:
{
int target = va_arg (arg, int);
- result = dupfd (fd, target, 0);
+ result = rpl_fcntl_DUPFD (fd, target);
break;
}
-#elif FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR
- case F_DUPFD:
- {
- int target = va_arg (arg, int);
- /* Detect invalid target; needed for cygwin 1.5.x. */
- if (target < 0 || getdtablesize () <= target)
- errno = EINVAL;
- else
- {
- /* Haiku alpha 2 loses fd flags on original. */
- int flags = fcntl (fd, F_GETFD);
- if (flags < 0)
- {
- result = -1;
- break;
- }
- result = fcntl (fd, action, target);
- if (0 <= result && fcntl (fd, F_SETFD, flags) == -1)
- {
- int saved_errno = errno;
- close (result);
- result = -1;
- errno = saved_errno;
- }
-# if REPLACE_FCHDIR
- if (0 <= result)
- result = _gl_register_dup (fd, result);
-# endif
- }
- break;
- } /* F_DUPFD */
-#endif /* FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR */
case F_DUPFD_CLOEXEC:
{
int target = va_arg (arg, int);
-
-#if !HAVE_FCNTL
- result = dupfd (fd, target, O_CLOEXEC);
- break;
-#else /* HAVE_FCNTL */
- /* Try the system call first, if the headers claim it exists
- (that is, if GNULIB_defined_F_DUPFD_CLOEXEC is 0), since we
- may be running with a glibc that has the macro but with an
- older kernel that does not support it. Cache the
- information on whether the system call really works, but
- avoid caching failure if the corresponding F_DUPFD fails
- for any reason. 0 = unknown, 1 = yes, -1 = no. */
- static int have_dupfd_cloexec = GNULIB_defined_F_DUPFD_CLOEXEC ? -1 : 0;
- if (0 <= have_dupfd_cloexec)
- {
- result = fcntl (fd, action, target);
- if (0 <= result || errno != EINVAL)
- {
- have_dupfd_cloexec = 1;
-# if REPLACE_FCHDIR
- if (0 <= result)
- result = _gl_register_dup (fd, result);
-# endif
- }
- else
- {
- result = rpl_fcntl (fd, F_DUPFD, target);
- if (result < 0)
- break;
- have_dupfd_cloexec = -1;
- }
- }
- else
- result = rpl_fcntl (fd, F_DUPFD, target);
- if (0 <= result && have_dupfd_cloexec == -1)
- {
- int flags = fcntl (result, F_GETFD);
- if (flags < 0 || fcntl (result, F_SETFD, flags | FD_CLOEXEC) == -1)
- {
- int saved_errno = errno;
- close (result);
- errno = saved_errno;
- result = -1;
- }
- }
+ result = rpl_fcntl_DUPFD_CLOEXEC (fd, target);
break;
-#endif /* HAVE_FCNTL */
- } /* F_DUPFD_CLOEXEC */
+ }
#if !HAVE_FCNTL
case F_GETFD:
{
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
HANDLE handle = (HANDLE) _get_osfhandle (fd);
DWORD flags;
if (handle == INVALID_HANDLE_VALUE
@@ -405,8 +255,183 @@ rpl_fcntl (int fd, int action, /* arg */...)
default:
{
#if HAVE_FCNTL
- void *p = va_arg (arg, void *);
- result = fcntl (fd, action, p);
+ switch (action)
+ {
+ #ifdef F_BARRIERFSYNC /* macOS */
+ case F_BARRIERFSYNC:
+ #endif
+ #ifdef F_CHKCLEAN /* macOS */
+ case F_CHKCLEAN:
+ #endif
+ #ifdef F_CLOSEM /* NetBSD, HP-UX */
+ case F_CLOSEM:
+ #endif
+ #ifdef F_FLUSH_DATA /* macOS */
+ case F_FLUSH_DATA:
+ #endif
+ #ifdef F_FREEZE_FS /* macOS */
+ case F_FREEZE_FS:
+ #endif
+ #ifdef F_FULLFSYNC /* macOS */
+ case F_FULLFSYNC:
+ #endif
+ #ifdef F_GETCONFINED /* macOS */
+ case F_GETCONFINED:
+ #endif
+ #ifdef F_GETDEFAULTPROTLEVEL /* macOS */
+ case F_GETDEFAULTPROTLEVEL:
+ #endif
+ #ifdef F_GETFD /* POSIX */
+ case F_GETFD:
+ #endif
+ #ifdef F_GETFL /* POSIX */
+ case F_GETFL:
+ #endif
+ #ifdef F_GETLEASE /* Linux */
+ case F_GETLEASE:
+ #endif
+ #ifdef F_GETNOSIGPIPE /* macOS */
+ case F_GETNOSIGPIPE:
+ #endif
+ #ifdef F_GETOWN /* POSIX */
+ case F_GETOWN:
+ #endif
+ #ifdef F_GETPIPE_SZ /* Linux */
+ case F_GETPIPE_SZ:
+ #endif
+ #ifdef F_GETPROTECTIONCLASS /* macOS */
+ case F_GETPROTECTIONCLASS:
+ #endif
+ #ifdef F_GETPROTECTIONLEVEL /* macOS */
+ case F_GETPROTECTIONLEVEL:
+ #endif
+ #ifdef F_GET_SEALS /* Linux */
+ case F_GET_SEALS:
+ #endif
+ #ifdef F_GETSIG /* Linux */
+ case F_GETSIG:
+ #endif
+ #ifdef F_MAXFD /* NetBSD */
+ case F_MAXFD:
+ #endif
+ #ifdef F_RECYCLE /* macOS */
+ case F_RECYCLE:
+ #endif
+ #ifdef F_SETFIFOENH /* HP-UX */
+ case F_SETFIFOENH:
+ #endif
+ #ifdef F_THAW_FS /* macOS */
+ case F_THAW_FS:
+ #endif
+ /* These actions take no argument. */
+ result = fcntl (fd, action);
+ break;
+
+ #ifdef F_ADD_SEALS /* Linux */
+ case F_ADD_SEALS:
+ #endif
+ #ifdef F_BADFD /* Solaris */
+ case F_BADFD:
+ #endif
+ #ifdef F_CHECK_OPENEVT /* macOS */
+ case F_CHECK_OPENEVT:
+ #endif
+ #ifdef F_DUP2FD /* FreeBSD, AIX, Solaris */
+ case F_DUP2FD:
+ #endif
+ #ifdef F_DUP2FD_CLOEXEC /* FreeBSD, Solaris */
+ case F_DUP2FD_CLOEXEC:
+ #endif
+ #ifdef F_DUP2FD_CLOFORK /* Solaris */
+ case F_DUP2FD_CLOFORK:
+ #endif
+ #ifdef F_DUPFD /* POSIX */
+ case F_DUPFD:
+ #endif
+ #ifdef F_DUPFD_CLOEXEC /* POSIX */
+ case F_DUPFD_CLOEXEC:
+ #endif
+ #ifdef F_DUPFD_CLOFORK /* Solaris */
+ case F_DUPFD_CLOFORK:
+ #endif
+ #ifdef F_GETXFL /* Solaris */
+ case F_GETXFL:
+ #endif
+ #ifdef F_GLOBAL_NOCACHE /* macOS */
+ case F_GLOBAL_NOCACHE:
+ #endif
+ #ifdef F_MAKECOMPRESSED /* macOS */
+ case F_MAKECOMPRESSED:
+ #endif
+ #ifdef F_MOVEDATAEXTENTS /* macOS */
+ case F_MOVEDATAEXTENTS:
+ #endif
+ #ifdef F_NOCACHE /* macOS */
+ case F_NOCACHE:
+ #endif
+ #ifdef F_NODIRECT /* macOS */
+ case F_NODIRECT:
+ #endif
+ #ifdef F_NOTIFY /* Linux */
+ case F_NOTIFY:
+ #endif
+ #ifdef F_OPLKACK /* IRIX */
+ case F_OPLKACK:
+ #endif
+ #ifdef F_OPLKREG /* IRIX */
+ case F_OPLKREG:
+ #endif
+ #ifdef F_RDAHEAD /* macOS */
+ case F_RDAHEAD:
+ #endif
+ #ifdef F_SETBACKINGSTORE /* macOS */
+ case F_SETBACKINGSTORE:
+ #endif
+ #ifdef F_SETCONFINED /* macOS */
+ case F_SETCONFINED:
+ #endif
+ #ifdef F_SETFD /* POSIX */
+ case F_SETFD:
+ #endif
+ #ifdef F_SETFL /* POSIX */
+ case F_SETFL:
+ #endif
+ #ifdef F_SETLEASE /* Linux */
+ case F_SETLEASE:
+ #endif
+ #ifdef F_SETNOSIGPIPE /* macOS */
+ case F_SETNOSIGPIPE:
+ #endif
+ #ifdef F_SETOWN /* POSIX */
+ case F_SETOWN:
+ #endif
+ #ifdef F_SETPIPE_SZ /* Linux */
+ case F_SETPIPE_SZ:
+ #endif
+ #ifdef F_SETPROTECTIONCLASS /* macOS */
+ case F_SETPROTECTIONCLASS:
+ #endif
+ #ifdef F_SETSIG /* Linux */
+ case F_SETSIG:
+ #endif
+ #ifdef F_SINGLE_WRITER /* macOS */
+ case F_SINGLE_WRITER:
+ #endif
+ /* These actions take an 'int' argument. */
+ {
+ int x = va_arg (arg, int);
+ result = fcntl (fd, action, x);
+ }
+ break;
+
+ default:
+ /* Other actions take a pointer argument. */
+ {
+ void *p = va_arg (arg, void *);
+ result = fcntl (fd, action, p);
+ }
+ break;
+ }
#else
errno = EINVAL;
#endif
@@ -416,3 +441,186 @@ rpl_fcntl (int fd, int action, /* arg */...)
va_end (arg);
return result;
}
+
+static int
+rpl_fcntl_DUPFD (int fd, int target)
+{
+ int result;
+#if !HAVE_FCNTL
+ result = dupfd (fd, target, 0);
+#elif FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR
+ /* Detect invalid target; needed for cygwin 1.5.x. */
+ if (target < 0 || getdtablesize () <= target)
+ {
+ result = -1;
+ errno = EINVAL;
+ }
+ else
+ {
+ /* Haiku alpha 2 loses fd flags on original. */
+ int flags = fcntl (fd, F_GETFD);
+ if (flags < 0)
+ result = -1;
+ else
+ {
+ result = fcntl (fd, F_DUPFD, target);
+ if (0 <= result && fcntl (fd, F_SETFD, flags) == -1)
+ {
+ int saved_errno = errno;
+ close (result);
+ result = -1;
+ errno = saved_errno;
+ }
+# if REPLACE_FCHDIR
+ if (0 <= result)
+ result = _gl_register_dup (fd, result);
+# endif
+ }
+ }
+#else
+ result = fcntl (fd, F_DUPFD, target);
+#endif
+ return result;
+}
+
+static int
+rpl_fcntl_DUPFD_CLOEXEC (int fd, int target)
+{
+ int result;
+#if !HAVE_FCNTL
+ result = dupfd (fd, target, O_CLOEXEC);
+#else /* HAVE_FCNTL */
+# if defined __HAIKU__
+ /* On Haiku, the system fcntl (fd, F_DUPFD_CLOEXEC, target) sets
+ the FD_CLOEXEC flag on fd, not on target. Therefore avoid the
+ system fcntl in this case. */
+# define have_dupfd_cloexec -1
+# else
+ /* Try the system call first, if the headers claim it exists
+ (that is, if GNULIB_defined_F_DUPFD_CLOEXEC is 0), since we
+ may be running with a glibc that has the macro but with an
+ older kernel that does not support it. Cache the
+ information on whether the system call really works, but
+ avoid caching failure if the corresponding F_DUPFD fails
+ for any reason. 0 = unknown, 1 = yes, -1 = no. */
+ static int have_dupfd_cloexec = GNULIB_defined_F_DUPFD_CLOEXEC ? -1 : 0;
+ if (0 <= have_dupfd_cloexec)
+ {
+ result = fcntl (fd, F_DUPFD_CLOEXEC, target);
+ if (0 <= result || errno != EINVAL)
+ {
+ have_dupfd_cloexec = 1;
+# if REPLACE_FCHDIR
+ if (0 <= result)
+ result = _gl_register_dup (fd, result);
+# endif
+ }
+ else
+ {
+ result = rpl_fcntl_DUPFD (fd, target);
+ if (result >= 0)
+ have_dupfd_cloexec = -1;
+ }
+ }
+ else
+# endif
+ result = rpl_fcntl_DUPFD (fd, target);
+ if (0 <= result && have_dupfd_cloexec == -1)
+ {
+ int flags = fcntl (result, F_GETFD);
+ if (flags < 0 || fcntl (result, F_SETFD, flags | FD_CLOEXEC) == -1)
+ {
+ int saved_errno = errno;
+ close (result);
+ errno = saved_errno;
+ result = -1;
+ }
+ }
+#endif /* HAVE_FCNTL */
+ return result;
+}
+
+#undef fcntl
+
+#ifdef __KLIBC__
+
+static int
+klibc_fcntl (int fd, int action, /* arg */...);
+{
+ va_list arg_ptr;
+ int arg;
+ struct stat sbuf;
+ int result;
+
+ va_start (arg_ptr, action);
+ arg = va_arg (arg_ptr, int);
+ result = fcntl (fd, action, arg);
+ /* EPERM for F_DUPFD, ENOTSUP for others */
+ if (result == -1 && (errno == EPERM || errno == ENOTSUP)
+ && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode))
+ {
+ ULONG ulMode;
+
+ switch (action)
+ {
+ case F_DUPFD:
+ /* Find available fd */
+ while (fcntl (arg, F_GETFL) != -1 || errno != EBADF)
+ arg++;
+
+ result = dup2 (fd, arg);
+ break;
+
+ /* Using underlying APIs is right ? */
+ case F_GETFD:
+ if (DosQueryFHState (fd, &ulMode))
+ break;
+
+ result = (ulMode & OPEN_FLAGS_NOINHERIT) ? FD_CLOEXEC : 0;
+ break;
+
+ case F_SETFD:
+ if (arg & ~FD_CLOEXEC)
+ break;
+
+ if (DosQueryFHState (fd, &ulMode))
+ break;
+
+ if (arg & FD_CLOEXEC)
+ ulMode |= OPEN_FLAGS_NOINHERIT;
+ else
+ ulMode &= ~OPEN_FLAGS_NOINHERIT;
+
+ /* Filter supported flags. */
+ ulMode &= (OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR
+ | OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT);
+
+ if (DosSetFHState (fd, ulMode))
+ break;
+
+ result = 0;
+ break;
+
+ case F_GETFL:
+ result = 0;
+ break;
+
+ case F_SETFL:
+ if (arg != 0)
+ break;
+
+ result = 0;
+ break;
+
+ default:
+ errno = EINVAL;
+ break;
+ }
+ }
+
+ va_end (arg_ptr);
+
+ return result;
+}
+
+#endif
diff --git a/gnu/fcntl.in.h b/gnu/fcntl.in.h
index 00b270c958da282813b00b43eddcf221f717a4ea..eb70dc61eca744ffe29614b969bf666850acd9ed 100644
--- a/gnu/fcntl.in.h
+++ b/gnu/fcntl.in.h
@@ -1,6 +1,6 @@
/* Like <fcntl.h>, but with non-working flags defined to 0.
- Copyright (C) 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@
/* Native Windows platforms declare open(), creat() in <io.h>. */
#if (@GNULIB_OPEN@ || defined GNULIB_POSIXCHECK) \
- && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+ && (defined _WIN32 && ! defined __CYGWIN__)
# include <io.h>
#endif
diff --git a/gnu/fd-hook.c b/gnu/fd-hook.c
index 390b64a3076c4e9acb8326f144b9c021ceeca001..78791198fa072b982db441acfcd516c4fa1fbe32 100644
--- a/gnu/fd-hook.c
+++ b/gnu/fd-hook.c
@@ -1,5 +1,5 @@
/* Hook for making file descriptor functions close(), ioctl() extensible.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2009.
This program is free software: you can redistribute it and/or modify it
diff --git a/gnu/fd-hook.h b/gnu/fd-hook.h
index deaa758236d703d0d33662545f76fd13c5333ee6..bf07f0068b7e55b4a5ef2457e11b2fb392fdd956 100644
--- a/gnu/fd-hook.h
+++ b/gnu/fd-hook.h
@@ -1,5 +1,5 @@
/* Hook for making file descriptor functions close(), ioctl() extensible.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
diff --git a/gnu/fd-safer-flag.c b/gnu/fd-safer-flag.c
index 9bfcd2923742d370c906c827e7e64ba150cbd05b..7c026ef54152adc60d36ea0a0d0f072f049a986d 100644
--- a/gnu/fd-safer-flag.c
+++ b/gnu/fd-safer-flag.c
@@ -1,7 +1,7 @@
/* Adjust a file descriptor result so that it avoids clobbering
STD{IN,OUT,ERR}_FILENO, with specific flags.
- Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fd-safer.c b/gnu/fd-safer.c
index 330203b1f49e758f72c964c6065b91eeec7a98ac..b5113e13673f88fe8812c74d7efa301e78456807 100644
--- a/gnu/fd-safer.c
+++ b/gnu/fd-safer.c
@@ -1,6 +1,6 @@
/* Return a safer copy of a file descriptor.
- Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fdopendir.c b/gnu/fdopendir.c
index 7f72258598dd65e222e3e29b2d34b473d1ec4cd6..b65588ac97e5833d33247a5b93ed3b34572c4ad5 100644
--- a/gnu/fdopendir.c
+++ b/gnu/fdopendir.c
@@ -1,5 +1,5 @@
/* provide a replacement fdopendir function
- Copyright (C) 2004-2017 Free Software Foundation, Inc.
+ Copyright (C) 2004-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fdutimensat.c b/gnu/fdutimensat.c
index 4041edd1436f6798c711eed5ffb5df9f0344d677..8b4d5e05845937776f63391aa75255a22d76d10f 100644
--- a/gnu/fdutimensat.c
+++ b/gnu/fdutimensat.c
@@ -1,6 +1,6 @@
/* Set file access and modification times.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/gnu/file-has-acl.c b/gnu/file-has-acl.c
index 1ce71324f3fdae9bdad8948a30c9e8afd566e9da..69a23ad8d92b702b060bbf530d0158c98b158c0f 100644
--- a/gnu/file-has-acl.c
+++ b/gnu/file-has-acl.c
@@ -1,6 +1,6 @@
/* Test whether a file has a nontrivial ACL. -*- coding: utf-8 -*-
- Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@ file_has_acl (char const *name, struct stat const *sb)
# elif HAVE_ACL_GET_FILE
/* POSIX 1003.1e (draft 17 -- abandoned) specific version. */
- /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+ /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
int ret;
if (HAVE_ACL_EXTENDED_FILE) /* Linux */
@@ -84,7 +84,7 @@ file_has_acl (char const *name, struct stat const *sb)
ACL_TYPE_DEFAULT. */
ret = acl_extended_file (name);
}
- else /* FreeBSD, Mac OS X, IRIX, Tru64 */
+ else /* FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
{
# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
/* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS)
@@ -100,7 +100,7 @@ file_has_acl (char const *name, struct stat const *sb)
}
else
ret = -1;
-# else /* FreeBSD, IRIX, Tru64 */
+# else /* FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */
acl_t acl = acl_get_file (name, ACL_TYPE_ACCESS);
if (acl)
{
@@ -114,7 +114,7 @@ file_has_acl (char const *name, struct stat const *sb)
/* On OSF/1, acl_get_file (name, ACL_TYPE_DEFAULT) always
returns NULL with errno not set. There is no point in
making this call. */
-# else /* FreeBSD, IRIX */
+# else /* FreeBSD, IRIX, Cygwin >= 2.5 */
/* On Linux, FreeBSD, IRIX, acl_get_file (name, ACL_TYPE_ACCESS)
and acl_get_file (name, ACL_TYPE_DEFAULT) on a directory
either both succeed or both fail; it depends on the
@@ -125,8 +125,15 @@ file_has_acl (char const *name, struct stat const *sb)
acl = acl_get_file (name, ACL_TYPE_DEFAULT);
if (acl)
{
+# ifdef __CYGWIN__ /* Cygwin >= 2.5 */
+ ret = acl_access_nontrivial (acl);
+ saved_errno = errno;
+ acl_free (acl);
+ errno = saved_errno;
+# else
ret = (0 < acl_entries (acl));
acl_free (acl);
+# endif
}
else
ret = -1;
@@ -141,7 +148,7 @@ file_has_acl (char const *name, struct stat const *sb)
return - acl_errno_valid (errno);
return ret;
-# elif HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+# elif HAVE_FACL && defined GETACL /* Solaris, Cygwin < 2.5, not HP-UX */
# if defined ACL_NO_TRIVIAL
diff --git a/gnu/fileblocks.c b/gnu/fileblocks.c
index 4a6eb3324f38548e5da73ed2f0c79c213d35e819..758e7609563663a52df27a3a71f485cbf08a4a2e 100644
--- a/gnu/fileblocks.c
+++ b/gnu/fileblocks.c
@@ -1,6 +1,6 @@
/* Convert file size to number of blocks on System V-like machines.
- Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2017 Free Software
+ Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/filename.h b/gnu/filename.h
index ae4d409c01fb7d1e34b294cab1dd3fd90950698c..3ba31059f696561ae389b4f3806d5aa07ca4cc90 100644
--- a/gnu/filename.h
+++ b/gnu/filename.h
@@ -1,5 +1,5 @@
/* Basic filename support macros.
- Copyright (C) 2001-2004, 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2007-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ extern "C" {
it may be concatenated to a directory pathname.
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
*/
-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+#if defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
/* Native Windows, Cygwin, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
# define HAS_DEVICE(P) \
diff --git a/gnu/filenamecat-lgpl.c b/gnu/filenamecat-lgpl.c
index 2bd43c0585360e2d16cd71947cce4894762219fe..98b105a150fd9e925dbf06cc39af0ee416013cd0 100644
--- a/gnu/filenamecat-lgpl.c
+++ b/gnu/filenamecat-lgpl.c
@@ -1,6 +1,6 @@
/* Concatenate two arbitrary file names.
- Copyright (C) 1996-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1996-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,55 +31,54 @@
# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
#endif
-/* Return the longest suffix of F that is a relative file name.
- If it has no such suffix, return the empty string. */
-
-static char const * _GL_ATTRIBUTE_PURE
-longest_relative_suffix (char const *f)
-{
- for (f += FILE_SYSTEM_PREFIX_LEN (f); ISSLASH (*f); f++)
- continue;
- return f;
-}
-
-/* Concatenate two file name components, DIR and ABASE, in
+/* Concatenate two file name components, DIR and BASE, in
newly-allocated storage and return the result.
The resulting file name F is such that the commands "ls F" and "(cd
- DIR; ls BASE)" refer to the same file, where BASE is ABASE with any
- file system prefixes and leading separators removed.
- Arrange for a directory separator if necessary between DIR and BASE
- in the result, removing any redundant separators.
+ DIR; ls ./BASE)" refer to the same file. If necessary, put
+ a separator between DIR and BASE in the result. Typically this
+ separator is "/", but in rare cases it might be ".".
In any case, if BASE_IN_RESULT is non-NULL, set
- *BASE_IN_RESULT to point to the copy of ABASE in the returned
- concatenation. However, if ABASE begins with more than one slash,
- set *BASE_IN_RESULT to point to the sole corresponding slash that
- is copied into the result buffer.
+ *BASE_IN_RESULT to point to the copy of BASE at the end of the
+ returned concatenation.
Return NULL if malloc fails. */
char *
-mfile_name_concat (char const *dir, char const *abase, char **base_in_result)
+mfile_name_concat (char const *dir, char const *base, char **base_in_result)
{
char const *dirbase = last_component (dir);
size_t dirbaselen = base_len (dirbase);
size_t dirlen = dirbase - dir + dirbaselen;
- size_t needs_separator = (dirbaselen && ! ISSLASH (dirbase[dirbaselen - 1]));
-
- char const *base = longest_relative_suffix (abase);
size_t baselen = strlen (base);
-
- char *p_concat = malloc (dirlen + needs_separator + baselen + 1);
+ char sep = '\0';
+ if (dirbaselen)
+ {
+ /* DIR is not a file system root, so separate with / if needed. */
+ if (! ISSLASH (dir[dirlen - 1]) && ! ISSLASH (*base))
+ sep = '/';
+ }
+ else if (ISSLASH (*base))
+ {
+ /* DIR is a file system root and BASE begins with a slash, so
+ separate with ".". For example, if DIR is "/" and BASE is
+ "/foo" then return "/./foo", as "//foo" would be wrong on
+ some POSIX systems. A fancier algorithm could omit "." in
+ some cases but is not worth the trouble. */
+ sep = '.';
+ }
+
+ char *p_concat = malloc (dirlen + (sep != '\0') + baselen + 1);
char *p;
if (p_concat == NULL)
return NULL;
p = mempcpy (p_concat, dir, dirlen);
- *p = DIRECTORY_SEPARATOR;
- p += needs_separator;
+ *p = sep;
+ p += sep != '\0';
if (base_in_result)
- *base_in_result = p - IS_ABSOLUTE_FILE_NAME (abase);
+ *base_in_result = p;
p = mempcpy (p, base, baselen);
*p = '\0';
diff --git a/gnu/filenamecat.h b/gnu/filenamecat.h
index aa996c18e3ef09ff0725435935046ca338e28edb..67b46b0a5ab400304eff223ce54376cad5bd64ba 100644
--- a/gnu/filenamecat.h
+++ b/gnu/filenamecat.h
@@ -1,6 +1,6 @@
/* Concatenate two arbitrary file names.
- Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2017 Free Software
+ Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/flexmember.h b/gnu/flexmember.h
index 7e4f95d3c89cc3bacc6b527542d5475f90e714d5..0d65f6da60f35712017f06c2155a4fe69791ac1b 100644
--- a/gnu/flexmember.h
+++ b/gnu/flexmember.h
@@ -1,6 +1,6 @@
/* Sizes of structs with flexible array members.
- Copyright 2016-2017 Free Software Foundation, Inc.
+ Copyright 2016-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/gnu/float+.h b/gnu/float+.h
index fb999b978c88801a75f2e75879104120176159f4..5af861f7aeb6ce0079262395f7ae735d077919d0 100644
--- a/gnu/float+.h
+++ b/gnu/float+.h
@@ -1,5 +1,5 @@
/* Supplemental information about the floating-point formats.
- Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2007.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/float.c b/gnu/float.c
index c4b059feb2bf04d911c49e0e469e0206155f3a84..8872deb59215eec1d0f29eb56d0437471579feb8 100644
--- a/gnu/float.c
+++ b/gnu/float.c
@@ -1,5 +1,5 @@
/* Auxiliary definitions for <float.h>.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2011.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/float.in.h b/gnu/float.in.h
index e7028e48e696d6cff5054d3b6263b0e2e556f467..ba094a8ef52b523a0f686deaecc193510932de8f 100644
--- a/gnu/float.in.h
+++ b/gnu/float.in.h
@@ -1,6 +1,6 @@
/* A correct <float.h>.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fnmatch.c b/gnu/fnmatch.c
index 0a7e88796010100da380705ba6955296397a133c..dbcd290691c8a77688168fe5ec8269fee1df0c91 100644
--- a/gnu/fnmatch.c
+++ b/gnu/fnmatch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1996-2007, 2009-2017 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993, 1996-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fnmatch.in.h b/gnu/fnmatch.in.h
index 7e9636b93e83c88a6ec93d331abddee2ee11c162..2ead7828a04b2817b7f4da863f1d094190f96391 100644
--- a/gnu/fnmatch.in.h
+++ b/gnu/fnmatch.in.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2017 Free
+/* Substitute for and wrapper around <fnmatch.h>.
+ Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2019 Free
Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,15 +17,29 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <https://www.gnu.org/licenses/>. */
-#ifndef _FNMATCH_H
-#define _FNMATCH_H 1
+#ifndef _@GUARD_PREFIX@_FNMATCH_H
-/* The definition of _GL_ARG_NONNULL is copied here. */
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
-#ifdef __cplusplus
-extern "C" {
+/* The include_next requires a split double-inclusion guard. */
+#if @HAVE_FNMATCH_H@ && !@REPLACE_FNMATCH@
+# @INCLUDE_NEXT@ @NEXT_FNMATCH_H@
#endif
+#ifndef _@GUARD_PREFIX@_FNMATCH_H
+#define _@GUARD_PREFIX@_FNMATCH_H
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
+
+/* The definition of _GL_ARG_NONNULL is copied here. */
+
+/* The definition of _GL_WARN_ON_USE is copied here. */
+
+#if !@HAVE_FNMATCH_H@ || @REPLACE_FNMATCH@
+
/* We #undef these before defining them because some losing systems
(HP-UX A.08.07 for example) define these in <unistd.h>. */
#undef FNM_PATHNAME
@@ -54,14 +69,42 @@ extern "C" {
# define FNM_NOSYS (-1)
#endif
+#endif
+
+
+#if @GNULIB_FNMATCH@
/* Match NAME against the file name pattern PATTERN,
returning zero if it matches, FNM_NOMATCH if not. */
-extern int fnmatch (const char *__pattern, const char *__name,
- int __flags)
- _GL_ARG_NONNULL ((1, 2));
-
-#ifdef __cplusplus
-}
+# if @REPLACE_FNMATCH@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define fnmatch rpl_fnmatch
+# endif
+_GL_FUNCDECL_RPL (fnmatch, int,
+ (const char *pattern, const char *name, int flags)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (fnmatch, int,
+ (const char *pattern, const char *name, int flags));
+# else
+# if !@HAVE_FNMATCH@
+_GL_FUNCDECL_SYS (fnmatch, int,
+ (const char *pattern, const char *name, int flags)
+ _GL_ARG_NONNULL ((1, 2)));
+# endif
+_GL_CXXALIAS_SYS (fnmatch, int,
+ (const char *pattern, const char *name, int flags));
+# endif
+# if !GNULIB_FNMATCH_GNU
+_GL_CXXALIASWARN (fnmatch);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef fnmatch
+# if HAVE_RAW_DECL_FNMATCH
+_GL_WARN_ON_USE (fnmatch,
+ "fnmatch does not portably work - "
+ "use gnulib module fnmatch for portability or gnulib module fnmatch-gnu for a glibc compatible implementation");
+# endif
#endif
-#endif /* fnmatch.h */
+
+#endif /* _@GUARD_PREFIX@_FNMATCH_H */
+#endif /* _@GUARD_PREFIX@_FNMATCH_H */
diff --git a/gnu/fnmatch_loop.c b/gnu/fnmatch_loop.c
index e2292904de8a95c8341089792044c0c3d560996f..82a7ceed7edfa92c9116b7fa05075b294a5f81b3 100644
--- a/gnu/fnmatch_loop.c
+++ b/gnu/fnmatch_loop.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1996-2006, 2009-2017 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993, 1996-2006, 2009-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/fpending.c b/gnu/fpending.c
index 5811a4a74750afdea4b1544d8d7de6b3a9d44ff3..3c01285bb83751f2961f93c17a24abf690b9ce90 100644
--- a/gnu/fpending.c
+++ b/gnu/fpending.c
@@ -1,5 +1,5 @@
/* fpending.c -- return the number of pending output bytes on a stream
- Copyright (C) 2000, 2004, 2006-2007, 2009-2017 Free Software Foundation,
+ Copyright (C) 2000, 2004, 2006-2007, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
@@ -24,6 +24,9 @@
#include "stdio-impl.h"
+/* This file is not used on systems that already have the __fpending function,
+ namely glibc >= 2.2, Solaris >= 7, Android API >= 23. */
+
/* Return the number of pending (aka buffered, unflushed)
bytes on the stream, FP, that is open for writing. */
size_t
@@ -32,7 +35,8 @@ __fpending (FILE *fp)
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
return fp->_IO_write_ptr - fp->_IO_write_base;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
diff --git a/gnu/fpending.h b/gnu/fpending.h
index 73c7d795c180ec8ffce8144a9ef528eff7edec45..097a3ef0717faf628922922a8b030906abae2326 100644
--- a/gnu/fpending.h
+++ b/gnu/fpending.h
@@ -1,6 +1,6 @@
/* Declare __fpending.
- Copyright (C) 2000, 2003, 2005-2006, 2009-2017 Free Software Foundation,
+ Copyright (C) 2000, 2003, 2005-2006, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/fprintftime.h b/gnu/fprintftime.h
index 88f1d242eeca2b23d42774d5e9e1d7d1056d5473..d598d1e0f79004d0576020cb2cb35ed7731f10ba 100644
--- a/gnu/fprintftime.h
+++ b/gnu/fprintftime.h
@@ -1,6 +1,6 @@
/* Generate time strings directly to the output. */
-/* Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fseek.c b/gnu/fseek.c
index 21dbd53f3cf73f1cf19e4407179e874c92a4d1d3..bb22fe085ba1342e5f3b3bcf4ebac2cb03259a70 100644
--- a/gnu/fseek.c
+++ b/gnu/fseek.c
@@ -1,5 +1,5 @@
/* An fseek() function that, together with fflush(), is POSIX compliant.
- Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/fseeko.c b/gnu/fseeko.c
index d0f24d8a838fa0a636a8ca6bd62168464cb688b8..859d212bbe153dca6b587db90baae567373084a8 100644
--- a/gnu/fseeko.c
+++ b/gnu/fseeko.c
@@ -1,5 +1,5 @@
/* An fseeko() function that, together with fflush(), is POSIX compliant.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence)
#endif
#if _GL_WINDOWS_64_BIT_OFF_T
# undef fseeko
-# if HAVE__FSEEKI64 /* msvc, mingw64 */
+# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */
# define fseeko _fseeki64
-# else /* mingw */
+# else /* mingw before msvcrt8.0 */
# define fseeko fseeko64
# endif
#endif
@@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence)
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
@@ -123,7 +124,8 @@ fseeko (FILE *fp, off_t offset, int whence)
return -1;
}
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
diff --git a/gnu/fstat.c b/gnu/fstat.c
index 7ab2cdcb92829d9c9d4da3b6d5450f0ce8908a80..4f0e618810469344efdff56bbe702609c61c8cf0 100644
--- a/gnu/fstat.c
+++ b/gnu/fstat.c
@@ -1,5 +1,5 @@
/* fstat() replacement.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
#include <sys/stat.h>
#undef __need_system_sys_stat_h
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# define WINDOWS_NATIVE
#endif
@@ -45,6 +45,8 @@ orig_fstat (int fd, struct stat *buf)
above. */
#include "sys/stat.h"
+#include "stat-time.h"
+
#include <errno.h>
#include <unistd.h>
#ifdef WINDOWS_NATIVE
@@ -83,6 +85,6 @@ rpl_fstat (int fd, struct stat *buf)
}
return _gl_fstat_by_handle (h, NULL, buf);
#else
- return orig_fstat (fd, buf);
+ return stat_time_normalize (orig_fstat (fd, buf), buf);
#endif
}
diff --git a/gnu/fstatat.c b/gnu/fstatat.c
index 294861f51b1952ed3982cb01b3919a2cc054b468..515b569399190311ce1d298eda75000d9764e3fd 100644
--- a/gnu/fstatat.c
+++ b/gnu/fstatat.c
@@ -1,6 +1,6 @@
/* Work around an fstatat bug on Solaris 9.
- Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -41,6 +41,8 @@ orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
above. */
#include "sys/stat.h"
+#include "stat-time.h"
+
#include <errno.h>
#include <fcntl.h>
#include <string.h>
@@ -51,6 +53,12 @@ orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
# define LSTAT_FOLLOWS_SLASHED_SYMLINK 0
# endif
+static int
+normal_fstatat (int fd, char const *file, struct stat *st, int flag)
+{
+ return stat_time_normalize (orig_fstatat (fd, file, st, flag), st);
+}
+
/* fstatat should always follow symbolic links that end in /, but on
Solaris 9 it doesn't if AT_SYMLINK_NOFOLLOW is specified.
Likewise, trailing slash on a non-directory should be an error.
@@ -63,7 +71,7 @@ orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
int
rpl_fstatat (int fd, char const *file, struct stat *st, int flag)
{
- int result = orig_fstatat (fd, file, st, flag);
+ int result = normal_fstatat (fd, file, st, flag);
size_t len;
if (LSTAT_FOLLOWS_SLASHED_SYMLINK || result != 0)
@@ -79,7 +87,7 @@ rpl_fstatat (int fd, char const *file, struct stat *st, int flag)
errno = ENOTDIR;
return -1;
}
- result = orig_fstatat (fd, file, st, flag & ~AT_SYMLINK_NOFOLLOW);
+ result = normal_fstatat (fd, file, st, flag & ~AT_SYMLINK_NOFOLLOW);
}
/* Fix stat behavior. */
if (result == 0 && !S_ISDIR (st->st_mode) && file[len - 1] == '/')
diff --git a/gnu/full-write.c b/gnu/full-write.c
index 338b94244f63ad90229f3210f9bdb68ef29b956a..ec6f81046ec6a7fbf667049e5a883efe6911cad5 100644
--- a/gnu/full-write.c
+++ b/gnu/full-write.c
@@ -1,6 +1,6 @@
/* An interface to read and write that retries (if necessary) until complete.
- Copyright (C) 1993-1994, 1997-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1993-1994, 1997-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/full-write.h b/gnu/full-write.h
index bc0f162ffba6fb1a41812cecff2d7e48214b3a90..0e0be3a34a783bc334041f4436855140bd81ce9f 100644
--- a/gnu/full-write.h
+++ b/gnu/full-write.h
@@ -1,6 +1,6 @@
/* An interface to write() that writes all it is asked to write.
- Copyright (C) 2002-2003, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/futimens.c b/gnu/futimens.c
index 6c3039262f771532ad4176f7f7dff6559129307b..cc03796c754d758a22f441f789ed230cec03ee31 100644
--- a/gnu/futimens.c
+++ b/gnu/futimens.c
@@ -1,5 +1,5 @@
/* Set the access and modification time of an open fd.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/get-permissions.c b/gnu/get-permissions.c
index c54d71c1c568e4623ec3c4b0cb6f911716c692d9..99b4664aae76122c561d9bb8f200f56d75a3b9de 100644
--- a/gnu/get-permissions.c
+++ b/gnu/get-permissions.c
@@ -1,6 +1,6 @@
/* Get permissions of a file. -*- coding: utf-8 -*-
- Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,16 +31,16 @@
int
get_permissions (const char *name, int desc, mode_t mode,
- struct permission_context *ctx)
+ struct permission_context *ctx)
{
memset (ctx, 0, sizeof *ctx);
ctx->mode = mode;
#if USE_ACL && HAVE_ACL_GET_FILE
/* POSIX 1003.1e (draft 17 -- abandoned) specific version. */
- /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+ /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
# if !HAVE_ACL_TYPE_EXTENDED
- /* Linux, FreeBSD, IRIX, Tru64 */
+ /* Linux, FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */
if (HAVE_ACL_GET_FD && desc != -1)
ctx->acl = acl_get_fd (desc);
@@ -57,16 +57,16 @@ get_permissions (const char *name, int desc, mode_t mode,
{
ctx->default_acl = acl_get_file (name, ACL_TYPE_DEFAULT);
if (ctx->default_acl == NULL)
- return -1;
+ return -1;
}
-# if HAVE_ACL_TYPE_NFS4 /* FreeBSD */
+# if HAVE_ACL_TYPE_NFS4 /* FreeBSD */
/* TODO (see set_permissions). */
-# endif
+# endif
-# else /* HAVE_ACL_TYPE_EXTENDED */
+# else /* HAVE_ACL_TYPE_EXTENDED */
/* Mac OS X */
/* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS)
@@ -115,16 +115,16 @@ get_permissions (const char *name, int desc, mode_t mode,
int ret;
if (desc != -1)
- ret = facl (desc, ACE_GETACLCNT, 0, NULL);
+ ret = facl (desc, ACE_GETACLCNT, 0, NULL);
else
- ret = acl (name, ACE_GETACLCNT, 0, NULL);
+ ret = acl (name, ACE_GETACLCNT, 0, NULL);
if (ret < 0)
- {
- if (errno == ENOSYS || errno == EINVAL)
- ret = 0;
- else
- return -1;
- }
+ {
+ if (errno == ENOSYS || errno == EINVAL)
+ ret = 0;
+ else
+ return -1;
+ }
ctx->ace_count = ret;
if (ctx->ace_count == 0)
@@ -138,15 +138,15 @@ get_permissions (const char *name, int desc, mode_t mode,
}
if (desc != -1)
- ret = facl (desc, ACE_GETACL, ctx->ace_count, ctx->ace_entries);
+ ret = facl (desc, ACE_GETACL, ctx->ace_count, ctx->ace_entries);
else
- ret = acl (name, ACE_GETACL, ctx->ace_count, ctx->ace_entries);
+ ret = acl (name, ACE_GETACL, ctx->ace_count, ctx->ace_entries);
if (ret < 0)
{
if (errno == ENOSYS || errno == EINVAL)
{
- free (ctx->ace_entries);
- ctx->ace_entries = NULL;
+ free (ctx->ace_entries);
+ ctx->ace_entries = NULL;
ctx->ace_count = 0;
break;
}
@@ -154,10 +154,10 @@ get_permissions (const char *name, int desc, mode_t mode,
return -1;
}
if (ret <= ctx->ace_count)
- {
- ctx->ace_count = ret;
- break;
- }
+ {
+ ctx->ace_count = ret;
+ break;
+ }
/* Huh? The number of ACL entries has increased since the last call.
Repeat. */
free (ctx->ace_entries);
@@ -170,20 +170,20 @@ get_permissions (const char *name, int desc, mode_t mode,
int ret;
if (desc != -1)
- ret = facl (desc, GETACLCNT, 0, NULL);
+ ret = facl (desc, GETACLCNT, 0, NULL);
else
- ret = acl (name, GETACLCNT, 0, NULL);
+ ret = acl (name, GETACLCNT, 0, NULL);
if (ret < 0)
- {
- if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
- ret = 0;
- else
- return -1;
- }
+ {
+ if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
+ ret = 0;
+ else
+ return -1;
+ }
ctx->count = ret;
if (ctx->count == 0)
- break;
+ break;
ctx->entries = (aclent_t *) malloc (ctx->count * sizeof (aclent_t));
if (ctx->entries == NULL)
@@ -193,26 +193,26 @@ get_permissions (const char *name, int desc, mode_t mode,
}
if (desc != -1)
- ret = facl (desc, GETACL, ctx->count, ctx->entries);
+ ret = facl (desc, GETACL, ctx->count, ctx->entries);
else
- ret = acl (name, GETACL, ctx->count, ctx->entries);
+ ret = acl (name, GETACL, ctx->count, ctx->entries);
if (ret < 0)
- {
- if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
- {
- free (ctx->entries);
- ctx->entries = NULL;
- ctx->count = 0;
- break;
- }
- else
- return -1;
- }
+ {
+ if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
+ {
+ free (ctx->entries);
+ ctx->entries = NULL;
+ ctx->count = 0;
+ break;
+ }
+ else
+ return -1;
+ }
if (ret <= ctx->count)
- {
- ctx->count = ret;
- break;
- }
+ {
+ ctx->count = ret;
+ break;
+ }
/* Huh? The number of ACL entries has increased since the last call.
Repeat. */
free (ctx->entries);
diff --git a/gnu/getcwd-lgpl.c b/gnu/getcwd-lgpl.c
index 3aaab32bca97e66e624b5af5c7eab000176b2f18..b224cfc9d109ce0d715e66d7a07e872d748277bf 100644
--- a/gnu/getcwd-lgpl.c
+++ b/gnu/getcwd-lgpl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2019 Free Software Foundation, Inc.
This file is part of gnulib.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/getcwd.c b/gnu/getcwd.c
index bb13ddedb30974500b9754062dcd69fdeedf6877..41eedb7005aa8aada1325d62de97c492a8f75b38 100644
--- a/gnu/getcwd.c
+++ b/gnu/getcwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2004-2017 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2004-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/getdelim.c b/gnu/getdelim.c
index 83cc2b0894082b552389e46d382b172d9cbee9a8..528678c2526002536d2ff81e3255ae573a61a13d 100644
--- a/gnu/getdelim.c
+++ b/gnu/getdelim.c
@@ -1,5 +1,5 @@
/* getdelim.c --- Implementation of replacement getdelim function.
- Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2017 Free Software
+ Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2019 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@
static void
alloc_failed (void)
{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* Avoid errno problem without using the realloc module; see:
https://lists.gnu.org/r/bug-gnulib/2016-08/msg00025.html */
errno = ENOMEM;
diff --git a/gnu/getdtablesize.c b/gnu/getdtablesize.c
index d0a5ecaf5d609da83377fb113a75fa5e66b5d1fb..03a92435f0b3b5bbe4fe27cdda200de049a5912d 100644
--- a/gnu/getdtablesize.c
+++ b/gnu/getdtablesize.c
@@ -1,5 +1,5 @@
/* getdtablesize() function: Return maximum possible file descriptor value + 1.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
/* Specification. */
#include <unistd.h>
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# include <stdio.h>
diff --git a/gnu/getfilecon.c b/gnu/getfilecon.c
index 0067dbd297a3dfe6cc8e133166eebe274cd6d6e8..713896de6199a10196506cdaca9a2e0e1073a69a 100644
--- a/gnu/getfilecon.c
+++ b/gnu/getfilecon.c
@@ -1,5 +1,5 @@
/* wrap getfilecon, lgetfilecon, and fgetfilecon
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/getgroups.c b/gnu/getgroups.c
index 52473a5a230f93ed3b3e94d3d1f3f6cfa628ac06..d8c77e9a650654d8e687f6eeafa917987bf09181 100644
--- a/gnu/getgroups.c
+++ b/gnu/getgroups.c
@@ -1,6 +1,6 @@
/* provide consistent interface to getgroups for systems that don't allow N==0
- Copyright (C) 1996, 1999, 2003, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1999, 2003, 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -58,8 +58,8 @@ int posix_getgroups (int, gid_t []) __asm ("_getgroups");
# define getgroups posix_getgroups
# endif
-/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, NULL) always
- fails. On other systems, it returns the number of supplemental
+/* On at least NeXTstep 3.2, getgroups (0, NULL) always fails.
+ On other systems, it returns the number of supplemental
groups for the process. This function handles that special case
and lets the system-provided function handle all others. However,
it can fail with ENOMEM if memory is tight. It is unspecified
diff --git a/gnu/getline.c b/gnu/getline.c
index 92a2543874c2d36eb0d629e3d6c45b291b168f69..40882fb218588a992f728256f3e4b84ba4e16d0e 100644
--- a/gnu/getline.c
+++ b/gnu/getline.c
@@ -1,5 +1,5 @@
/* getline.c --- Implementation of replacement getline function.
- Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/gnu/getopt-cdefs.in.h b/gnu/getopt-cdefs.in.h
index 83a18f9a75e76cb069ac73d2835e923ea037d05e..049145b38699d4a6a72371ad51141c7479ac6265 100644
--- a/gnu/getopt-cdefs.in.h
+++ b/gnu/getopt-cdefs.in.h
@@ -1,5 +1,5 @@
/* getopt-on-non-glibc compatibility macros.
- Copyright (C) 1989-2017 Free Software Foundation, Inc.
+ Copyright (C) 1989-2019 Free Software Foundation, Inc.
This file is part of gnulib.
Unlike most of the getopt implementation, it is NOT shared
with the GNU C Library.
diff --git a/gnu/getopt-core.h b/gnu/getopt-core.h
index ec0734c7230962fd8d3ca31f33924cb21af8eb42..6360ad6942e41b57b164c7eb5ecabfb0c7a1ad66 100644
--- a/gnu/getopt-core.h
+++ b/gnu/getopt-core.h
@@ -1,5 +1,5 @@
/* Declarations for getopt (basic, portable features only).
- Copyright (C) 1989-2017 Free Software Foundation, Inc.
+ Copyright (C) 1989-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library and is also part of gnulib.
Patches to this file should be submitted to both projects.
diff --git a/gnu/getopt-ext.h b/gnu/getopt-ext.h
index 4cdbfb0e7a52c306ca0b526ae31f50cb229494a0..13cb0077beff344211a97e77ea9e6525406f4e3b 100644
--- a/gnu/getopt-ext.h
+++ b/gnu/getopt-ext.h
@@ -1,5 +1,5 @@
/* Declarations for getopt (GNU extensions).
- Copyright (C) 1989-2017 Free Software Foundation, Inc.
+ Copyright (C) 1989-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library and is also part of gnulib.
Patches to this file should be submitted to both projects.
diff --git a/gnu/getopt-pfx-core.h b/gnu/getopt-pfx-core.h
index 02b2b5064d33b46a87e67e0c1d6d149ccfc859d5..8fac2691e8587bc017ba1ec5cd47b99f291874ca 100644
--- a/gnu/getopt-pfx-core.h
+++ b/gnu/getopt-pfx-core.h
@@ -1,5 +1,5 @@
/* getopt (basic, portable features) gnulib wrapper header.
- Copyright (C) 1989-2017 Free Software Foundation, Inc.
+ Copyright (C) 1989-2019 Free Software Foundation, Inc.
This file is part of gnulib.
Unlike most of the getopt implementation, it is NOT shared
with the GNU C Library.
diff --git a/gnu/getopt-pfx-ext.h b/gnu/getopt-pfx-ext.h
index 75e6fd32fe08f82eac6b4783e9b609d4a1166c39..0e21aefb0b7c8096a86caeb913b3c458be98bd1a 100644
--- a/gnu/getopt-pfx-ext.h
+++ b/gnu/getopt-pfx-ext.h
@@ -1,5 +1,5 @@
/* getopt (GNU extensions) gnulib wrapper header.
- Copyright (C) 1989-2017 Free Software Foundation, Inc.
+ Copyright (C) 1989-2019 Free Software Foundation, Inc.
This file is part of gnulib.
Unlike most of the getopt implementation, it is NOT shared
with the GNU C Library.
diff --git a/gnu/getopt.c b/gnu/getopt.c
index b0cc35bfb1bedf0bdcb5876ecfcbd99f09cd4c25..8ee075a8091ca804571e6afe611f984cf7bb05a7 100644
--- a/gnu/getopt.c
+++ b/gnu/getopt.c
@@ -1,5 +1,5 @@
/* Getopt for GNU.
- Copyright (C) 1987-2017 Free Software Foundation, Inc.
+ Copyright (C) 1987-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library and is also part of gnulib.
Patches to this file should be submitted to both projects.
@@ -46,7 +46,7 @@
/* When used standalone, flockfile and funlockfile might not be
available. */
# if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \
- || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+ || (defined _WIN32 && ! defined __CYGWIN__))
# define flockfile(fp) /* nop */
# define funlockfile(fp) /* nop */
# endif
diff --git a/gnu/getopt.in.h b/gnu/getopt.in.h
index 594ed8092a1b50e35b7540139bccd17cf35a0606..c77f34ce587a24dc6c64662b2fe654e497939a1a 100644
--- a/gnu/getopt.in.h
+++ b/gnu/getopt.in.h
@@ -1,5 +1,5 @@
/* Declarations for getopt.
- Copyright (C) 1989-2017 Free Software Foundation, Inc.
+ Copyright (C) 1989-2019 Free Software Foundation, Inc.
This file is part of gnulib.
Unlike most of the getopt implementation, it is NOT shared
with the GNU C Library, which supplies a different version of
diff --git a/gnu/getopt1.c b/gnu/getopt1.c
index d689f4ce67aeec10022b70e9452e8958a6ff579b..883aa6bbc91694b789d9a46996a611c2123aa8c0 100644
--- a/gnu/getopt1.c
+++ b/gnu/getopt1.c
@@ -1,5 +1,5 @@
/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987-2017 Free Software Foundation, Inc.
+ Copyright (C) 1987-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library and is also part of gnulib.
Patches to this file should be submitted to both projects.
diff --git a/gnu/getopt_int.h b/gnu/getopt_int.h
index e33856ce9b9b6b303c930c15115dc1891762af1d..e63706f60ea3eaec4fcce644ebb2b005a6d75e97 100644
--- a/gnu/getopt_int.h
+++ b/gnu/getopt_int.h
@@ -1,5 +1,5 @@
/* Internal declarations for getopt.
- Copyright (C) 1989-2017 Free Software Foundation, Inc.
+ Copyright (C) 1989-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library and is also part of gnulib.
Patches to this file should be submitted to both projects.
diff --git a/gnu/getpagesize.c b/gnu/getpagesize.c
index 4594a4a8b514d6a0f15a88d33af843a3d2d94dd9..3a698292bce9d6f3a459bd1b673e18d72caf7e95 100644
--- a/gnu/getpagesize.c
+++ b/gnu/getpagesize.c
@@ -1,6 +1,6 @@
/* getpagesize emulation for systems where it cannot be done in a C macro.
- Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
#include <unistd.h>
/* This implementation is only for native Windows systems. */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
diff --git a/gnu/getprogname.c b/gnu/getprogname.c
index a2b23362b22239fbccf9593e2d72823af2f325f2..96fa759613549b00fbcadce636f99bd5d2b7707f 100644
--- a/gnu/getprogname.c
+++ b/gnu/getprogname.c
@@ -1,5 +1,5 @@
/* Program name management.
- Copyright (C) 2016-2017 Free Software Foundation, Inc.
+ Copyright (C) 2016-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -110,9 +110,73 @@ getprogname (void)
first = 0;
pid_t pid = getpid ();
struct pst_status status;
- p = (0 < pstat_getproc (&status, sizeof status, 0, pid)
- ? strdup (status.pst_ucomm)
- : NULL);
+ if (pstat_getproc (&status, sizeof status, 0, pid) > 0)
+ {
+ char *ucomm = status.pst_ucomm;
+ char *cmd = status.pst_cmd;
+ if (strlen (ucomm) < PST_UCOMMLEN - 1)
+ p = ucomm;
+ else
+ {
+ /* ucomm is truncated to length PST_UCOMMLEN - 1.
+ Look at cmd instead. */
+ char *space = strchr (cmd, ' ');
+ if (space != NULL)
+ *space = '\0';
+ p = strrchr (cmd, '/');
+ if (p != NULL)
+ p++;
+ else
+ p = cmd;
+ if (strlen (p) > PST_UCOMMLEN - 1
+ && memcmp (p, ucomm, PST_UCOMMLEN - 1) == 0)
+ /* p is less truncated than ucomm. */
+ ;
+ else
+ p = ucomm;
+ }
+ p = strdup (p);
+ }
+ else
+ {
+# if !defined __LP64__
+ /* Support for 32-bit programs running in 64-bit HP-UX.
+ The documented way to do this is to use the same source code
+ as above, but in a compilation unit where '#define _PSTAT64 1'
+ is in effect. I prefer a single compilation unit; the struct
+ size and the offsets are not going to change. */
+ char status64[1216];
+ if (__pstat_getproc64 (status64, sizeof status64, 0, pid) > 0)
+ {
+ char *ucomm = status64 + 288;
+ char *cmd = status64 + 168;
+ if (strlen (ucomm) < PST_UCOMMLEN - 1)
+ p = ucomm;
+ else
+ {
+ /* ucomm is truncated to length PST_UCOMMLEN - 1.
+ Look at cmd instead. */
+ char *space = strchr (cmd, ' ');
+ if (space != NULL)
+ *space = '\0';
+ p = strrchr (cmd, '/');
+ if (p != NULL)
+ p++;
+ else
+ p = cmd;
+ if (strlen (p) > PST_UCOMMLEN - 1
+ && memcmp (p, ucomm, PST_UCOMMLEN - 1) == 0)
+ /* p is less truncated than ucomm. */
+ ;
+ else
+ p = ucomm;
+ }
+ p = strdup (p);
+ }
+ else
+# endif
+ p = NULL;
+ }
if (!p)
p = "?";
}
@@ -182,3 +246,10 @@ getprogname (void)
}
#endif
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */
diff --git a/gnu/getprogname.h b/gnu/getprogname.h
index dd5fac840d2b2c658f90754020fb2038b933e8a6..1590b38d3f143bb69ef752defa4dea800db457d8 100644
--- a/gnu/getprogname.h
+++ b/gnu/getprogname.h
@@ -1,5 +1,5 @@
/* Program name management.
- Copyright (C) 2016-2017 Free Software Foundation, Inc.
+ Copyright (C) 2016-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/gettext.h b/gnu/gettext.h
index f6150be6523d154b14f61800f6ab0b1ad7990c2a..89f53d917bbc73a6a7e2fa3b7fc8c955db8ef1a1 100644
--- a/gnu/gettext.h
+++ b/gnu/gettext.h
@@ -1,5 +1,5 @@
/* Convenience header for conditional use of GNU <libintl.h>.
- Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2017 Free Software
+ Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@ -185,7 +185,7 @@ npgettext_aux (const char *domain,
#include <string.h>
#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
- /* || __STDC_VERSION__ == 199901L
+ /* || (__STDC_VERSION__ == 199901L && !defined __HP_cc)
|| (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ )
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
#else
diff --git a/gnu/gettime.c b/gnu/gettime.c
index e5af26c9902859c7075ef0280ba0c11b46ac62f7..1fd153f6dceba507d7e7f7bc60366c09ee544178 100644
--- a/gnu/gettime.c
+++ b/gnu/gettime.c
@@ -1,6 +1,6 @@
/* gettime -- get the system clock
- Copyright (C) 2002, 2004-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,21 +28,22 @@
void
gettime (struct timespec *ts)
{
-#if HAVE_NANOTIME
- nanotime (ts);
+#if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME
+ clock_gettime (CLOCK_REALTIME, ts);
#else
+ struct timeval tv;
+ gettimeofday (&tv, NULL);
+ ts->tv_sec = tv.tv_sec;
+ ts->tv_nsec = tv.tv_usec * 1000;
+#endif
+}
-# if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME
- if (clock_gettime (CLOCK_REALTIME, ts) == 0)
- return;
-# endif
-
- {
- struct timeval tv;
- gettimeofday (&tv, NULL);
- ts->tv_sec = tv.tv_sec;
- ts->tv_nsec = tv.tv_usec * 1000;
- }
+/* Return the current system time as a struct timespec. */
-#endif
+struct timespec
+current_timespec (void)
+{
+ struct timespec ts;
+ gettime (&ts);
+ return ts;
}
diff --git a/gnu/gettimeofday.c b/gnu/gettimeofday.c
index a11b1830c4c5667ef6c1317c67ddc04646145cb6..360cdc4d7932044d952f0b71bcf88d6e6e3f3307 100644
--- a/gnu/gettimeofday.c
+++ b/gnu/gettimeofday.c
@@ -1,6 +1,6 @@
/* Provide gettimeofday for systems that don't have it or for which it's broken.
- Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
#include <time.h>
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# define WINDOWS_NATIVE
# include <windows.h>
#endif
@@ -33,6 +33,10 @@
#ifdef WINDOWS_NATIVE
+/* Avoid warnings from gcc -Wcast-function-type. */
+# define GetProcAddress \
+ (void *) GetProcAddress
+
/* GetSystemTimePreciseAsFileTime was introduced only in Windows 8. */
typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime);
static GetSystemTimePreciseAsFileTimeFuncType GetSystemTimePreciseAsFileTimeFunc = NULL;
@@ -45,7 +49,7 @@ initialize (void)
if (kernel32 != NULL)
{
GetSystemTimePreciseAsFileTimeFunc =
- (GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime");
+ (GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime");
}
initialized = TRUE;
}
diff --git a/gnu/group-member.c b/gnu/group-member.c
index 7c4ce49675362c26b7572e29853540bb37826c2d..ad61cf0b63025aa912c7f7a509cdaa45d529037b 100644
--- a/gnu/group-member.c
+++ b/gnu/group-member.c
@@ -1,6 +1,6 @@
/* group-member.c -- determine whether group id is in calling user's group list
- Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2017 Free Software
+ Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/hard-locale.c b/gnu/hard-locale.c
index 12a3512e180bf7a5ef20f8dd3155bc8dae59291f..dcfcad62ee7cf86204109b07a7c358e829e9ba94 100644
--- a/gnu/hard-locale.c
+++ b/gnu/hard-locale.c
@@ -1,6 +1,6 @@
/* hard-locale.c -- Determine whether a locale is hard.
- Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2017 Free Software
+ Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/hard-locale.h b/gnu/hard-locale.h
index 7f8533d7640fa239e45734cd1f0450f40111b41d..8f1da96e2f252abf418f41c721b732724f1fcb23 100644
--- a/gnu/hard-locale.h
+++ b/gnu/hard-locale.h
@@ -1,6 +1,6 @@
/* Determine whether a locale is hard.
- Copyright (C) 1999, 2003-2004, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2003-2004, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/hash.c b/gnu/hash.c
index 6e7a4af3c9aa80a73214c76559caf15d8802b91d..9e1f8e8417eb2255c542223dc583efac6e78af59 100644
--- a/gnu/hash.c
+++ b/gnu/hash.c
@@ -1,6 +1,6 @@
/* hash - hashing table processing.
- Copyright (C) 1998-2004, 2006-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-2004, 2006-2007, 2009-2019 Free Software Foundation, Inc.
Written by Jim Meyering, 1992.
diff --git a/gnu/hash.h b/gnu/hash.h
index faac4685d8b7dc6d77a1b0248c42ba5bae601fe4..a1a483a35941bcbc644e56709b0a0e35ed7a130b 100644
--- a/gnu/hash.h
+++ b/gnu/hash.h
@@ -1,5 +1,5 @@
/* hash - hashing table processing.
- Copyright (C) 1998-1999, 2001, 2003, 2009-2017 Free Software Foundation,
+ Copyright (C) 1998-1999, 2001, 2003, 2009-2019 Free Software Foundation,
Inc.
Written by Jim Meyering <meyering@ascend.com>, 1998.
diff --git a/gnu/human.c b/gnu/human.c
index e472501949d25855a0bbea6eb91a738afe8d56cb..fbfa206004a230d4e428b0d9ab9c77f3fd27f323 100644
--- a/gnu/human.c
+++ b/gnu/human.c
@@ -1,6 +1,6 @@
/* human.c -- print human readable file size
- Copyright (C) 1996-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1996-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/human.h b/gnu/human.h
index a87b6f2f66bf7a8aa49afb576db5a41fb89e386a..31a47377e6d5aba2d7ac4b1ecf7674752840e546 100644
--- a/gnu/human.h
+++ b/gnu/human.h
@@ -1,6 +1,6 @@
/* human.h -- print human readable file size
- Copyright (C) 1996-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1996-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/intprops.h b/gnu/intprops.h
index 2df7b1f9f69afdfca3bab94b01fe3b8390a511e3..1a44ae5565373cabbbd2fd032f4c0ccff4265e78 100644
--- a/gnu/intprops.h
+++ b/gnu/intprops.h
@@ -1,6 +1,6 @@
/* intprops.h -- properties of integer types
- Copyright (C) 2001-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
@@ -22,12 +22,13 @@
#include <limits.h>
-/* Return a value with the common real type of E and V and the value of V. */
-#define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
+/* Return a value with the common real type of E and V and the value of V.
+ Do not evaluate E. */
+#define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v))
/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
<https://lists.gnu.org/r/bug-gnulib/2011-05/msg00406.html>. */
-#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v))
+#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v))
/* The extra casts in the following macros work around compiler bugs,
e.g., in Cray C 5.0.3.0. */
@@ -40,13 +41,14 @@
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
/* Return 1 if the real expression E, after promotion, has a
- signed or floating type. */
+ signed or floating type. Do not evaluate E. */
#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
/* Minimum and maximum values for integer types and expressions. */
/* The width in bits of the integer type or expression T.
+ Do not evaluate T.
Padding bits are not supported; this is checked at compile-time below. */
#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
@@ -58,7 +60,7 @@
: ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
/* The maximum and minimum values for the type of the expression E,
- after integer promotion. E should not have side effects. */
+ after integer promotion. E is not evaluated. */
#define _GL_INT_MINIMUM(e) \
(EXPR_SIGNED (e) \
? ~ _GL_SIGNED_INT_MAXIMUM (e) \
@@ -340,8 +342,8 @@
Arguments should be free of side effects. */
#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \
op_result_overflow (a, b, \
- _GL_INT_MINIMUM (0 * (b) + (a)), \
- _GL_INT_MAXIMUM (0 * (b) + (a)))
+ _GL_INT_MINIMUM (_GL_INT_CONVERT (a, b)), \
+ _GL_INT_MAXIMUM (_GL_INT_CONVERT (a, b)))
/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
Return 1 if the result overflows. See above for restrictions. */
diff --git a/gnu/inttostr.h b/gnu/inttostr.h
index 680b84b11686765277ddf8e49c87ed7223522568..7cb677489d08f8784a27a997dec2dcdc9f00b4f3 100644
--- a/gnu/inttostr.h
+++ b/gnu/inttostr.h
@@ -1,6 +1,6 @@
/* inttostr.h -- convert integers to printable strings
- Copyright (C) 2001-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/inttypes.in.h b/gnu/inttypes.in.h
index e7357e96accddbac1ec33d246785a3a67b65b98a..d3c735c12ce2b1ec1afdb15d2a9dd6ce6d8f6d93 100644
--- a/gnu/inttypes.in.h
+++ b/gnu/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2017 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2019 Free Software Foundation, Inc.
Written by Paul Eggert, Bruno Haible, Derek Price.
This file is part of gnulib.
@@ -52,7 +52,7 @@
/* Get CHAR_BIT. */
#include <limits.h>
/* On mingw, __USE_MINGW_ANSI_STDIO only works if <stdio.h> is also included */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# include <stdio.h>
#endif
@@ -1067,11 +1067,13 @@ _GL_WARN_ON_USE (imaxabs, "imaxabs is unportable - "
#endif
#if @GNULIB_IMAXDIV@
-# if !@HAVE_DECL_IMAXDIV@
+# if !@HAVE_IMAXDIV_T@
# if !GNULIB_defined_imaxdiv_t
typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t;
# define GNULIB_defined_imaxdiv_t 1
# endif
+# endif
+# if !@HAVE_DECL_IMAXDIV@
extern imaxdiv_t imaxdiv (intmax_t, intmax_t);
# endif
#elif defined GNULIB_POSIXCHECK
diff --git a/gnu/iswblank.c b/gnu/iswblank.c
index c3b5b072a6daa38c30b64bfaccdd627c8f537a83..6d7a6dfde88869c84bde0591945dc0da6273aff4 100644
--- a/gnu/iswblank.c
+++ b/gnu/iswblank.c
@@ -1,5 +1,5 @@
/* Test wide character for being blank.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/itold.c b/gnu/itold.c
index f787f676bc645524f820fcd860539169aea2ae7f..bca01eb56967ecf51487e8633f087004a0408395 100644
--- a/gnu/itold.c
+++ b/gnu/itold.c
@@ -1,5 +1,5 @@
/* Replacement for 'int' to 'long double' conversion routine.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2011.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/langinfo.in.h b/gnu/langinfo.in.h
index 394737ec694d21cf60c983fb71d873483183fd71..6d4063506d7db210d2b92ca2d93c09a78b193a61 100644
--- a/gnu/langinfo.in.h
+++ b/gnu/langinfo.in.h
@@ -1,5 +1,5 @@
/* Substitute for and wrapper around <langinfo.h>.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -86,6 +86,18 @@ typedef int nl_item;
# define MON_10 (MON_1 + 9)
# define MON_11 (MON_1 + 10)
# define MON_12 (MON_1 + 11)
+# define ALTMON_1 10200
+# define ALTMON_2 (ALTMON_1 + 1)
+# define ALTMON_3 (ALTMON_1 + 2)
+# define ALTMON_4 (ALTMON_1 + 3)
+# define ALTMON_5 (ALTMON_1 + 4)
+# define ALTMON_6 (ALTMON_1 + 5)
+# define ALTMON_7 (ALTMON_1 + 6)
+# define ALTMON_8 (ALTMON_1 + 7)
+# define ALTMON_9 (ALTMON_1 + 8)
+# define ALTMON_10 (ALTMON_1 + 9)
+# define ALTMON_11 (ALTMON_1 + 10)
+# define ALTMON_12 (ALTMON_1 + 11)
# define ABMON_1 10035
# define ABMON_2 (ABMON_1 + 1)
# define ABMON_3 (ABMON_1 + 2)
@@ -138,6 +150,22 @@ typedef int nl_item;
# define GNULIB_defined_T_FMT_AMPM 1
# endif
+# if !@HAVE_LANGINFO_ALTMON@
+# define ALTMON_1 10200
+# define ALTMON_2 (ALTMON_1 + 1)
+# define ALTMON_3 (ALTMON_1 + 2)
+# define ALTMON_4 (ALTMON_1 + 3)
+# define ALTMON_5 (ALTMON_1 + 4)
+# define ALTMON_6 (ALTMON_1 + 5)
+# define ALTMON_7 (ALTMON_1 + 6)
+# define ALTMON_8 (ALTMON_1 + 7)
+# define ALTMON_9 (ALTMON_1 + 8)
+# define ALTMON_10 (ALTMON_1 + 9)
+# define ALTMON_11 (ALTMON_1 + 10)
+# define ALTMON_12 (ALTMON_1 + 11)
+# define GNULIB_defined_ALTMON 1
+# endif
+
# if !@HAVE_LANGINFO_ERA@
# define ERA 10047
# define ERA_D_FMT 10048
diff --git a/gnu/lchown.c b/gnu/lchown.c
index fff81e0b1a5eeedb49e2e883de761fb97ebd5faf..03138c29bb2514507ac6a38fb03495a619bfcf1f 100644
--- a/gnu/lchown.c
+++ b/gnu/lchown.c
@@ -1,6 +1,6 @@
/* Provide a stub lchown function for systems that lack it.
- Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2017 Free Software
+ Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/libc-config.h b/gnu/libc-config.h
new file mode 100644
index 0000000000000000000000000000000000000000..57c69661d2f2c07a274407b1c3983a11c2677132
--- /dev/null
+++ b/gnu/libc-config.h
@@ -0,0 +1,174 @@
+/* System definitions for code taken from the GNU C Library
+
+ Copyright 2017-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public
+ License along with this program; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+/* Written by Paul Eggert. */
+
+/* This is intended to be a good-enough substitute for glibc system
+ macros like those defined in <sys/cdefs.h>, so that Gnulib code
+ shared with glibc can do this as the first #include:
+
+ #ifndef _LIBC
+ # include <libc-config.h>
+ #endif
+
+ When compiled as part of glibc this is a no-op; when compiled as
+ part of Gnulib this includes Gnulib's <config.h> and defines macros
+ that glibc library code would normally assume. */
+
+#include <config.h>
+
+/* On glibc this includes <features.h> and <sys/cdefs.h> and #defines
+ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it
+ includes <sys/cdefs.h> which defines __nonnull. Elsewhere it
+ is harmless. */
+#include <errno.h>
+
+/* From glibc <errno.h>. */
+#ifndef __set_errno
+# define __set_errno(val) (errno = (val))
+#endif
+
+/* From glibc <features.h>. */
+
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) ((maj) < __GNUC__ + ((min) <= __GNUC_MINOR__))
+# else
+# define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#ifndef __glibc_clang_prereq
+# if defined __clang_major__ && defined __clang_minor__
+# define __glibc_clang_prereq(maj, min) \
+ ((maj) < __clang_major__ + ((min) <= __clang_minor__))
+# else
+# define __glibc_clang_prereq(maj, min) 0
+# endif
+#endif
+
+
+/* Prepare to include <cdefs.h>, which is our copy of glibc
+ <sys/cdefs.h>. */
+
+/* Define _FEATURES_H so that <cdefs.h> does not include <features.h>. */
+#ifndef _FEATURES_H
+# define _FEATURES_H 1
+#endif
+/* Define __WORDSIZE so that <cdefs.h> does not attempt to include
+ nonexistent files. Make it a syntax error, since Gnulib does not
+ use __WORDSIZE now, and if Gnulib uses it later the syntax error
+ will let us know that __WORDSIZE needs configuring. */
+#ifndef __WORDSIZE
+# define __WORDSIZE %%%
+#endif
+/* Undef the macros unconditionally defined by our copy of glibc
+ <sys/cdefs.h>, so that they do not clash with any system-defined
+ versions. */
+#undef _SYS_CDEFS_H
+#undef __ASMNAME
+#undef __ASMNAME2
+#undef __BEGIN_DECLS
+#undef __CONCAT
+#undef __END_DECLS
+#undef __HAVE_GENERIC_SELECTION
+#undef __LDBL_COMPAT
+#undef __LDBL_REDIR
+#undef __LDBL_REDIR1
+#undef __LDBL_REDIR1_DECL
+#undef __LDBL_REDIR1_NTH
+#undef __LDBL_REDIR_DECL
+#undef __LDBL_REDIR_NTH
+#undef __LEAF
+#undef __LEAF_ATTR
+#undef __NTH
+#undef __NTHNL
+#undef __P
+#undef __PMT
+#undef __REDIRECT
+#undef __REDIRECT_LDBL
+#undef __REDIRECT_NTH
+#undef __REDIRECT_NTHNL
+#undef __REDIRECT_NTH_LDBL
+#undef __STRING
+#undef __THROW
+#undef __THROWNL
+#undef __always_inline
+#undef __attribute__
+#undef __attribute_alloc_size__
+#undef __attribute_artificial__
+#undef __attribute_const__
+#undef __attribute_deprecated__
+#undef __attribute_deprecated_msg__
+#undef __attribute_format_arg__
+#undef __attribute_format_strfmon__
+#undef __attribute_malloc__
+#undef __attribute_noinline__
+#undef __attribute_nonstring__
+#undef __attribute_pure__
+#undef __attribute_used__
+#undef __attribute_warn_unused_result__
+#undef __bos
+#undef __bos0
+#undef __errordecl
+#undef __extension__
+#undef __extern_always_inline
+#undef __extern_inline
+#undef __flexarr
+#undef __fortify_function
+#undef __glibc_c99_flexarr_available
+#undef __glibc_clang_has_extension
+#undef __glibc_likely
+#undef __glibc_macro_warning
+#undef __glibc_macro_warning1
+#undef __glibc_unlikely
+#undef __inline
+#undef __ptr_t
+#undef __restrict
+#undef __restrict_arr
+#undef __va_arg_pack
+#undef __va_arg_pack_len
+#undef __warnattr
+#undef __warndecl
+
+/* Include our copy of glibc <sys/cdefs.h>. */
+#include <cdefs.h>
+
+/* <cdefs.h> __inline is too pessimistic for non-GCC. */
+#undef __inline
+#ifndef HAVE___INLINE
+# if 199901 <= __STDC_VERSION__ || defined inline
+# define __inline inline
+# else
+# define __inline
+# endif
+#endif
+
+
+/* A substitute for glibc <libc-symbols.h>, good enough for Gnulib. */
+#define attribute_hidden
+#define libc_hidden_proto(name, ...)
+#define libc_hidden_def(name)
+#define libc_hidden_weak(name)
+#define libc_hidden_ver(local, name)
+#define strong_alias(name, aliasname)
+#define weak_alias(name, aliasname)
+
+/* A substitute for glibc <shlib-compat.h>, good enough for Gnulib. */
+#define SHLIB_COMPAT(lib, introduced, obsoleted) 0
+#define versioned_symbol(lib, local, symbol, version)
diff --git a/gnu/limits.in.h b/gnu/limits.in.h
index 78dcf31037e1457e726a3f26dcdfd18e09bba034..39750b38d1a593b2e1c894225f273f047b07eaf1 100644
--- a/gnu/limits.in.h
+++ b/gnu/limits.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <limits.h>.
- Copyright 2016-2017 Free Software Foundation, Inc.
+ Copyright 2016-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -28,15 +28,32 @@
#ifndef _@GUARD_PREFIX@_LIMITS_H
#define _@GUARD_PREFIX@_LIMITS_H
-/* For HP-UX 11.31. */
-#if defined LONG_LONG_MIN && !defined LLONG_MIN
-# define LLONG_MIN LONG_LONG_MIN
+#ifndef LLONG_MIN
+# if defined LONG_LONG_MIN /* HP-UX 11.31 */
+# define LLONG_MIN LONG_LONG_MIN
+# elif defined LONGLONG_MIN /* IRIX 6.5 */
+# define LLONG_MIN LONGLONG_MIN
+# elif defined __GNUC__
+# define LLONG_MIN (- __LONG_LONG_MAX__ - 1LL)
+# endif
#endif
-#if defined LONG_LONG_MAX && !defined LLONG_MAX
-# define LLONG_MAX LONG_LONG_MAX
+#ifndef LLONG_MAX
+# if defined LONG_LONG_MAX /* HP-UX 11.31 */
+# define LLONG_MAX LONG_LONG_MAX
+# elif defined LONGLONG_MAX /* IRIX 6.5 */
+# define LLONG_MAX LONGLONG_MAX
+# elif defined __GNUC__
+# define LLONG_MAX __LONG_LONG_MAX__
+# endif
#endif
-#if defined ULONG_LONG_MAX && !defined ULLONG_MAX
-# define ULLONG_MAX ULONG_LONG_MAX
+#ifndef ULLONG_MAX
+# if defined ULONG_LONG_MAX /* HP-UX 11.31 */
+# define ULLONG_MAX ULONG_LONG_MAX
+# elif defined ULONGLONG_MAX /* IRIX 6.5 */
+# define ULLONG_MAX ULONGLONG_MAX
+# elif defined __GNUC__
+# define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1ULL)
+# endif
#endif
/* The number of usable bits in an unsigned or signed integer type
@@ -53,6 +70,19 @@
#define _GL_COB8(n) (_GL_COB4 ((n) >> 4) + _GL_COB4 (n))
#define _GL_COB4(n) (!!((n) & 8) + !!((n) & 4) + !!((n) & 2) + !!((n) & 1))
+#ifndef WORD_BIT
+/* Assume 'int' is 32 bits wide. */
+# define WORD_BIT 32
+#endif
+#ifndef LONG_BIT
+/* Assume 'long' is 32 or 64 bits wide. */
+# if LONG_MAX == INT_MAX
+# define LONG_BIT 32
+# else
+# define LONG_BIT 64
+# endif
+#endif
+
/* Macros specified by ISO/IEC TS 18661-1:2014. */
#if (! defined ULLONG_WIDTH \
diff --git a/gnu/link.c b/gnu/link.c
index 70ad9ffa5048ba3ad81e1e195311d6c18f732359..2074b62b5c7d1a29a83c8618c7b496ec50446c38 100644
--- a/gnu/link.c
+++ b/gnu/link.c
@@ -1,6 +1,6 @@
/* Emulate link on platforms that lack it, namely native Windows platforms.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,11 +25,15 @@
#include <sys/stat.h>
#if !HAVE_LINK
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
+/* Avoid warnings from gcc -Wcast-function-type. */
+# define GetProcAddress \
+ (void *) GetProcAddress
+
/* CreateHardLink was introduced only in Windows 2000. */
typedef BOOL (WINAPI * CreateHardLinkFuncType) (LPCTSTR lpFileName,
LPCTSTR lpExistingFileName,
diff --git a/gnu/linkat.c b/gnu/linkat.c
index 481717777f8d42aca89b49ad0324bde1cc5e448e..6a4f1a617059ab3589391f738a34064b536ac945 100644
--- a/gnu/linkat.c
+++ b/gnu/linkat.c
@@ -1,5 +1,5 @@
/* Create a hard link relative to open directories.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/localcharset.c b/gnu/localcharset.c
index f16a1a1cb891ca4435f2254d9c34245075311540..38e27e6f3724ac0aa0395cc48a6117a2eb9569b5 100644
--- a/gnu/localcharset.c
+++ b/gnu/localcharset.c
@@ -1,6 +1,6 @@
/* Determine a canonical name for the current locale's character encoding.
- Copyright (C) 2000-2006, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2000-2006, 2008-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
/* Specification. */
#include "localcharset.h"
-#include <fcntl.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
@@ -32,7 +31,7 @@
# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
#endif
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+#if defined _WIN32 && !defined __CYGWIN__
# define WINDOWS_NATIVE
# include <locale.h>
#endif
@@ -45,11 +44,10 @@
#endif
#if !defined WINDOWS_NATIVE
-# include <unistd.h>
# if HAVE_LANGINFO_CODESET
# include <langinfo.h>
# else
-# if 0 /* see comment below */
+# if 0 /* see comment regarding use of setlocale(), below */
# include <locale.h>
# endif
# endif
@@ -71,321 +69,613 @@
# include <xlocale.h>
#endif
-#if ENABLE_RELOCATABLE
-# include "relocatable.h"
-#else
-# define relocate(pathname) (pathname)
-# define relocate2(pathname,allocatedp) (*(allocatedp) = NULL, (pathname))
-#endif
-
-/* Get LIBDIR. */
-#ifndef LIBDIR
-# include "configmake.h"
-#endif
-
-/* Define O_NOFOLLOW to 0 on platforms where it does not exist. */
-#ifndef O_NOFOLLOW
-# define O_NOFOLLOW 0
-#endif
-
-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
- /* Native Windows, Cygwin, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-#endif
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
+#if HAVE_LANGINFO_CODESET || defined WINDOWS_NATIVE || defined OS2
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-#endif
+/* On these platforms, we use a mapping from non-canonical encoding name
+ to GNU canonical encoding name. */
-#if HAVE_DECL_GETC_UNLOCKED
-# undef getc
-# define getc getc_unlocked
-#endif
+/* With glibc-2.1 or newer, we don't need any canonicalization,
+ because glibc has iconv and both glibc and libiconv support all
+ GNU canonical names directly. */
+# if !((defined __GNU_LIBRARY__ && __GLIBC__ >= 2) || defined __UCLIBC__)
-/* The following static variable is declared 'volatile' to avoid a
- possible multithread problem in the function get_charset_aliases. If we
- are running in a threaded environment, and if two threads initialize
- 'charset_aliases' simultaneously, both will produce the same value,
- and everything will be ok if the two assignments to 'charset_aliases'
- are atomic. But I don't know what will happen if the two assignments mix. */
-#if __STDC__ != 1
-# define volatile /* empty */
-#endif
-/* Pointer to the contents of the charset.alias file, if it has already been
- read, else NULL. Its format is:
- ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
-static const char * volatile charset_aliases;
-
-/* Return a pointer to the contents of the charset.alias file. */
-static const char *
-get_charset_aliases (void)
+struct table_entry
{
- const char *cp;
-
- cp = charset_aliases;
- if (cp == NULL)
- {
-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2)
- char *malloc_dir = NULL;
- const char *dir;
- const char *base = "charset.alias";
- char *file_name;
-
- /* Make it possible to override the charset.alias location. This is
- necessary for running the testsuite before "make install". */
- dir = getenv ("CHARSETALIASDIR");
- if (dir == NULL || dir[0] == '\0')
- dir = relocate2 (LIBDIR, &malloc_dir);
-
- /* Concatenate dir and base into freshly allocated file_name. */
- {
- size_t dir_len = strlen (dir);
- size_t base_len = strlen (base);
- int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
- file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
- if (file_name != NULL)
- {
- memcpy (file_name, dir, dir_len);
- if (add_slash)
- file_name[dir_len] = DIRECTORY_SEPARATOR;
- memcpy (file_name + dir_len + add_slash, base, base_len + 1);
- }
- }
-
- free (malloc_dir);
-
- if (file_name == NULL)
- /* Out of memory. Treat the file as empty. */
- cp = "";
- else
- {
- int fd;
-
- /* Open the file. Reject symbolic links on platforms that support
- O_NOFOLLOW. This is a security feature. Without it, an attacker
- could retrieve parts of the contents (namely, the tail of the
- first line that starts with "* ") of an arbitrary file by placing
- a symbolic link to that file under the name "charset.alias" in
- some writable directory and defining the environment variable
- CHARSETALIASDIR to point to that directory. */
- fd = open (file_name,
- O_RDONLY | (HAVE_WORKING_O_NOFOLLOW ? O_NOFOLLOW : 0));
- if (fd < 0)
- /* File not found. Treat it as empty. */
- cp = "";
- else
- {
- FILE *fp;
-
- fp = fdopen (fd, "r");
- if (fp == NULL)
- {
- /* Out of memory. Treat the file as empty. */
- close (fd);
- cp = "";
- }
- else
- {
- /* Parse the file's contents. */
- char *res_ptr = NULL;
- size_t res_size = 0;
-
- for (;;)
- {
- int c;
- char buf1[50+1];
- char buf2[50+1];
- size_t l1, l2;
- char *old_res_ptr;
-
- c = getc (fp);
- if (c == EOF)
- break;
- if (c == '\n' || c == ' ' || c == '\t')
- continue;
- if (c == '#')
- {
- /* Skip comment, to end of line. */
- do
- c = getc (fp);
- while (!(c == EOF || c == '\n'));
- if (c == EOF)
- break;
- continue;
- }
- ungetc (c, fp);
- if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
- break;
- l1 = strlen (buf1);
- l2 = strlen (buf2);
- old_res_ptr = res_ptr;
- if (res_size == 0)
- {
- res_size = l1 + 1 + l2 + 1;
- res_ptr = (char *) malloc (res_size + 1);
- }
- else
- {
- res_size += l1 + 1 + l2 + 1;
- res_ptr = (char *) realloc (res_ptr, res_size + 1);
- }
- if (res_ptr == NULL)
- {
- /* Out of memory. */
- res_size = 0;
- free (old_res_ptr);
- break;
- }
- strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
- strcpy (res_ptr + res_size - (l2 + 1), buf2);
- }
- fclose (fp);
- if (res_size == 0)
- cp = "";
- else
- {
- *(res_ptr + res_size) = '\0';
- cp = res_ptr;
- }
- }
- }
+ const char alias[11+1];
+ const char canonical[11+1];
+};
+
+/* Table of platform-dependent mappings, sorted in ascending order. */
+static const struct table_entry alias_table[] =
+ {
+# if defined __FreeBSD__ /* FreeBSD */
+ /*{ "ARMSCII-8", "ARMSCII-8" },*/
+ { "Big5", "BIG5" },
+ { "C", "ASCII" },
+ /*{ "CP1131", "CP1131" },*/
+ /*{ "CP1251", "CP1251" },*/
+ /*{ "CP866", "CP866" },*/
+ /*{ "GB18030", "GB18030" },*/
+ /*{ "GB2312", "GB2312" },*/
+ /*{ "GBK", "GBK" },*/
+ /*{ "ISCII-DEV", "?" },*/
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-13", "ISO-8859-13" },
+ { "ISO8859-15", "ISO-8859-15" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-7", "ISO-8859-7" },
+ { "ISO8859-9", "ISO-8859-9" },
+ /*{ "KOI8-R", "KOI8-R" },*/
+ /*{ "KOI8-U", "KOI8-U" },*/
+ { "SJIS", "SHIFT_JIS" },
+ { "US-ASCII", "ASCII" },
+ { "eucCN", "GB2312" },
+ { "eucJP", "EUC-JP" },
+ { "eucKR", "EUC-KR" }
+# define alias_table_defined
+# endif
+# if defined __NetBSD__ /* NetBSD */
+ { "646", "ASCII" },
+ /*{ "ARMSCII-8", "ARMSCII-8" },*/
+ /*{ "BIG5", "BIG5" },*/
+ { "Big5-HKSCS", "BIG5-HKSCS" },
+ /*{ "CP1251", "CP1251" },*/
+ /*{ "CP866", "CP866" },*/
+ /*{ "GB18030", "GB18030" },*/
+ /*{ "GB2312", "GB2312" },*/
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-13", "ISO-8859-13" },
+ { "ISO8859-15", "ISO-8859-15" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-4", "ISO-8859-4" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-7", "ISO-8859-7" },
+ /*{ "KOI8-R", "KOI8-R" },*/
+ /*{ "KOI8-U", "KOI8-U" },*/
+ /*{ "PT154", "PT154" },*/
+ { "SJIS", "SHIFT_JIS" },
+ { "eucCN", "GB2312" },
+ { "eucJP", "EUC-JP" },
+ { "eucKR", "EUC-KR" },
+ { "eucTW", "EUC-TW" }
+# define alias_table_defined
+# endif
+# if defined __OpenBSD__ /* OpenBSD */
+ { "646", "ASCII" },
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-13", "ISO-8859-13" },
+ { "ISO8859-15", "ISO-8859-15" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-4", "ISO-8859-4" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-7", "ISO-8859-7" }
+# define alias_table_defined
+# endif
+# if defined __APPLE__ && defined __MACH__ /* Mac OS X */
+ /* Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is
+ useless:
+ - It returns the empty string when LANG is set to a locale of the
+ form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
+ LC_CTYPE file.
+ - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
+ the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
+ - The documentation says:
+ "... all code that calls BSD system routines should ensure
+ that the const *char parameters of these routines are in UTF-8
+ encoding. All BSD system functions expect their string
+ parameters to be in UTF-8 encoding and nothing else."
+ It also says
+ "An additional caveat is that string parameters for files,
+ paths, and other file-system entities must be in canonical
+ UTF-8. In a canonical UTF-8 Unicode string, all decomposable
+ characters are decomposed ..."
+ but this is not true: You can pass non-decomposed UTF-8 strings
+ to file system functions, and it is the OS which will convert
+ them to decomposed UTF-8 before accessing the file system.
+ - The Apple Terminal application displays UTF-8 by default.
+ - However, other applications are free to use different encodings:
+ - xterm uses ISO-8859-1 by default.
+ - TextEdit uses MacRoman by default.
+ We prefer UTF-8 over decomposed UTF-8-MAC because one should
+ minimize the use of decomposed Unicode. Unfortunately, through the
+ Darwin file system, decomposed UTF-8 strings are leaked into user
+ space nevertheless.
+ Then there are also the locales with encodings other than US-ASCII
+ and UTF-8. These locales can be occasionally useful to users (e.g.
+ when grepping through ISO-8859-1 encoded text files), when all their
+ file names are in US-ASCII.
+ */
+ { "ARMSCII-8", "ARMSCII-8" },
+ { "Big5", "BIG5" },
+ { "Big5HKSCS", "BIG5-HKSCS" },
+ { "CP1131", "CP1131" },
+ { "CP1251", "CP1251" },
+ { "CP866", "CP866" },
+ { "CP949", "CP949" },
+ { "GB18030", "GB18030" },
+ { "GB2312", "GB2312" },
+ { "GBK", "GBK" },
+ /*{ "ISCII-DEV", "?" },*/
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-13", "ISO-8859-13" },
+ { "ISO8859-15", "ISO-8859-15" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-4", "ISO-8859-4" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-7", "ISO-8859-7" },
+ { "ISO8859-9", "ISO-8859-9" },
+ { "KOI8-R", "KOI8-R" },
+ { "KOI8-U", "KOI8-U" },
+ { "PT154", "PT154" },
+ { "SJIS", "SHIFT_JIS" },
+ { "eucCN", "GB2312" },
+ { "eucJP", "EUC-JP" },
+ { "eucKR", "EUC-KR" }
+# define alias_table_defined
+# endif
+# if defined _AIX /* AIX */
+ /*{ "GBK", "GBK" },*/
+ { "IBM-1046", "CP1046" },
+ { "IBM-1124", "CP1124" },
+ { "IBM-1129", "CP1129" },
+ { "IBM-1252", "CP1252" },
+ { "IBM-850", "CP850" },
+ { "IBM-856", "CP856" },
+ { "IBM-921", "ISO-8859-13" },
+ { "IBM-922", "CP922" },
+ { "IBM-932", "CP932" },
+ { "IBM-943", "CP943" },
+ { "IBM-eucCN", "GB2312" },
+ { "IBM-eucJP", "EUC-JP" },
+ { "IBM-eucKR", "EUC-KR" },
+ { "IBM-eucTW", "EUC-TW" },
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-15", "ISO-8859-15" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-6", "ISO-8859-6" },
+ { "ISO8859-7", "ISO-8859-7" },
+ { "ISO8859-8", "ISO-8859-8" },
+ { "ISO8859-9", "ISO-8859-9" },
+ { "TIS-620", "TIS-620" },
+ /*{ "UTF-8", "UTF-8" },*/
+ { "big5", "BIG5" }
+# define alias_table_defined
+# endif
+# if defined __hpux /* HP-UX */
+ { "SJIS", "SHIFT_JIS" },
+ { "arabic8", "HP-ARABIC8" },
+ { "big5", "BIG5" },
+ { "cp1251", "CP1251" },
+ { "eucJP", "EUC-JP" },
+ { "eucKR", "EUC-KR" },
+ { "eucTW", "EUC-TW" },
+ { "gb18030", "GB18030" },
+ { "greek8", "HP-GREEK8" },
+ { "hebrew8", "HP-HEBREW8" },
+ { "hkbig5", "BIG5-HKSCS" },
+ { "hp15CN", "GB2312" },
+ { "iso88591", "ISO-8859-1" },
+ { "iso885913", "ISO-8859-13" },
+ { "iso885915", "ISO-8859-15" },
+ { "iso88592", "ISO-8859-2" },
+ { "iso88594", "ISO-8859-4" },
+ { "iso88595", "ISO-8859-5" },
+ { "iso88596", "ISO-8859-6" },
+ { "iso88597", "ISO-8859-7" },
+ { "iso88598", "ISO-8859-8" },
+ { "iso88599", "ISO-8859-9" },
+ { "kana8", "HP-KANA8" },
+ { "koi8r", "KOI8-R" },
+ { "roman8", "HP-ROMAN8" },
+ { "tis620", "TIS-620" },
+ { "turkish8", "HP-TURKISH8" },
+ { "utf8", "UTF-8" }
+# define alias_table_defined
+# endif
+# if defined __sgi /* IRIX */
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-15", "ISO-8859-15" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-7", "ISO-8859-7" },
+ { "ISO8859-9", "ISO-8859-9" },
+ { "eucCN", "GB2312" },
+ { "eucJP", "EUC-JP" },
+ { "eucKR", "EUC-KR" },
+ { "eucTW", "EUC-TW" }
+# define alias_table_defined
+# endif
+# if defined __osf__ /* OSF/1 */
+ /*{ "GBK", "GBK" },*/
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-15", "ISO-8859-15" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-4", "ISO-8859-4" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-7", "ISO-8859-7" },
+ { "ISO8859-8", "ISO-8859-8" },
+ { "ISO8859-9", "ISO-8859-9" },
+ { "KSC5601", "CP949" },
+ { "SJIS", "SHIFT_JIS" },
+ { "TACTIS", "TIS-620" },
+ /*{ "UTF-8", "UTF-8" },*/
+ { "big5", "BIG5" },
+ { "cp850", "CP850" },
+ { "dechanyu", "DEC-HANYU" },
+ { "dechanzi", "GB2312" },
+ { "deckanji", "DEC-KANJI" },
+ { "deckorean", "EUC-KR" },
+ { "eucJP", "EUC-JP" },
+ { "eucKR", "EUC-KR" },
+ { "eucTW", "EUC-TW" },
+ { "sdeckanji", "EUC-JP" }
+# define alias_table_defined
+# endif
+# if defined __sun /* Solaris */
+ { "5601", "EUC-KR" },
+ { "646", "ASCII" },
+ /*{ "BIG5", "BIG5" },*/
+ { "Big5-HKSCS", "BIG5-HKSCS" },
+ { "GB18030", "GB18030" },
+ /*{ "GBK", "GBK" },*/
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-11", "TIS-620" },
+ { "ISO8859-13", "ISO-8859-13" },
+ { "ISO8859-15", "ISO-8859-15" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-3", "ISO-8859-3" },
+ { "ISO8859-4", "ISO-8859-4" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-6", "ISO-8859-6" },
+ { "ISO8859-7", "ISO-8859-7" },
+ { "ISO8859-8", "ISO-8859-8" },
+ { "ISO8859-9", "ISO-8859-9" },
+ { "PCK", "SHIFT_JIS" },
+ { "TIS620.2533", "TIS-620" },
+ /*{ "UTF-8", "UTF-8" },*/
+ { "ansi-1251", "CP1251" },
+ { "cns11643", "EUC-TW" },
+ { "eucJP", "EUC-JP" },
+ { "gb2312", "GB2312" },
+ { "koi8-r", "KOI8-R" }
+# define alias_table_defined
+# endif
+# if defined __minix /* Minix */
+ { "646", "ASCII" }
+# define alias_table_defined
+# endif
+# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Windows */
+ { "CP1361", "JOHAB" },
+ { "CP20127", "ASCII" },
+ { "CP20866", "KOI8-R" },
+ { "CP20936", "GB2312" },
+ { "CP21866", "KOI8-RU" },
+ { "CP28591", "ISO-8859-1" },
+ { "CP28592", "ISO-8859-2" },
+ { "CP28593", "ISO-8859-3" },
+ { "CP28594", "ISO-8859-4" },
+ { "CP28595", "ISO-8859-5" },
+ { "CP28596", "ISO-8859-6" },
+ { "CP28597", "ISO-8859-7" },
+ { "CP28598", "ISO-8859-8" },
+ { "CP28599", "ISO-8859-9" },
+ { "CP28605", "ISO-8859-15" },
+ { "CP38598", "ISO-8859-8" },
+ { "CP51932", "EUC-JP" },
+ { "CP51936", "GB2312" },
+ { "CP51949", "EUC-KR" },
+ { "CP51950", "EUC-TW" },
+ { "CP54936", "GB18030" },
+ { "CP65001", "UTF-8" },
+ { "CP936", "GBK" }
+# define alias_table_defined
+# endif
+# if defined OS2 /* OS/2 */
+ /* The list of encodings is taken from "List of OS/2 Codepages"
+ by Alex Taylor:
+ <http://altsan.org/os2/toolkits/uls/index.html#codepages>.
+ See also "IBM Globalization - Code page identifiers":
+ <https://www-01.ibm.com/software/globalization/cp/cp_cpgid.html>. */
+ { "CP1089", "ISO-8859-6" },
+ { "CP1208", "UTF-8" },
+ { "CP1381", "GB2312" },
+ { "CP1386", "GBK" },
+ { "CP3372", "EUC-JP" },
+ { "CP813", "ISO-8859-7" },
+ { "CP819", "ISO-8859-1" },
+ { "CP878", "KOI8-R" },
+ { "CP912", "ISO-8859-2" },
+ { "CP913", "ISO-8859-3" },
+ { "CP914", "ISO-8859-4" },
+ { "CP915", "ISO-8859-5" },
+ { "CP916", "ISO-8859-8" },
+ { "CP920", "ISO-8859-9" },
+ { "CP921", "ISO-8859-13" },
+ { "CP923", "ISO-8859-15" },
+ { "CP954", "EUC-JP" },
+ { "CP964", "EUC-TW" },
+ { "CP970", "EUC-KR" }
+# define alias_table_defined
+# endif
+# if defined VMS /* OpenVMS */
+ /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
+ "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
+ section 10.7 "Handling Different Character Sets". */
+ { "DECHANYU", "DEC-HANYU" },
+ { "DECHANZI", "GB2312" },
+ { "DECKANJI", "DEC-KANJI" },
+ { "DECKOREAN", "EUC-KR" },
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-7", "ISO-8859-7" },
+ { "ISO8859-8", "ISO-8859-8" },
+ { "ISO8859-9", "ISO-8859-9" },
+ { "SDECKANJI", "EUC-JP" },
+ { "SJIS", "SHIFT_JIS" },
+ { "eucJP", "EUC-JP" },
+ { "eucTW", "EUC-TW" }
+# define alias_table_defined
+# endif
+# ifndef alias_table_defined
+ /* Just a dummy entry, to avoid a C syntax error. */
+ { "", "" }
+# endif
+ };
- free (file_name);
- }
+# endif
#else
-# if defined DARWIN7
- /* To avoid the trouble of installing a file that is shared by many
- GNU packages -- many packaging systems have problems with this --,
- simply inline the aliases here. */
- cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
- "ISO8859-2" "\0" "ISO-8859-2" "\0"
- "ISO8859-4" "\0" "ISO-8859-4" "\0"
- "ISO8859-5" "\0" "ISO-8859-5" "\0"
- "ISO8859-7" "\0" "ISO-8859-7" "\0"
- "ISO8859-9" "\0" "ISO-8859-9" "\0"
- "ISO8859-13" "\0" "ISO-8859-13" "\0"
- "ISO8859-15" "\0" "ISO-8859-15" "\0"
- "KOI8-R" "\0" "KOI8-R" "\0"
- "KOI8-U" "\0" "KOI8-U" "\0"
- "CP866" "\0" "CP866" "\0"
- "CP949" "\0" "CP949" "\0"
- "CP1131" "\0" "CP1131" "\0"
- "CP1251" "\0" "CP1251" "\0"
- "eucCN" "\0" "GB2312" "\0"
- "GB2312" "\0" "GB2312" "\0"
- "eucJP" "\0" "EUC-JP" "\0"
- "eucKR" "\0" "EUC-KR" "\0"
- "Big5" "\0" "BIG5" "\0"
- "Big5HKSCS" "\0" "BIG5-HKSCS" "\0"
- "GBK" "\0" "GBK" "\0"
- "GB18030" "\0" "GB18030" "\0"
- "SJIS" "\0" "SHIFT_JIS" "\0"
- "ARMSCII-8" "\0" "ARMSCII-8" "\0"
- "PT154" "\0" "PT154" "\0"
- /*"ISCII-DEV" "\0" "?" "\0"*/
- "*" "\0" "UTF-8" "\0";
-# endif
+/* On these platforms, we use a mapping from locale name to GNU canonical
+ encoding name. */
-# if defined VMS
- /* To avoid the troubles of an extra file charset.alias_vms in the
- sources of many GNU packages, simply inline the aliases here. */
- /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
- "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
- section 10.7 "Handling Different Character Sets". */
- cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
- "ISO8859-2" "\0" "ISO-8859-2" "\0"
- "ISO8859-5" "\0" "ISO-8859-5" "\0"
- "ISO8859-7" "\0" "ISO-8859-7" "\0"
- "ISO8859-8" "\0" "ISO-8859-8" "\0"
- "ISO8859-9" "\0" "ISO-8859-9" "\0"
- /* Japanese */
- "eucJP" "\0" "EUC-JP" "\0"
- "SJIS" "\0" "SHIFT_JIS" "\0"
- "DECKANJI" "\0" "DEC-KANJI" "\0"
- "SDECKANJI" "\0" "EUC-JP" "\0"
- /* Chinese */
- "eucTW" "\0" "EUC-TW" "\0"
- "DECHANYU" "\0" "DEC-HANYU" "\0"
- "DECHANZI" "\0" "GB2312" "\0"
- /* Korean */
- "DECKOREAN" "\0" "EUC-KR" "\0";
+struct table_entry
+{
+ const char locale[17+1];
+ const char canonical[11+1];
+};
+
+/* Table of platform-dependent mappings, sorted in ascending order. */
+static const struct table_entry locale_table[] =
+ {
+# if defined __FreeBSD__ /* FreeBSD 4.2 */
+ { "cs_CZ.ISO_8859-2", "ISO-8859-2" },
+ { "da_DK.DIS_8859-15", "ISO-8859-15" },
+ { "da_DK.ISO_8859-1", "ISO-8859-1" },
+ { "de_AT.DIS_8859-15", "ISO-8859-15" },
+ { "de_AT.ISO_8859-1", "ISO-8859-1" },
+ { "de_CH.DIS_8859-15", "ISO-8859-15" },
+ { "de_CH.ISO_8859-1", "ISO-8859-1" },
+ { "de_DE.DIS_8859-15", "ISO-8859-15" },
+ { "de_DE.ISO_8859-1", "ISO-8859-1" },
+ { "en_AU.DIS_8859-15", "ISO-8859-15" },
+ { "en_AU.ISO_8859-1", "ISO-8859-1" },
+ { "en_CA.DIS_8859-15", "ISO-8859-15" },
+ { "en_CA.ISO_8859-1", "ISO-8859-1" },
+ { "en_GB.DIS_8859-15", "ISO-8859-15" },
+ { "en_GB.ISO_8859-1", "ISO-8859-1" },
+ { "en_US.DIS_8859-15", "ISO-8859-15" },
+ { "en_US.ISO_8859-1", "ISO-8859-1" },
+ { "es_ES.DIS_8859-15", "ISO-8859-15" },
+ { "es_ES.ISO_8859-1", "ISO-8859-1" },
+ { "fi_FI.DIS_8859-15", "ISO-8859-15" },
+ { "fi_FI.ISO_8859-1", "ISO-8859-1" },
+ { "fr_BE.DIS_8859-15", "ISO-8859-15" },
+ { "fr_BE.ISO_8859-1", "ISO-8859-1" },
+ { "fr_CA.DIS_8859-15", "ISO-8859-15" },
+ { "fr_CA.ISO_8859-1", "ISO-8859-1" },
+ { "fr_CH.DIS_8859-15", "ISO-8859-15" },
+ { "fr_CH.ISO_8859-1", "ISO-8859-1" },
+ { "fr_FR.DIS_8859-15", "ISO-8859-15" },
+ { "fr_FR.ISO_8859-1", "ISO-8859-1" },
+ { "hr_HR.ISO_8859-2", "ISO-8859-2" },
+ { "hu_HU.ISO_8859-2", "ISO-8859-2" },
+ { "is_IS.DIS_8859-15", "ISO-8859-15" },
+ { "is_IS.ISO_8859-1", "ISO-8859-1" },
+ { "it_CH.DIS_8859-15", "ISO-8859-15" },
+ { "it_CH.ISO_8859-1", "ISO-8859-1" },
+ { "it_IT.DIS_8859-15", "ISO-8859-15" },
+ { "it_IT.ISO_8859-1", "ISO-8859-1" },
+ { "ja_JP.EUC", "EUC-JP" },
+ { "ja_JP.SJIS", "SHIFT_JIS" },
+ { "ja_JP.Shift_JIS", "SHIFT_JIS" },
+ { "ko_KR.EUC", "EUC-KR" },
+ { "la_LN.ASCII", "ASCII" },
+ { "la_LN.DIS_8859-15", "ISO-8859-15" },
+ { "la_LN.ISO_8859-1", "ISO-8859-1" },
+ { "la_LN.ISO_8859-2", "ISO-8859-2" },
+ { "la_LN.ISO_8859-4", "ISO-8859-4" },
+ { "lt_LN.ASCII", "ASCII" },
+ { "lt_LN.DIS_8859-15", "ISO-8859-15" },
+ { "lt_LN.ISO_8859-1", "ISO-8859-1" },
+ { "lt_LN.ISO_8859-2", "ISO-8859-2" },
+ { "lt_LT.ISO_8859-4", "ISO-8859-4" },
+ { "nl_BE.DIS_8859-15", "ISO-8859-15" },
+ { "nl_BE.ISO_8859-1", "ISO-8859-1" },
+ { "nl_NL.DIS_8859-15", "ISO-8859-15" },
+ { "nl_NL.ISO_8859-1", "ISO-8859-1" },
+ { "no_NO.DIS_8859-15", "ISO-8859-15" },
+ { "no_NO.ISO_8859-1", "ISO-8859-1" },
+ { "pl_PL.ISO_8859-2", "ISO-8859-2" },
+ { "pt_PT.DIS_8859-15", "ISO-8859-15" },
+ { "pt_PT.ISO_8859-1", "ISO-8859-1" },
+ { "ru_RU.CP866", "CP866" },
+ { "ru_RU.ISO_8859-5", "ISO-8859-5" },
+ { "ru_RU.KOI8-R", "KOI8-R" },
+ { "ru_SU.CP866", "CP866" },
+ { "ru_SU.ISO_8859-5", "ISO-8859-5" },
+ { "ru_SU.KOI8-R", "KOI8-R" },
+ { "sl_SI.ISO_8859-2", "ISO-8859-2" },
+ { "sv_SE.DIS_8859-15", "ISO-8859-15" },
+ { "sv_SE.ISO_8859-1", "ISO-8859-1" },
+ { "uk_UA.KOI8-U", "KOI8-U" },
+ { "zh_CN.EUC", "GB2312" },
+ { "zh_TW.BIG5", "BIG5" },
+ { "zh_TW.Big5", "BIG5" }
+# define locale_table_defined
# endif
-
-# if defined WINDOWS_NATIVE || defined __CYGWIN__
- /* To avoid the troubles of installing a separate file in the same
- directory as the DLL and of retrieving the DLL's directory at
- runtime, simply inline the aliases here. */
-
- cp = "CP936" "\0" "GBK" "\0"
- "CP1361" "\0" "JOHAB" "\0"
- "CP20127" "\0" "ASCII" "\0"
- "CP20866" "\0" "KOI8-R" "\0"
- "CP20936" "\0" "GB2312" "\0"
- "CP21866" "\0" "KOI8-RU" "\0"
- "CP28591" "\0" "ISO-8859-1" "\0"
- "CP28592" "\0" "ISO-8859-2" "\0"
- "CP28593" "\0" "ISO-8859-3" "\0"
- "CP28594" "\0" "ISO-8859-4" "\0"
- "CP28595" "\0" "ISO-8859-5" "\0"
- "CP28596" "\0" "ISO-8859-6" "\0"
- "CP28597" "\0" "ISO-8859-7" "\0"
- "CP28598" "\0" "ISO-8859-8" "\0"
- "CP28599" "\0" "ISO-8859-9" "\0"
- "CP28605" "\0" "ISO-8859-15" "\0"
- "CP38598" "\0" "ISO-8859-8" "\0"
- "CP51932" "\0" "EUC-JP" "\0"
- "CP51936" "\0" "GB2312" "\0"
- "CP51949" "\0" "EUC-KR" "\0"
- "CP51950" "\0" "EUC-TW" "\0"
- "CP54936" "\0" "GB18030" "\0"
- "CP65001" "\0" "UTF-8" "\0";
+# if defined __DJGPP__ /* DOS / DJGPP 2.03 */
+ /* The encodings given here may not all be correct.
+ If you find that the encoding given for your language and
+ country is not the one your DOS machine actually uses, just
+ correct it in this file, and send a mail to
+ Juan Manuel Guerrero <juan.guerrero@gmx.de>
+ and <bug-gnulib@gnu.org>. */
+ { "C", "ASCII" },
+ { "ar", "CP864" },
+ { "ar_AE", "CP864" },
+ { "ar_DZ", "CP864" },
+ { "ar_EG", "CP864" },
+ { "ar_IQ", "CP864" },
+ { "ar_IR", "CP864" },
+ { "ar_JO", "CP864" },
+ { "ar_KW", "CP864" },
+ { "ar_MA", "CP864" },
+ { "ar_OM", "CP864" },
+ { "ar_QA", "CP864" },
+ { "ar_SA", "CP864" },
+ { "ar_SY", "CP864" },
+ { "be", "CP866" },
+ { "be_BE", "CP866" },
+ { "bg", "CP866" }, /* not CP855 ?? */
+ { "bg_BG", "CP866" }, /* not CP855 ?? */
+ { "ca", "CP850" },
+ { "ca_ES", "CP850" },
+ { "cs", "CP852" },
+ { "cs_CZ", "CP852" },
+ { "da", "CP865" }, /* not CP850 ?? */
+ { "da_DK", "CP865" }, /* not CP850 ?? */
+ { "de", "CP850" },
+ { "de_AT", "CP850" },
+ { "de_CH", "CP850" },
+ { "de_DE", "CP850" },
+ { "el", "CP869" },
+ { "el_GR", "CP869" },
+ { "en", "CP850" },
+ { "en_AU", "CP850" }, /* not CP437 ?? */
+ { "en_CA", "CP850" },
+ { "en_GB", "CP850" },
+ { "en_NZ", "CP437" },
+ { "en_US", "CP437" },
+ { "en_ZA", "CP850" }, /* not CP437 ?? */
+ { "eo", "CP850" },
+ { "eo_EO", "CP850" },
+ { "es", "CP850" },
+ { "es_AR", "CP850" },
+ { "es_BO", "CP850" },
+ { "es_CL", "CP850" },
+ { "es_CO", "CP850" },
+ { "es_CR", "CP850" },
+ { "es_CU", "CP850" },
+ { "es_DO", "CP850" },
+ { "es_EC", "CP850" },
+ { "es_ES", "CP850" },
+ { "es_GT", "CP850" },
+ { "es_HN", "CP850" },
+ { "es_MX", "CP850" },
+ { "es_NI", "CP850" },
+ { "es_PA", "CP850" },
+ { "es_PE", "CP850" },
+ { "es_PY", "CP850" },
+ { "es_SV", "CP850" },
+ { "es_UY", "CP850" },
+ { "es_VE", "CP850" },
+ { "et", "CP850" },
+ { "et_EE", "CP850" },
+ { "eu", "CP850" },
+ { "eu_ES", "CP850" },
+ { "fi", "CP850" },
+ { "fi_FI", "CP850" },
+ { "fr", "CP850" },
+ { "fr_BE", "CP850" },
+ { "fr_CA", "CP850" },
+ { "fr_CH", "CP850" },
+ { "fr_FR", "CP850" },
+ { "ga", "CP850" },
+ { "ga_IE", "CP850" },
+ { "gd", "CP850" },
+ { "gd_GB", "CP850" },
+ { "gl", "CP850" },
+ { "gl_ES", "CP850" },
+ { "he", "CP862" },
+ { "he_IL", "CP862" },
+ { "hr", "CP852" },
+ { "hr_HR", "CP852" },
+ { "hu", "CP852" },
+ { "hu_HU", "CP852" },
+ { "id", "CP850" }, /* not CP437 ?? */
+ { "id_ID", "CP850" }, /* not CP437 ?? */
+ { "is", "CP861" }, /* not CP850 ?? */
+ { "is_IS", "CP861" }, /* not CP850 ?? */
+ { "it", "CP850" },
+ { "it_CH", "CP850" },
+ { "it_IT", "CP850" },
+ { "ja", "CP932" },
+ { "ja_JP", "CP932" },
+ { "kr", "CP949" }, /* not CP934 ?? */
+ { "kr_KR", "CP949" }, /* not CP934 ?? */
+ { "lt", "CP775" },
+ { "lt_LT", "CP775" },
+ { "lv", "CP775" },
+ { "lv_LV", "CP775" },
+ { "mk", "CP866" }, /* not CP855 ?? */
+ { "mk_MK", "CP866" }, /* not CP855 ?? */
+ { "mt", "CP850" },
+ { "mt_MT", "CP850" },
+ { "nb", "CP865" }, /* not CP850 ?? */
+ { "nb_NO", "CP865" }, /* not CP850 ?? */
+ { "nl", "CP850" },
+ { "nl_BE", "CP850" },
+ { "nl_NL", "CP850" },
+ { "nn", "CP865" }, /* not CP850 ?? */
+ { "nn_NO", "CP865" }, /* not CP850 ?? */
+ { "no", "CP865" }, /* not CP850 ?? */
+ { "no_NO", "CP865" }, /* not CP850 ?? */
+ { "pl", "CP852" },
+ { "pl_PL", "CP852" },
+ { "pt", "CP850" },
+ { "pt_BR", "CP850" },
+ { "pt_PT", "CP850" },
+ { "ro", "CP852" },
+ { "ro_RO", "CP852" },
+ { "ru", "CP866" },
+ { "ru_RU", "CP866" },
+ { "sk", "CP852" },
+ { "sk_SK", "CP852" },
+ { "sl", "CP852" },
+ { "sl_SI", "CP852" },
+ { "sq", "CP852" },
+ { "sq_AL", "CP852" },
+ { "sr", "CP852" }, /* CP852 or CP866 or CP855 ?? */
+ { "sr_CS", "CP852" }, /* CP852 or CP866 or CP855 ?? */
+ { "sr_YU", "CP852" }, /* CP852 or CP866 or CP855 ?? */
+ { "sv", "CP850" },
+ { "sv_SE", "CP850" },
+ { "th", "CP874" },
+ { "th_TH", "CP874" },
+ { "tr", "CP857" },
+ { "tr_TR", "CP857" },
+ { "uk", "CP1125" },
+ { "uk_UA", "CP1125" },
+ { "zh_CN", "GBK" },
+ { "zh_TW", "CP950" } /* not CP938 ?? */
+# define locale_table_defined
# endif
-# if defined OS2
- /* To avoid the troubles of installing a separate file in the same
- directory as the DLL and of retrieving the DLL's directory at
- runtime, simply inline the aliases here. */
-
- /* The list of encodings is taken from "List of OS/2 Codepages"
- by Alex Taylor:
- <http://altsan.org/os2/toolkits/uls/index.html#codepages>.
- See also "IBM Globalization - Code page identifiers":
- <https://www-01.ibm.com/software/globalization/cp/cp_cpgid.html>. */
- cp = "CP813" "\0" "ISO-8859-7" "\0"
- "CP878" "\0" "KOI8-R" "\0"
- "CP819" "\0" "ISO-8859-1" "\0"
- "CP912" "\0" "ISO-8859-2" "\0"
- "CP913" "\0" "ISO-8859-3" "\0"
- "CP914" "\0" "ISO-8859-4" "\0"
- "CP915" "\0" "ISO-8859-5" "\0"
- "CP916" "\0" "ISO-8859-8" "\0"
- "CP920" "\0" "ISO-8859-9" "\0"
- "CP921" "\0" "ISO-8859-13" "\0"
- "CP923" "\0" "ISO-8859-15" "\0"
- "CP954" "\0" "EUC-JP" "\0"
- "CP964" "\0" "EUC-TW" "\0"
- "CP970" "\0" "EUC-KR" "\0"
- "CP1089" "\0" "ISO-8859-6" "\0"
- "CP1208" "\0" "UTF-8" "\0"
- "CP1381" "\0" "GB2312" "\0"
- "CP1386" "\0" "GBK" "\0"
- "CP3372" "\0" "EUC-JP" "\0";
+# ifndef locale_table_defined
+ /* Just a dummy entry, to avoid a C syntax error. */
+ { "", "" }
# endif
-#endif
+ };
- charset_aliases = cp;
- }
+#endif
- return cp;
-}
/* Determine the current locale's character encoding, and canonicalize it
- into one of the canonical names listed in config.charset.
+ into one of the canonical names listed in localcharset.h.
The result must not be freed; it is statically allocated.
If the canonical name cannot be determined, the result is a non-canonical
name. */
@@ -397,9 +687,8 @@ const char *
locale_charset (void)
{
const char *codeset;
- const char *aliases;
-#if !(defined WINDOWS_NATIVE || defined OS2)
+#if HAVE_LANGINFO_CODESET || defined WINDOWS_NATIVE || defined OS2
# if HAVE_LANGINFO_CODESET
@@ -462,37 +751,11 @@ locale_charset (void)
}
# endif
-# else
-
- /* On old systems which lack it, use setlocale or getenv. */
- const char *locale = NULL;
-
- /* But most old systems don't have a complete set of locales. Some
- (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't
- use setlocale here; it would return "C" when it doesn't support the
- locale name the user has set. */
-# if 0
- locale = setlocale (LC_CTYPE, NULL);
-# endif
- if (locale == NULL || locale[0] == '\0')
- {
- locale = getenv ("LC_ALL");
- if (locale == NULL || locale[0] == '\0')
- {
- locale = getenv ("LC_CTYPE");
- if (locale == NULL || locale[0] == '\0')
- locale = getenv ("LANG");
- }
- }
-
- /* On some old systems, one used to set locale = "iso8859_1". On others,
- you set it to "language_COUNTRY.charset". In any case, we resolve it
- through the charset.alias file. */
- codeset = locale;
-
-# endif
+ if (codeset == NULL)
+ /* The canonical name cannot be determined. */
+ codeset = "";
-#elif defined WINDOWS_NATIVE
+# elif defined WINDOWS_NATIVE
static char buf[2 + 10 + 1];
@@ -526,7 +789,7 @@ locale_charset (void)
}
codeset = buf;
-#elif defined OS2
+# elif defined OS2
const char *locale;
static char buf[2 + 10 + 1];
@@ -583,28 +846,144 @@ locale_charset (void)
}
}
-#endif
+# else
- if (codeset == NULL)
- /* The canonical name cannot be determined. */
- codeset = "";
+# error "Add code for other platforms here."
- /* Resolve alias. */
- for (aliases = get_charset_aliases ();
- *aliases != '\0';
- aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
- if (strcmp (codeset, aliases) == 0
- || (aliases[0] == '*' && aliases[1] == '\0'))
+# endif
+
+ /* Resolve alias. */
+ {
+# ifdef alias_table_defined
+ /* On some platforms, UTF-8 locales are the most frequently used ones.
+ Speed up the common case and slow down the less common cases by
+ testing for this case first. */
+# if defined __OpenBSD__ || (defined __APPLE__ && defined __MACH__) || defined __sun || defined __CYGWIN__
+ if (strcmp (codeset, "UTF-8") == 0)
+ goto done_table_lookup;
+ else
+# endif
{
- codeset = aliases + strlen (aliases) + 1;
- break;
+ const struct table_entry * const table = alias_table;
+ size_t const table_size =
+ sizeof (alias_table) / sizeof (struct table_entry);
+ /* The table is sorted. Perform a binary search. */
+ size_t hi = table_size;
+ size_t lo = 0;
+ while (lo < hi)
+ {
+ /* Invariant:
+ for i < lo, strcmp (table[i].alias, codeset) < 0,
+ for i >= hi, strcmp (table[i].alias, codeset) > 0. */
+ size_t mid = (hi + lo) >> 1; /* >= lo, < hi */
+ int cmp = strcmp (table[mid].alias, codeset);
+ if (cmp < 0)
+ lo = mid + 1;
+ else if (cmp > 0)
+ hi = mid;
+ else
+ {
+ /* Found an i with
+ strcmp (table[i].alias, codeset) == 0. */
+ codeset = table[mid].canonical;
+ goto done_table_lookup;
+ }
+ }
}
+ if (0)
+ done_table_lookup: ;
+ else
+# endif
+ {
+ /* Did not find it in the table. */
+ /* On Mac OS X, all modern locales use the UTF-8 encoding.
+ BeOS and Haiku have a single locale, and it has UTF-8 encoding. */
+# if (defined __APPLE__ && defined __MACH__) || defined __BEOS__ || defined __HAIKU__
+ codeset = "UTF-8";
+# else
+ /* Don't return an empty string. GNU libc and GNU libiconv interpret
+ the empty string as denoting "the locale's character encoding",
+ thus GNU libiconv would call this function a second time. */
+ if (codeset[0] == '\0')
+ codeset = "ASCII";
+# endif
+ }
+ }
- /* Don't return an empty string. GNU libc and GNU libiconv interpret
- the empty string as denoting "the locale's character encoding",
- thus GNU libiconv would call this function a second time. */
- if (codeset[0] == '\0')
- codeset = "ASCII";
+#else
+
+ /* On old systems which lack it, use setlocale or getenv. */
+ const char *locale = NULL;
+
+ /* But most old systems don't have a complete set of locales. Some
+ (like DJGPP) have only the C locale. Therefore we don't use setlocale
+ here; it would return "C" when it doesn't support the locale name the
+ user has set. */
+# if 0
+ locale = setlocale (LC_CTYPE, NULL);
+# endif
+ if (locale == NULL || locale[0] == '\0')
+ {
+ locale = getenv ("LC_ALL");
+ if (locale == NULL || locale[0] == '\0')
+ {
+ locale = getenv ("LC_CTYPE");
+ if (locale == NULL || locale[0] == '\0')
+ locale = getenv ("LANG");
+ if (locale == NULL)
+ locale = "";
+ }
+ }
+
+ /* Map locale name to canonical encoding name. */
+ {
+# ifdef locale_table_defined
+ const struct table_entry * const table = locale_table;
+ size_t const table_size =
+ sizeof (locale_table) / sizeof (struct table_entry);
+ /* The table is sorted. Perform a binary search. */
+ size_t hi = table_size;
+ size_t lo = 0;
+ while (lo < hi)
+ {
+ /* Invariant:
+ for i < lo, strcmp (table[i].locale, locale) < 0,
+ for i >= hi, strcmp (table[i].locale, locale) > 0. */
+ size_t mid = (hi + lo) >> 1; /* >= lo, < hi */
+ int cmp = strcmp (table[mid].locale, locale);
+ if (cmp < 0)
+ lo = mid + 1;
+ else if (cmp > 0)
+ hi = mid;
+ else
+ {
+ /* Found an i with
+ strcmp (table[i].locale, locale) == 0. */
+ codeset = table[mid].canonical;
+ goto done_table_lookup;
+ }
+ }
+ if (0)
+ done_table_lookup: ;
+ else
+# endif
+ {
+ /* Did not find it in the table. */
+ /* On Mac OS X, all modern locales use the UTF-8 encoding.
+ BeOS and Haiku have a single locale, and it has UTF-8 encoding. */
+# if (defined __APPLE__ && defined __MACH__) || defined __BEOS__ || defined __HAIKU__
+ codeset = "UTF-8";
+# else
+ /* The canonical name cannot be determined. */
+ /* Don't return an empty string. GNU libc and GNU libiconv interpret
+ the empty string as denoting "the locale's character encoding",
+ thus GNU libiconv would call this function a second time. */
+ codeset = "ASCII";
+# endif
+ }
+ }
+
+#endif
#ifdef DARWIN7
/* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8"
diff --git a/gnu/localcharset.h b/gnu/localcharset.h
index bca429b67054d29b15d18d826fd9b0910e34d5f9..7d0d7711dbe40776da92a9b6e501818116d5b38e 100644
--- a/gnu/localcharset.h
+++ b/gnu/localcharset.h
@@ -1,5 +1,5 @@
/* Determine a canonical name for the current locale's character encoding.
- Copyright (C) 2000-2003, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003, 2009-2019 Free Software Foundation, Inc.
This file is part of the GNU CHARSET Library.
This program is free software; you can redistribute it and/or modify
@@ -25,12 +25,106 @@ extern "C" {
/* Determine the current locale's character encoding, and canonicalize it
- into one of the canonical names listed in config.charset.
+ into one of the canonical names listed below.
The result must not be freed; it is statically allocated.
If the canonical name cannot be determined, the result is a non-canonical
name. */
extern const char * locale_charset (void);
+/* About GNU canonical names for character encodings:
+
+ Every canonical name must be supported by GNU libiconv. Support by GNU libc
+ is also desirable.
+
+ The name is case insensitive. Usually an upper case MIME charset name is
+ preferred.
+
+ The current list of these GNU canonical names is:
+
+ name MIME? used by which systems
+ (darwin = Mac OS X, windows = native Windows)
+
+ ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin minix cygwin
+ ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+ ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+ ISO-8859-3 Y glibc solaris cygwin
+ ISO-8859-4 Y hpux osf solaris freebsd netbsd openbsd darwin
+ ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+ ISO-8859-6 Y glibc aix hpux solaris cygwin
+ ISO-8859-7 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+ ISO-8859-8 Y glibc aix hpux osf solaris cygwin
+ ISO-8859-9 Y glibc aix hpux irix osf solaris freebsd darwin cygwin
+ ISO-8859-13 glibc hpux solaris freebsd netbsd openbsd darwin cygwin
+ ISO-8859-14 glibc cygwin
+ ISO-8859-15 glibc aix irix osf solaris freebsd netbsd openbsd darwin cygwin
+ KOI8-R Y glibc hpux solaris freebsd netbsd openbsd darwin
+ KOI8-U Y glibc freebsd netbsd openbsd darwin cygwin
+ KOI8-T glibc
+ CP437 dos
+ CP775 dos
+ CP850 aix osf dos
+ CP852 dos
+ CP855 dos
+ CP856 aix
+ CP857 dos
+ CP861 dos
+ CP862 dos
+ CP864 dos
+ CP865 dos
+ CP866 freebsd netbsd openbsd darwin dos
+ CP869 dos
+ CP874 windows dos
+ CP922 aix
+ CP932 aix cygwin windows dos
+ CP943 aix
+ CP949 osf darwin windows dos
+ CP950 windows dos
+ CP1046 aix
+ CP1124 aix
+ CP1125 dos
+ CP1129 aix
+ CP1131 freebsd darwin
+ CP1250 windows
+ CP1251 glibc hpux solaris freebsd netbsd openbsd darwin cygwin windows
+ CP1252 aix windows
+ CP1253 windows
+ CP1254 windows
+ CP1255 glibc windows
+ CP1256 windows
+ CP1257 windows
+ GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin cygwin
+ EUC-JP Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin
+ EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin
+ EUC-TW glibc aix hpux irix osf solaris netbsd
+ BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin cygwin
+ BIG5-HKSCS glibc hpux solaris netbsd darwin
+ GBK glibc aix osf solaris freebsd darwin cygwin windows dos
+ GB18030 glibc hpux solaris freebsd netbsd darwin
+ SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin
+ JOHAB glibc solaris windows
+ TIS-620 glibc aix hpux osf solaris cygwin
+ VISCII Y glibc
+ TCVN5712-1 glibc
+ ARMSCII-8 glibc freebsd netbsd darwin
+ GEORGIAN-PS glibc cygwin
+ PT154 glibc netbsd cygwin
+ HP-ROMAN8 hpux
+ HP-ARABIC8 hpux
+ HP-GREEK8 hpux
+ HP-HEBREW8 hpux
+ HP-TURKISH8 hpux
+ HP-KANA8 hpux
+ DEC-KANJI osf
+ DEC-HANYU osf
+ UTF-8 Y glibc aix hpux osf solaris netbsd darwin cygwin
+
+ Note: Names which are not marked as being a MIME name should not be used in
+ Internet protocols for information interchange (mail, news, etc.).
+
+ Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+ must understand both names and treat them as equivalent.
+ */
+
#ifdef __cplusplus
}
diff --git a/gnu/locale.in.h b/gnu/locale.in.h
index 7cb3f88f8e4e8ac76b47a2a3c1b42288ceb1ec78..5f33ed17cccb37174f393e351be1bcd3b0d99a54 100644
--- a/gnu/locale.in.h
+++ b/gnu/locale.in.h
@@ -1,5 +1,5 @@
/* A POSIX <locale.h>.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,10 +19,13 @@
#endif
@PRAGMA_COLUMNS@
-#ifdef _GL_ALREADY_INCLUDING_LOCALE_H
+#if (defined _WIN32 && !defined __CYGWIN__ && defined __need_locale_t) \
+ || defined _GL_ALREADY_INCLUDING_LOCALE_H
-/* Special invocation conventions to handle Solaris header files
- (through Solaris 10) when combined with gettext's libintl.h. */
+/* Special invocation convention:
+ - Inside mingw header files,
+ - To handle Solaris header files (through Solaris 10) when combined
+ with gettext's libintl.h. */
#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
@@ -187,11 +190,40 @@ _GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - "
# endif
#endif
-#if @GNULIB_DUPLOCALE@
+#if /*@GNULIB_NEWLOCALE@ ||*/ (@GNULIB_LOCALENAME@ && @HAVE_NEWLOCALE@)
+# if @REPLACE_NEWLOCALE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef newlocale
+# define newlocale rpl_newlocale
+# define GNULIB_defined_newlocale 1
+# endif
+_GL_FUNCDECL_RPL (newlocale, locale_t,
+ (int category_mask, const char *name, locale_t base)
+ _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (newlocale, locale_t,
+ (int category_mask, const char *name, locale_t base));
+# else
+# if @HAVE_NEWLOCALE@
+_GL_CXXALIAS_SYS (newlocale, locale_t,
+ (int category_mask, const char *name, locale_t base));
+# endif
+# endif
+# if @HAVE_NEWLOCALE@
+_GL_CXXALIASWARN (newlocale);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef newlocale
+# if HAVE_RAW_DECL_NEWLOCALE
+_GL_WARN_ON_USE (newlocale, "newlocale is not portable");
+# endif
+#endif
+
+#if @GNULIB_DUPLOCALE@ || (@GNULIB_LOCALENAME@ && @HAVE_DUPLOCALE@)
# if @REPLACE_DUPLOCALE@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef duplocale
# define duplocale rpl_duplocale
+# define GNULIB_defined_duplocale 1
# endif
_GL_FUNCDECL_RPL (duplocale, locale_t, (locale_t locale) _GL_ARG_NONNULL ((1)));
_GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale));
@@ -211,6 +243,30 @@ _GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - "
# endif
#endif
+#if /*@GNULIB_FREELOCALE@ ||*/ (@GNULIB_LOCALENAME@ && @HAVE_FREELOCALE@)
+# if @REPLACE_FREELOCALE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef freelocale
+# define freelocale rpl_freelocale
+# define GNULIB_defined_freelocale 1
+# endif
+_GL_FUNCDECL_RPL (freelocale, void, (locale_t locale) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (freelocale, void, (locale_t locale));
+# else
+# if @HAVE_FREELOCALE@
+_GL_CXXALIAS_SYS (freelocale, void, (locale_t locale));
+# endif
+# endif
+# if @HAVE_FREELOCALE@
+_GL_CXXALIASWARN (freelocale);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef freelocale
+# if HAVE_RAW_DECL_FREELOCALE
+_GL_WARN_ON_USE (freelocale, "freelocale is not portable");
+# endif
+#endif
+
#endif /* _@GUARD_PREFIX@_LOCALE_H */
-#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */
#endif /* _@GUARD_PREFIX@_LOCALE_H */
+#endif /* !(__need_locale_t || _GL_ALREADY_INCLUDING_LOCALE_H) */
diff --git a/gnu/localeconv.c b/gnu/localeconv.c
index 4fd3fec7ec84b304e91876ec734453a347bef696..b5a965f3e033e62d6ab11e129d1c62da1bdaedb7 100644
--- a/gnu/localeconv.c
+++ b/gnu/localeconv.c
@@ -1,5 +1,5 @@
/* Query locale dependent information for formatting numbers.
- Copyright (C) 2012-2017 Free Software Foundation, Inc.
+ Copyright (C) 2012-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/localtime-buffer.c b/gnu/localtime-buffer.c
index c96c577ac1f42b0c03e7692baa1cdb2e22b9f83a..b65ea45af204450643d1e66d303a4740d9e8f047 100644
--- a/gnu/localtime-buffer.c
+++ b/gnu/localtime-buffer.c
@@ -1,6 +1,6 @@
/* Provide access to the last buffer returned by localtime() or gmtime().
- Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@ struct tm *localtime_buffer_addr = &tm_zero_buffer;
struct tm *
rpl_localtime (time_t const *timep)
+#undef localtime
{
struct tm *tm = localtime (timep);
@@ -46,6 +47,7 @@ rpl_localtime (time_t const *timep)
/* Same as above, since gmtime and localtime use the same buffer. */
struct tm *
rpl_gmtime (time_t const *timep)
+#undef gmtime
{
struct tm *tm = gmtime (timep);
diff --git a/gnu/localtime-buffer.h b/gnu/localtime-buffer.h
index 0a0389da0731f69a07334eac62dd7e77725da7f7..031111a752fee6680a488d0a82b14f6c8d9b0ee0 100644
--- a/gnu/localtime-buffer.h
+++ b/gnu/localtime-buffer.h
@@ -1,6 +1,6 @@
/* Provide access to the last buffer returned by localtime() or gmtime().
- Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/lseek.c b/gnu/lseek.c
index 4c87bd5f27ad2ee876f8e5bb4f4a712b1db21347..46f7a3fa4e35bbbd44bed9b77da9d551a289acc0 100644
--- a/gnu/lseek.c
+++ b/gnu/lseek.c
@@ -1,5 +1,5 @@
/* An lseek() function that detects pipes.
- Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
/* Specification. */
#include <unistd.h>
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* Windows platforms. */
/* Get GetFileType. */
# include <windows.h>
@@ -39,7 +39,7 @@
off_t
rpl_lseek (int fd, off_t offset, int whence)
{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* mingw lseek mistakenly succeeds on pipes, sockets, and terminals. */
HANDLE h = (HANDLE) _get_osfhandle (fd);
if (h == INVALID_HANDLE_VALUE)
diff --git a/gnu/lstat.c b/gnu/lstat.c
index c721a4e641c08b8e25d73900e56dad4071d6e9a7..d57ca105fd3b5783053969dfa71b1f9b40af9775 100644
--- a/gnu/lstat.c
+++ b/gnu/lstat.c
@@ -1,6 +1,6 @@
/* Work around a bug of lstat on some systems
- Copyright (C) 1997-2006, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997-2006, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -47,6 +47,8 @@ orig_lstat (const char *filename, struct stat *buf)
above. */
# include "sys/stat.h"
+# include "stat-time.h"
+
# include <string.h>
# include <errno.h>
@@ -66,32 +68,33 @@ orig_lstat (const char *filename, struct stat *buf)
int
rpl_lstat (const char *file, struct stat *sbuf)
{
- size_t len;
- int lstat_result = orig_lstat (file, sbuf);
-
- if (lstat_result != 0)
- return lstat_result;
+ int result = orig_lstat (file, sbuf);
/* This replacement file can blindly check against '/' rather than
using the ISSLASH macro, because all platforms with '\\' either
lack symlinks (mingw) or have working lstat (cygwin) and thus do
not compile this file. 0 len should have already been filtered
out above, with a failure return of ENOENT. */
- len = strlen (file);
- if (file[len - 1] != '/' || S_ISDIR (sbuf->st_mode))
- return 0;
-
- /* At this point, a trailing slash is only permitted on
- symlink-to-dir; but it should have found information on the
- directory, not the symlink. Call stat() to get info about the
- link's referent. Our replacement stat guarantees valid results,
- even if the symlink is not pointing to a directory. */
- if (!S_ISLNK (sbuf->st_mode))
+ if (result == 0)
{
- errno = ENOTDIR;
- return -1;
+ if (S_ISDIR (sbuf->st_mode) || file[strlen (file) - 1] != '/')
+ result = stat_time_normalize (result, sbuf);
+ else
+ {
+ /* At this point, a trailing slash is permitted only on
+ symlink-to-dir; but it should have found information on the
+ directory, not the symlink. Call 'stat' to get info about the
+ link's referent. Our replacement stat guarantees valid results,
+ even if the symlink is not pointing to a directory. */
+ if (!S_ISLNK (sbuf->st_mode))
+ {
+ errno = ENOTDIR;
+ return -1;
+ }
+ result = stat (file, sbuf);
+ }
}
- return stat (file, sbuf);
+ return result;
}
#endif /* HAVE_LSTAT */
diff --git a/gnu/malloc.c b/gnu/malloc.c
index f13eb7b673120e4ddf7c792805ef0f85ae55283f..76e6ff764b7bbaca05904cad345651f04cece40a 100644
--- a/gnu/malloc.c
+++ b/gnu/malloc.c
@@ -1,6 +1,6 @@
/* malloc() function that is glibc compatible.
- Copyright (C) 1997-1998, 2006-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997-1998, 2006-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/malloca.c b/gnu/malloca.c
index 4b3348d37b662cdec246b06bda4c283a0f799f3c..f60c5fb5d9353a3e10dafeee9ae8a3519e9f8d65 100644
--- a/gnu/malloca.c
+++ b/gnu/malloca.c
@@ -1,6 +1,6 @@
/* Safe automatic memory allocation.
- Copyright (C) 2003, 2006-2007, 2009-2017 Free Software Foundation, Inc.
- Written by Bruno Haible <bruno@clisp.org>, 2003.
+ Copyright (C) 2003, 2006-2007, 2009-2019 Free Software Foundation, Inc.
+ Written by Bruno Haible <bruno@clisp.org>, 2003, 2018.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,92 +21,49 @@
/* Specification. */
#include "malloca.h"
-#include <stdint.h>
-
#include "verify.h"
-/* Silence a warning from clang's MemorySanitizer. */
-#if defined __has_feature
-# if __has_feature(memory_sanitizer)
-# define NO_SANITIZE_MEMORY __attribute__((no_sanitize("memory")))
-# endif
-#endif
-#ifndef NO_SANITIZE_MEMORY
-# define NO_SANITIZE_MEMORY
-#endif
-
/* The speed critical point in this file is freea() applied to an alloca()
result: it must be fast, to match the speed of alloca(). The speed of
mmalloca() and freea() in the other case are not critical, because they
- are only invoked for big memory sizes. */
-
-#if HAVE_ALLOCA
-
-/* Store the mmalloca() results in a hash table. This is needed to reliably
- distinguish a mmalloca() result and an alloca() result.
-
- Although it is possible that the same pointer is returned by alloca() and
- by mmalloca() at different times in the same application, it does not lead
- to a bug in freea(), because:
- - Before a pointer returned by alloca() can point into malloc()ed memory,
- the function must return, and once this has happened the programmer must
- not call freea() on it anyway.
- - Before a pointer returned by mmalloca() can point into the stack, it
- must be freed. The only function that can free it is freea(), and
- when freea() frees it, it also removes it from the hash table. */
-
-#define MAGIC_NUMBER 0x1415fb4a
-#define MAGIC_SIZE sizeof (int)
-/* This is how the header info would look like without any alignment
- considerations. */
-struct preliminary_header { void *next; int magic; };
-/* But the header's size must be a multiple of sa_alignment_max. */
-#define HEADER_SIZE \
- (((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max)
-union header {
- void *next;
- struct {
- char room[HEADER_SIZE - MAGIC_SIZE];
- int word;
- } magic;
-};
-verify (HEADER_SIZE == sizeof (union header));
-/* We make the hash table quite big, so that during lookups the probability
- of empty hash buckets is quite high. There is no need to make the hash
- table resizable, because when the hash table gets filled so much that the
- lookup becomes slow, it means that the application has memory leaks. */
-#define HASH_TABLE_SIZE 257
-static void * mmalloca_results[HASH_TABLE_SIZE];
-
-#endif
+ are only invoked for big memory sizes.
+ Here we use a bit in the address as an indicator, an idea by Ondřej Bílka.
+ malloca() can return three types of pointers:
+ - Pointers ≡ 0 mod 2*sa_alignment_max come from stack allocation.
+ - Pointers ≡ sa_alignment_max mod 2*sa_alignment_max come from heap
+ allocation.
+ - NULL comes from a failed heap allocation. */
+
+/* Type for holding very small pointer differences. */
+typedef unsigned char small_t;
+/* Verify that it is wide enough. */
+verify (2 * sa_alignment_max - 1 <= (small_t) -1);
void *
mmalloca (size_t n)
{
#if HAVE_ALLOCA
- /* Allocate one more word, that serves as an indicator for malloc()ed
- memory, so that freea() of an alloca() result is fast. */
- size_t nplus = n + HEADER_SIZE;
+ /* Allocate one more word, used to determine the address to pass to freea(),
+ and room for the alignment ≡ sa_alignment_max mod 2*sa_alignment_max. */
+ size_t nplus = n + sizeof (small_t) + 2 * sa_alignment_max - 1;
if (nplus >= n)
{
- void *p = malloc (nplus);
+ char *mem = (char *) malloc (nplus);
- if (p != NULL)
+ if (mem != NULL)
{
- size_t slot;
- union header *h = p;
-
- p = h + 1;
-
- /* Put a magic number into the indicator word. */
- h->magic.word = MAGIC_NUMBER;
-
- /* Enter p into the hash table. */
- slot = (uintptr_t) p % HASH_TABLE_SIZE;
- h->next = mmalloca_results[slot];
- mmalloca_results[slot] = p;
-
+ char *p =
+ (char *)((((uintptr_t)mem + sizeof (small_t) + sa_alignment_max - 1)
+ & ~(uintptr_t)(2 * sa_alignment_max - 1))
+ + sa_alignment_max);
+ /* Here p >= mem + sizeof (small_t),
+ and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1
+ hence p + n <= mem + nplus.
+ So, the memory range [p, p+n) lies in the allocated memory range
+ [mem, mem + nplus). */
+ ((small_t *) p)[-1] = p - mem;
+ /* p ≡ sa_alignment_max mod 2*sa_alignment_max. */
return p;
}
}
@@ -122,38 +79,27 @@ mmalloca (size_t n)
}
#if HAVE_ALLOCA
-void NO_SANITIZE_MEMORY
+void
freea (void *p)
{
- /* mmalloca() may have returned NULL. */
- if (p != NULL)
+ /* Check argument. */
+ if ((uintptr_t) p & (sa_alignment_max - 1))
{
- /* Attempt to quickly distinguish the mmalloca() result - which has
- a magic indicator word - and the alloca() result - which has an
- uninitialized indicator word. It is for this test that sa_increment
- additional bytes are allocated in the alloca() case. */
- if (((int *) p)[-1] == MAGIC_NUMBER)
- {
- /* Looks like a mmalloca() result. To see whether it really is one,
- perform a lookup in the hash table. */
- size_t slot = (uintptr_t) p % HASH_TABLE_SIZE;
- void **chain = &mmalloca_results[slot];
- for (; *chain != NULL;)
- {
- union header *h = p;
- if (*chain == p)
- {
- /* Found it. Remove it from the hash table and free it. */
- union header *p_begin = h - 1;
- *chain = p_begin->next;
- free (p_begin);
- return;
- }
- h = *chain;
- chain = &h[-1].next;
- }
- }
- /* At this point, we know it was not a mmalloca() result. */
+ /* p was not the result of a malloca() call. Invalid argument. */
+ abort ();
+ }
+ /* Determine whether p was a non-NULL pointer returned by mmalloca(). */
+ if ((uintptr_t) p & sa_alignment_max)
+ {
+ void *mem = (char *) p - ((small_t *) p)[-1];
+ free (mem);
}
}
#endif
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */
diff --git a/gnu/malloca.h b/gnu/malloca.h
index d5155c73b78953b75577ac6e15e4acd570e1d65f..d80c316caa9434238801b61f20d905cad3300fdb 100644
--- a/gnu/malloca.h
+++ b/gnu/malloca.h
@@ -1,5 +1,5 @@
/* Safe automatic memory allocation.
- Copyright (C) 2003-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2003.
This program is free software; you can redistribute it and/or modify
@@ -56,8 +56,10 @@ extern "C" {
the function returns. Upon failure, it returns NULL. */
#if HAVE_ALLOCA
# define malloca(N) \
- ((N) < 4032 - sa_increment \
- ? (void *) ((char *) alloca ((N) + sa_increment) + sa_increment) \
+ ((N) < 4032 - (2 * sa_alignment_max - 1) \
+ ? (void *) (((uintptr_t) (char *) alloca ((N) + 2 * sa_alignment_max - 1) \
+ + (2 * sa_alignment_max - 1)) \
+ & ~(uintptr_t)(2 * sa_alignment_max - 1)) \
: mmalloca (N))
#else
# define malloca(N) \
@@ -119,10 +121,7 @@ enum
| (sa_alignment_longlong - 1)
#endif
| (sa_alignment_longdouble - 1)
- ) + 1,
-/* The increment that guarantees room for a magic word must be >= sizeof (int)
- and a multiple of sa_alignment_max. */
- sa_increment = ((sizeof (int) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max
+ ) + 1
};
#endif /* _MALLOCA_H */
diff --git a/gnu/malloca.valgrind b/gnu/malloca.valgrind
deleted file mode 100644
index 52f0a50f57f2db64a2683a605e13e9cc3cd11f6d..0000000000000000000000000000000000000000
--- a/gnu/malloca.valgrind
+++ /dev/null
@@ -1,7 +0,0 @@
-# Suppress a valgrind message about use of uninitialized memory in freea().
-# This use is OK because it provides only a speedup.
-{
- freea
- Memcheck:Cond
- fun:freea
-}
diff --git a/gnu/mbchar.c b/gnu/mbchar.c
index edd6dc54ef3607b337089e4ab04b778c3dd503d7..aa8012b656f88a2651f22280fe0f23d85f0d9fc9 100644
--- a/gnu/mbchar.c
+++ b/gnu/mbchar.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/mbchar.h b/gnu/mbchar.h
index 469b80227745853cb25d11b2da9a4c58aeae1a13..2d26075cbb96f8d2b12a44987828ca3f9b48ab61 100644
--- a/gnu/mbchar.h
+++ b/gnu/mbchar.h
@@ -1,5 +1,5 @@
/* Multibyte character data type.
- Copyright (C) 2001, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/mbrtowc.c b/gnu/mbrtowc.c
index 28787c6e3a85f0352aedcd7e099e1fe4479fe1b5..bbe3f7a3b91ebc98854b9fe4ba68b7e43b4748bb 100644
--- a/gnu/mbrtowc.c
+++ b/gnu/mbrtowc.c
@@ -1,5 +1,5 @@
/* Convert multibyte character to wide character.
- Copyright (C) 1999-2002, 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999-2002, 2005-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
@@ -35,12 +35,60 @@
# include "streq.h"
# include "verify.h"
-#ifndef FALLTHROUGH
-# if __GNUC__ < 7
-# define FALLTHROUGH ((void) 0)
-# else
-# define FALLTHROUGH __attribute__ ((__fallthrough__))
+# ifndef FALLTHROUGH
+# if __GNUC__ < 7
+# define FALLTHROUGH ((void) 0)
+# else
+# define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
# endif
+
+/* Returns a classification of special values of the encoding of the current
+ locale. */
+typedef enum {
+ enc_other, /* other */
+ enc_utf8, /* UTF-8 */
+ enc_eucjp, /* EUC-JP */
+ enc_94, /* EUC-KR, GB2312, BIG5 */
+ enc_euctw, /* EUC-TW */
+ enc_gb18030, /* GB18030 */
+ enc_sjis /* SJIS */
+} enc_t;
+static inline enc_t
+locale_enc (void)
+{
+ const char *encoding = locale_charset ();
+ if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+ return enc_utf8;
+ if (STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
+ return enc_eucjp;
+ if (STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+ || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+ || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
+ return enc_94;
+ if (STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
+ return enc_euctw;
+ if (STREQ_OPT (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
+ return enc_gb18030;
+ if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
+ return enc_sjis;
+ return enc_other;
+}
+
+#if GNULIB_WCHAR_SINGLE
+/* When we know that the locale does not change, provide a speedup by
+ caching the value of locale_enc. */
+static int cached_locale_enc = -1;
+static inline enc_t
+locale_enc_cached (void)
+{
+ if (cached_locale_enc < 0)
+ cached_locale_enc = locale_enc ();
+ return cached_locale_enc;
+}
+#else
+/* By default, don't make assumptions, hence no caching. */
+# define locale_enc_cached locale_enc
#endif
verify (sizeof (mbstate_t) >= 4);
@@ -137,10 +185,9 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
if (m >= 4 || m >= MB_CUR_MAX)
goto invalid;
/* Here MB_CUR_MAX > 1 and 0 < m < 4. */
- {
- const char *encoding = locale_charset ();
-
- if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+ switch (locale_enc_cached ())
+ {
+ case enc_utf8: /* UTF-8 */
{
/* Cf. unistr/u8-mblen.c. */
unsigned char c = (unsigned char) p[0];
@@ -197,8 +244,7 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
/* As a reference for this code, you can use the GNU libiconv
implementation. Look for uses of the RET_TOOFEW macro. */
- if (STREQ_OPT (encoding,
- "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
+ case enc_eucjp: /* EUC-JP */
{
if (m == 1)
{
@@ -221,12 +267,8 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
}
goto invalid;
}
- if (STREQ_OPT (encoding,
- "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
- || STREQ_OPT (encoding,
- "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
- || STREQ_OPT (encoding,
- "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
+
+ case enc_94: /* EUC-KR, GB2312, BIG5 */
{
if (m == 1)
{
@@ -237,8 +279,8 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
}
goto invalid;
}
- if (STREQ_OPT (encoding,
- "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
+
+ case enc_euctw: /* EUC-TW */
{
if (m == 1)
{
@@ -256,8 +298,8 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
}
goto invalid;
}
- if (STREQ_OPT (encoding,
- "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
+
+ case enc_gb18030: /* GB18030 */
{
if (m == 1)
{
@@ -290,7 +332,8 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
}
goto invalid;
}
- if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
+
+ case enc_sjis: /* SJIS */
{
if (m == 1)
{
@@ -303,9 +346,10 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
goto invalid;
}
- /* An unknown multibyte encoding. */
- goto incomplete;
- }
+ default:
+ /* An unknown multibyte encoding. */
+ goto incomplete;
+ }
incomplete:
{
diff --git a/gnu/mbscasecmp.c b/gnu/mbscasecmp.c
index cf00b402fa007c7f4e0e7f6d554984dd7d33037c..86a5073b34e425996765221b44a3960616ba37ff 100644
--- a/gnu/mbscasecmp.c
+++ b/gnu/mbscasecmp.c
@@ -1,5 +1,5 @@
/* Case-insensitive string comparison function.
- Copyright (C) 1998-1999, 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2005,
based on earlier glibc code.
diff --git a/gnu/mbsinit.c b/gnu/mbsinit.c
index e429214f95ceb769551bde8d8cba6c1598c115cf..5ecaef77c72cbcb3b0cbc3774c96d3935d1bb370 100644
--- a/gnu/mbsinit.c
+++ b/gnu/mbsinit.c
@@ -1,5 +1,5 @@
/* Test for initial conversion state.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
@@ -54,7 +54,7 @@ mbsinit (const mbstate_t *ps)
int
mbsinit (const mbstate_t *ps)
{
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# if defined _WIN32 && !defined __CYGWIN__
/* Native Windows. */
# ifdef __MINGW32__
/* On mingw, 'mbstate_t' is defined as 'int'. */
diff --git a/gnu/mbsrtowcs-impl.h b/gnu/mbsrtowcs-impl.h
index 22b31cbeef590d6925fb7f4ee6c31811240ccb6c..110d692e16d0658c02973e2154ab1c32a743837c 100644
--- a/gnu/mbsrtowcs-impl.h
+++ b/gnu/mbsrtowcs-impl.h
@@ -1,5 +1,5 @@
/* Convert string to wide string.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/mbsrtowcs-state.c b/gnu/mbsrtowcs-state.c
index ae7256c0fd204617626300cd4fca1c9a41fff948..59525e72c4dde2eeebcd3047f16cd8a209be6bfc 100644
--- a/gnu/mbsrtowcs-state.c
+++ b/gnu/mbsrtowcs-state.c
@@ -1,5 +1,5 @@
/* Convert string to wide string.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/mbsrtowcs.c b/gnu/mbsrtowcs.c
index 7441c82d4832a740ded8d2234c08027bcd47e98e..14f241e30988a9d64b4b234d1580d1e4cae5f0ab 100644
--- a/gnu/mbsrtowcs.c
+++ b/gnu/mbsrtowcs.c
@@ -1,5 +1,5 @@
/* Convert string to wide string.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/mbtowc-impl.h b/gnu/mbtowc-impl.h
index 7cba7d395daeb343a385e79b318f0e3f936c1464..f4ab98181ff1b1bd8118ef9207eac1257165808d 100644
--- a/gnu/mbtowc-impl.h
+++ b/gnu/mbtowc-impl.h
@@ -1,5 +1,5 @@
/* Convert multibyte character to wide character.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2011.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/mbtowc.c b/gnu/mbtowc.c
index 4db254b92e0dae664fd018a2a5c403ff17aecf05..77a847241ea0553fccdbb5589ad1c9a7665eb703 100644
--- a/gnu/mbtowc.c
+++ b/gnu/mbtowc.c
@@ -1,5 +1,5 @@
/* Convert multibyte character to wide character.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2011.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/mbuiter.h b/gnu/mbuiter.h
index 25a13f88ea916a1f833039e616bcf93d535c82b5..dde69abc647421559ee86ee3f9d45750d7160bf4 100644
--- a/gnu/mbuiter.h
+++ b/gnu/mbuiter.h
@@ -1,5 +1,5 @@
/* Iterating through multibyte strings: macros for multi-byte encodings.
- Copyright (C) 2001, 2005, 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2005, 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/memchr.c b/gnu/memchr.c
index 5f89177cf990baf42d7325ea68258303e84e4f9f..4e0c5f9de9a411cfe982237f468e74f9d103437e 100644
--- a/gnu/memchr.c
+++ b/gnu/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2017
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2019
Free Software Foundation, Inc.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/gnu/mempcpy.c b/gnu/mempcpy.c
index b839a54e2f547d75354a5d87719f4d9dd973f3c0..d0220e10fb073df8576d33612fbfeb0bdcdc1712 100644
--- a/gnu/mempcpy.c
+++ b/gnu/mempcpy.c
@@ -1,5 +1,5 @@
/* Copy memory area and return pointer after last written byte.
- Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/memrchr.c b/gnu/memrchr.c
index 29e56984cb1f99ccebc6e58a292b3107431a27e5..96022835cef9ebb85093817973d17ce685f3a43c 100644
--- a/gnu/memrchr.c
+++ b/gnu/memrchr.c
@@ -1,6 +1,6 @@
/* memrchr -- find the last occurrence of a byte in a memory block
- Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2017 Free Software
+ Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2019 Free Software
Foundation, Inc.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
@@ -68,7 +68,7 @@ __memrchr (void const *s, int c_in, size_t n)
if (*--char_ptr == c)
return (void *) char_ptr;
- longword_ptr = (const longword *) char_ptr;
+ longword_ptr = (const void *) char_ptr;
/* All these elucidatory comments refer to 4-byte longwords,
but the theory applies equally well to any size longwords. */
diff --git a/gnu/minmax.h b/gnu/minmax.h
index bbf14163c1bb145097711563edcf6c84b7dc44d0..d7f6bea0619c3ed8f78be287099045b9b0dfec8a 100644
--- a/gnu/minmax.h
+++ b/gnu/minmax.h
@@ -1,5 +1,5 @@
/* MIN, MAX macros.
- Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2017 Free Software
+ Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2019 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/mkdir.c b/gnu/mkdir.c
index c94c1ba8e4596f4abc1790a5e29a434b3d837013..b8320d00fef92c3c4d2f90f39ca79143e53d8d52 100644
--- a/gnu/mkdir.c
+++ b/gnu/mkdir.c
@@ -1,7 +1,7 @@
/* On some systems, mkdir ("foo/", 0700) fails because of the trailing
slash. On those systems, this wrapper removes the trailing slash.
- Copyright (C) 2001, 2003, 2006, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003, 2006, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@
Additionally, it declares _mkdir (and depending on compile flags, an
alias mkdir), only in the nonstandard includes <direct.h> and <io.h>,
which are included in the <sys/stat.h> override. */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# define mkdir(name,mode) _mkdir (name)
# define maybe_unused _GL_UNUSED
#else
diff --git a/gnu/mkdirat.c b/gnu/mkdirat.c
index eb644da94b78f608dcfa5d870365771d81efc3c6..21c09cc800588a5bf03a5d186355540d9d817c7f 100644
--- a/gnu/mkdirat.c
+++ b/gnu/mkdirat.c
@@ -1,5 +1,5 @@
/* fd-relative mkdir
- Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/mkdtemp.c b/gnu/mkdtemp.c
index 9bd4ec9a94d6aa01b2971d5c0657dd1fffefe8a7..b1dd28dde839b0792cc224589af60c5d034606f3 100644
--- a/gnu/mkdtemp.c
+++ b/gnu/mkdtemp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2017 Free Software
+/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2019 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/gnu/mkfifo.c b/gnu/mkfifo.c
index af13362c2bbca58079001ee5e08eafb13640b35a..1878dca454478953f08f76f8cfbd23e095a2c74b 100644
--- a/gnu/mkfifo.c
+++ b/gnu/mkfifo.c
@@ -1,5 +1,5 @@
/* Create a named fifo.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/mkfifoat.c b/gnu/mkfifoat.c
index def4a1475f31bd8c3a3975ba80d3b95e59081bed..8e44adeb65e2d219c0594bc2b84cc04f4b0bdb71 100644
--- a/gnu/mkfifoat.c
+++ b/gnu/mkfifoat.c
@@ -1,5 +1,5 @@
/* Create a named fifo relative to an open directory.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/mknod.c b/gnu/mknod.c
index d12d4fe6031ffba565959f1073569e89287d4bfb..dbbfe29c46d834dc413572bffb59b1c00facb1e0 100644
--- a/gnu/mknod.c
+++ b/gnu/mknod.c
@@ -1,5 +1,5 @@
/* Create a device inode.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/mknodat.c b/gnu/mknodat.c
index f9085582bda3df6f07eb26c47186e224ba26b39f..0cec0d309719b6722d99b2e833d3bb0b24dde414 100644
--- a/gnu/mknodat.c
+++ b/gnu/mknodat.c
@@ -1,5 +1,5 @@
/* Create an inode relative to an open directory.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ mknodat (int fd _GL_UNUSED, char const *path _GL_UNUSED,
return -1;
}
-#else /* HAVE_MKFIFO */
+#else
/* Create a file system node FILE relative to directory FD, with
access permissions and file type in MODE, and device type in DEV.
@@ -54,4 +54,4 @@ mknodat (int fd _GL_UNUSED, char const *path _GL_UNUSED,
# undef AT_FUNC_POST_FILE_PARAM_DECLS
# undef AT_FUNC_POST_FILE_ARGS
-#endif /* HAVE_MKFIFO */
+#endif
diff --git a/gnu/mktime-internal.h b/gnu/mktime-internal.h
index 00e58abdd6cafb8d3f5c74b8d68d482e49a1024a..d13d89cfae78fe077c0ebf0c8d0cc02e9c31cb1f 100644
--- a/gnu/mktime-internal.h
+++ b/gnu/mktime-internal.h
@@ -1,6 +1,6 @@
/* mktime variant that also uses an offset guess
- Copyright 2016-2017 Free Software Foundation, Inc.
+ Copyright 2016-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -35,3 +35,19 @@ typedef int mktime_offset_t;
time_t mktime_internal (struct tm *,
struct tm * (*) (time_t const *, struct tm *),
mktime_offset_t *);
+
+/* Although glibc source code uses leading underscores, Gnulib wants
+ ordinary names.
+
+ Portable standalone applications should supply a <time.h> that
+ declares a POSIX-compliant localtime_r, for the benefit of older
+ implementations that lack localtime_r or have a nonstandard one.
+ Similarly for gmtime_r. See the gnulib time_r module for one way
+ to implement this. */
+
+#undef __gmtime_r
+#undef __localtime_r
+#define __gmtime_r gmtime_r
+#define __localtime_r localtime_r
+
+#define __mktime_internal mktime_internal
diff --git a/gnu/mktime.c b/gnu/mktime.c
index dd7f0a3ab34aaf04871f43dc9eedb224f6c758d8..d411aa77058bf0b069614671fefff88e19193223 100644
--- a/gnu/mktime.c
+++ b/gnu/mktime.c
@@ -1,5 +1,5 @@
/* Convert a 'struct tm' to a time_t value.
- Copyright (C) 1993-2017 Free Software Foundation, Inc.
+ Copyright (C) 1993-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Paul Eggert <eggert@twinsun.com>.
@@ -17,27 +17,21 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-/* Define this to 1 to have a standalone program to test this implementation of
- mktime. */
-#ifndef DEBUG_MKTIME
-# define DEBUG_MKTIME 0
-#endif
-
/* The following macros influence what gets defined when this file is compiled:
Macro/expression Which gnulib module This compilation unit
should define
+ _LIBC (glibc proper) mktime
+
NEED_MKTIME_WORKING mktime rpl_mktime
|| NEED_MKTIME_WINDOWS
NEED_MKTIME_INTERNAL mktime-internal mktime_internal
-
- DEBUG_MKTIME (defined manually) my_mktime, main
*/
-#if !defined _LIBC && !DEBUG_MKTIME
-# include <config.h>
+#ifndef _LIBC
+# include <libc-config.h>
#endif
/* Assume that leap seconds are possible, unless told otherwise.
@@ -49,34 +43,74 @@
#include <time.h>
+#include <errno.h>
#include <limits.h>
#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
#include <intprops.h>
#include <verify.h>
-#if DEBUG_MKTIME
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
-/* Make it work even if the system's libc has its own mktime routine. */
-# undef mktime
-# define mktime my_mktime
+#ifndef NEED_MKTIME_INTERNAL
+# define NEED_MKTIME_INTERNAL 0
+#endif
+#ifndef NEED_MKTIME_WINDOWS
+# define NEED_MKTIME_WINDOWS 0
+#endif
+#ifndef NEED_MKTIME_WORKING
+# define NEED_MKTIME_WORKING 0
#endif
-#if NEED_MKTIME_WINDOWS /* on native Windows */
-# include <stdlib.h>
-# include <string.h>
+#include "mktime-internal.h"
+
+#if !defined _LIBC && (NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS)
+static void
+my_tzset (void)
+{
+# if NEED_MKTIME_WINDOWS
+ /* Rectify the value of the environment variable TZ.
+ There are four possible kinds of such values:
+ - Traditional US time zone names, e.g. "PST8PDT". Syntax: see
+ <https://msdn.microsoft.com/en-us/library/90s5c885.aspx>
+ - Time zone names based on geography, that contain one or more
+ slashes, e.g. "Europe/Moscow".
+ - Time zone names based on geography, without slashes, e.g.
+ "Singapore".
+ - Time zone names that contain explicit DST rules. Syntax: see
+ <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03>
+ The Microsoft CRT understands only the first kind. It produces incorrect
+ results if the value of TZ is of the other kinds.
+ But in a Cygwin environment, /etc/profile.d/tzset.sh sets TZ to a value
+ of the second kind for most geographies, or of the first kind in a few
+ other geographies. If it is of the second kind, neutralize it. For the
+ Microsoft CRT, an absent or empty TZ means the time zone that the user
+ has set in the Windows Control Panel.
+ If the value of TZ is of the third or fourth kind -- Cygwin programs
+ understand these syntaxes as well --, it does not matter whether we
+ neutralize it or not, since these values occur only when a Cygwin user
+ has set TZ explicitly; this case is 1. rare and 2. under the user's
+ responsibility. */
+ const char *tz = getenv ("TZ");
+ if (tz != NULL && strchr (tz, '/') != NULL)
+ _putenv ("TZ=");
+# elif HAVE_TZSET
+ tzset ();
+# endif
+}
+# undef __tzset
+# define __tzset() my_tzset ()
#endif
-#if NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL || DEBUG_MKTIME
+#if defined _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL
/* A signed type that can represent an integer number of years
- multiplied by three times the number of seconds in a year. It is
+ multiplied by four times the number of seconds in a year. It is
needed when converting a tm_year value times the number of seconds
- in a year. The factor of three comes because these products need
+ in a year. The factor of four comes because these products need
to be subtracted from each other, and sometimes with an offset
- added to them, without worrying about overflow.
+ added to them, and then with another timestamp added, without
+ worrying about overflow.
Much of the code uses long_int to represent time_t values, to
lessen the hassle of dealing with platforms where time_t is
@@ -84,12 +118,12 @@
time_t values that mktime can generate even on platforms where
time_t is excessively wide. */
-#if INT_MAX <= LONG_MAX / 3 / 366 / 24 / 60 / 60
+#if INT_MAX <= LONG_MAX / 4 / 366 / 24 / 60 / 60
typedef long int long_int;
#else
typedef long long int long_int;
#endif
-verify (INT_MAX <= TYPE_MAXIMUM (long_int) / 3 / 366 / 24 / 60 / 60);
+verify (INT_MAX <= TYPE_MAXIMUM (long_int) / 4 / 366 / 24 / 60 / 60);
/* Shift A right by B bits portably, by dividing A by 2**B and
truncating towards minus infinity. B should be in the range 0 <= B
@@ -150,19 +184,6 @@ const unsigned short int __mon_yday[2][13] =
};
-#ifdef _LIBC
-typedef time_t mktime_offset_t;
-#else
-/* Portable standalone applications should supply a <time.h> that
- declares a POSIX-compliant localtime_r, for the benefit of older
- implementations that lack localtime_r or have a nonstandard one.
- See the gnulib time_r module for one way to implement this. */
-# undef __localtime_r
-# define __localtime_r localtime_r
-# define __mktime_internal mktime_internal
-# include "mktime-internal.h"
-#endif
-
/* Do the values A and B differ according to the rules for tm_isdst?
A and B differ if one is zero and the other positive. */
static bool
@@ -176,9 +197,10 @@ isdst_differ (int a, int b)
were not adjusted between the timestamps.
The YEAR values uses the same numbering as TP->tm_year. Values
- need not be in the usual range. However, YEAR1 must not overflow
- when multiplied by three times the number of seconds in a year, and
- likewise for YDAY1 and three times the number of seconds in a day. */
+ need not be in the usual range. However, YEAR1 - YEAR0 must not
+ overflow even when multiplied by three times the number of seconds
+ in a year, and likewise for YDAY1 - YDAY0 and three times the
+ number of seconds in a day. */
static long_int
ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1,
@@ -213,43 +235,25 @@ long_int_avg (long_int a, long_int b)
return shr (a, 1) + shr (b, 1) + ((a | b) & 1);
}
-/* Return a time_t value corresponding to (YEAR-YDAY HOUR:MIN:SEC),
- assuming that T corresponds to *TP and that no clock adjustments
- occurred between *TP and the desired time.
- Although T and the returned value are of type long_int,
- they represent time_t values and must be in time_t range.
- If TP is null, return a value not equal to T; this avoids false matches.
+/* Return a long_int value corresponding to (YEAR-YDAY HOUR:MIN:SEC)
+ minus *TP seconds, assuming no clock adjustments occurred between
+ the two timestamps.
+
YEAR and YDAY must not be so large that multiplying them by three times the
number of seconds in a year (or day, respectively) would overflow long_int.
- If the returned value would be out of range, yield the minimal or
- maximal in-range value, except do not yield a value equal to T. */
+ *TP should be in the usual range. */
static long_int
-guess_time_tm (long_int year, long_int yday, int hour, int min, int sec,
- long_int t, const struct tm *tp)
+tm_diff (long_int year, long_int yday, int hour, int min, int sec,
+ struct tm const *tp)
{
- if (tp)
- {
- long_int result;
- long_int d = ydhms_diff (year, yday, hour, min, sec,
- tp->tm_year, tp->tm_yday,
- tp->tm_hour, tp->tm_min, tp->tm_sec);
- if (! INT_ADD_WRAPV (t, d, &result))
- return result;
- }
-
- /* Overflow occurred one way or another. Return the nearest result
- that is actually in range, except don't report a zero difference
- if the actual difference is nonzero, as that would cause a false
- match; and don't oscillate between two values, as that would
- confuse the spring-forward gap detector. */
- return (t < long_int_avg (mktime_min, mktime_max)
- ? (t <= mktime_min + 1 ? t + 1 : mktime_min)
- : (mktime_max - 1 <= t ? t - 1 : mktime_max));
+ return ydhms_diff (year, yday, hour, min, sec,
+ tp->tm_year, tp->tm_yday,
+ tp->tm_hour, tp->tm_min, tp->tm_sec);
}
/* Use CONVERT to convert T to a struct tm value in *TM. T must be in
- range for time_t. Return TM if successful, NULL if T is out of
- range for CONVERT. */
+ range for time_t. Return TM if successful, NULL (setting errno) on
+ failure. */
static struct tm *
convert_time (struct tm *(*convert) (const time_t *, struct tm *),
long_int t, struct tm *tm)
@@ -261,61 +265,64 @@ convert_time (struct tm *(*convert) (const time_t *, struct tm *),
/* Use CONVERT to convert *T to a broken down time in *TP.
If *T is out of range for conversion, adjust it so that
it is the nearest in-range value and then convert that.
- A value is in range if it fits in both time_t and long_int. */
+ A value is in range if it fits in both time_t and long_int.
+ Return TP on success, NULL (setting errno) on failure. */
static struct tm *
ranged_convert (struct tm *(*convert) (const time_t *, struct tm *),
long_int *t, struct tm *tp)
{
- struct tm *r;
- if (*t < mktime_min)
- *t = mktime_min;
- else if (mktime_max < *t)
- *t = mktime_max;
- r = convert_time (convert, *t, tp);
-
- if (!r && *t)
+ long_int t1 = (*t < mktime_min ? mktime_min
+ : *t <= mktime_max ? *t : mktime_max);
+ struct tm *r = convert_time (convert, t1, tp);
+ if (r)
{
- long_int bad = *t;
- long_int ok = 0;
+ *t = t1;
+ return r;
+ }
+ if (errno != EOVERFLOW)
+ return NULL;
- /* BAD is a known unconvertible value, and OK is a known good one.
- Use binary search to narrow the range between BAD and OK until
- they differ by 1. */
- while (true)
- {
- long_int mid = long_int_avg (ok, bad);
- if (mid != ok && mid != bad)
- break;
- r = convert_time (convert, mid, tp);
- if (r)
- ok = mid;
- else
- bad = mid;
- }
+ long_int bad = t1;
+ long_int ok = 0;
+ struct tm oktm; oktm.tm_sec = -1;
- if (!r && ok)
- {
- /* The last conversion attempt failed;
- revert to the most recent successful attempt. */
- r = convert_time (convert, ok, tp);
- }
+ /* BAD is a known out-of-range value, and OK is a known in-range one.
+ Use binary search to narrow the range between BAD and OK until
+ they differ by 1. */
+ while (true)
+ {
+ long_int mid = long_int_avg (ok, bad);
+ if (mid == ok || mid == bad)
+ break;
+ if (convert_time (convert, mid, tp))
+ ok = mid, oktm = *tp;
+ else if (errno != EOVERFLOW)
+ return NULL;
+ else
+ bad = mid;
}
- return r;
+ if (oktm.tm_sec < 0)
+ return NULL;
+ *t = ok;
+ *tp = oktm;
+ return tp;
}
+
/* Convert *TP to a time_t value, inverting
the monotonic and mostly-unit-linear conversion function CONVERT.
Use *OFFSET to keep track of a guess at the offset of the result,
compared to what the result would be for UTC without leap seconds.
If *OFFSET's guess is correct, only one CONVERT call is needed.
+ If successful, set *TP to the canonicalized struct tm;
+ otherwise leave *TP alone, return ((time_t) -1) and set errno.
This function is external because it is used also by timegm.c. */
time_t
__mktime_internal (struct tm *tp,
struct tm *(*convert) (const time_t *, struct tm *),
mktime_offset_t *offset)
{
- long_int t, gt, t0, t1, t2, dt;
struct tm tm;
/* The maximum number of probes (calls to CONVERT) should be enough
@@ -335,7 +342,7 @@ __mktime_internal (struct tm *tp,
int isdst = tp->tm_isdst;
/* 1 if the previous probe was DST. */
- int dst2;
+ int dst2 = 0;
/* Ensure that mon is in range, and set year accordingly. */
int mon_remainder = mon % 12;
@@ -355,6 +362,7 @@ __mktime_internal (struct tm *tp,
long_int lmday = mday;
long_int yday = mon_yday + lmday;
+ mktime_offset_t off = *offset;
int negative_offset_guess;
int sec_requested = sec;
@@ -362,7 +370,7 @@ __mktime_internal (struct tm *tp,
if (LEAP_SECONDS_POSSIBLE)
{
/* Handle out-of-range seconds specially,
- since ydhms_tm_diff assumes every minute has 60 seconds. */
+ since ydhms_diff assumes every minute has 60 seconds. */
if (sec < 0)
sec = 0;
if (59 < sec)
@@ -372,34 +380,47 @@ __mktime_internal (struct tm *tp,
/* Invert CONVERT by probing. First assume the same offset as last
time. */
- INT_SUBTRACT_WRAPV (0, *offset, &negative_offset_guess);
- t0 = ydhms_diff (year, yday, hour, min, sec,
- EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0, negative_offset_guess);
+ INT_SUBTRACT_WRAPV (0, off, &negative_offset_guess);
+ long_int t0 = ydhms_diff (year, yday, hour, min, sec,
+ EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0,
+ negative_offset_guess);
+ long_int t = t0, t1 = t0, t2 = t0;
/* Repeatedly use the error to improve the guess. */
- for (t = t1 = t2 = t0, dst2 = 0;
- (gt = guess_time_tm (year, yday, hour, min, sec, t,
- ranged_convert (convert, &t, &tm)),
- t != gt);
- t1 = t2, t2 = t, t = gt, dst2 = tm.tm_isdst != 0)
- if (t == t1 && t != t2
- && (tm.tm_isdst < 0
- || (isdst < 0
- ? dst2 <= (tm.tm_isdst != 0)
- : (isdst != 0) != (tm.tm_isdst != 0))))
- /* We can't possibly find a match, as we are oscillating
- between two values. The requested time probably falls
- within a spring-forward gap of size GT - T. Follow the common
- practice in this case, which is to return a time that is GT - T
- away from the requested time, preferring a time whose
- tm_isdst differs from the requested value. (If no tm_isdst
- was requested and only one of the two values has a nonzero
- tm_isdst, prefer that value.) In practice, this is more
- useful than returning -1. */
- goto offset_found;
- else if (--remaining_probes == 0)
- return -1;
+ while (true)
+ {
+ if (! ranged_convert (convert, &t, &tm))
+ return -1;
+ long_int dt = tm_diff (year, yday, hour, min, sec, &tm);
+ if (dt == 0)
+ break;
+
+ if (t == t1 && t != t2
+ && (tm.tm_isdst < 0
+ || (isdst < 0
+ ? dst2 <= (tm.tm_isdst != 0)
+ : (isdst != 0) != (tm.tm_isdst != 0))))
+ /* We can't possibly find a match, as we are oscillating
+ between two values. The requested time probably falls
+ within a spring-forward gap of size DT. Follow the common
+ practice in this case, which is to return a time that is DT
+ away from the requested time, preferring a time whose
+ tm_isdst differs from the requested value. (If no tm_isdst
+ was requested and only one of the two values has a nonzero
+ tm_isdst, prefer that value.) In practice, this is more
+ useful than returning -1. */
+ goto offset_found;
+
+ remaining_probes--;
+ if (remaining_probes == 0)
+ {
+ __set_errno (EOVERFLOW);
+ return -1;
+ }
+
+ t1 = t2, t2 = t, t += dt, dst2 = tm.tm_isdst != 0;
+ }
/* We have a match. Check whether tm.tm_isdst has the requested
value, if any. */
@@ -441,25 +462,38 @@ __mktime_internal (struct tm *tp,
if (! INT_ADD_WRAPV (t, delta * direction, &ot))
{
struct tm otm;
- ranged_convert (convert, &ot, &otm);
+ if (! ranged_convert (convert, &ot, &otm))
+ return -1;
if (! isdst_differ (isdst, otm.tm_isdst))
{
/* We found the desired tm_isdst.
Extrapolate back to the desired time. */
- t = guess_time_tm (year, yday, hour, min, sec, ot, &otm);
- ranged_convert (convert, &t, &tm);
- goto offset_found;
+ long_int gt = ot + tm_diff (year, yday, hour, min, sec,
+ &otm);
+ if (mktime_min <= gt && gt <= mktime_max)
+ {
+ if (convert_time (convert, gt, &tm))
+ {
+ t = gt;
+ goto offset_found;
+ }
+ if (errno != EOVERFLOW)
+ return -1;
+ }
}
}
}
+
+ __set_errno (EOVERFLOW);
+ return -1;
}
offset_found:
/* Set *OFFSET to the low-order bits of T - T0 - NEGATIVE_OFFSET_GUESS.
This is just a heuristic to speed up the next mktime call, and
correctness is unaffected if integer overflow occurs here. */
- INT_SUBTRACT_WRAPV (t, t0, &dt);
- INT_SUBTRACT_WRAPV (dt, negative_offset_guess, offset);
+ INT_SUBTRACT_WRAPV (t, t0, offset);
+ INT_SUBTRACT_WRAPV (*offset, negative_offset_guess, offset);
if (LEAP_SECONDS_POSSIBLE && sec_requested != tm.tm_sec)
{
@@ -469,8 +503,12 @@ __mktime_internal (struct tm *tp,
sec_adjustment -= sec;
sec_adjustment += sec_requested;
if (INT_ADD_WRAPV (t, sec_adjustment, &t)
- || ! (mktime_min <= t && t <= mktime_max)
- || ! convert_time (convert, t, &tm))
+ || ! (mktime_min <= t && t <= mktime_max))
+ {
+ __set_errno (EOVERFLOW);
+ return -1;
+ }
+ if (! convert_time (convert, t, &tm))
return -1;
}
@@ -478,64 +516,28 @@ __mktime_internal (struct tm *tp,
return t;
}
-#endif /* NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL || DEBUG_MKTIME */
+#endif /* _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL */
-#if NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS || DEBUG_MKTIME
-
-# if NEED_MKTIME_WORKING || DEBUG_MKTIME
-static mktime_offset_t localtime_offset;
-# endif
+#if defined _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS
/* Convert *TP to a time_t value. */
time_t
mktime (struct tm *tp)
{
-# if NEED_MKTIME_WINDOWS
- /* Rectify the value of the environment variable TZ.
- There are four possible kinds of such values:
- - Traditional US time zone names, e.g. "PST8PDT". Syntax: see
- <https://msdn.microsoft.com/en-us/library/90s5c885.aspx>
- - Time zone names based on geography, that contain one or more
- slashes, e.g. "Europe/Moscow".
- - Time zone names based on geography, without slashes, e.g.
- "Singapore".
- - Time zone names that contain explicit DST rules. Syntax: see
- <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03>
- The Microsoft CRT understands only the first kind. It produces incorrect
- results if the value of TZ is of the other kinds.
- But in a Cygwin environment, /etc/profile.d/tzset.sh sets TZ to a value
- of the second kind for most geographies, or of the first kind in a few
- other geographies. If it is of the second kind, neutralize it. For the
- Microsoft CRT, an absent or empty TZ means the time zone that the user
- has set in the Windows Control Panel.
- If the value of TZ is of the third or fourth kind -- Cygwin programs
- understand these syntaxes as well --, it does not matter whether we
- neutralize it or not, since these values occur only when a Cygwin user
- has set TZ explicitly; this case is 1. rare and 2. under the user's
- responsibility. */
- const char *tz = getenv ("TZ");
- if (tz != NULL && strchr (tz, '/') != NULL)
- _putenv ("TZ=");
-# endif
-
-# if NEED_MKTIME_WORKING || DEBUG_MKTIME
-# ifdef _LIBC
/* POSIX.1 8.1.1 requires that whenever mktime() is called, the
time zone names contained in the external variable 'tzname' shall
be set as if the tzset() function had been called. */
__tzset ();
-# elif HAVE_TZSET
- tzset ();
-# endif
+# if defined _LIBC || NEED_MKTIME_WORKING
+ static mktime_offset_t localtime_offset;
return __mktime_internal (tp, __localtime_r, &localtime_offset);
# else
# undef mktime
return mktime (tp);
# endif
}
-
-#endif /* NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS || DEBUG_MKTIME */
+#endif /* _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS */
#ifdef weak_alias
weak_alias (mktime, timelocal)
@@ -545,146 +547,3 @@ weak_alias (mktime, timelocal)
libc_hidden_def (mktime)
libc_hidden_weak (timelocal)
#endif
-
-#if DEBUG_MKTIME
-
-static int
-not_equal_tm (const struct tm *a, const struct tm *b)
-{
- return ((a->tm_sec ^ b->tm_sec)
- | (a->tm_min ^ b->tm_min)
- | (a->tm_hour ^ b->tm_hour)
- | (a->tm_mday ^ b->tm_mday)
- | (a->tm_mon ^ b->tm_mon)
- | (a->tm_year ^ b->tm_year)
- | (a->tm_yday ^ b->tm_yday)
- | isdst_differ (a->tm_isdst, b->tm_isdst));
-}
-
-static void
-print_tm (const struct tm *tp)
-{
- if (tp)
- printf ("%04d-%02d-%02d %02d:%02d:%02d yday %03d wday %d isdst %d",
- tp->tm_year + TM_YEAR_BASE, tp->tm_mon + 1, tp->tm_mday,
- tp->tm_hour, tp->tm_min, tp->tm_sec,
- tp->tm_yday, tp->tm_wday, tp->tm_isdst);
- else
- printf ("0");
-}
-
-static int
-check_result (time_t tk, struct tm tmk, time_t tl, const struct tm *lt)
-{
- if (tk != tl || !lt || not_equal_tm (&tmk, lt))
- {
- printf ("mktime (");
- print_tm (lt);
- printf (")\nyields (");
- print_tm (&tmk);
- printf (") == %ld, should be %ld\n", (long int) tk, (long int) tl);
- return 1;
- }
-
- return 0;
-}
-
-int
-main (int argc, char **argv)
-{
- int status = 0;
- struct tm tm, tmk, tml;
- struct tm *lt;
- time_t tk, tl, tl1;
- char trailer;
-
- /* Sanity check, plus call tzset. */
- tl = 0;
- if (! localtime (&tl))
- {
- printf ("localtime (0) fails\n");
- status = 1;
- }
-
- if ((argc == 3 || argc == 4)
- && (sscanf (argv[1], "%d-%d-%d%c",
- &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &trailer)
- == 3)
- && (sscanf (argv[2], "%d:%d:%d%c",
- &tm.tm_hour, &tm.tm_min, &tm.tm_sec, &trailer)
- == 3))
- {
- tm.tm_year -= TM_YEAR_BASE;
- tm.tm_mon--;
- tm.tm_isdst = argc == 3 ? -1 : atoi (argv[3]);
- tmk = tm;
- tl = mktime (&tmk);
- lt = localtime_r (&tl, &tml);
- printf ("mktime returns %ld == ", (long int) tl);
- print_tm (&tmk);
- printf ("\n");
- status = check_result (tl, tmk, tl, lt);
- }
- else if (argc == 4 || (argc == 5 && strcmp (argv[4], "-") == 0))
- {
- time_t from = atol (argv[1]);
- time_t by = atol (argv[2]);
- time_t to = atol (argv[3]);
-
- if (argc == 4)
- for (tl = from; by < 0 ? to <= tl : tl <= to; tl = tl1)
- {
- lt = localtime_r (&tl, &tml);
- if (lt)
- {
- tmk = tml;
- tk = mktime (&tmk);
- status |= check_result (tk, tmk, tl, &tml);
- }
- else
- {
- printf ("localtime_r (%ld) yields 0\n", (long int) tl);
- status = 1;
- }
- tl1 = tl + by;
- if ((tl1 < tl) != (by < 0))
- break;
- }
- else
- for (tl = from; by < 0 ? to <= tl : tl <= to; tl = tl1)
- {
- /* Null benchmark. */
- lt = localtime_r (&tl, &tml);
- if (lt)
- {
- tmk = tml;
- tk = tl;
- status |= check_result (tk, tmk, tl, &tml);
- }
- else
- {
- printf ("localtime_r (%ld) yields 0\n", (long int) tl);
- status = 1;
- }
- tl1 = tl + by;
- if ((tl1 < tl) != (by < 0))
- break;
- }
- }
- else
- printf ("Usage:\
-\t%s YYYY-MM-DD HH:MM:SS [ISDST] # Test given time.\n\
-\t%s FROM BY TO # Test values FROM, FROM+BY, ..., TO.\n\
-\t%s FROM BY TO - # Do not test those values (for benchmark).\n",
- argv[0], argv[0], argv[0]);
-
- return status;
-}
-
-#endif /* DEBUG_MKTIME */
-
-/*
-Local Variables:
-compile-command: "gcc -DDEBUG_MKTIME -I. -Wall -W -O2 -g mktime.c -o mktime"
-End:
-*/
diff --git a/gnu/modechange.c b/gnu/modechange.c
index c96e6d0fe30b6b5d4348a0782e8f9f60e190e331..29ba48726c801b48a030dd8fe22d68d9e3a667aa 100644
--- a/gnu/modechange.c
+++ b/gnu/modechange.c
@@ -1,6 +1,6 @@
/* modechange.c -- file mode manipulation
- Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2017 Free Software
+ Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/modechange.h b/gnu/modechange.h
index 991fa09d9b21a5f37178bc02b62f314306c2af95..a1cc243231d4abf05a8a5d67fc18de5f4783f2dc 100644
--- a/gnu/modechange.h
+++ b/gnu/modechange.h
@@ -1,6 +1,6 @@
/* modechange.h -- definitions for file mode manipulation
- Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2017 Free Software
+ Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/msvc-inval.c b/gnu/msvc-inval.c
index fced1178a31174697662cb32588d319f2ed9fa6f..75b5a070ab5962b2c9e8749ca1f55dd22c8f0fa3 100644
--- a/gnu/msvc-inval.c
+++ b/gnu/msvc-inval.c
@@ -1,5 +1,5 @@
/* Invalid parameter handler for MSVC runtime libraries.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/msvc-inval.h b/gnu/msvc-inval.h
index b544a46ea6fc500d1d6efde21bf143b0ec45ea37..e31cf650919ab5ce3279e30243d072efab2fcf7e 100644
--- a/gnu/msvc-inval.h
+++ b/gnu/msvc-inval.h
@@ -1,5 +1,5 @@
/* Invalid parameter handler for MSVC runtime libraries.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/msvc-nothrow.c b/gnu/msvc-nothrow.c
index b74b22282c6ec02a92b0be526c1147e191275ddf..49b709ca4aa03e6c53dd1f9db58b3afa5b1a9274 100644
--- a/gnu/msvc-nothrow.c
+++ b/gnu/msvc-nothrow.c
@@ -1,6 +1,6 @@
/* Wrappers that don't throw invalid parameter notifications
with MSVC runtime libraries.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/msvc-nothrow.h b/gnu/msvc-nothrow.h
index b0622c0b588c27d231e9925b2a38e00661a729cb..8d3ca7892e89d24016636bf1c8ffdf8d8ae2349b 100644
--- a/gnu/msvc-nothrow.h
+++ b/gnu/msvc-nothrow.h
@@ -1,6 +1,6 @@
/* Wrappers that don't throw invalid parameter notifications
with MSVC runtime libraries.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
This file defines wrappers that turn such an invalid parameter notification
into an error code. */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* Get original declaration of _get_osfhandle. */
# include <io.h>
diff --git a/gnu/nl_langinfo.c b/gnu/nl_langinfo.c
index 3e554e3d25ef520c8cc5f451acb4a733582b9ca3..e8a5595aeed9364d72c2059a23800c433a5e4928 100644
--- a/gnu/nl_langinfo.c
+++ b/gnu/nl_langinfo.c
@@ -1,6 +1,6 @@
/* nl_langinfo() replacement: query locale dependent information.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,12 +22,13 @@
#include <locale.h>
#include <string.h>
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# define WIN32_LEAN_AND_MEAN /* avoid including junk */
# include <windows.h>
# include <stdio.h>
#endif
+#if !REPLACE_NL_LANGINFO || GNULIB_defined_CODESET
/* Return the codeset of the current locale, if this is easily deducible.
Otherwise, return "". */
static char *
@@ -64,7 +65,7 @@ ctype_codeset (void)
}
}
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
/* If setlocale is successful, it returns the number of the
codepage, as a string. Otherwise, fall back on Windows API
GetACP, which returns the locale's codepage as a number (although
@@ -76,9 +77,10 @@ ctype_codeset (void)
else
sprintf (buf + 2, "%u", GetACP ());
codeset = memcpy (buf, "CP", 2);
-#endif
+# endif
return codeset;
}
+#endif
#if REPLACE_NL_LANGINFO
@@ -100,6 +102,24 @@ rpl_nl_langinfo (nl_item item)
case T_FMT_AMPM:
return (char *) "%I:%M:%S %p";
# endif
+# if GNULIB_defined_ALTMON
+ case ALTMON_1:
+ case ALTMON_2:
+ case ALTMON_3:
+ case ALTMON_4:
+ case ALTMON_5:
+ case ALTMON_6:
+ case ALTMON_7:
+ case ALTMON_8:
+ case ALTMON_9:
+ case ALTMON_10:
+ case ALTMON_11:
+ case ALTMON_12:
+ /* We don't ship the appropriate localizations with gnulib. Therefore,
+ treat ALTMON_i like MON_i. */
+ item = item - ALTMON_1 + MON_1;
+ break;
+# endif
# if GNULIB_defined_ERA
case ERA:
/* The format is not standardized. In glibc it is a sequence of strings
@@ -171,8 +191,10 @@ nl_langinfo (nl_item item)
return localeconv () ->decimal_point;
case THOUSEP:
return localeconv () ->thousands_sep;
+# ifdef GROUPING
case GROUPING:
return localeconv () ->grouping;
+# endif
/* nl_langinfo items of the LC_TIME category.
TODO: Really use the locale. */
case D_T_FMT:
@@ -228,28 +250,49 @@ nl_langinfo (nl_item item)
return (char *) abdays[item - ABDAY_1];
return nlbuf;
}
- case MON_1:
- case MON_2:
- case MON_3:
- case MON_4:
- case MON_5:
- case MON_6:
- case MON_7:
- case MON_8:
- case MON_9:
- case MON_10:
- case MON_11:
- case MON_12:
- {
- static char const months[][sizeof "September"] = {
- "January", "February", "March", "April", "May", "June", "July",
- "September", "October", "November", "December"
- };
+ {
+ static char const months[][sizeof "September"] = {
+ "January", "February", "March", "April", "May", "June", "July",
+ "September", "October", "November", "December"
+ };
+ case MON_1:
+ case MON_2:
+ case MON_3:
+ case MON_4:
+ case MON_5:
+ case MON_6:
+ case MON_7:
+ case MON_8:
+ case MON_9:
+ case MON_10:
+ case MON_11:
+ case MON_12:
tmm.tm_mon = item - MON_1;
if (!strftime (nlbuf, sizeof nlbuf, "%B", &tmm))
return (char *) months[item - MON_1];
return nlbuf;
- }
+ case ALTMON_1:
+ case ALTMON_2:
+ case ALTMON_3:
+ case ALTMON_4:
+ case ALTMON_5:
+ case ALTMON_6:
+ case ALTMON_7:
+ case ALTMON_8:
+ case ALTMON_9:
+ case ALTMON_10:
+ case ALTMON_11:
+ case ALTMON_12:
+ tmm.tm_mon = item - ALTMON_1;
+ /* The platforms without nl_langinfo() don't support strftime with %OB.
+ We don't even need to try. */
+ #if 0
+ if (!strftime (nlbuf, sizeof nlbuf, "%OB", &tmm))
+ #endif
+ if (!strftime (nlbuf, sizeof nlbuf, "%B", &tmm))
+ return (char *) months[item - ALTMON_1];
+ return nlbuf;
+ }
case ABMON_1:
case ABMON_2:
case ABMON_3:
@@ -279,6 +322,7 @@ nl_langinfo (nl_item item)
/* nl_langinfo items of the LC_MONETARY category. */
case CRNCYSTR:
return localeconv () ->currency_symbol;
+# ifdef INT_CURR_SYMBOL
case INT_CURR_SYMBOL:
return localeconv () ->int_curr_symbol;
case MON_DECIMAL_POINT:
@@ -307,6 +351,7 @@ nl_langinfo (nl_item item)
return & localeconv () ->p_sign_posn;
case N_SIGN_POSN:
return & localeconv () ->n_sign_posn;
+# endif
/* nl_langinfo items of the LC_MESSAGES category
TODO: Really use the locale. */
case YESEXPR:
diff --git a/gnu/nstrftime.c b/gnu/nstrftime.c
index 8795cd729d72a48bea880975b89d0fa0926c25ad..71f778a5fe7ca0825d6766b35938d662c692b040 100644
--- a/gnu/nstrftime.c
+++ b/gnu/nstrftime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2017 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -91,6 +91,7 @@ extern char *tzname[];
# define UCHAR_T unsigned char
# define L_(Str) Str
# define NLW(Sym) Sym
+# define ABALTMON_1 _NL_ABALTMON_1
# define MEMCPY(d, s, n) memcpy (d, s, n)
# define STRLEN(s) strlen (s)
@@ -255,7 +256,7 @@ extern char *tzname[];
# undef _NL_CURRENT
# define _NL_CURRENT(category, item) \
(current->values[_NL_ITEM_INDEX (item)].string)
-# define LOCALE_PARAM , __locale_t loc
+# define LOCALE_PARAM , locale_t loc
# define LOCALE_ARG , loc
# define HELPER_LOCALE_ARG , current
#else
@@ -475,12 +476,19 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
# define f_month \
((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)))
+# define a_altmonth \
+ ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
+ ? "?" : _NL_CURRENT (LC_TIME, NLW(ABALTMON_1) + tp->tm_mon)))
+# define f_altmonth \
+ ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
+ ? "?" : _NL_CURRENT (LC_TIME, NLW(ALTMON_1) + tp->tm_mon)))
# define ampm \
((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \
? NLW(PM_STR) : NLW(AM_STR)))
# define aw_len STRLEN (a_wkday)
# define am_len STRLEN (a_month)
+# define aam_len STRLEN (a_altmonth)
# define ap_len STRLEN (ampm)
#endif
#if HAVE_TZNAME
@@ -808,17 +816,20 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
to_uppcase = true;
to_lowcase = false;
}
- if (modifier != 0)
+ if (modifier == L_('E'))
goto bad_format;
#ifdef _NL_CURRENT
- cpy (am_len, a_month);
+ if (modifier == L_('O'))
+ cpy (aam_len, a_altmonth);
+ else
+ cpy (am_len, a_month);
break;
#else
goto underlying_strftime;
#endif
case L_('B'):
- if (modifier != 0)
+ if (modifier == L_('E'))
goto bad_format;
if (change_case)
{
@@ -826,7 +837,10 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
to_lowcase = false;
}
#ifdef _NL_CURRENT
- cpy (STRLEN (f_month), f_month);
+ if (modifier == L_('O'))
+ cpy (STRLEN (f_altmonth), f_altmonth);
+ else
+ cpy (STRLEN (f_month), f_month);
break;
#else
goto underlying_strftime;
@@ -1424,28 +1438,10 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
# endif
ltm = *tp;
+ ltm.tm_wday = -1;
lt = mktime_z (tz, <m);
-
- if (lt == (time_t) -1)
- {
- /* mktime returns -1 for errors, but -1 is also a
- valid time_t value. Check whether an error really
- occurred. */
- struct tm tm;
-
- if (! localtime_rz (tz, <, &tm)
- || ((ltm.tm_sec ^ tm.tm_sec)
- | (ltm.tm_min ^ tm.tm_min)
- | (ltm.tm_hour ^ tm.tm_hour)
- | (ltm.tm_mday ^ tm.tm_mday)
- | (ltm.tm_mon ^ tm.tm_mon)
- | (ltm.tm_year ^ tm.tm_year)))
- break;
- }
-
- if (! localtime_rz (0, <, >m))
+ if (ltm.tm_wday < 0 || ! localtime_rz (0, <, >m))
break;
-
diff = tm_diff (<m, >m);
}
#endif
diff --git a/gnu/obstack.c b/gnu/obstack.c
index 31be3a76d0c07c037f056a619bdece40373e6a9d..abdd713d4fe1a6085895f08ec2458bba16a7b584 100644
--- a/gnu/obstack.c
+++ b/gnu/obstack.c
@@ -1,5 +1,5 @@
/* obstack.c - subroutines used implicitly by object stack macros
- Copyright (C) 1988-2017 Free Software Foundation, Inc.
+ Copyright (C) 1988-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
diff --git a/gnu/obstack.h b/gnu/obstack.h
index 00cd25dcbc1b45864048f4cfc2d7bb270716c471..9fc64552c0be94d66d709f3dfc9d29403184463c 100644
--- a/gnu/obstack.h
+++ b/gnu/obstack.h
@@ -1,5 +1,5 @@
/* obstack.h - object stack macros
- Copyright (C) 1988-2017 Free Software Foundation, Inc.
+ Copyright (C) 1988-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -111,7 +111,7 @@
#include <stddef.h> /* For size_t and ptrdiff_t. */
#include <string.h> /* For __GNU_LIBRARY__, and memcpy. */
-#if __STDC_VERSION__ < 199901L
+#if __STDC_VERSION__ < 199901L || defined __HP_cc
# define __FLEXIBLE_ARRAY_MEMBER 1
#else
# define __FLEXIBLE_ARRAY_MEMBER
diff --git a/gnu/open-safer.c b/gnu/open-safer.c
new file mode 100644
index 0000000000000000000000000000000000000000..040433a0dff3ad7eeb0d32cb52e6b237f3c99c74
--- /dev/null
+++ b/gnu/open-safer.c
@@ -0,0 +1,46 @@
+/* Invoke open, but avoid some glitches.
+
+ Copyright (C) 2005-2006, 2008-2019 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Paul Eggert. */
+
+#include <config.h>
+
+#include "fcntl-safer.h"
+
+#include <fcntl.h>
+#include <stdarg.h>
+#include "unistd-safer.h"
+
+int
+open_safer (char const *file, int flags, ...)
+{
+ mode_t mode = 0;
+
+ if (flags & O_CREAT)
+ {
+ va_list ap;
+ va_start (ap, flags);
+
+ /* We have to use PROMOTED_MODE_T instead of mode_t, otherwise GCC 4
+ creates crashing code when 'mode_t' is smaller than 'int'. */
+ mode = va_arg (ap, PROMOTED_MODE_T);
+
+ va_end (ap);
+ }
+
+ return fd_safer (open (file, flags, mode));
+}
diff --git a/gnu/open.c b/gnu/open.c
index b5452b56afd3a05d41e6179a535092eb8e16dc06..655260572d42cb6515add348c16a770b4f2d12af 100644
--- a/gnu/open.c
+++ b/gnu/open.c
@@ -1,5 +1,5 @@
/* Open a descriptor to a file.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -86,7 +86,7 @@ open (const char *filename, int flags, ...)
flags &= ~O_NONBLOCK;
#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
if (strcmp (filename, "/dev/null") == 0)
filename = "NUL";
#endif
diff --git a/gnu/openat-die.c b/gnu/openat-die.c
index b45b6b91ec3151b66c5f7828e11546ef5d5db389..690c447af3646f587758db03c2ea0ec51b7c0380 100644
--- a/gnu/openat-die.c
+++ b/gnu/openat-die.c
@@ -1,6 +1,6 @@
/* Report a save- or restore-cwd failure in our openat replacement and then exit.
- Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/openat-priv.h b/gnu/openat-priv.h
index b5a411b944b047c3199237b1bb71d1f782f7e394..7b90eefa48813af797bea99bff7464704ebc4b94 100644
--- a/gnu/openat-priv.h
+++ b/gnu/openat-priv.h
@@ -1,6 +1,6 @@
/* Internals for openat-like functions.
- Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/openat-proc.c b/gnu/openat-proc.c
index 6d2b598c8b2878601c29efc750b98b5e28086f15..da76e2b393eb515feace001322ae6358c32a1a54 100644
--- a/gnu/openat-proc.c
+++ b/gnu/openat-proc.c
@@ -1,6 +1,6 @@
/* Create /proc/self/fd-related names for subfiles of open directories.
- Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/openat-safer.c b/gnu/openat-safer.c
new file mode 100644
index 0000000000000000000000000000000000000000..667beaaa829099785815a5c2183e569469d241c8
--- /dev/null
+++ b/gnu/openat-safer.c
@@ -0,0 +1,46 @@
+/* Invoke openat, but avoid some glitches.
+
+ Copyright (C) 2005-2006, 2008-2019 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Paul Eggert for open, ported by Eric Blake for openat. */
+
+#include <config.h>
+
+#include "fcntl-safer.h"
+
+#include <fcntl.h>
+#include <stdarg.h>
+#include "unistd-safer.h"
+
+int
+openat_safer (int fd, char const *file, int flags, ...)
+{
+ mode_t mode = 0;
+
+ if (flags & O_CREAT)
+ {
+ va_list ap;
+ va_start (ap, flags);
+
+ /* We have to use PROMOTED_MODE_T instead of mode_t, otherwise GCC 4
+ creates crashing code when 'mode_t' is smaller than 'int'. */
+ mode = va_arg (ap, PROMOTED_MODE_T);
+
+ va_end (ap);
+ }
+
+ return fd_safer (openat (fd, file, flags, mode));
+}
diff --git a/gnu/openat.c b/gnu/openat.c
index 8b6389e20661630313a535bc87c8e9ecc56b948a..4ab4a318d282f17173ea5d20348affb113a5ec99 100644
--- a/gnu/openat.c
+++ b/gnu/openat.c
@@ -1,5 +1,5 @@
/* provide a replacement openat function
- Copyright (C) 2004-2017 Free Software Foundation, Inc.
+ Copyright (C) 2004-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/openat.h b/gnu/openat.h
index 1c4f64a32ed7fdb61d4f64a900b123eb34166cd1..f23b371c4375d79d9b38751e88d4482b6c529968 100644
--- a/gnu/openat.h
+++ b/gnu/openat.h
@@ -1,5 +1,5 @@
/* provide a replacement openat function
- Copyright (C) 2004-2006, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2004-2006, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/opendir-safer.c b/gnu/opendir-safer.c
index be18dc9108db1af5da7e3bd227c87833baee923d..0bd831a721700da2dd94863653091bb3826144aa 100644
--- a/gnu/opendir-safer.c
+++ b/gnu/opendir-safer.c
@@ -1,6 +1,6 @@
/* Invoke opendir, but avoid some glitches.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/opendir.c b/gnu/opendir.c
index ad5c0d8348afbfacf740012d4285399b10679566..2eb96c6ec4838133d0d2a48d2115b58079e86964 100644
--- a/gnu/opendir.c
+++ b/gnu/opendir.c
@@ -1,5 +1,5 @@
/* Start reading the entries of a directory.
- Copyright (C) 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/opendirat.c b/gnu/opendirat.c
new file mode 100644
index 0000000000000000000000000000000000000000..ad63131ea115d31ffbc68c3cf9ee9a94908ef500
--- /dev/null
+++ b/gnu/opendirat.c
@@ -0,0 +1,54 @@
+/* Open a directory relative to another directory.
+
+ Copyright 2006-2019 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+ Written by Jim Meyering and Paul Eggert. */
+
+#include <config.h>
+
+#include <opendirat.h>
+
+#include <errno.h>
+#include <fcntl--.h>
+#include <unistd.h>
+
+/* Relative to DIR_FD, open the directory DIR, passing EXTRA_FLAGS to
+ the underlying openat call. On success, store into *PNEW_FD the
+ underlying file descriptor of the newly opened directory and return
+ the directory stream. On failure, return NULL and set errno.
+
+ On success, *PNEW_FD is at least 3, so this is a "safer" function. */
+
+DIR *
+opendirat (int dir_fd, char const *dir, int extra_flags, int *pnew_fd)
+{
+ int open_flags = (O_RDONLY | O_CLOEXEC | O_DIRECTORY | O_NOCTTY
+ | O_NONBLOCK | extra_flags);
+ int new_fd = openat (dir_fd, dir, open_flags);
+
+ if (new_fd < 0)
+ return NULL;
+ DIR *dirp = fdopendir (new_fd);
+ if (dirp)
+ *pnew_fd = new_fd;
+ else
+ {
+ int fdopendir_errno = errno;
+ close (new_fd);
+ errno = fdopendir_errno;
+ }
+ return dirp;
+}
diff --git a/gnu/opendirat.h b/gnu/opendirat.h
new file mode 100644
index 0000000000000000000000000000000000000000..1edf5b57d0da2236079552ebe54e19d48c573389
--- /dev/null
+++ b/gnu/opendirat.h
@@ -0,0 +1,2 @@
+#include <dirent.h>
+DIR *opendirat (int, char const *, int, int *);
diff --git a/gnu/parse-datetime.c b/gnu/parse-datetime.c
index 600ecf6372c6646282a642a38f43d54c70e08c43..568de6bea9aaab98375e6e729f19516c6a99c23a 100644
--- a/gnu/parse-datetime.c
+++ b/gnu/parse-datetime.c
@@ -67,7 +67,7 @@
/* Parse a string into an internal timestamp.
- Copyright (C) 1999-2000, 2002-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999-2000, 2002-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -558,7 +558,7 @@ debug_print_current_time (char const *item, parser_control *pc)
if (pc->local_zones_seen && !pc->debug_local_zones_seen)
{
fprintf (stderr, &" isdst=%d%s"[!space],
- pc->local_isdst, pc->dsts_seen ? " DST" : "");
+ pc->local_isdst, pc->dsts_seen ? " DST" : "");
pc->debug_local_zones_seen = true;
space = true;
}
@@ -3456,24 +3456,17 @@ yyerror (parser_control const *pc _GL_UNUSED,
return 0;
}
-/* In timezone TZ, if *TM0 is the old and *TM1 is the new value of a
- struct tm after passing it to mktime_z, return true if it's OK that
- mktime_z returned T. It's not OK if *TM0 has out-of-range
- members. */
+/* If *TM0 is the old and *TM1 is the new value of a struct tm after
+ passing it to mktime_z, return true if it's OK. It's not OK if
+ mktime failed or if *TM0 has out-of-range mainline members.
+ The caller should set TM1->tm_wday to -1 before calling mktime,
+ as a negative tm_wday is how mktime failure is inferred. */
static bool
-mktime_ok (timezone_t tz, struct tm const *tm0, struct tm const *tm1, time_t t)
+mktime_ok (struct tm const *tm0, struct tm const *tm1)
{
- struct tm ltm;
- if (t == (time_t) -1)
- {
- /* Guard against falsely reporting an error when parsing a
- timestamp that happens to equal (time_t) -1, on a host that
- supports such a timestamp. */
- tm1 = localtime_rz (tz, &t, <m);
- if (!tm1)
- return false;
- }
+ if (tm1->tm_wday < 0)
+ return false;
return ! ((tm0->tm_sec ^ tm1->tm_sec)
| (tm0->tm_min ^ tm1->tm_min)
@@ -3668,6 +3661,11 @@ parse_datetime2 (struct timespec *result, char const *p,
timezone_t tz = tzdefault;
+ /* Store a local copy prior to first "goto". Without this, a prior use
+ below of RELATIVE_TIME_0 on the RHS might translate to an assignment-
+ to-temporary, which would trigger a -Wjump-misses-init warning. */
+ const relative_time rel_time_0 = RELATIVE_TIME_0;
+
if (strncmp (p, "TZ=\"", 4) == 0)
{
char const *tzbase = p + 4;
@@ -3740,7 +3738,7 @@ parse_datetime2 (struct timespec *result, char const *p,
tm.tm_isdst = tmp.tm_isdst;
pc.meridian = MER24;
- pc.rel = RELATIVE_TIME_0;
+ pc.rel = rel_time_0;
pc.timespec_seen = false;
pc.rels_seen = false;
pc.dates_seen = 0;
@@ -3863,7 +3861,7 @@ parse_datetime2 (struct timespec *result, char const *p,
fprintf (stderr, ", dst");
if (pc.zones_seen)
- fprintf (stderr, " (%s)", time_zone_str (pc.time_zone, time_zone_buf));
+ fprintf (stderr, " (%s)", time_zone_str (pc.time_zone, time_zone_buf));
fputc ('\n', stderr);
}
@@ -3943,10 +3941,11 @@ parse_datetime2 (struct timespec *result, char const *p,
tm0.tm_mon = tm.tm_mon;
tm0.tm_year = tm.tm_year;
tm0.tm_isdst = tm.tm_isdst;
+ tm.tm_wday = -1;
Start = mktime_z (tz, &tm);
- if (! mktime_ok (tz, &tm0, &tm, Start))
+ if (! mktime_ok (&tm0, &tm))
{
bool repaired = false;
bool time_zone_seen = pc.zones_seen != 0;
@@ -3979,8 +3978,9 @@ parse_datetime2 (struct timespec *result, char const *p,
tm.tm_mon = tm0.tm_mon;
tm.tm_year = tm0.tm_year;
tm.tm_isdst = tm0.tm_isdst;
+ tm.tm_wday = -1;
Start = mktime_z (tz2, &tm);
- repaired = mktime_ok (tz2, &tm0, &tm, Start);
+ repaired = mktime_ok (&tm0, &tm);
tzfree (tz2);
}
diff --git a/gnu/parse-datetime.h b/gnu/parse-datetime.h
index 013be4b16c870e8ae55cc58c9e22b75b53e8cf72..9f7aebd1d692b87e8c1b618308fadec51a227a4a 100644
--- a/gnu/parse-datetime.h
+++ b/gnu/parse-datetime.h
@@ -1,6 +1,6 @@
/* Parse a string into an internal timestamp.
- Copyright (C) 1995, 1997-1998, 2003-2004, 2007, 2009-2017 Free Software
+ Copyright (C) 1995, 1997-1998, 2003-2004, 2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/parse-datetime.y b/gnu/parse-datetime.y
index f8da02d3f3fdbe3dfb1fc3c46bf897c72971fa1c..b264bb7fbbd4ecac46b45d41024cd72686c57ad2 100644
--- a/gnu/parse-datetime.y
+++ b/gnu/parse-datetime.y
@@ -1,7 +1,7 @@
%{
/* Parse a string into an internal timestamp.
- Copyright (C) 1999-2000, 2002-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999-2000, 2002-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -492,7 +492,7 @@ debug_print_current_time (char const *item, parser_control *pc)
if (pc->local_zones_seen && !pc->debug_local_zones_seen)
{
fprintf (stderr, &" isdst=%d%s"[!space],
- pc->local_isdst, pc->dsts_seen ? " DST" : "");
+ pc->local_isdst, pc->dsts_seen ? " DST" : "");
pc->debug_local_zones_seen = true;
space = true;
}
@@ -1554,24 +1554,17 @@ yyerror (parser_control const *pc _GL_UNUSED,
return 0;
}
-/* In timezone TZ, if *TM0 is the old and *TM1 is the new value of a
- struct tm after passing it to mktime_z, return true if it's OK that
- mktime_z returned T. It's not OK if *TM0 has out-of-range
- members. */
+/* If *TM0 is the old and *TM1 is the new value of a struct tm after
+ passing it to mktime_z, return true if it's OK. It's not OK if
+ mktime failed or if *TM0 has out-of-range mainline members.
+ The caller should set TM1->tm_wday to -1 before calling mktime,
+ as a negative tm_wday is how mktime failure is inferred. */
static bool
-mktime_ok (timezone_t tz, struct tm const *tm0, struct tm const *tm1, time_t t)
+mktime_ok (struct tm const *tm0, struct tm const *tm1)
{
- struct tm ltm;
- if (t == (time_t) -1)
- {
- /* Guard against falsely reporting an error when parsing a
- timestamp that happens to equal (time_t) -1, on a host that
- supports such a timestamp. */
- tm1 = localtime_rz (tz, &t, <m);
- if (!tm1)
- return false;
- }
+ if (tm1->tm_wday < 0)
+ return false;
return ! ((tm0->tm_sec ^ tm1->tm_sec)
| (tm0->tm_min ^ tm1->tm_min)
@@ -1766,6 +1759,11 @@ parse_datetime2 (struct timespec *result, char const *p,
timezone_t tz = tzdefault;
+ /* Store a local copy prior to first "goto". Without this, a prior use
+ below of RELATIVE_TIME_0 on the RHS might translate to an assignment-
+ to-temporary, which would trigger a -Wjump-misses-init warning. */
+ const relative_time rel_time_0 = RELATIVE_TIME_0;
+
if (strncmp (p, "TZ=\"", 4) == 0)
{
char const *tzbase = p + 4;
@@ -1838,7 +1836,7 @@ parse_datetime2 (struct timespec *result, char const *p,
tm.tm_isdst = tmp.tm_isdst;
pc.meridian = MER24;
- pc.rel = RELATIVE_TIME_0;
+ pc.rel = rel_time_0;
pc.timespec_seen = false;
pc.rels_seen = false;
pc.dates_seen = 0;
@@ -1961,7 +1959,7 @@ parse_datetime2 (struct timespec *result, char const *p,
fprintf (stderr, ", dst");
if (pc.zones_seen)
- fprintf (stderr, " (%s)", time_zone_str (pc.time_zone, time_zone_buf));
+ fprintf (stderr, " (%s)", time_zone_str (pc.time_zone, time_zone_buf));
fputc ('\n', stderr);
}
@@ -2041,10 +2039,11 @@ parse_datetime2 (struct timespec *result, char const *p,
tm0.tm_mon = tm.tm_mon;
tm0.tm_year = tm.tm_year;
tm0.tm_isdst = tm.tm_isdst;
+ tm.tm_wday = -1;
Start = mktime_z (tz, &tm);
- if (! mktime_ok (tz, &tm0, &tm, Start))
+ if (! mktime_ok (&tm0, &tm))
{
bool repaired = false;
bool time_zone_seen = pc.zones_seen != 0;
@@ -2077,8 +2076,9 @@ parse_datetime2 (struct timespec *result, char const *p,
tm.tm_mon = tm0.tm_mon;
tm.tm_year = tm0.tm_year;
tm.tm_isdst = tm0.tm_isdst;
+ tm.tm_wday = -1;
Start = mktime_z (tz2, &tm);
- repaired = mktime_ok (tz2, &tm0, &tm, Start);
+ repaired = mktime_ok (&tm0, &tm);
tzfree (tz2);
}
diff --git a/gnu/pathmax.h b/gnu/pathmax.h
index 191ba45e6933f68f09d7d75c971deedb1a84db0f..83b9491f1154aecca7b230460114f952aeac6f33 100644
--- a/gnu/pathmax.h
+++ b/gnu/pathmax.h
@@ -1,5 +1,5 @@
/* Define PATH_MAX somehow. Requires sys/types.h.
- Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2017 Free Software
+ Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2019 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@ -65,7 +65,7 @@
# define PATH_MAX 1024
# endif
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
/* The page "Naming Files, Paths, and Namespaces" on msdn.microsoft.com,
section "Maximum Path Length Limitation",
<https://msdn.microsoft.com/en-us/library/aa365247.aspx#maxpath>
diff --git a/gnu/pipe-safer.c b/gnu/pipe-safer.c
index a3cfc10e89ca5f68413de6012c65314dbc03eefd..62017397c60e42bc94a0d15d0b09ddf8e47701e3 100644
--- a/gnu/pipe-safer.c
+++ b/gnu/pipe-safer.c
@@ -1,5 +1,5 @@
/* Invoke pipe, but avoid some glitches.
- Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/printf-args.c b/gnu/printf-args.c
index 74335e494384823fcfa4095b5ef75c66a7e8453e..e45cfbede10ed3913850a3c66b2eb8ada5a9624c 100644
--- a/gnu/printf-args.c
+++ b/gnu/printf-args.c
@@ -1,5 +1,5 @@
/* Decomposed printf argument list.
- Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2017 Free Software
+ Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/printf-args.h b/gnu/printf-args.h
index 74fd26e9a7bc4a34ec186f0f770f995fb0cad8cd..866cba04d8ca45c284c44c4ea5dfc0cdbf9c4bf8 100644
--- a/gnu/printf-args.h
+++ b/gnu/printf-args.h
@@ -1,5 +1,5 @@
/* Decomposed printf argument list.
- Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2017 Free Software
+ Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2019 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/printf-parse.c b/gnu/printf-parse.c
index b56eb7245571e7478bc188a3d6af252176540fa0..8596fd5f305c544215863409355ca60790f25d8d 100644
--- a/gnu/printf-parse.c
+++ b/gnu/printf-parse.c
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999-2000, 2002-2003, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999-2000, 2002-2003, 2006-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -419,7 +419,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
cp++;
}
#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* On native Windows, PRIdMAX is defined as "I64d".
We cannot change it to "lld" because PRIdMAX must also
be understood by the system's printf routines. */
diff --git a/gnu/printf-parse.h b/gnu/printf-parse.h
index e19a07dc0fdd828ca1b529990063acbae79aede5..746bb3fe0fa9f23e439b7a677c43ec37222c360b 100644
--- a/gnu/printf-parse.h
+++ b/gnu/printf-parse.h
@@ -1,5 +1,5 @@
/* Parse printf format string.
- Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2017 Free Software
+ Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2019 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/priv-set.c b/gnu/priv-set.c
index 1ba2551d2daa73c60d1881c77a39c41e101be4e5..2e4ce40fdde8690715fa9efe84c55e19f1d40c05 100644
--- a/gnu/priv-set.c
+++ b/gnu/priv-set.c
@@ -1,6 +1,6 @@
/* Query, remove, or restore a Solaris privilege.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/priv-set.h b/gnu/priv-set.h
index 22463e5df570911f7be9ab995e2d8fe0bf403305..96f6428fb271d184f25bb2d9703f5dda55dd9896 100644
--- a/gnu/priv-set.h
+++ b/gnu/priv-set.h
@@ -1,6 +1,6 @@
/* Query, remove, or restore a Solaris privilege.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/progname.c b/gnu/progname.c
index fa51ca9c1422038c1fceed46e9bc25fef1495be1..a42b7fa2f7003c13ef1434c308d2492a6af874a6 100644
--- a/gnu/progname.c
+++ b/gnu/progname.c
@@ -1,5 +1,5 @@
/* Program name management.
- Copyright (C) 2001-2003, 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2001.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/progname.h b/gnu/progname.h
index 3e026246c6663a15e5c2166f876622578b8e919f..c726e97e905e54535d7c63ebd15d0026c44e8fa6 100644
--- a/gnu/progname.h
+++ b/gnu/progname.h
@@ -1,5 +1,5 @@
/* Program name management.
- Copyright (C) 2001-2004, 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006, 2009-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2001.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/quote.h b/gnu/quote.h
index 2c2f0b747974a2c23de2a745dd9f8942ddff05f4..5cef8ff1e0937ed37a4d2f2956ec8f2667b38898 100644
--- a/gnu/quote.h
+++ b/gnu/quote.h
@@ -1,6 +1,6 @@
/* quote.h - prototypes for quote.c
- Copyright (C) 1998-2001, 2003, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-2001, 2003, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/quotearg.c b/gnu/quotearg.c
index 8e432e1343c1a6893408bb403a4b7c901357b048..773d53f11549b81a33d650085ed2642c0e200795 100644
--- a/gnu/quotearg.c
+++ b/gnu/quotearg.c
@@ -1,6 +1,6 @@
/* quotearg.c - quote arguments for output
- Copyright (C) 1998-2002, 2004-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-2002, 2004-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1080,3 +1080,10 @@ quote (char const *arg)
{
return quote_n (0, arg);
}
+
+/*
+ * Hey Emacs!
+ * Local Variables:
+ * coding: utf-8
+ * End:
+ */
diff --git a/gnu/quotearg.h b/gnu/quotearg.h
index 8d6b7f887a5497283f7fa7bc843f0bd5c84cebb8..0f07e0211e29ba8d15a0623ca6844a21f3d060ca 100644
--- a/gnu/quotearg.h
+++ b/gnu/quotearg.h
@@ -1,6 +1,6 @@
/* quotearg.h - quote arguments for output
- Copyright (C) 1998-2002, 2004, 2006, 2008-2017 Free Software Foundation,
+ Copyright (C) 1998-2002, 2004, 2006, 2008-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/raise.c b/gnu/raise.c
index aff5a582a6772dcd342f7d343aa74f40c45087d9..e750b7a4c6495914e6266b1dbc171a3cbfa2551b 100644
--- a/gnu/raise.c
+++ b/gnu/raise.c
@@ -1,6 +1,6 @@
/* Provide a non-threads replacement for the POSIX raise function.
- Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,27 +31,9 @@
# include "msvc-inval.h"
# endif
-# undef raise
-
# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static int
-raise_nothrow (int sig)
-{
- int result;
-
- TRY_MSVC_INVAL
- {
- result = raise (sig);
- }
- CATCH_MSVC_INVAL
- {
- result = -1;
- errno = EINVAL;
- }
- DONE_MSVC_INVAL;
-
- return result;
-}
+/* Forward declaration. */
+static int raise_nothrow (int sig);
# else
# define raise_nothrow raise
# endif
@@ -61,12 +43,11 @@ raise_nothrow (int sig)
# include <unistd.h>
-# define rpl_raise raise
-
#endif
int
-rpl_raise (int sig)
+raise (int sig)
+#undef raise
{
#if GNULIB_defined_signal_blocking && GNULIB_defined_SIGPIPE
if (sig == SIGPIPE)
@@ -79,3 +60,24 @@ rpl_raise (int sig)
return kill (getpid (), sig);
#endif
}
+
+#if HAVE_RAISE && HAVE_MSVC_INVALID_PARAMETER_HANDLER
+static int
+raise_nothrow (int sig)
+{
+ int result;
+
+ TRY_MSVC_INVAL
+ {
+ result = raise (sig);
+ }
+ CATCH_MSVC_INVAL
+ {
+ result = -1;
+ errno = EINVAL;
+ }
+ DONE_MSVC_INVAL;
+
+ return result;
+}
+#endif
diff --git a/gnu/rawmemchr.c b/gnu/rawmemchr.c
index f5793dd6603479999f3cfe7f919fc896f389448b..7df61512fc6345ebd7d9347b122c1aee83748f67 100644
--- a/gnu/rawmemchr.c
+++ b/gnu/rawmemchr.c
@@ -1,5 +1,5 @@
/* Searching in a string.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/read.c b/gnu/read.c
index 238e765a4755af5914f6575c5cd1641d3186ef56..52df1b06eb05b2d9f9ae7c3beab870c43767de19 100644
--- a/gnu/read.c
+++ b/gnu/read.c
@@ -1,5 +1,5 @@
/* POSIX compatible read() function.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2011.
This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
/* Specification. */
#include <unistd.h>
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# include <errno.h>
# include <io.h>
diff --git a/gnu/readdir.c b/gnu/readdir.c
index 041cdbdf799c50ef152809597c6eb22a168674c1..2a2e1e319503c4bd53a31bba5e725c7d19bb2db7 100644
--- a/gnu/readdir.c
+++ b/gnu/readdir.c
@@ -1,5 +1,5 @@
/* Read the next entry of a directory.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/readlink.c b/gnu/readlink.c
index cd9604b224cad616e73ea5d38fcbe8ce604781bd..bf71109350215c965fc039de94e8e63c301d0fe9 100644
--- a/gnu/readlink.c
+++ b/gnu/readlink.c
@@ -1,5 +1,5 @@
/* Stub for readlink().
- Copyright (C) 2003-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/readlinkat.c b/gnu/readlinkat.c
index c9880e1c7049b3464535fd75273e44b57e3e85f3..c0f3e59f6ce2161da2a91d89b3c268bcbae340b6 100644
--- a/gnu/readlinkat.c
+++ b/gnu/readlinkat.c
@@ -1,5 +1,5 @@
/* Read a symlink relative to an open directory.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/realloc.c b/gnu/realloc.c
index 4a7d390e90e0004783641c536578e4ccd14b73ba..a81ce3b55dcd54b8370fbf4aefd1ab22526e9f94 100644
--- a/gnu/realloc.c
+++ b/gnu/realloc.c
@@ -1,6 +1,6 @@
/* realloc() function that is glibc compatible.
- Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2017 Free Software
+ Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/ref-add.sin b/gnu/ref-add.sin
deleted file mode 100644
index 52df06a22bfd7da8f99cb7c0b1bd2d5c6a9bd5f5..0000000000000000000000000000000000000000
--- a/gnu/ref-add.sin
+++ /dev/null
@@ -1,29 +0,0 @@
-# Add this package to a list of references stored in a text file.
-#
-# Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, see <https://www.gnu.org/licenses/>.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
- s/# Packages using this file://
- ta
- :a
- s/ @PACKAGE@ / @PACKAGE@ /
- tb
- s/ $/ @PACKAGE@ /
- :b
- s/^/# Packages using this file:/
-}
diff --git a/gnu/ref-del.sin b/gnu/ref-del.sin
deleted file mode 100644
index 8e9752d23c6efb97b8aca3d9bf0144e35225d419..0000000000000000000000000000000000000000
--- a/gnu/ref-del.sin
+++ /dev/null
@@ -1,24 +0,0 @@
-# Remove this package from a list of references stored in a text file.
-#
-# Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, see <https://www.gnu.org/licenses/>.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
- s/# Packages using this file://
- s/ @PACKAGE@ / /
- s/^/# Packages using this file:/
-}
diff --git a/gnu/regcomp.c b/gnu/regcomp.c
index d79c69d6ad6efdf996732544c43f5c79a0d10b0d..10a0a49d97a947a1442ea6e807719127ebea5a79 100644
--- a/gnu/regcomp.c
+++ b/gnu/regcomp.c
@@ -1,5 +1,5 @@
/* Extended regular expression matching and search library.
- Copyright (C) 2002-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@ -59,7 +59,7 @@ static reg_errcode_t calc_inveclosure (re_dfa_t *dfa);
static Idx fetch_number (re_string_t *input, re_token_t *token,
reg_syntax_t syntax);
static int peek_token (re_token_t *token, re_string_t *input,
- reg_syntax_t syntax) internal_function;
+ reg_syntax_t syntax);
static bin_tree_t *parse (re_string_t *regexp, regex_t *preg,
reg_syntax_t syntax, reg_errcode_t *err);
static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg,
@@ -233,9 +233,7 @@ re_compile_pattern (const char *pattern, size_t length,
return NULL;
return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
}
-#ifdef _LIBC
weak_alias (__re_compile_pattern, re_compile_pattern)
-#endif
/* Set by 're_set_syntax' to the current regexp syntax to recognize. Can
also be assigned to arbitrarily: each pattern buffer stores its own
@@ -260,9 +258,7 @@ re_set_syntax (reg_syntax_t syntax)
re_syntax_options = syntax;
return ret;
}
-#ifdef _LIBC
weak_alias (__re_set_syntax, re_set_syntax)
-#endif
int
re_compile_fastmap (struct re_pattern_buffer *bufp)
@@ -281,9 +277,7 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
bufp->fastmap_accurate = 1;
return 0;
}
-#ifdef _LIBC
weak_alias (__re_compile_fastmap, re_compile_fastmap)
-#endif
static inline void
__attribute__ ((always_inline))
@@ -464,7 +458,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
the return codes and their meanings.) */
int
-regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
+regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags)
{
reg_errcode_t ret;
reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
@@ -476,7 +470,7 @@ regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
/* Try to allocate space for the fastmap. */
preg->fastmap = re_malloc (char, SBC_MAX);
- if (BE (preg->fastmap == NULL, 0))
+ if (__glibc_unlikely (preg->fastmap == NULL))
return REG_ESPACE;
syntax |= (cflags & REG_ICASE) ? RE_ICASE : 0;
@@ -502,7 +496,7 @@ regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
ret = REG_EPAREN;
/* We have already checked preg->fastmap != NULL. */
- if (BE (ret == REG_NOERROR, 1))
+ if (__glibc_likely (ret == REG_NOERROR))
/* Compute the fastmap now, since regexec cannot modify the pattern
buffer. This function never fails in this implementation. */
(void) re_compile_fastmap (preg);
@@ -515,23 +509,21 @@ regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
return (int) ret;
}
-#ifdef _LIBC
+libc_hidden_def (__regcomp)
weak_alias (__regcomp, regcomp)
-#endif
/* Returns a message corresponding to an error code, ERRCODE, returned
from either regcomp or regexec. We don't use PREG here. */
size_t
-regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf,
+regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf,
size_t errbuf_size)
{
const char *msg;
size_t msg_size;
+ int nerrcodes = sizeof __re_error_msgid_idx / sizeof __re_error_msgid_idx[0];
- if (BE (errcode < 0
- || errcode >= (int) (sizeof (__re_error_msgid_idx)
- / sizeof (__re_error_msgid_idx[0])), 0))
+ if (__glibc_unlikely (errcode < 0 || errcode >= nerrcodes))
/* Only error codes returned by the rest of the code should be passed
to this routine. If we are given anything else, or if other regex
code generates an invalid error code, then the program has a bug.
@@ -542,10 +534,10 @@ regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf,
msg_size = strlen (msg) + 1; /* Includes the null. */
- if (BE (errbuf_size != 0, 1))
+ if (__glibc_likely (errbuf_size != 0))
{
size_t cpy_size = msg_size;
- if (BE (msg_size > errbuf_size, 0))
+ if (__glibc_unlikely (msg_size > errbuf_size))
{
cpy_size = errbuf_size - 1;
errbuf[cpy_size] = '\0';
@@ -555,9 +547,7 @@ regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf,
return msg_size;
}
-#ifdef _LIBC
weak_alias (__regerror, regerror)
-#endif
#ifdef RE_ENABLE_I18N
@@ -643,7 +633,7 @@ void
regfree (regex_t *preg)
{
re_dfa_t *dfa = preg->buffer;
- if (BE (dfa != NULL, 1))
+ if (__glibc_likely (dfa != NULL))
{
lock_fini (dfa->lock);
free_dfa_content (dfa);
@@ -657,9 +647,8 @@ regfree (regex_t *preg)
re_free (preg->translate);
preg->translate = NULL;
}
-#ifdef _LIBC
+libc_hidden_def (__regfree)
weak_alias (__regfree, regfree)
-#endif
/* Entry points compatible with 4.2 BSD regex library. We don't define
them unless specifically requested. */
@@ -699,7 +688,7 @@ re_comp (const char *s)
if (re_comp_buf.fastmap == NULL)
{
- re_comp_buf.fastmap = (char *) malloc (SBC_MAX);
+ re_comp_buf.fastmap = re_malloc (char, SBC_MAX);
if (re_comp_buf.fastmap == NULL)
return (char *) gettext (__re_error_msgid
+ __re_error_msgid_idx[(int) REG_ESPACE]);
@@ -752,7 +741,7 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
/* Initialize the dfa. */
dfa = preg->buffer;
- if (BE (preg->allocated < sizeof (re_dfa_t), 0))
+ if (__glibc_unlikely (preg->allocated < sizeof (re_dfa_t)))
{
/* If zero allocated, but buffer is non-null, try to realloc
enough space. This loses if buffer's address is bogus, but
@@ -767,9 +756,9 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
preg->used = sizeof (re_dfa_t);
err = init_dfa (dfa, length);
- if (BE (err == REG_NOERROR && lock_init (dfa->lock) != 0, 0))
+ if (__glibc_unlikely (err == REG_NOERROR && lock_init (dfa->lock) != 0))
err = REG_ESPACE;
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
free_dfa_content (dfa);
preg->buffer = NULL;
@@ -784,7 +773,7 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
err = re_string_construct (®exp, pattern, length, preg->translate,
(syntax & RE_ICASE) != 0, dfa);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_compile_internal_free_return:
free_workarea_compile (preg);
@@ -799,12 +788,12 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
/* Parse the regular expression, and build a structure tree. */
preg->re_nsub = 0;
dfa->str_tree = parse (®exp, preg, syntax, &err);
- if (BE (dfa->str_tree == NULL, 0))
+ if (__glibc_unlikely (dfa->str_tree == NULL))
goto re_compile_internal_free_return;
/* Analyze the tree and create the nfa. */
err = analyze (preg);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto re_compile_internal_free_return;
#ifdef RE_ENABLE_I18N
@@ -820,7 +809,7 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
free_workarea_compile (preg);
re_string_destruct (®exp);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
lock_fini (dfa->lock);
free_dfa_content (dfa);
@@ -862,7 +851,8 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
calculation below, and for similar doubling calculations
elsewhere. And it's <= rather than <, because some of the
doubling calculations add 1 afterwards. */
- if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) / 2 <= pat_len, 0))
+ if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / max_object_size) / 2
+ <= pat_len))
return REG_ESPACE;
dfa->nodes_alloc = pat_len + 1;
@@ -906,7 +896,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
int i, j, ch;
dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
- if (BE (dfa->sb_char == NULL, 0))
+ if (__glibc_unlikely (dfa->sb_char == NULL))
return REG_ESPACE;
/* Set the bits corresponding to single byte chars. */
@@ -925,7 +915,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
}
#endif
- if (BE (dfa->nodes == NULL || dfa->state_table == NULL, 0))
+ if (__glibc_unlikely (dfa->nodes == NULL || dfa->state_table == NULL))
return REG_ESPACE;
return REG_NOERROR;
}
@@ -935,21 +925,23 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
character used by some operators like "\<", "\>", etc. */
static void
-internal_function
init_word_char (re_dfa_t *dfa)
{
int i = 0;
int j;
int ch = 0;
dfa->word_ops_used = 1;
- if (BE (dfa->map_notascii == 0, 1))
+ if (__glibc_likely (dfa->map_notascii == 0))
{
+ /* Avoid uint32_t and uint64_t as some non-GCC platforms lack
+ them, an issue when this code is used in Gnulib. */
bitset_word_t bits0 = 0x00000000;
bitset_word_t bits1 = 0x03ff0000;
bitset_word_t bits2 = 0x87fffffe;
bitset_word_t bits3 = 0x07fffffe;
if (BITSET_WORD_BITS == 64)
{
+ /* Pacify gcc -Woverflow on 32-bit platformns. */
dfa->word_char[0] = bits1 << 31 << 1 | bits0;
dfa->word_char[1] = bits3 << 31 << 1 | bits2;
i = 2;
@@ -966,7 +958,7 @@ init_word_char (re_dfa_t *dfa)
goto general_case;
ch = 128;
- if (BE (dfa->is_utf8, 1))
+ if (__glibc_likely (dfa->is_utf8))
{
memset (&dfa->word_char[i], '\0', (SBC_MAX - ch) / 8);
return;
@@ -1013,7 +1005,7 @@ create_initial_state (re_dfa_t *dfa)
first = dfa->str_tree->first->node_idx;
dfa->init_node = first;
err = re_node_set_init_copy (&init_nodes, dfa->eclosures + first);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
/* The back-references which are in initial states can epsilon transit,
@@ -1057,7 +1049,7 @@ create_initial_state (re_dfa_t *dfa)
/* It must be the first time to invoke acquire_state. */
dfa->init_state = re_acquire_state_context (&err, dfa, &init_nodes, 0);
/* We don't check ERR here, since the initial state must not be NULL. */
- if (BE (dfa->init_state == NULL, 0))
+ if (__glibc_unlikely (dfa->init_state == NULL))
return err;
if (dfa->init_state->has_constraint)
{
@@ -1069,8 +1061,9 @@ create_initial_state (re_dfa_t *dfa)
&init_nodes,
CONTEXT_NEWLINE
| CONTEXT_BEGBUF);
- if (BE (dfa->init_state_word == NULL || dfa->init_state_nl == NULL
- || dfa->init_state_begbuf == NULL, 0))
+ if (__glibc_unlikely (dfa->init_state_word == NULL
+ || dfa->init_state_nl == NULL
+ || dfa->init_state_begbuf == NULL))
return err;
}
else
@@ -1177,8 +1170,8 @@ analyze (regex_t *preg)
dfa->org_indices = re_malloc (Idx, dfa->nodes_alloc);
dfa->edests = re_malloc (re_node_set, dfa->nodes_alloc);
dfa->eclosures = re_malloc (re_node_set, dfa->nodes_alloc);
- if (BE (dfa->nexts == NULL || dfa->org_indices == NULL || dfa->edests == NULL
- || dfa->eclosures == NULL, 0))
+ if (__glibc_unlikely (dfa->nexts == NULL || dfa->org_indices == NULL
+ || dfa->edests == NULL || dfa->eclosures == NULL))
return REG_ESPACE;
dfa->subexp_map = re_malloc (Idx, preg->re_nsub);
@@ -1193,23 +1186,23 @@ analyze (regex_t *preg)
break;
if (i == preg->re_nsub)
{
- free (dfa->subexp_map);
+ re_free (dfa->subexp_map);
dfa->subexp_map = NULL;
}
}
ret = postorder (dfa->str_tree, lower_subexps, preg);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
ret = postorder (dfa->str_tree, calc_first, dfa);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
preorder (dfa->str_tree, calc_next, dfa);
ret = preorder (dfa->str_tree, link_nfa_nodes, dfa);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
ret = calc_eclosure (dfa);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
/* We only need this during the prune_impossible_nodes pass in regexec.c;
@@ -1218,7 +1211,7 @@ analyze (regex_t *preg)
|| dfa->nbackref)
{
dfa->inveclosures = re_malloc (re_node_set, dfa->nodes_len);
- if (BE (dfa->inveclosures == NULL, 0))
+ if (__glibc_unlikely (dfa->inveclosures == NULL))
return REG_ESPACE;
ret = calc_inveclosure (dfa);
}
@@ -1248,7 +1241,7 @@ postorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
do
{
reg_errcode_t err = fn (extra, node);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
if (node->parent == NULL)
return REG_NOERROR;
@@ -1270,7 +1263,7 @@ preorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
for (node = root; ; )
{
reg_errcode_t err = fn (extra, node);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
/* Go to the left node, or up and to the right. */
@@ -1371,7 +1364,8 @@ lower_subexp (reg_errcode_t *err, regex_t *preg, bin_tree_t *node)
cls = create_tree (dfa, NULL, NULL, OP_CLOSE_SUBEXP);
tree1 = body ? create_tree (dfa, body, cls, CONCAT) : cls;
tree = create_tree (dfa, op, tree1, CONCAT);
- if (BE (tree == NULL || tree1 == NULL || op == NULL || cls == NULL, 0))
+ if (__glibc_unlikely (tree == NULL || tree1 == NULL
+ || op == NULL || cls == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -1397,7 +1391,7 @@ calc_first (void *extra, bin_tree_t *node)
{
node->first = node;
node->node_idx = re_dfa_add_node (dfa, node->token);
- if (BE (node->node_idx == -1, 0))
+ if (__glibc_unlikely (node->node_idx == -1))
return REG_ESPACE;
if (node->token.type == ANCHOR)
dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type;
@@ -1490,7 +1484,6 @@ link_nfa_nodes (void *extra, bin_tree_t *node)
to their own constraint. */
static reg_errcode_t
-internal_function
duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
Idx root_node, unsigned int init_constraint)
{
@@ -1509,11 +1502,11 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
org_dest = dfa->nexts[org_node];
re_node_set_empty (dfa->edests + clone_node);
clone_dest = duplicate_node (dfa, org_dest, constraint);
- if (BE (clone_dest == -1, 0))
+ if (__glibc_unlikely (clone_dest == -1))
return REG_ESPACE;
dfa->nexts[clone_node] = dfa->nexts[org_node];
ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
}
else if (dfa->edests[org_node].nelem == 0)
@@ -1535,17 +1528,17 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
if (org_node == root_node && clone_node != org_node)
{
ok = re_node_set_insert (dfa->edests + clone_node, org_dest);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
break;
}
/* In case the node has another constraint, append it. */
constraint |= dfa->nodes[org_node].constraint;
clone_dest = duplicate_node (dfa, org_dest, constraint);
- if (BE (clone_dest == -1, 0))
+ if (__glibc_unlikely (clone_dest == -1))
return REG_ESPACE;
ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
}
else /* dfa->edests[org_node].nelem == 2 */
@@ -1561,14 +1554,14 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
/* There is no such duplicated node, create a new one. */
reg_errcode_t err;
clone_dest = duplicate_node (dfa, org_dest, constraint);
- if (BE (clone_dest == -1, 0))
+ if (__glibc_unlikely (clone_dest == -1))
return REG_ESPACE;
ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
err = duplicate_node_closure (dfa, org_dest, clone_dest,
root_node, constraint);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
else
@@ -1576,16 +1569,16 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
/* There is a duplicated node which satisfies the constraint,
use it to avoid infinite loop. */
ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
}
org_dest = dfa->edests[org_node].elems[1];
clone_dest = duplicate_node (dfa, org_dest, constraint);
- if (BE (clone_dest == -1, 0))
+ if (__glibc_unlikely (clone_dest == -1))
return REG_ESPACE;
ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
}
org_node = org_dest;
@@ -1619,7 +1612,7 @@ static Idx
duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint)
{
Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]);
- if (BE (dup_idx != -1, 1))
+ if (__glibc_likely (dup_idx != -1))
{
dfa->nodes[dup_idx].constraint = constraint;
dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].constraint;
@@ -1645,7 +1638,7 @@ calc_inveclosure (re_dfa_t *dfa)
for (idx = 0; idx < dfa->eclosures[src].nelem; ++idx)
{
ok = re_node_set_insert_last (dfa->inveclosures + elems[idx], src);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
}
}
@@ -1686,7 +1679,7 @@ calc_eclosure (re_dfa_t *dfa)
continue;
/* Calculate epsilon closure of 'node_idx'. */
err = calc_eclosure_iter (&eclosure_elem, dfa, node_idx, true);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
if (dfa->eclosures[node_idx].nelem == 0)
@@ -1709,7 +1702,7 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
bool ok;
bool incomplete = false;
err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
/* This indicates that we are calculating this node now.
@@ -1724,7 +1717,7 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
{
err = duplicate_node_closure (dfa, node, node, node,
dfa->nodes[node].constraint);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
@@ -1746,14 +1739,14 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
if (dfa->eclosures[edest].nelem == 0)
{
err = calc_eclosure_iter (&eclosure_elem, dfa, edest, false);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
else
eclosure_elem = dfa->eclosures[edest];
/* Merge the epsilon closure of 'edest'. */
err = re_node_set_merge (&eclosure, &eclosure_elem);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
/* If the epsilon closure of 'edest' is incomplete,
the epsilon closure of this node is also incomplete. */
@@ -1766,7 +1759,7 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
/* An epsilon closure includes itself. */
ok = re_node_set_insert (&eclosure, node);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
if (incomplete && !root)
dfa->eclosures[node].nelem = 0;
@@ -1782,7 +1775,6 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
We must not use this function inside bracket expressions. */
static void
-internal_function
fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax)
{
re_string_skip_bytes (input, peek_token (result, input, syntax));
@@ -1792,7 +1784,6 @@ fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax)
We must not use this function inside bracket expressions. */
static int
-internal_function
peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
{
unsigned char c;
@@ -2031,7 +2022,6 @@ peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
We must not use this function out of bracket expressions. */
static int
-internal_function
peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
{
unsigned char c;
@@ -2139,14 +2129,14 @@ parse (re_string_t *regexp, regex_t *preg, reg_syntax_t syntax,
dfa->syntax = syntax;
fetch_token (¤t_token, regexp, syntax | RE_CARET_ANCHORS_HERE);
tree = parse_reg_exp (regexp, preg, ¤t_token, syntax, 0, err);
- if (BE (*err != REG_NOERROR && tree == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL))
return NULL;
eor = create_tree (dfa, NULL, NULL, END_OF_RE);
if (tree != NULL)
root = create_tree (dfa, tree, eor, CONCAT);
else
root = eor;
- if (BE (eor == NULL || root == NULL, 0))
+ if (__glibc_unlikely (eor == NULL || root == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2171,7 +2161,7 @@ parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
bin_tree_t *tree, *branch = NULL;
bitset_word_t initial_bkref_map = dfa->completed_bkref_map;
tree = parse_branch (regexp, preg, token, syntax, nest, err);
- if (BE (*err != REG_NOERROR && tree == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL))
return NULL;
while (token->type == OP_ALT)
@@ -2183,7 +2173,7 @@ parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
bitset_word_t accumulated_bkref_map = dfa->completed_bkref_map;
dfa->completed_bkref_map = initial_bkref_map;
branch = parse_branch (regexp, preg, token, syntax, nest, err);
- if (BE (*err != REG_NOERROR && branch == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && branch == NULL))
{
if (tree != NULL)
postorder (tree, free_tree, NULL);
@@ -2194,7 +2184,7 @@ parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
else
branch = NULL;
tree = create_tree (dfa, tree, branch, OP_ALT);
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2219,14 +2209,14 @@ parse_branch (re_string_t *regexp, regex_t *preg, re_token_t *token,
bin_tree_t *tree, *expr;
re_dfa_t *dfa = preg->buffer;
tree = parse_expression (regexp, preg, token, syntax, nest, err);
- if (BE (*err != REG_NOERROR && tree == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL))
return NULL;
while (token->type != OP_ALT && token->type != END_OF_RE
&& (nest == 0 || token->type != OP_CLOSE_SUBEXP))
{
expr = parse_expression (regexp, preg, token, syntax, nest, err);
- if (BE (*err != REG_NOERROR && expr == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && expr == NULL))
{
if (tree != NULL)
postorder (tree, free_tree, NULL);
@@ -2267,7 +2257,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
{
case CHARACTER:
tree = create_token_tree (dfa, NULL, NULL, token);
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2282,7 +2272,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
fetch_token (token, regexp, syntax);
mbc_remain = create_token_tree (dfa, NULL, NULL, token);
tree = create_tree (dfa, tree, mbc_remain, CONCAT);
- if (BE (mbc_remain == NULL || tree == NULL, 0))
+ if (__glibc_unlikely (mbc_remain == NULL || tree == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2294,25 +2284,25 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
case OP_OPEN_SUBEXP:
tree = parse_sub_exp (regexp, preg, token, syntax, nest + 1, err);
- if (BE (*err != REG_NOERROR && tree == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL))
return NULL;
break;
case OP_OPEN_BRACKET:
tree = parse_bracket_exp (regexp, dfa, token, syntax, err);
- if (BE (*err != REG_NOERROR && tree == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL))
return NULL;
break;
case OP_BACK_REF:
- if (!BE (dfa->completed_bkref_map & (1 << token->opr.idx), 1))
+ if (!__glibc_likely (dfa->completed_bkref_map & (1 << token->opr.idx)))
{
*err = REG_ESUBREG;
return NULL;
}
dfa->used_bkref_map |= 1 << token->opr.idx;
tree = create_token_tree (dfa, NULL, NULL, token);
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2358,7 +2348,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
/* mb_partial and word_char bits should be initialized already
by peek_token. */
tree = create_token_tree (dfa, NULL, NULL, token);
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2388,7 +2378,8 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
}
tree_last = create_token_tree (dfa, NULL, NULL, token);
tree = create_tree (dfa, tree_first, tree_last, OP_ALT);
- if (BE (tree_first == NULL || tree_last == NULL || tree == NULL, 0))
+ if (__glibc_unlikely (tree_first == NULL || tree_last == NULL
+ || tree == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2397,7 +2388,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
else
{
tree = create_token_tree (dfa, NULL, NULL, token);
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2412,7 +2403,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
case OP_PERIOD:
tree = create_token_tree (dfa, NULL, NULL, token);
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2427,7 +2418,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
"alnum",
"_",
token->type == OP_NOTWORD, err);
- if (BE (*err != REG_NOERROR && tree == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL))
return NULL;
break;
@@ -2437,7 +2428,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
"space",
"",
token->type == OP_NOTSPACE, err);
- if (BE (*err != REG_NOERROR && tree == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && tree == NULL))
return NULL;
break;
@@ -2463,7 +2454,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
{
bin_tree_t *dup_tree = parse_dup_op (tree, regexp, dfa, token,
syntax, err);
- if (BE (*err != REG_NOERROR && dup_tree == NULL, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR && dup_tree == NULL))
{
if (tree != NULL)
postorder (tree, free_tree, NULL);
@@ -2509,13 +2500,14 @@ parse_sub_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
else
{
tree = parse_reg_exp (regexp, preg, token, syntax, nest, err);
- if (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0))
+ if (__glibc_unlikely (*err == REG_NOERROR
+ && token->type != OP_CLOSE_SUBEXP))
{
if (tree != NULL)
postorder (tree, free_tree, NULL);
*err = REG_EPAREN;
}
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
return NULL;
}
@@ -2523,7 +2515,7 @@ parse_sub_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
dfa->completed_bkref_map |= 1 << cur_nsub;
tree = create_tree (dfa, tree, NULL, SUBEXP);
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
{
*err = REG_ESPACE;
return NULL;
@@ -2556,17 +2548,17 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
return NULL;
}
}
- if (BE (start != -2, 1))
+ if (__glibc_likely (start != -2))
{
/* We treat "{n}" as "{n,n}". */
end = ((token->type == OP_CLOSE_DUP_NUM) ? start
: ((token->type == CHARACTER && token->opr.c == ',')
? fetch_number (regexp, token, syntax) : -2));
}
- if (BE (start == -2 || end == -2, 0))
+ if (__glibc_unlikely (start == -2 || end == -2))
{
/* Invalid sequence. */
- if (BE (!(syntax & RE_INVALID_INTERVAL_ORD), 0))
+ if (__glibc_unlikely (!(syntax & RE_INVALID_INTERVAL_ORD)))
{
if (token->type == END_OF_RE)
*err = REG_EBRACE;
@@ -2585,15 +2577,15 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
return elem;
}
- if (BE ((end != -1 && start > end)
- || token->type != OP_CLOSE_DUP_NUM, 0))
+ if (__glibc_unlikely ((end != -1 && start > end)
+ || token->type != OP_CLOSE_DUP_NUM))
{
/* First number greater than second. */
*err = REG_BADBR;
return NULL;
}
- if (BE (RE_DUP_MAX < (end == -1 ? start : end), 0))
+ if (__glibc_unlikely (RE_DUP_MAX < (end == -1 ? start : end)))
{
*err = REG_ESIZE;
return NULL;
@@ -2607,23 +2599,23 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
fetch_token (token, regexp, syntax);
- if (BE (elem == NULL, 0))
+ if (__glibc_unlikely (elem == NULL))
return NULL;
- if (BE (start == 0 && end == 0, 0))
+ if (__glibc_unlikely (start == 0 && end == 0))
{
postorder (elem, free_tree, NULL);
return NULL;
}
/* Extract "<re>{n,m}" to "<re><re>...<re><re>{0,<m-n>}". */
- if (BE (start > 0, 0))
+ if (__glibc_unlikely (start > 0))
{
tree = elem;
for (i = 2; i <= start; ++i)
{
elem = duplicate_tree (elem, dfa);
tree = create_tree (dfa, tree, elem, CONCAT);
- if (BE (elem == NULL || tree == NULL, 0))
+ if (__glibc_unlikely (elem == NULL || tree == NULL))
goto parse_dup_op_espace;
}
@@ -2632,7 +2624,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
/* Duplicate ELEM before it is marked optional. */
elem = duplicate_tree (elem, dfa);
- if (BE (elem == NULL, 0))
+ if (__glibc_unlikely (elem == NULL))
goto parse_dup_op_espace;
old_tree = tree;
}
@@ -2647,13 +2639,9 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
tree = create_tree (dfa, elem, NULL,
(end == -1 ? OP_DUP_ASTERISK : OP_ALT));
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
goto parse_dup_op_espace;
-/* From gnulib's "intprops.h":
- True if the arithmetic type T is signed. */
-#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-
/* This loop is actually executed only when end != -1,
to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?... We have
already created the start+1-th copy. */
@@ -2662,11 +2650,11 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
{
elem = duplicate_tree (elem, dfa);
tree = create_tree (dfa, tree, elem, CONCAT);
- if (BE (elem == NULL || tree == NULL, 0))
+ if (__glibc_unlikely (elem == NULL || tree == NULL))
goto parse_dup_op_espace;
tree = create_tree (dfa, tree, NULL, OP_ALT);
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
goto parse_dup_op_espace;
}
@@ -2688,15 +2676,14 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
# ifdef RE_ENABLE_I18N
/* Convert the byte B to the corresponding wide character. In a
- unibyte locale, treat B as itself if it is an encoding error.
- In a multibyte locale, return WEOF if B is an encoding error. */
+ unibyte locale, treat B as itself. In a multibyte locale, return
+ WEOF if B is an encoding error. */
static wint_t
parse_byte (unsigned char b, re_charset_t *mbcset)
{
- wint_t wc = __btowc (b);
- return wc == WEOF && !mbcset ? b : wc;
+ return mbcset == NULL ? b : __btowc (b);
}
-#endif
+# endif
/* Local function for parse_bracket_exp only used in case of NOT _LIBC.
Build the range expression which starts from START_ELEM, and ends
@@ -2706,7 +2693,6 @@ parse_byte (unsigned char b, re_charset_t *mbcset)
update it. */
static reg_errcode_t
-internal_function
# ifdef RE_ENABLE_I18N
build_range_exp (const reg_syntax_t syntax,
bitset_t sbcset,
@@ -2723,17 +2709,18 @@ build_range_exp (const reg_syntax_t syntax,
{
unsigned int start_ch, end_ch;
/* Equivalence Classes and Character Classes can't be a range start/end. */
- if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS
- || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS,
- 0))
+ if (__glibc_unlikely (start_elem->type == EQUIV_CLASS
+ || start_elem->type == CHAR_CLASS
+ || end_elem->type == EQUIV_CLASS
+ || end_elem->type == CHAR_CLASS))
return REG_ERANGE;
/* We can handle no multi character collating elements without libc
support. */
- if (BE ((start_elem->type == COLL_SYM
- && strlen ((char *) start_elem->opr.name) > 1)
- || (end_elem->type == COLL_SYM
- && strlen ((char *) end_elem->opr.name) > 1), 0))
+ if (__glibc_unlikely ((start_elem->type == COLL_SYM
+ && strlen ((char *) start_elem->opr.name) > 1)
+ || (end_elem->type == COLL_SYM
+ && strlen ((char *) end_elem->opr.name) > 1)))
return REG_ECOLLATE;
# ifdef RE_ENABLE_I18N
@@ -2754,7 +2741,8 @@ build_range_exp (const reg_syntax_t syntax,
? parse_byte (end_ch, mbcset) : end_elem->opr.wch);
if (start_wc == WEOF || end_wc == WEOF)
return REG_ECOLLATE;
- else if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_wc > end_wc, 0))
+ else if (__glibc_unlikely ((syntax & RE_NO_EMPTY_RANGES)
+ && start_wc > end_wc))
return REG_ERANGE;
/* Got valid collation sequence values, add them as a new entry.
@@ -2765,7 +2753,7 @@ build_range_exp (const reg_syntax_t syntax,
if (mbcset)
{
/* Check the space of the arrays. */
- if (BE (*range_alloc == mbcset->nranges, 0))
+ if (__glibc_unlikely (*range_alloc == mbcset->nranges))
{
/* There is not enough space, need realloc. */
wchar_t *new_array_start, *new_array_end;
@@ -2780,7 +2768,8 @@ build_range_exp (const reg_syntax_t syntax,
new_array_end = re_realloc (mbcset->range_ends, wchar_t,
new_nranges);
- if (BE (new_array_start == NULL || new_array_end == NULL, 0))
+ if (__glibc_unlikely (new_array_start == NULL
+ || new_array_end == NULL))
{
re_free (new_array_start);
re_free (new_array_end);
@@ -2832,7 +2821,6 @@ build_range_exp (const reg_syntax_t syntax,
pointer argument since we may update it. */
static reg_errcode_t
-internal_function
# ifdef RE_ENABLE_I18N
build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
Idx *coll_sym_alloc, const unsigned char *name)
@@ -2841,7 +2829,7 @@ build_collating_symbol (bitset_t sbcset, const unsigned char *name)
# endif /* not RE_ENABLE_I18N */
{
size_t name_len = strlen ((const char *) name);
- if (BE (name_len != 1, 0))
+ if (__glibc_unlikely (name_len != 1))
return REG_ECOLLATE;
else
{
@@ -2976,18 +2964,21 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
/* Equivalence Classes and Character Classes can't be a range
start/end. */
- if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS
- || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS,
- 0))
+ if (__glibc_unlikely (start_elem->type == EQUIV_CLASS
+ || start_elem->type == CHAR_CLASS
+ || end_elem->type == EQUIV_CLASS
+ || end_elem->type == CHAR_CLASS))
return REG_ERANGE;
/* FIXME: Implement rational ranges here, too. */
start_collseq = lookup_collation_sequence_value (start_elem);
end_collseq = lookup_collation_sequence_value (end_elem);
/* Check start/end collation sequence values. */
- if (BE (start_collseq == UINT_MAX || end_collseq == UINT_MAX, 0))
+ if (__glibc_unlikely (start_collseq == UINT_MAX
+ || end_collseq == UINT_MAX))
return REG_ECOLLATE;
- if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_collseq > end_collseq, 0))
+ if (__glibc_unlikely ((syntax & RE_NO_EMPTY_RANGES)
+ && start_collseq > end_collseq))
return REG_ERANGE;
/* Got valid collation sequence values, add them as a new entry.
@@ -2997,7 +2988,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
if (nrules > 0 || dfa->mb_cur_max > 1)
{
/* Check the space of the arrays. */
- if (BE (*range_alloc == mbcset->nranges, 0))
+ if (__glibc_unlikely (*range_alloc == mbcset->nranges))
{
/* There is not enough space, need realloc. */
uint32_t *new_array_start;
@@ -3011,7 +3002,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
new_array_end = re_realloc (mbcset->range_ends, uint32_t,
new_nranges);
- if (BE (new_array_start == NULL || new_array_end == NULL, 0))
+ if (__glibc_unlikely (new_array_start == NULL
+ || new_array_end == NULL))
return REG_ESPACE;
mbcset->range_starts = new_array_start;
@@ -3075,7 +3067,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
/* Got valid collation sequence, add it as a new entry. */
/* Check the space of the arrays. */
- if (BE (*coll_sym_alloc == mbcset->ncoll_syms, 0))
+ if (__glibc_unlikely (*coll_sym_alloc == mbcset->ncoll_syms))
{
/* Not enough, realloc it. */
/* +1 in case of mbcset->ncoll_syms is 0. */
@@ -3084,7 +3076,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
if *alloc == 0. */
int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t,
new_coll_sym_alloc);
- if (BE (new_coll_syms == NULL, 0))
+ if (__glibc_unlikely (new_coll_syms == NULL))
return REG_ESPACE;
mbcset->coll_syms = new_coll_syms;
*coll_sym_alloc = new_coll_sym_alloc;
@@ -3094,7 +3086,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
}
else
{
- if (BE (name_len != 1, 0))
+ if (__glibc_unlikely (name_len != 1))
return REG_ECOLLATE;
else
{
@@ -3138,9 +3130,9 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
#endif /* RE_ENABLE_I18N */
#ifdef RE_ENABLE_I18N
- if (BE (sbcset == NULL || mbcset == NULL, 0))
+ if (__glibc_unlikely (sbcset == NULL || mbcset == NULL))
#else
- if (BE (sbcset == NULL, 0))
+ if (__glibc_unlikely (sbcset == NULL))
#endif /* RE_ENABLE_I18N */
{
re_free (sbcset);
@@ -3152,7 +3144,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
}
token_len = peek_token_bracket (token, regexp, syntax);
- if (BE (token->type == END_OF_RE, 0))
+ if (__glibc_unlikely (token->type == END_OF_RE))
{
*err = REG_BADPAT;
goto parse_bracket_exp_free_return;
@@ -3167,7 +3159,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
bitset_set (sbcset, '\n');
re_string_skip_bytes (regexp, token_len); /* Skip a token. */
token_len = peek_token_bracket (token, regexp, syntax);
- if (BE (token->type == END_OF_RE, 0))
+ if (__glibc_unlikely (token->type == END_OF_RE))
{
*err = REG_BADPAT;
goto parse_bracket_exp_free_return;
@@ -3192,7 +3184,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
start_elem.type = COLL_SYM;
ret = parse_bracket_element (&start_elem, regexp, token, token_len, dfa,
syntax, first_round);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
{
*err = ret;
goto parse_bracket_exp_free_return;
@@ -3205,7 +3197,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
/* Do not check for ranges if we know they are not allowed. */
if (start_elem.type != CHAR_CLASS && start_elem.type != EQUIV_CLASS)
{
- if (BE (token->type == END_OF_RE, 0))
+ if (__glibc_unlikely (token->type == END_OF_RE))
{
*err = REG_EBRACK;
goto parse_bracket_exp_free_return;
@@ -3214,7 +3206,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
{
re_string_skip_bytes (regexp, token_len); /* Skip '-'. */
token_len2 = peek_token_bracket (&token2, regexp, syntax);
- if (BE (token2.type == END_OF_RE, 0))
+ if (__glibc_unlikely (token2.type == END_OF_RE))
{
*err = REG_EBRACK;
goto parse_bracket_exp_free_return;
@@ -3236,7 +3228,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
end_elem.type = COLL_SYM;
ret = parse_bracket_element (&end_elem, regexp, &token2, token_len2,
dfa, syntax, true);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
{
*err = ret;
goto parse_bracket_exp_free_return;
@@ -3256,7 +3248,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
*err = build_range_exp (syntax, sbcset, &start_elem, &end_elem);
# endif
#endif /* RE_ENABLE_I18N */
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
goto parse_bracket_exp_free_return;
}
else
@@ -3269,7 +3261,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
#ifdef RE_ENABLE_I18N
case MB_CHAR:
/* Check whether the array has enough space. */
- if (BE (mbchar_alloc == mbcset->nmbchars, 0))
+ if (__glibc_unlikely (mbchar_alloc == mbcset->nmbchars))
{
wchar_t *new_mbchars;
/* Not enough, realloc it. */
@@ -3278,7 +3270,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
/* Use realloc since array is NULL if *alloc == 0. */
new_mbchars = re_realloc (mbcset->mbchars, wchar_t,
mbchar_alloc);
- if (BE (new_mbchars == NULL, 0))
+ if (__glibc_unlikely (new_mbchars == NULL))
goto parse_bracket_exp_espace;
mbcset->mbchars = new_mbchars;
}
@@ -3291,7 +3283,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
mbcset, &equiv_class_alloc,
#endif /* RE_ENABLE_I18N */
start_elem.opr.name);
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
goto parse_bracket_exp_free_return;
break;
case COLL_SYM:
@@ -3300,7 +3292,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
mbcset, &coll_sym_alloc,
#endif /* RE_ENABLE_I18N */
start_elem.opr.name);
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
goto parse_bracket_exp_free_return;
break;
case CHAR_CLASS:
@@ -3310,7 +3302,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
#endif /* RE_ENABLE_I18N */
(const char *) start_elem.opr.name,
syntax);
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
goto parse_bracket_exp_free_return;
break;
default:
@@ -3318,7 +3310,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
break;
}
}
- if (BE (token->type == END_OF_RE, 0))
+ if (__glibc_unlikely (token->type == END_OF_RE))
{
*err = REG_EBRACK;
goto parse_bracket_exp_free_return;
@@ -3349,7 +3341,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
br_token.type = COMPLEX_BRACKET;
br_token.opr.mbcset = mbcset;
mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token);
- if (BE (mbc_tree == NULL, 0))
+ if (__glibc_unlikely (mbc_tree == NULL))
goto parse_bracket_exp_espace;
for (sbc_idx = 0; sbc_idx < BITSET_WORDS; ++sbc_idx)
if (sbcset[sbc_idx])
@@ -3362,12 +3354,12 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
br_token.type = SIMPLE_BRACKET;
br_token.opr.sbcset = sbcset;
work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
- if (BE (work_tree == NULL, 0))
+ if (__glibc_unlikely (work_tree == NULL))
goto parse_bracket_exp_espace;
/* Then join them by ALT node. */
work_tree = create_tree (dfa, work_tree, mbc_tree, OP_ALT);
- if (BE (work_tree == NULL, 0))
+ if (__glibc_unlikely (work_tree == NULL))
goto parse_bracket_exp_espace;
}
else
@@ -3386,7 +3378,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
br_token.type = SIMPLE_BRACKET;
br_token.opr.sbcset = sbcset;
work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
- if (BE (work_tree == NULL, 0))
+ if (__glibc_unlikely (work_tree == NULL))
goto parse_bracket_exp_espace;
}
return work_tree;
@@ -3423,7 +3415,7 @@ parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
if (token->type == OP_OPEN_COLL_ELEM || token->type == OP_OPEN_CHAR_CLASS
|| token->type == OP_OPEN_EQUIV_CLASS)
return parse_bracket_symbol (elem, regexp, token);
- if (BE (token->type == OP_CHARSET_RANGE, 0) && !accept_hyphen)
+ if (__glibc_unlikely (token->type == OP_CHARSET_RANGE) && !accept_hyphen)
{
/* A '-' must only appear as anything but a range indicator before
the closing bracket. Everything else is an error. */
@@ -3518,7 +3510,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
_NL_COLLATE_INDIRECTMB);
idx1 = findidx (table, indirect, extra, &cp, -1);
- if (BE (idx1 == 0 || *cp != '\0', 0))
+ if (__glibc_unlikely (idx1 == 0 || *cp != '\0'))
/* This isn't a valid character. */
return REG_ECOLLATE;
@@ -3537,21 +3529,13 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
continue;
/* Compare only if the length matches and the collation rule
index is the same. */
- if (len == weights[idx2 & 0xffffff] && (idx1 >> 24) == (idx2 >> 24))
- {
- int cnt = 0;
-
- while (cnt <= len &&
- weights[(idx1 & 0xffffff) + 1 + cnt]
- == weights[(idx2 & 0xffffff) + 1 + cnt])
- ++cnt;
-
- if (cnt > len)
- bitset_set (sbcset, ch);
- }
+ if (len == weights[idx2 & 0xffffff] && (idx1 >> 24) == (idx2 >> 24)
+ && memcmp (weights + (idx1 & 0xffffff) + 1,
+ weights + (idx2 & 0xffffff) + 1, len) == 0)
+ bitset_set (sbcset, ch);
}
/* Check whether the array has enough space. */
- if (BE (*equiv_class_alloc == mbcset->nequiv_classes, 0))
+ if (__glibc_unlikely (*equiv_class_alloc == mbcset->nequiv_classes))
{
/* Not enough, realloc it. */
/* +1 in case of mbcset->nequiv_classes is 0. */
@@ -3560,7 +3544,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
int32_t *new_equiv_classes = re_realloc (mbcset->equiv_classes,
int32_t,
new_equiv_class_alloc);
- if (BE (new_equiv_classes == NULL, 0))
+ if (__glibc_unlikely (new_equiv_classes == NULL))
return REG_ESPACE;
mbcset->equiv_classes = new_equiv_classes;
*equiv_class_alloc = new_equiv_class_alloc;
@@ -3570,7 +3554,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
else
#endif /* _LIBC */
{
- if (BE (strlen ((const char *) name) != 1, 0))
+ if (__glibc_unlikely (strlen ((const char *) name) != 1))
return REG_ECOLLATE;
bitset_set (sbcset, *name);
}
@@ -3604,7 +3588,7 @@ build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
#ifdef RE_ENABLE_I18N
/* Check the space of the arrays. */
- if (BE (*char_class_alloc == mbcset->nchar_classes, 0))
+ if (__glibc_unlikely (*char_class_alloc == mbcset->nchar_classes))
{
/* Not enough, realloc it. */
/* +1 in case of mbcset->nchar_classes is 0. */
@@ -3612,7 +3596,7 @@ build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
/* Use realloc since array is NULL if *alloc == 0. */
wctype_t *new_char_classes = re_realloc (mbcset->char_classes, wctype_t,
new_char_class_alloc);
- if (BE (new_char_classes == NULL, 0))
+ if (__glibc_unlikely (new_char_classes == NULL))
return REG_ESPACE;
mbcset->char_classes = new_char_classes;
*char_class_alloc = new_char_class_alloc;
@@ -3622,7 +3606,7 @@ build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
#define BUILD_CHARCLASS_LOOP(ctype_func) \
do { \
- if (BE (trans != NULL, 0)) \
+ if (__glibc_unlikely (trans != NULL)) \
{ \
for (i = 0; i < SBC_MAX; ++i) \
if (ctype_func (i)) \
@@ -3682,14 +3666,14 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
bin_tree_t *tree;
sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
- if (BE (sbcset == NULL, 0))
+ if (__glibc_unlikely (sbcset == NULL))
{
*err = REG_ESPACE;
return NULL;
}
#ifdef RE_ENABLE_I18N
mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
- if (BE (mbcset == NULL, 0))
+ if (__glibc_unlikely (mbcset == NULL))
{
re_free (sbcset);
*err = REG_ESPACE;
@@ -3705,7 +3689,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
#endif /* RE_ENABLE_I18N */
class_name, 0);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
{
re_free (sbcset);
#ifdef RE_ENABLE_I18N
@@ -3735,7 +3719,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
br_token.type = SIMPLE_BRACKET;
br_token.opr.sbcset = sbcset;
tree = create_token_tree (dfa, NULL, NULL, &br_token);
- if (BE (tree == NULL, 0))
+ if (__glibc_unlikely (tree == NULL))
goto build_word_op_espace;
#ifdef RE_ENABLE_I18N
@@ -3747,11 +3731,11 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
br_token.opr.mbcset = mbcset;
dfa->has_mb_node = 1;
mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token);
- if (BE (mbc_tree == NULL, 0))
+ if (__glibc_unlikely (mbc_tree == NULL))
goto build_word_op_espace;
/* Then join them by ALT node. */
tree = create_tree (dfa, tree, mbc_tree, OP_ALT);
- if (BE (mbc_tree != NULL, 1))
+ if (__glibc_likely (mbc_tree != NULL))
return tree;
}
else
@@ -3787,7 +3771,7 @@ fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
{
fetch_token (token, input, syntax);
c = token->opr.c;
- if (BE (token->type == END_OF_RE, 0))
+ if (__glibc_unlikely (token->type == END_OF_RE))
return -2;
if (token->type == OP_CLOSE_DUP_NUM || c == ',')
break;
@@ -3808,9 +3792,9 @@ free_charset (re_charset_t *cset)
# ifdef _LIBC
re_free (cset->coll_syms);
re_free (cset->equiv_classes);
+# endif
re_free (cset->range_starts);
re_free (cset->range_ends);
-# endif
re_free (cset->char_classes);
re_free (cset);
}
@@ -3837,7 +3821,7 @@ create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
const re_token_t *token)
{
bin_tree_t *tree;
- if (BE (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE, 0))
+ if (__glibc_unlikely (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE))
{
bin_tree_storage_t *storage = re_malloc (bin_tree_storage_t, 1);
diff --git a/gnu/regex.c b/gnu/regex.c
index 998d95e5bdda0c3fbb24b908146585294ec8491c..eab7a48b24008c72c6ef63697401b4916605e93e 100644
--- a/gnu/regex.c
+++ b/gnu/regex.c
@@ -1,5 +1,5 @@
/* Extended regular expression matching and search library.
- Copyright (C) 2002-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@ -18,12 +18,12 @@
<https://www.gnu.org/licenses/>. */
#ifndef _LIBC
-# include <config.h>
+# include <libc-config.h>
-# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+# if __GNUC_PREREQ (4, 6)
# pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
# endif
-# if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
+# if __GNUC_PREREQ (4, 3)
# pragma GCC diagnostic ignored "-Wold-style-definition"
# pragma GCC diagnostic ignored "-Wtype-limits"
# endif
diff --git a/gnu/regex.h b/gnu/regex.h
index b236a1b34fc7a199082622cc2576ad2fe132099b..77ac1a559c4d84d2915f91e4736839e97a409fbd 100644
--- a/gnu/regex.h
+++ b/gnu/regex.h
@@ -1,7 +1,6 @@
/* Definitions for data structures and routines for the regular
expression library.
- Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2017 Free Software
- Foundation, Inc.
+ Copyright (C) 1985, 1989-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -608,28 +607,28 @@ extern int re_exec (const char *);
# endif
#endif
-/* GCC 2.95 and later have "__restrict"; C99 compilers have
+/* For plain 'restrict', use glibc's __restrict if defined.
+ Otherwise, GCC 2.95 and later have "__restrict"; C99 compilers have
"restrict", and "configure" may have defined "restrict".
Other compilers use __restrict, __restrict__, and _Restrict, and
'configure' might #define 'restrict' to those words, so pick a
different name. */
#ifndef _Restrict_
-# if 199901L <= __STDC_VERSION__
-# define _Restrict_ restrict
-# elif 2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)
+# if defined __restrict || 2 < __GNUC__ + (95 <= __GNUC_MINOR__)
# define _Restrict_ __restrict
+# elif 199901L <= __STDC_VERSION__ || defined restrict
+# define _Restrict_ restrict
# else
# define _Restrict_
# endif
#endif
-/* gcc 3.1 and up support the [restrict] syntax. Don't trust
- sys/cdefs.h's definition of __restrict_arr, though, as it
- mishandles gcc -ansi -pedantic. */
+/* For [restrict], use glibc's __restrict_arr if available.
+ Otherwise, GCC 3.1 (not in C++ mode) and C99 support [restrict]. */
#ifndef _Restrict_arr_
-# if ((199901L <= __STDC_VERSION__ \
- || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__)) \
- && !defined __STRICT_ANSI__)) \
- && !defined __GNUG__)
+# ifdef __restrict_arr
+# define _Restrict_arr_ __restrict_arr
+# elif ((199901L <= __STDC_VERSION__ || 3 < __GNUC__ + (1 <= __GNUC_MINOR__)) \
+ && !defined __GNUG__)
# define _Restrict_arr_ _Restrict_
# else
# define _Restrict_arr_
diff --git a/gnu/regex_internal.c b/gnu/regex_internal.c
index a77319b9d0933ee647354f3453456b89c9a09242..b592f06725c1e1177594029e3c549229716a98b6 100644
--- a/gnu/regex_internal.c
+++ b/gnu/regex_internal.c
@@ -1,5 +1,5 @@
/* Extended regular expression matching and search library.
- Copyright (C) 2002-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@ -20,14 +20,24 @@
static void re_string_construct_common (const char *str, Idx len,
re_string_t *pstr,
RE_TRANSLATE_TYPE trans, bool icase,
- const re_dfa_t *dfa) internal_function;
+ const re_dfa_t *dfa);
static re_dfastate_t *create_ci_newstate (const re_dfa_t *dfa,
const re_node_set *nodes,
- re_hashval_t hash) internal_function;
+ re_hashval_t hash);
static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa,
const re_node_set *nodes,
unsigned int context,
- re_hashval_t hash) internal_function;
+ re_hashval_t hash);
+static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
+ Idx new_buf_len);
+#ifdef RE_ENABLE_I18N
+static void build_wcs_buffer (re_string_t *pstr);
+static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr);
+#endif /* RE_ENABLE_I18N */
+static void build_upper_buffer (re_string_t *pstr);
+static void re_string_translate_buffer (re_string_t *pstr);
+static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
+ int eflags) __attribute__ ((pure));
/* Functions for string operation. */
@@ -35,7 +45,7 @@ static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa,
re_string_reconstruct before using the object. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_string_allocate (re_string_t *pstr, const char *str, Idx len, Idx init_len,
RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa)
{
@@ -49,7 +59,7 @@ re_string_allocate (re_string_t *pstr, const char *str, Idx len, Idx init_len,
re_string_construct_common (str, len, pstr, trans, icase, dfa);
ret = re_string_realloc_buffers (pstr, init_buf_len);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
pstr->word_char = dfa->word_char;
@@ -63,7 +73,7 @@ re_string_allocate (re_string_t *pstr, const char *str, Idx len, Idx init_len,
/* This function allocate the buffers, and initialize them. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_string_construct (re_string_t *pstr, const char *str, Idx len,
RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa)
{
@@ -74,7 +84,7 @@ re_string_construct (re_string_t *pstr, const char *str, Idx len,
if (len > 0)
{
ret = re_string_realloc_buffers (pstr, len + 1);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
}
pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str;
@@ -87,14 +97,14 @@ re_string_construct (re_string_t *pstr, const char *str, Idx len,
while (1)
{
ret = build_wcs_upper_buffer (pstr);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
if (pstr->valid_raw_len >= len)
break;
if (pstr->bufs_len > pstr->valid_len + dfa->mb_cur_max)
break;
ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
}
}
@@ -126,7 +136,7 @@ re_string_construct (re_string_t *pstr, const char *str, Idx len,
/* Helper functions for re_string_allocate, and re_string_construct. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
{
#ifdef RE_ENABLE_I18N
@@ -136,17 +146,18 @@ re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
/* Avoid overflow in realloc. */
const size_t max_object_size = MAX (sizeof (wint_t), sizeof (Idx));
- if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_buf_len, 0))
+ if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / max_object_size)
+ < new_buf_len))
return REG_ESPACE;
new_wcs = re_realloc (pstr->wcs, wint_t, new_buf_len);
- if (BE (new_wcs == NULL, 0))
+ if (__glibc_unlikely (new_wcs == NULL))
return REG_ESPACE;
pstr->wcs = new_wcs;
if (pstr->offsets != NULL)
{
Idx *new_offsets = re_realloc (pstr->offsets, Idx, new_buf_len);
- if (BE (new_offsets == NULL, 0))
+ if (__glibc_unlikely (new_offsets == NULL))
return REG_ESPACE;
pstr->offsets = new_offsets;
}
@@ -156,7 +167,7 @@ re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
{
unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char,
new_buf_len);
- if (BE (new_mbs == NULL, 0))
+ if (__glibc_unlikely (new_mbs == NULL))
return REG_ESPACE;
pstr->mbs = new_mbs;
}
@@ -166,7 +177,6 @@ re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
static void
-internal_function
re_string_construct_common (const char *str, Idx len, re_string_t *pstr,
RE_TRANSLATE_TYPE trans, bool icase,
const re_dfa_t *dfa)
@@ -198,7 +208,6 @@ re_string_construct_common (const char *str, Idx len, re_string_t *pstr,
built and starts from PSTR->VALID_LEN. */
static void
-internal_function
build_wcs_buffer (re_string_t *pstr)
{
#ifdef _LIBC
@@ -222,7 +231,7 @@ build_wcs_buffer (re_string_t *pstr)
remain_len = end_idx - byte_idx;
prev_st = pstr->cur_state;
/* Apply the translation if we need. */
- if (BE (pstr->trans != NULL, 0))
+ if (__glibc_unlikely (pstr->trans != NULL))
{
int i, ch;
@@ -236,17 +245,18 @@ build_wcs_buffer (re_string_t *pstr)
else
p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx;
mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
- if (BE (mbclen == (size_t) -1 || mbclen == 0
- || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len), 0))
+ if (__glibc_unlikely (mbclen == (size_t) -1 || mbclen == 0
+ || (mbclen == (size_t) -2
+ && pstr->bufs_len >= pstr->len)))
{
/* We treat these cases as a singlebyte character. */
mbclen = 1;
wc = (wchar_t) pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
- if (BE (pstr->trans != NULL, 0))
+ if (__glibc_unlikely (pstr->trans != NULL))
wc = pstr->trans[wc];
pstr->cur_state = prev_st;
}
- else if (BE (mbclen == (size_t) -2, 0))
+ else if (__glibc_unlikely (mbclen == (size_t) -2))
{
/* The buffer doesn't have enough space, finish to build. */
pstr->cur_state = prev_st;
@@ -267,7 +277,7 @@ build_wcs_buffer (re_string_t *pstr)
but for REG_ICASE. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
build_wcs_upper_buffer (re_string_t *pstr)
{
mbstate_t prev_st;
@@ -309,7 +319,7 @@ build_wcs_upper_buffer (re_string_t *pstr)
mbclen = __mbrtowc (&wc,
((const char *) pstr->raw_mbs + pstr->raw_mbs_idx
+ byte_idx), remain_len, &pstr->cur_state);
- if (BE (mbclen < (size_t) -2, 1))
+ if (__glibc_likely (0 < mbclen && mbclen < (size_t) -2))
{
wchar_t wcu = __towupper (wc);
if (wcu != wc)
@@ -317,7 +327,7 @@ build_wcs_upper_buffer (re_string_t *pstr)
size_t mbcdlen;
mbcdlen = __wcrtomb (buf, wcu, &prev_st);
- if (BE (mbclen == mbcdlen, 1))
+ if (__glibc_likely (mbclen == mbcdlen))
memcpy (pstr->mbs + byte_idx, buf, mbclen);
else
{
@@ -342,7 +352,7 @@ build_wcs_upper_buffer (re_string_t *pstr)
pstr->mbs[byte_idx] = ch;
/* And also cast it to wide char. */
pstr->wcs[byte_idx++] = (wchar_t) ch;
- if (BE (mbclen == (size_t) -1, 0))
+ if (__glibc_unlikely (mbclen == (size_t) -1))
pstr->cur_state = prev_st;
}
else
@@ -364,7 +374,7 @@ build_wcs_upper_buffer (re_string_t *pstr)
offsets_needed:
remain_len = end_idx - byte_idx;
prev_st = pstr->cur_state;
- if (BE (pstr->trans != NULL, 0))
+ if (__glibc_unlikely (pstr->trans != NULL))
{
int i, ch;
@@ -378,15 +388,15 @@ build_wcs_upper_buffer (re_string_t *pstr)
else
p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx;
mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
- if (BE (mbclen < (size_t) -2, 1))
+ if (__glibc_likely (0 < mbclen && mbclen < (size_t) -2))
{
wchar_t wcu = __towupper (wc);
if (wcu != wc)
{
size_t mbcdlen;
- mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st);
- if (BE (mbclen == mbcdlen, 1))
+ mbcdlen = __wcrtomb ((char *) buf, wcu, &prev_st);
+ if (__glibc_likely (mbclen == mbcdlen))
memcpy (pstr->mbs + byte_idx, buf, mbclen);
else if (mbcdlen != (size_t) -1)
{
@@ -436,7 +446,7 @@ build_wcs_upper_buffer (re_string_t *pstr)
else
memcpy (pstr->mbs + byte_idx, p, mbclen);
- if (BE (pstr->offsets_needed != 0, 0))
+ if (__glibc_unlikely (pstr->offsets_needed != 0))
{
size_t i;
for (i = 0; i < mbclen; ++i)
@@ -455,17 +465,17 @@ build_wcs_upper_buffer (re_string_t *pstr)
/* It is an invalid character or '\0'. Just use the byte. */
int ch = pstr->raw_mbs[pstr->raw_mbs_idx + src_idx];
- if (BE (pstr->trans != NULL, 0))
+ if (__glibc_unlikely (pstr->trans != NULL))
ch = pstr->trans [ch];
pstr->mbs[byte_idx] = ch;
- if (BE (pstr->offsets_needed != 0, 0))
+ if (__glibc_unlikely (pstr->offsets_needed != 0))
pstr->offsets[byte_idx] = src_idx;
++src_idx;
/* And also cast it to wide char. */
pstr->wcs[byte_idx++] = (wchar_t) ch;
- if (BE (mbclen == (size_t) -1, 0))
+ if (__glibc_unlikely (mbclen == (size_t) -1))
pstr->cur_state = prev_st;
}
else
@@ -484,7 +494,6 @@ build_wcs_upper_buffer (re_string_t *pstr)
Return the index. */
static Idx
-internal_function
re_string_skip_chars (re_string_t *pstr, Idx new_raw_idx, wint_t *last_wc)
{
mbstate_t prev_st;
@@ -501,7 +510,8 @@ re_string_skip_chars (re_string_t *pstr, Idx new_raw_idx, wint_t *last_wc)
prev_st = pstr->cur_state;
mbclen = __mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx,
remain_len, &pstr->cur_state);
- if (BE (mbclen == (size_t) -2 || mbclen == (size_t) -1 || mbclen == 0, 0))
+ if (__glibc_unlikely (mbclen == (size_t) -2 || mbclen == (size_t) -1
+ || mbclen == 0))
{
/* We treat these cases as a single byte character. */
if (mbclen == 0 || remain_len == 0)
@@ -525,7 +535,6 @@ re_string_skip_chars (re_string_t *pstr, Idx new_raw_idx, wint_t *last_wc)
This function is used in case of REG_ICASE. */
static void
-internal_function
build_upper_buffer (re_string_t *pstr)
{
Idx char_idx, end_idx;
@@ -534,7 +543,7 @@ build_upper_buffer (re_string_t *pstr)
for (char_idx = pstr->valid_len; char_idx < end_idx; ++char_idx)
{
int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx];
- if (BE (pstr->trans != NULL, 0))
+ if (__glibc_unlikely (pstr->trans != NULL))
ch = pstr->trans[ch];
pstr->mbs[char_idx] = toupper (ch);
}
@@ -545,7 +554,6 @@ build_upper_buffer (re_string_t *pstr)
/* Apply TRANS to the buffer in PSTR. */
static void
-internal_function
re_string_translate_buffer (re_string_t *pstr)
{
Idx buf_idx, end_idx;
@@ -566,12 +574,12 @@ re_string_translate_buffer (re_string_t *pstr)
convert to upper case in case of REG_ICASE, apply translation. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
{
Idx offset;
- if (BE (pstr->raw_mbs_idx <= idx, 0))
+ if (__glibc_unlikely (pstr->raw_mbs_idx <= idx))
offset = idx - pstr->raw_mbs_idx;
else
{
@@ -593,14 +601,14 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
offset = idx;
}
- if (BE (offset != 0, 1))
+ if (__glibc_likely (offset != 0))
{
/* Should the already checked characters be kept? */
- if (BE (offset < pstr->valid_raw_len, 1))
+ if (__glibc_likely (offset < pstr->valid_raw_len))
{
/* Yes, move them to the front of the buffer. */
#ifdef RE_ENABLE_I18N
- if (BE (pstr->offsets_needed, 0))
+ if (__glibc_unlikely (pstr->offsets_needed))
{
Idx low = 0, high = pstr->valid_len, mid;
do
@@ -672,7 +680,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
memmove (pstr->wcs, pstr->wcs + offset,
(pstr->valid_len - offset) * sizeof (wint_t));
#endif /* RE_ENABLE_I18N */
- if (BE (pstr->mbs_allocated, 0))
+ if (__glibc_unlikely (pstr->mbs_allocated))
memmove (pstr->mbs, pstr->mbs + offset,
pstr->valid_len - offset);
pstr->valid_len -= offset;
@@ -688,7 +696,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
/* No, skip all characters until IDX. */
Idx prev_valid_len = pstr->valid_len;
- if (BE (pstr->offsets_needed, 0))
+ if (__glibc_unlikely (pstr->offsets_needed))
{
pstr->len = pstr->raw_len - idx + offset;
pstr->stop = pstr->raw_stop - idx + offset;
@@ -716,7 +724,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
#ifdef _LIBC
/* We know the wchar_t encoding is UCS4, so for the simple
case, ASCII characters, skip the conversion step. */
- if (isascii (*p) && BE (pstr->trans == NULL, 1))
+ if (isascii (*p) && __glibc_likely (pstr->trans == NULL))
{
memset (&pstr->cur_state, '\0', sizeof (mbstate_t));
/* pstr->valid_len = 0; */
@@ -734,7 +742,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
size_t mbclen;
const unsigned char *pp = p;
- if (BE (pstr->trans != NULL, 0))
+ if (__glibc_unlikely (pstr->trans != NULL))
{
int i = mlen < 6 ? mlen : 6;
while (--i >= 0)
@@ -764,13 +772,13 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
pstr->tip_context
= re_string_context_at (pstr, prev_valid_len - 1, eflags);
else
- pstr->tip_context = ((BE (pstr->word_ops_used != 0, 0)
+ pstr->tip_context = ((__glibc_unlikely (pstr->word_ops_used != 0)
&& IS_WIDE_WORD_CHAR (wc))
? CONTEXT_WORD
: ((IS_WIDE_NEWLINE (wc)
&& pstr->newline_anchor)
? CONTEXT_NEWLINE : 0));
- if (BE (pstr->valid_len, 0))
+ if (__glibc_unlikely (pstr->valid_len))
{
for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx)
pstr->wcs[wcs_idx] = WEOF;
@@ -792,7 +800,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
? CONTEXT_NEWLINE : 0));
}
}
- if (!BE (pstr->mbs_allocated, 0))
+ if (!__glibc_unlikely (pstr->mbs_allocated))
pstr->mbs += offset;
}
pstr->raw_mbs_idx = idx;
@@ -806,7 +814,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
if (pstr->icase)
{
reg_errcode_t ret = build_wcs_upper_buffer (pstr);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
}
else
@@ -814,7 +822,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
}
else
#endif /* RE_ENABLE_I18N */
- if (BE (pstr->mbs_allocated, 0))
+ if (__glibc_unlikely (pstr->mbs_allocated))
{
if (pstr->icase)
build_upper_buffer (pstr);
@@ -829,14 +837,14 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
}
static unsigned char
-internal_function __attribute__ ((pure))
+__attribute__ ((pure))
re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
{
int ch;
Idx off;
/* Handle the common (easiest) cases first. */
- if (BE (!pstr->mbs_allocated, 1))
+ if (__glibc_likely (!pstr->mbs_allocated))
return re_string_peek_byte (pstr, idx);
#ifdef RE_ENABLE_I18N
@@ -866,10 +874,9 @@ re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
}
static unsigned char
-internal_function
re_string_fetch_byte_case (re_string_t *pstr)
{
- if (BE (!pstr->mbs_allocated, 1))
+ if (__glibc_likely (!pstr->mbs_allocated))
return re_string_fetch_byte (pstr);
#ifdef RE_ENABLE_I18N
@@ -904,7 +911,6 @@ re_string_fetch_byte_case (re_string_t *pstr)
}
static void
-internal_function
re_string_destruct (re_string_t *pstr)
{
#ifdef RE_ENABLE_I18N
@@ -918,15 +924,14 @@ re_string_destruct (re_string_t *pstr)
/* Return the context at IDX in INPUT. */
static unsigned int
-internal_function
re_string_context_at (const re_string_t *input, Idx idx, int eflags)
{
int c;
- if (BE (idx < 0, 0))
+ if (__glibc_unlikely (idx < 0))
/* In this case, we use the value stored in input->tip_context,
since we can't know the character in input->mbs[-1] here. */
return input->tip_context;
- if (BE (idx == input->len, 0))
+ if (__glibc_unlikely (idx == input->len))
return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF
: CONTEXT_NEWLINE | CONTEXT_ENDBUF);
#ifdef RE_ENABLE_I18N
@@ -945,7 +950,8 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags)
return input->tip_context;
}
wc = input->wcs[wc_idx];
- if (BE (input->word_ops_used != 0, 0) && IS_WIDE_WORD_CHAR (wc))
+ if (__glibc_unlikely (input->word_ops_used != 0)
+ && IS_WIDE_WORD_CHAR (wc))
return CONTEXT_WORD;
return (IS_WIDE_NEWLINE (wc) && input->newline_anchor
? CONTEXT_NEWLINE : 0);
@@ -963,25 +969,26 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags)
/* Functions for set operation. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_node_set_alloc (re_node_set *set, Idx size)
{
set->alloc = size;
set->nelem = 0;
set->elems = re_malloc (Idx, size);
- if (BE (set->elems == NULL, 0) && (MALLOC_0_IS_NONNULL || size != 0))
+ if (__glibc_unlikely (set->elems == NULL)
+ && (MALLOC_0_IS_NONNULL || size != 0))
return REG_ESPACE;
return REG_NOERROR;
}
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_node_set_init_1 (re_node_set *set, Idx elem)
{
set->alloc = 1;
set->nelem = 1;
set->elems = re_malloc (Idx, 1);
- if (BE (set->elems == NULL, 0))
+ if (__glibc_unlikely (set->elems == NULL))
{
set->alloc = set->nelem = 0;
return REG_ESPACE;
@@ -991,12 +998,12 @@ re_node_set_init_1 (re_node_set *set, Idx elem)
}
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_node_set_init_2 (re_node_set *set, Idx elem1, Idx elem2)
{
set->alloc = 2;
set->elems = re_malloc (Idx, 2);
- if (BE (set->elems == NULL, 0))
+ if (__glibc_unlikely (set->elems == NULL))
return REG_ESPACE;
if (elem1 == elem2)
{
@@ -1021,7 +1028,7 @@ re_node_set_init_2 (re_node_set *set, Idx elem1, Idx elem2)
}
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_node_set_init_copy (re_node_set *dest, const re_node_set *src)
{
dest->nelem = src->nelem;
@@ -1029,7 +1036,7 @@ re_node_set_init_copy (re_node_set *dest, const re_node_set *src)
{
dest->alloc = dest->nelem;
dest->elems = re_malloc (Idx, dest->alloc);
- if (BE (dest->elems == NULL, 0))
+ if (__glibc_unlikely (dest->elems == NULL))
{
dest->alloc = dest->nelem = 0;
return REG_ESPACE;
@@ -1046,7 +1053,7 @@ re_node_set_init_copy (re_node_set *dest, const re_node_set *src)
Note: We assume dest->elems is NULL, when dest->alloc is 0. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
const re_node_set *src2)
{
@@ -1060,7 +1067,7 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
{
Idx new_alloc = src1->nelem + src2->nelem + dest->alloc;
Idx *new_elems = re_realloc (dest->elems, Idx, new_alloc);
- if (BE (new_elems == NULL, 0))
+ if (__glibc_unlikely (new_elems == NULL))
return REG_ESPACE;
dest->elems = new_elems;
dest->alloc = new_alloc;
@@ -1137,7 +1144,7 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
DEST. Return value indicate the error code or REG_NOERROR if succeeded. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_node_set_init_union (re_node_set *dest, const re_node_set *src1,
const re_node_set *src2)
{
@@ -1146,7 +1153,7 @@ re_node_set_init_union (re_node_set *dest, const re_node_set *src1,
{
dest->alloc = src1->nelem + src2->nelem;
dest->elems = re_malloc (Idx, dest->alloc);
- if (BE (dest->elems == NULL, 0))
+ if (__glibc_unlikely (dest->elems == NULL))
return REG_ESPACE;
}
else
@@ -1190,7 +1197,7 @@ re_node_set_init_union (re_node_set *dest, const re_node_set *src1,
DEST. Return value indicate the error code or REG_NOERROR if succeeded. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_node_set_merge (re_node_set *dest, const re_node_set *src)
{
Idx is, id, sbase, delta;
@@ -1200,13 +1207,13 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
{
Idx new_alloc = 2 * (src->nelem + dest->alloc);
Idx *new_buffer = re_realloc (dest->elems, Idx, new_alloc);
- if (BE (new_buffer == NULL, 0))
+ if (__glibc_unlikely (new_buffer == NULL))
return REG_ESPACE;
dest->elems = new_buffer;
dest->alloc = new_alloc;
}
- if (BE (dest->nelem == 0, 0))
+ if (__glibc_unlikely (dest->nelem == 0))
{
dest->nelem = src->nelem;
memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx));
@@ -1273,15 +1280,15 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
Return true if successful. */
static bool
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_node_set_insert (re_node_set *set, Idx elem)
{
Idx idx;
/* In case the set is empty. */
if (set->alloc == 0)
- return BE (re_node_set_init_1 (set, elem) == REG_NOERROR, 1);
+ return __glibc_likely (re_node_set_init_1 (set, elem) == REG_NOERROR);
- if (BE (set->nelem, 0) == 0)
+ if (__glibc_unlikely (set->nelem) == 0)
{
/* We already guaranteed above that set->alloc != 0. */
set->elems[0] = elem;
@@ -1295,7 +1302,7 @@ re_node_set_insert (re_node_set *set, Idx elem)
Idx *new_elems;
set->alloc = set->alloc * 2;
new_elems = re_realloc (set->elems, Idx, set->alloc);
- if (BE (new_elems == NULL, 0))
+ if (__glibc_unlikely (new_elems == NULL))
return false;
set->elems = new_elems;
}
@@ -1325,7 +1332,7 @@ re_node_set_insert (re_node_set *set, Idx elem)
Return true if successful. */
static bool
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_node_set_insert_last (re_node_set *set, Idx elem)
{
/* Realloc if we need. */
@@ -1334,7 +1341,7 @@ re_node_set_insert_last (re_node_set *set, Idx elem)
Idx *new_elems;
set->alloc = (set->alloc + 1) * 2;
new_elems = re_realloc (set->elems, Idx, set->alloc);
- if (BE (new_elems == NULL, 0))
+ if (__glibc_unlikely (new_elems == NULL))
return false;
set->elems = new_elems;
}
@@ -1348,7 +1355,7 @@ re_node_set_insert_last (re_node_set *set, Idx elem)
Return true if SET1 and SET2 are equivalent. */
static bool
-internal_function __attribute__ ((pure))
+__attribute__ ((pure))
re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
{
Idx i;
@@ -1363,7 +1370,7 @@ re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
/* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise. */
static Idx
-internal_function __attribute__ ((pure))
+__attribute__ ((pure))
re_node_set_contains (const re_node_set *set, Idx elem)
{
__re_size_t idx, right, mid;
@@ -1385,7 +1392,6 @@ re_node_set_contains (const re_node_set *set, Idx elem)
}
static void
-internal_function
re_node_set_remove_at (re_node_set *set, Idx idx)
{
if (idx < 0 || idx >= set->nelem)
@@ -1400,10 +1406,9 @@ re_node_set_remove_at (re_node_set *set, Idx idx)
Or return -1 if an error occurred. */
static Idx
-internal_function
re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
{
- if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0))
+ if (__glibc_unlikely (dfa->nodes_len >= dfa->nodes_alloc))
{
size_t new_nodes_alloc = dfa->nodes_alloc * 2;
Idx *new_nexts, *new_indices;
@@ -1414,19 +1419,20 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
const size_t max_object_size = MAX (sizeof (re_token_t),
MAX (sizeof (re_node_set),
sizeof (Idx)));
- if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_nodes_alloc, 0))
+ if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / max_object_size)
+ < new_nodes_alloc))
return -1;
new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc);
- if (BE (new_nodes == NULL, 0))
+ if (__glibc_unlikely (new_nodes == NULL))
return -1;
dfa->nodes = new_nodes;
new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc);
new_indices = re_realloc (dfa->org_indices, Idx, new_nodes_alloc);
new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc);
new_eclosures = re_realloc (dfa->eclosures, re_node_set, new_nodes_alloc);
- if (BE (new_nexts == NULL || new_indices == NULL
- || new_edests == NULL || new_eclosures == NULL, 0))
+ if (__glibc_unlikely (new_nexts == NULL || new_indices == NULL
+ || new_edests == NULL || new_eclosures == NULL))
{
re_free (new_nexts);
re_free (new_indices);
@@ -1454,7 +1460,6 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
}
static re_hashval_t
-internal_function
calc_state_hash (const re_node_set *nodes, unsigned int context)
{
re_hashval_t hash = nodes->nelem + context;
@@ -1474,7 +1479,7 @@ calc_state_hash (const re_node_set *nodes, unsigned int context)
optimization. */
static re_dfastate_t *
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,
const re_node_set *nodes)
{
@@ -1486,7 +1491,7 @@ re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,
/* Suppress bogus uninitialized-variable warnings. */
*err = REG_NOERROR;
#endif
- if (BE (nodes->nelem == 0, 0))
+ if (__glibc_unlikely (nodes->nelem == 0))
{
*err = REG_NOERROR;
return NULL;
@@ -1505,7 +1510,7 @@ re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,
/* There are no appropriate state in the dfa, create the new one. */
new_state = create_ci_newstate (dfa, nodes, hash);
- if (BE (new_state == NULL, 0))
+ if (__glibc_unlikely (new_state == NULL))
*err = REG_ESPACE;
return new_state;
@@ -1522,7 +1527,7 @@ re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,
optimization. */
static re_dfastate_t *
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa,
const re_node_set *nodes, unsigned int context)
{
@@ -1552,7 +1557,7 @@ re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa,
}
/* There are no appropriate state in 'dfa', create the new one. */
new_state = create_cd_newstate (dfa, nodes, context, hash);
- if (BE (new_state == NULL, 0))
+ if (__glibc_unlikely (new_state == NULL))
*err = REG_ESPACE;
return new_state;
@@ -1573,7 +1578,7 @@ register_state (const re_dfa_t *dfa, re_dfastate_t *newstate,
newstate->hash = hash;
err = re_node_set_alloc (&newstate->non_eps_nodes, newstate->nodes.nelem);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return REG_ESPACE;
for (i = 0; i < newstate->nodes.nelem; i++)
{
@@ -1584,12 +1589,12 @@ register_state (const re_dfa_t *dfa, re_dfastate_t *newstate,
}
spot = dfa->state_table + (hash & dfa->state_hash_mask);
- if (BE (spot->alloc <= spot->num, 0))
+ if (__glibc_unlikely (spot->alloc <= spot->num))
{
Idx new_alloc = 2 * spot->num + 2;
re_dfastate_t **new_array = re_realloc (spot->array, re_dfastate_t *,
new_alloc);
- if (BE (new_array == NULL, 0))
+ if (__glibc_unlikely (new_array == NULL))
return REG_ESPACE;
spot->array = new_array;
spot->alloc = new_alloc;
@@ -1618,7 +1623,7 @@ free_state (re_dfastate_t *state)
Return the new state if succeeded, otherwise return NULL. */
static re_dfastate_t *
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
re_hashval_t hash)
{
@@ -1627,10 +1632,10 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
re_dfastate_t *newstate;
newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1);
- if (BE (newstate == NULL, 0))
+ if (__glibc_unlikely (newstate == NULL))
return NULL;
err = re_node_set_init_copy (&newstate->nodes, nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_free (newstate);
return NULL;
@@ -1656,7 +1661,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
newstate->has_constraint = 1;
}
err = register_state (dfa, newstate, hash);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
free_state (newstate);
newstate = NULL;
@@ -1668,7 +1673,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
Return the new state if succeeded, otherwise return NULL. */
static re_dfastate_t *
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
unsigned int context, re_hashval_t hash)
{
@@ -1677,10 +1682,10 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
re_dfastate_t *newstate;
newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1);
- if (BE (newstate == NULL, 0))
+ if (__glibc_unlikely (newstate == NULL))
return NULL;
err = re_node_set_init_copy (&newstate->nodes, nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_free (newstate);
return NULL;
@@ -1712,7 +1717,7 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
if (newstate->entrance_nodes == &newstate->nodes)
{
newstate->entrance_nodes = re_malloc (re_node_set, 1);
- if (BE (newstate->entrance_nodes == NULL, 0))
+ if (__glibc_unlikely (newstate->entrance_nodes == NULL))
{
free_state (newstate);
return NULL;
@@ -1732,7 +1737,7 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
}
}
err = register_state (dfa, newstate, hash);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
free_state (newstate);
newstate = NULL;
diff --git a/gnu/regex_internal.h b/gnu/regex_internal.h
index fc4ffdb21fdd76c530ad58656573206203ea0649..a3aedda891518186f1f4e6b6453aa103c1055e4a 100644
--- a/gnu/regex_internal.h
+++ b/gnu/regex_internal.h
@@ -1,5 +1,5 @@
/* Extended regular expression matching and search library.
- Copyright (C) 2002-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@ -33,13 +33,13 @@
#include <stdbool.h>
#include <stdint.h>
-#include "intprops.h"
+#include <intprops.h>
#ifdef _LIBC
# include <libc-lock.h>
# define lock_define(name) __libc_lock_define (, name)
# define lock_init(lock) (__libc_lock_init (lock), 0)
-# define lock_fini(lock) 0
+# define lock_fini(lock) ((void) 0)
# define lock_lock(lock) __libc_lock_lock (lock)
# define lock_unlock(lock) __libc_lock_unlock (lock)
#elif defined GNULIB_LOCK && !defined USE_UNLOCKED_IO
@@ -116,8 +116,6 @@
# define RE_ENABLE_I18N
#endif
-#define BE(expr, val) __builtin_expect (expr, val)
-
/* Number of ASCII characters. */
#define ASCII_CHARS 0x80
@@ -133,7 +131,10 @@
/* Rename to standard API for using out of glibc. */
#ifndef _LIBC
# undef __wctype
+# undef __iswalnum
# undef __iswctype
+# undef __towlower
+# undef __towupper
# define __wctype wctype
# define __iswalnum iswalnum
# define __iswctype iswctype
@@ -143,13 +144,8 @@
# define __mbrtowc mbrtowc
# define __wcrtomb wcrtomb
# define __regfree regfree
-# define attribute_hidden
#endif /* not _LIBC */
-#if __GNUC__ < 3 + (__GNUC_MINOR__ < 1)
-# define __attribute__(arg)
-#endif
-
#ifndef SSIZE_MAX
# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
#endif
@@ -438,24 +434,9 @@ struct re_dfa_t;
typedef struct re_dfa_t re_dfa_t;
#ifndef _LIBC
-# define internal_function
# define IS_IN(libc) false
#endif
-static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
- Idx new_buf_len)
- internal_function;
-#ifdef RE_ENABLE_I18N
-static void build_wcs_buffer (re_string_t *pstr) internal_function;
-static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr)
- internal_function;
-#endif /* RE_ENABLE_I18N */
-static void build_upper_buffer (re_string_t *pstr) internal_function;
-static void re_string_translate_buffer (re_string_t *pstr) internal_function;
-static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
- int eflags)
- internal_function __attribute__ ((pure));
-
#define re_string_peek_byte(pstr, offset) \
((pstr)->mbs[(pstr)->cur_idx + offset])
#define re_string_fetch_byte(pstr) \
@@ -761,31 +742,31 @@ typedef struct
/* Functions for bitset_t operation. */
-static void
+static inline void
bitset_set (bitset_t set, Idx i)
{
set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS;
}
-static void
+static inline void
bitset_clear (bitset_t set, Idx i)
{
set[i / BITSET_WORD_BITS] &= ~ ((bitset_word_t) 1 << i % BITSET_WORD_BITS);
}
-static bool
+static inline bool
bitset_contain (const bitset_t set, Idx i)
{
return (set[i / BITSET_WORD_BITS] >> i % BITSET_WORD_BITS) & 1;
}
-static void
+static inline void
bitset_empty (bitset_t set)
{
memset (set, '\0', sizeof (bitset_t));
}
-static void
+static inline void
bitset_set_all (bitset_t set)
{
memset (set, -1, sizeof (bitset_word_t) * (SBC_MAX / BITSET_WORD_BITS));
@@ -794,13 +775,13 @@ bitset_set_all (bitset_t set)
((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1;
}
-static void
+static inline void
bitset_copy (bitset_t dest, const bitset_t src)
{
memcpy (dest, src, sizeof (bitset_t));
}
-static void __attribute__ ((unused))
+static inline void
bitset_not (bitset_t set)
{
int bitset_i;
@@ -812,7 +793,7 @@ bitset_not (bitset_t set)
& ~set[BITSET_WORDS - 1]);
}
-static void __attribute__ ((unused))
+static inline void
bitset_merge (bitset_t dest, const bitset_t src)
{
int bitset_i;
@@ -820,7 +801,7 @@ bitset_merge (bitset_t dest, const bitset_t src)
dest[bitset_i] |= src[bitset_i];
}
-static void __attribute__ ((unused))
+static inline void
bitset_mask (bitset_t dest, const bitset_t src)
{
int bitset_i;
@@ -831,7 +812,7 @@ bitset_mask (bitset_t dest, const bitset_t src)
#ifdef RE_ENABLE_I18N
/* Functions for re_string. */
static int
-internal_function __attribute__ ((pure, unused))
+__attribute__ ((pure, unused))
re_string_char_size_at (const re_string_t *pstr, Idx idx)
{
int byte_idx;
@@ -844,7 +825,7 @@ re_string_char_size_at (const re_string_t *pstr, Idx idx)
}
static wint_t
-internal_function __attribute__ ((pure, unused))
+__attribute__ ((pure, unused))
re_string_wchar_at (const re_string_t *pstr, Idx idx)
{
if (pstr->mb_cur_max == 1)
@@ -857,7 +838,7 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
# endif
static int
-internal_function __attribute__ ((pure, unused))
+__attribute__ ((pure, unused))
re_string_elem_size_at (const re_string_t *pstr, Idx idx)
{
# ifdef _LIBC
@@ -882,23 +863,6 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
}
#endif /* RE_ENABLE_I18N */
-#ifndef __GNUC_PREREQ
-# if defined __GNUC__ && defined __GNUC_MINOR__
-# define __GNUC_PREREQ(maj, min) \
- ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-# else
-# define __GNUC_PREREQ(maj, min) 0
-# endif
-#endif
-
-#if __GNUC_PREREQ (3,4)
-# undef __attribute_warn_unused_result__
-# define __attribute_warn_unused_result__ \
- __attribute__ ((__warn_unused_result__))
-#else
-# define __attribute_warn_unused_result__ /* empty */
-#endif
-
#ifndef FALLTHROUGH
# if __GNUC__ < 7
# define FALLTHROUGH ((void) 0)
diff --git a/gnu/regexec.c b/gnu/regexec.c
index 51a5c9ea686e2f7eecc9b52b6cfae5898bac82c8..21cf7915f7c184b0360a1ad8b1061acf09d2ba6b 100644
--- a/gnu/regexec.c
+++ b/gnu/regexec.c
@@ -1,5 +1,5 @@
/* Extended regular expression matching and search library.
- Copyright (C) 2002-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@ -18,189 +18,159 @@
<https://www.gnu.org/licenses/>. */
static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
- Idx n) internal_function;
-static void match_ctx_clean (re_match_context_t *mctx) internal_function;
-static void match_ctx_free (re_match_context_t *cache) internal_function;
+ Idx n);
+static void match_ctx_clean (re_match_context_t *mctx);
+static void match_ctx_free (re_match_context_t *cache);
static reg_errcode_t match_ctx_add_entry (re_match_context_t *cache, Idx node,
- Idx str_idx, Idx from, Idx to)
- internal_function;
-static Idx search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
- internal_function;
+ Idx str_idx, Idx from, Idx to);
+static Idx search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx);
static reg_errcode_t match_ctx_add_subtop (re_match_context_t *mctx, Idx node,
- Idx str_idx) internal_function;
+ Idx str_idx);
static re_sub_match_last_t * match_ctx_add_sublast (re_sub_match_top_t *subtop,
- Idx node, Idx str_idx)
- internal_function;
+ Idx node, Idx str_idx);
static void sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts,
re_dfastate_t **limited_sts, Idx last_node,
- Idx last_str_idx)
- internal_function;
+ Idx last_str_idx);
static reg_errcode_t re_search_internal (const regex_t *preg,
const char *string, Idx length,
Idx start, Idx last_start, Idx stop,
size_t nmatch, regmatch_t pmatch[],
- int eflags) internal_function;
+ int eflags);
static regoff_t re_search_2_stub (struct re_pattern_buffer *bufp,
const char *string1, Idx length1,
const char *string2, Idx length2,
Idx start, regoff_t range,
struct re_registers *regs,
- Idx stop, bool ret_len) internal_function;
+ Idx stop, bool ret_len);
static regoff_t re_search_stub (struct re_pattern_buffer *bufp,
const char *string, Idx length, Idx start,
regoff_t range, Idx stop,
struct re_registers *regs,
- bool ret_len) internal_function;
+ bool ret_len);
static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch,
- Idx nregs, int regs_allocated) internal_function;
-static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx)
- internal_function;
+ Idx nregs, int regs_allocated);
+static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx);
static Idx check_matching (re_match_context_t *mctx, bool fl_longest_match,
- Idx *p_match_first) internal_function;
+ Idx *p_match_first);
static Idx check_halt_state_context (const re_match_context_t *mctx,
- const re_dfastate_t *state, Idx idx)
- internal_function;
+ const re_dfastate_t *state, Idx idx);
static void update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,
regmatch_t *prev_idx_match, Idx cur_node,
- Idx cur_idx, Idx nmatch) internal_function;
+ Idx cur_idx, Idx nmatch);
static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs,
Idx str_idx, Idx dest_node, Idx nregs,
regmatch_t *regs,
- re_node_set *eps_via_nodes)
- internal_function;
+ re_node_set *eps_via_nodes);
static reg_errcode_t set_regs (const regex_t *preg,
const re_match_context_t *mctx,
size_t nmatch, regmatch_t *pmatch,
- bool fl_backtrack) internal_function;
-static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs)
- internal_function;
+ bool fl_backtrack);
+static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs);
#ifdef RE_ENABLE_I18N
static int sift_states_iter_mb (const re_match_context_t *mctx,
re_sift_context_t *sctx,
- Idx node_idx, Idx str_idx, Idx max_str_idx)
- internal_function;
+ Idx node_idx, Idx str_idx, Idx max_str_idx);
#endif /* RE_ENABLE_I18N */
static reg_errcode_t sift_states_backward (const re_match_context_t *mctx,
- re_sift_context_t *sctx)
- internal_function;
+ re_sift_context_t *sctx);
static reg_errcode_t build_sifted_states (const re_match_context_t *mctx,
re_sift_context_t *sctx, Idx str_idx,
- re_node_set *cur_dest)
- internal_function;
+ re_node_set *cur_dest);
static reg_errcode_t update_cur_sifted_state (const re_match_context_t *mctx,
re_sift_context_t *sctx,
Idx str_idx,
- re_node_set *dest_nodes)
- internal_function;
+ re_node_set *dest_nodes);
static reg_errcode_t add_epsilon_src_nodes (const re_dfa_t *dfa,
re_node_set *dest_nodes,
- const re_node_set *candidates)
- internal_function;
+ const re_node_set *candidates);
static bool check_dst_limits (const re_match_context_t *mctx,
const re_node_set *limits,
Idx dst_node, Idx dst_idx, Idx src_node,
- Idx src_idx) internal_function;
+ Idx src_idx);
static int check_dst_limits_calc_pos_1 (const re_match_context_t *mctx,
int boundaries, Idx subexp_idx,
- Idx from_node, Idx bkref_idx)
- internal_function;
+ Idx from_node, Idx bkref_idx);
static int check_dst_limits_calc_pos (const re_match_context_t *mctx,
Idx limit, Idx subexp_idx,
Idx node, Idx str_idx,
- Idx bkref_idx) internal_function;
+ Idx bkref_idx);
static reg_errcode_t check_subexp_limits (const re_dfa_t *dfa,
re_node_set *dest_nodes,
const re_node_set *candidates,
re_node_set *limits,
struct re_backref_cache_entry *bkref_ents,
- Idx str_idx) internal_function;
+ Idx str_idx);
static reg_errcode_t sift_states_bkref (const re_match_context_t *mctx,
re_sift_context_t *sctx,
- Idx str_idx, const re_node_set *candidates)
- internal_function;
+ Idx str_idx, const re_node_set *candidates);
static reg_errcode_t merge_state_array (const re_dfa_t *dfa,
re_dfastate_t **dst,
- re_dfastate_t **src, Idx num)
- internal_function;
+ re_dfastate_t **src, Idx num);
static re_dfastate_t *find_recover_state (reg_errcode_t *err,
- re_match_context_t *mctx) internal_function;
+ re_match_context_t *mctx);
static re_dfastate_t *transit_state (reg_errcode_t *err,
re_match_context_t *mctx,
- re_dfastate_t *state) internal_function;
+ re_dfastate_t *state);
static re_dfastate_t *merge_state_with_log (reg_errcode_t *err,
re_match_context_t *mctx,
- re_dfastate_t *next_state)
- internal_function;
+ re_dfastate_t *next_state);
static reg_errcode_t check_subexp_matching_top (re_match_context_t *mctx,
re_node_set *cur_nodes,
- Idx str_idx) internal_function;
+ Idx str_idx);
#if 0
static re_dfastate_t *transit_state_sb (reg_errcode_t *err,
re_match_context_t *mctx,
- re_dfastate_t *pstate)
- internal_function;
+ re_dfastate_t *pstate);
#endif
#ifdef RE_ENABLE_I18N
static reg_errcode_t transit_state_mb (re_match_context_t *mctx,
- re_dfastate_t *pstate)
- internal_function;
+ re_dfastate_t *pstate);
#endif /* RE_ENABLE_I18N */
static reg_errcode_t transit_state_bkref (re_match_context_t *mctx,
- const re_node_set *nodes)
- internal_function;
+ const re_node_set *nodes);
static reg_errcode_t get_subexp (re_match_context_t *mctx,
- Idx bkref_node, Idx bkref_str_idx)
- internal_function;
+ Idx bkref_node, Idx bkref_str_idx);
static reg_errcode_t get_subexp_sub (re_match_context_t *mctx,
const re_sub_match_top_t *sub_top,
re_sub_match_last_t *sub_last,
- Idx bkref_node, Idx bkref_str)
- internal_function;
+ Idx bkref_node, Idx bkref_str);
static Idx find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
- Idx subexp_idx, int type) internal_function;
+ Idx subexp_idx, int type);
static reg_errcode_t check_arrival (re_match_context_t *mctx,
state_array_t *path, Idx top_node,
Idx top_str, Idx last_node, Idx last_str,
- int type) internal_function;
+ int type);
static reg_errcode_t check_arrival_add_next_nodes (re_match_context_t *mctx,
Idx str_idx,
re_node_set *cur_nodes,
- re_node_set *next_nodes)
- internal_function;
+ re_node_set *next_nodes);
static reg_errcode_t check_arrival_expand_ecl (const re_dfa_t *dfa,
re_node_set *cur_nodes,
- Idx ex_subexp, int type)
- internal_function;
+ Idx ex_subexp, int type);
static reg_errcode_t check_arrival_expand_ecl_sub (const re_dfa_t *dfa,
re_node_set *dst_nodes,
Idx target, Idx ex_subexp,
- int type) internal_function;
+ int type);
static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx,
re_node_set *cur_nodes, Idx cur_str,
- Idx subexp_num, int type)
- internal_function;
-static bool build_trtable (const re_dfa_t *dfa,
- re_dfastate_t *state) internal_function;
+ Idx subexp_num, int type);
+static bool build_trtable (const re_dfa_t *dfa, re_dfastate_t *state);
#ifdef RE_ENABLE_I18N
static int check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
- const re_string_t *input, Idx idx)
- internal_function;
+ const re_string_t *input, Idx idx);
# ifdef _LIBC
static unsigned int find_collation_sequence_value (const unsigned char *mbs,
- size_t name_len)
- internal_function;
+ size_t name_len);
# endif /* _LIBC */
#endif /* RE_ENABLE_I18N */
static Idx group_nodes_into_DFAstates (const re_dfa_t *dfa,
const re_dfastate_t *state,
re_node_set *states_node,
- bitset_t *states_ch) internal_function;
+ bitset_t *states_ch);
static bool check_node_accept (const re_match_context_t *mctx,
- const re_token_t *node, Idx idx)
- internal_function;
-static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
- internal_function;
+ const re_token_t *node, Idx idx);
+static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len);
/* Entry point for POSIX code. */
@@ -219,7 +189,7 @@ static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
We return 0 if we find a match and REG_NOMATCH if not. */
int
-regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string,
+regexec (const regex_t *__restrict preg, const char *__restrict string,
size_t nmatch, regmatch_t pmatch[], int eflags)
{
reg_errcode_t err;
@@ -252,6 +222,8 @@ regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string,
}
#ifdef _LIBC
+libc_hidden_def (__regexec)
+
# include <shlib-compat.h>
versioned_symbol (libc, __regexec, regexec, GLIBC_2_3_4);
@@ -260,8 +232,8 @@ __typeof__ (__regexec) __compat_regexec;
int
attribute_compat_text_section
-__compat_regexec (const regex_t *_Restrict_ preg,
- const char *_Restrict_ string, size_t nmatch,
+__compat_regexec (const regex_t *__restrict preg,
+ const char *__restrict string, size_t nmatch,
regmatch_t pmatch[], int eflags)
{
return regexec (preg, string, nmatch, pmatch,
@@ -346,7 +318,6 @@ weak_alias (__re_search_2, re_search_2)
#endif
static regoff_t
-internal_function
re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
Idx length1, const char *string2, Idx length2, Idx start,
regoff_t range, struct re_registers *regs,
@@ -357,9 +328,8 @@ re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
Idx len;
char *s = NULL;
- if (BE ((length1 < 0 || length2 < 0 || stop < 0
- || INT_ADD_WRAPV (length1, length2, &len)),
- 0))
+ if (__glibc_unlikely ((length1 < 0 || length2 < 0 || stop < 0
+ || INT_ADD_WRAPV (length1, length2, &len))))
return -2;
/* Concatenate the strings. */
@@ -368,7 +338,7 @@ re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
{
s = re_malloc (char, len);
- if (BE (s == NULL, 0))
+ if (__glibc_unlikely (s == NULL))
return -2;
#ifdef _LIBC
memcpy (__mempcpy (s, string1, length1), string2, length2);
@@ -395,7 +365,6 @@ re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
otherwise the position of the match is returned. */
static regoff_t
-internal_function
re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
Idx start, regoff_t range, Idx stop, struct re_registers *regs,
bool ret_len)
@@ -409,11 +378,13 @@ re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
Idx last_start = start + range;
/* Check for out-of-range. */
- if (BE (start < 0 || start > length, 0))
+ if (__glibc_unlikely (start < 0 || start > length))
return -1;
- if (BE (length < last_start || (0 <= range && last_start < start), 0))
+ if (__glibc_unlikely (length < last_start
+ || (0 <= range && last_start < start)))
last_start = length;
- else if (BE (last_start < 0 || (range < 0 && start <= last_start), 0))
+ else if (__glibc_unlikely (last_start < 0
+ || (range < 0 && start <= last_start)))
last_start = 0;
lock_lock (dfa->lock);
@@ -425,17 +396,17 @@ re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
if (start < last_start && bufp->fastmap != NULL && !bufp->fastmap_accurate)
re_compile_fastmap (bufp);
- if (BE (bufp->no_sub, 0))
+ if (__glibc_unlikely (bufp->no_sub))
regs = NULL;
/* We need at least 1 register. */
if (regs == NULL)
nregs = 1;
- else if (BE (bufp->regs_allocated == REGS_FIXED
- && regs->num_regs <= bufp->re_nsub, 0))
+ else if (__glibc_unlikely (bufp->regs_allocated == REGS_FIXED
+ && regs->num_regs <= bufp->re_nsub))
{
nregs = regs->num_regs;
- if (BE (nregs < 1, 0))
+ if (__glibc_unlikely (nregs < 1))
{
/* Nothing can be copied to regs. */
regs = NULL;
@@ -445,7 +416,7 @@ re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
else
nregs = bufp->re_nsub + 1;
pmatch = re_malloc (regmatch_t, nregs);
- if (BE (pmatch == NULL, 0))
+ if (__glibc_unlikely (pmatch == NULL))
{
rval = -2;
goto out;
@@ -464,11 +435,11 @@ re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
/* If caller wants register contents data back, copy them. */
bufp->regs_allocated = re_copy_regs (regs, pmatch, nregs,
bufp->regs_allocated);
- if (BE (bufp->regs_allocated == REGS_UNALLOCATED, 0))
+ if (__glibc_unlikely (bufp->regs_allocated == REGS_UNALLOCATED))
rval = -2;
}
- if (BE (rval == 0, 1))
+ if (__glibc_likely (rval == 0))
{
if (ret_len)
{
@@ -485,7 +456,6 @@ re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
}
static unsigned
-internal_function
re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
int regs_allocated)
{
@@ -499,10 +469,10 @@ re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
if (regs_allocated == REGS_UNALLOCATED)
{ /* No. So allocate them with malloc. */
regs->start = re_malloc (regoff_t, need_regs);
- if (BE (regs->start == NULL, 0))
+ if (__glibc_unlikely (regs->start == NULL))
return REGS_UNALLOCATED;
regs->end = re_malloc (regoff_t, need_regs);
- if (BE (regs->end == NULL, 0))
+ if (__glibc_unlikely (regs->end == NULL))
{
re_free (regs->start);
return REGS_UNALLOCATED;
@@ -513,14 +483,14 @@ re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
{ /* Yes. If we need more elements than were already
allocated, reallocate them. If we need fewer, just
leave it alone. */
- if (BE (need_regs > regs->num_regs, 0))
+ if (__glibc_unlikely (need_regs > regs->num_regs))
{
regoff_t *new_start = re_realloc (regs->start, regoff_t, need_regs);
regoff_t *new_end;
- if (BE (new_start == NULL, 0))
+ if (__glibc_unlikely (new_start == NULL))
return REGS_UNALLOCATED;
new_end = re_realloc (regs->end, regoff_t, need_regs);
- if (BE (new_end == NULL, 0))
+ if (__glibc_unlikely (new_end == NULL))
{
re_free (new_start);
return REGS_UNALLOCATED;
@@ -611,7 +581,7 @@ re_exec (const char *s)
(0 <= LAST_START && LAST_START <= LENGTH) */
static reg_errcode_t
-__attribute_warn_unused_result__ internal_function
+__attribute_warn_unused_result__
re_search_internal (const regex_t *preg, const char *string, Idx length,
Idx start, Idx last_start, Idx stop, size_t nmatch,
regmatch_t pmatch[], int eflags)
@@ -646,9 +616,10 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
nmatch -= extra_nmatch;
/* Check if the DFA haven't been compiled. */
- if (BE (preg->used == 0 || dfa->init_state == NULL
- || dfa->init_state_word == NULL || dfa->init_state_nl == NULL
- || dfa->init_state_begbuf == NULL, 0))
+ if (__glibc_unlikely (preg->used == 0 || dfa->init_state == NULL
+ || dfa->init_state_word == NULL
+ || dfa->init_state_nl == NULL
+ || dfa->init_state_begbuf == NULL))
return REG_NOMATCH;
#ifdef DEBUG
@@ -675,14 +646,14 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
err = re_string_allocate (&mctx.input, string, length, dfa->nodes_len + 1,
preg->translate, (preg->syntax & RE_ICASE) != 0,
dfa);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
mctx.input.stop = stop;
mctx.input.raw_stop = stop;
mctx.input.newline_anchor = preg->newline_anchor;
err = match_ctx_init (&mctx, eflags, dfa->nbackref * 2);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
/* We will log all the DFA states through which the dfa pass,
@@ -692,15 +663,15 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
if (nmatch > 1 || dfa->has_mb_node)
{
/* Avoid overflow. */
- if (BE ((MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *))
- <= mctx.input.bufs_len), 0))
+ if (__glibc_unlikely ((MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *))
+ <= mctx.input.bufs_len)))
{
err = REG_ESPACE;
goto free_return;
}
mctx.state_log = re_malloc (re_dfastate_t *, mctx.input.bufs_len + 1);
- if (BE (mctx.state_log == NULL, 0))
+ if (__glibc_unlikely (mctx.state_log == NULL))
{
err = REG_ESPACE;
goto free_return;
@@ -744,19 +715,19 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
case 7:
/* Fastmap with single-byte translation, match forward. */
- while (BE (match_first < right_lim, 1)
+ while (__glibc_likely (match_first < right_lim)
&& !fastmap[t[(unsigned char) string[match_first]]])
++match_first;
goto forward_match_found_start_or_reached_end;
case 6:
/* Fastmap without translation, match forward. */
- while (BE (match_first < right_lim, 1)
+ while (__glibc_likely (match_first < right_lim)
&& !fastmap[(unsigned char) string[match_first]])
++match_first;
forward_match_found_start_or_reached_end:
- if (BE (match_first == right_lim, 0))
+ if (__glibc_unlikely (match_first == right_lim))
{
ch = match_first >= length
? 0 : (unsigned char) string[match_first];
@@ -789,11 +760,12 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
/* If MATCH_FIRST is out of the valid range, reconstruct the
buffers. */
__re_size_t offset = match_first - mctx.input.raw_mbs_idx;
- if (BE (offset >= (__re_size_t) mctx.input.valid_raw_len, 0))
+ if (__glibc_unlikely (offset
+ >= (__re_size_t) mctx.input.valid_raw_len))
{
err = re_string_reconstruct (&mctx.input, match_first,
eflags);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
offset = match_first - mctx.input.raw_mbs_idx;
@@ -817,7 +789,7 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
/* Reconstruct the buffers so that the matcher can assume that
the matching starts from the beginning of the buffer. */
err = re_string_reconstruct (&mctx.input, match_first, eflags);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
#ifdef RE_ENABLE_I18N
@@ -834,7 +806,7 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
start <= last_start ? &match_first : NULL);
if (match_last != -1)
{
- if (BE (match_last == -2, 0))
+ if (__glibc_unlikely (match_last == -2))
{
err = REG_ESPACE;
goto free_return;
@@ -854,7 +826,7 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
err = prune_impossible_nodes (&mctx);
if (err == REG_NOERROR)
break;
- if (BE (err != REG_NOMATCH, 0))
+ if (__glibc_unlikely (err != REG_NOMATCH))
goto free_return;
match_last = -1;
}
@@ -891,7 +863,7 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
{
err = set_regs (preg, &mctx, nmatch, pmatch,
dfa->has_plural_match && dfa->nbackref > 0);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
}
@@ -902,7 +874,7 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
if (pmatch[reg_idx].rm_so != -1)
{
#ifdef RE_ENABLE_I18N
- if (BE (mctx.input.offsets_needed != 0, 0))
+ if (__glibc_unlikely (mctx.input.offsets_needed != 0))
{
pmatch[reg_idx].rm_so =
(pmatch[reg_idx].rm_so == mctx.input.valid_len
@@ -945,7 +917,7 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
}
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
prune_impossible_nodes (re_match_context_t *mctx)
{
const re_dfa_t *const dfa = mctx->dfa;
@@ -961,11 +933,12 @@ prune_impossible_nodes (re_match_context_t *mctx)
halt_node = mctx->last_node;
/* Avoid overflow. */
- if (BE (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) <= match_last, 0))
+ if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *))
+ <= match_last))
return REG_ESPACE;
sifted_states = re_malloc (re_dfastate_t *, match_last + 1);
- if (BE (sifted_states == NULL, 0))
+ if (__glibc_unlikely (sifted_states == NULL))
{
ret = REG_ESPACE;
goto free_return;
@@ -973,7 +946,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
if (dfa->nbackref)
{
lim_states = re_malloc (re_dfastate_t *, match_last + 1);
- if (BE (lim_states == NULL, 0))
+ if (__glibc_unlikely (lim_states == NULL))
{
ret = REG_ESPACE;
goto free_return;
@@ -986,7 +959,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
match_last);
ret = sift_states_backward (mctx, &sctx);
re_node_set_free (&sctx.limits);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
goto free_return;
if (sifted_states[0] != NULL || lim_states[0] != NULL)
break;
@@ -1008,7 +981,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
match_last + 1);
re_free (lim_states);
lim_states = NULL;
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
goto free_return;
}
else
@@ -1016,7 +989,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
sift_ctx_init (&sctx, sifted_states, lim_states, halt_node, match_last);
ret = sift_states_backward (mctx, &sctx);
re_node_set_free (&sctx.limits);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
goto free_return;
if (sifted_states[0] == NULL)
{
@@ -1041,7 +1014,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
since initial states may have constraints like "\<", "^", etc.. */
static inline re_dfastate_t *
-__attribute__ ((always_inline)) internal_function
+__attribute__ ((always_inline))
acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
Idx idx)
{
@@ -1083,7 +1056,7 @@ acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
index of the buffer. */
static Idx
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
check_matching (re_match_context_t *mctx, bool fl_longest_match,
Idx *p_match_first)
{
@@ -1099,7 +1072,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
err = REG_NOERROR;
cur_state = acquire_init_state_context (&err, mctx, cur_str_idx);
/* An initial state must not be NULL (invalid). */
- if (BE (cur_state == NULL, 0))
+ if (__glibc_unlikely (cur_state == NULL))
{
assert (err == REG_ESPACE);
return -2;
@@ -1111,24 +1084,24 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
/* Check OP_OPEN_SUBEXP in the initial state in case that we use them
later. E.g. Processing back references. */
- if (BE (dfa->nbackref, 0))
+ if (__glibc_unlikely (dfa->nbackref))
{
at_init_state = false;
err = check_subexp_matching_top (mctx, &cur_state->nodes, 0);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
if (cur_state->has_backref)
{
err = transit_state_bkref (mctx, &cur_state->nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
}
}
/* If the RE accepts NULL string. */
- if (BE (cur_state->halt, 0))
+ if (__glibc_unlikely (cur_state->halt))
{
if (!cur_state->has_constraint
|| check_halt_state_context (mctx, cur_state, cur_str_idx))
@@ -1148,13 +1121,13 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
re_dfastate_t *old_state = cur_state;
Idx next_char_idx = re_string_cur_idx (&mctx->input) + 1;
- if ((BE (next_char_idx >= mctx->input.bufs_len, 0)
+ if ((__glibc_unlikely (next_char_idx >= mctx->input.bufs_len)
&& mctx->input.bufs_len < mctx->input.len)
- || (BE (next_char_idx >= mctx->input.valid_len, 0)
+ || (__glibc_unlikely (next_char_idx >= mctx->input.valid_len)
&& mctx->input.valid_len < mctx->input.len))
{
err = extend_buffers (mctx, next_char_idx + 1);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
assert (err == REG_ESPACE);
return -2;
@@ -1170,7 +1143,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
/* Reached the invalid state or an error. Try to recover a valid
state using the state log, if available and if we have not
already found a valid (even if not the longest) match. */
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return -2;
if (mctx->state_log == NULL
@@ -1179,7 +1152,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
break;
}
- if (BE (at_init_state, 0))
+ if (__glibc_unlikely (at_init_state))
{
if (old_state == cur_state)
next_start_idx = next_char_idx;
@@ -1216,7 +1189,6 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
/* Check NODE match the current context. */
static bool
-internal_function
check_halt_node_context (const re_dfa_t *dfa, Idx node, unsigned int context)
{
re_token_type_t type = dfa->nodes[node].type;
@@ -1235,7 +1207,6 @@ check_halt_node_context (const re_dfa_t *dfa, Idx node, unsigned int context)
match the context, return the node. */
static Idx
-internal_function
check_halt_state_context (const re_match_context_t *mctx,
const re_dfastate_t *state, Idx idx)
{
@@ -1257,7 +1228,6 @@ check_halt_state_context (const re_match_context_t *mctx,
return -1 in case of errors. */
static Idx
-internal_function
proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
Idx *pidx, Idx node, re_node_set *eps_via_nodes,
struct re_fail_stack_t *fs)
@@ -1271,7 +1241,7 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
re_node_set *edests = &dfa->edests[node];
Idx dest_node;
ok = re_node_set_insert (eps_via_nodes, node);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return -2;
/* Pick up a valid destination, or return -1 if none
is found. */
@@ -1333,7 +1303,7 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
{
Idx dest_node;
ok = re_node_set_insert (eps_via_nodes, node);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return -2;
dest_node = dfa->edests[node].elems[0];
if (re_node_set_contains (&mctx->state_log[*pidx]->nodes,
@@ -1359,7 +1329,7 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
}
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node,
Idx nregs, regmatch_t *regs, re_node_set *eps_via_nodes)
{
@@ -1368,8 +1338,8 @@ push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node,
if (fs->num == fs->alloc)
{
struct re_fail_stack_ent_t *new_array;
- new_array = realloc (fs->stack, (sizeof (struct re_fail_stack_ent_t)
- * fs->alloc * 2));
+ new_array = re_realloc (fs->stack, struct re_fail_stack_ent_t,
+ fs->alloc * 2);
if (new_array == NULL)
return REG_ESPACE;
fs->alloc *= 2;
@@ -1386,7 +1356,6 @@ push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node,
}
static Idx
-internal_function
pop_fail_stack (struct re_fail_stack_t *fs, Idx *pidx, Idx nregs,
regmatch_t *regs, re_node_set *eps_via_nodes)
{
@@ -1406,7 +1375,7 @@ pop_fail_stack (struct re_fail_stack_t *fs, Idx *pidx, Idx nregs,
pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,
regmatch_t *pmatch, bool fl_backtrack)
{
@@ -1484,9 +1453,9 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,
cur_node = proceed_next_node (mctx, nmatch, pmatch, &idx, cur_node,
&eps_via_nodes, fs);
- if (BE (cur_node < 0, 0))
+ if (__glibc_unlikely (cur_node < 0))
{
- if (BE (cur_node == -2, 0))
+ if (__glibc_unlikely (cur_node == -2))
{
re_node_set_free (&eps_via_nodes);
if (prev_idx_match_malloced)
@@ -1513,7 +1482,6 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,
}
static reg_errcode_t
-internal_function
free_fail_stack_return (struct re_fail_stack_t *fs)
{
if (fs)
@@ -1530,7 +1498,6 @@ free_fail_stack_return (struct re_fail_stack_t *fs)
}
static void
-internal_function
update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,
regmatch_t *prev_idx_match, Idx cur_node, Idx cur_idx, Idx nmatch)
{
@@ -1602,7 +1569,6 @@ update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,
((state) != NULL && re_node_set_contains (&(state)->nodes, node))
static reg_errcode_t
-internal_function
sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
{
reg_errcode_t err;
@@ -1617,10 +1583,10 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
/* Build sifted state_log[str_idx]. It has the nodes which can epsilon
transit to the last_node and the last_node itself. */
err = re_node_set_init_1 (&cur_dest, sctx->last_node);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
/* Then check each states in the state_log. */
@@ -1641,7 +1607,7 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
if (mctx->state_log[str_idx])
{
err = build_sifted_states (mctx, sctx, str_idx, &cur_dest);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
}
@@ -1650,7 +1616,7 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
- It is in CUR_SRC.
And update state_log. */
err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
}
err = REG_NOERROR;
@@ -1660,7 +1626,7 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
}
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,
Idx str_idx, re_node_set *cur_dest)
{
@@ -1712,7 +1678,7 @@ build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,
continue;
}
ok = re_node_set_insert (cur_dest, prev_node);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
}
@@ -1722,7 +1688,6 @@ build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,
/* Helper functions. */
static reg_errcode_t
-internal_function
clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx)
{
Idx top = mctx->state_log_top;
@@ -1734,7 +1699,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx)
{
reg_errcode_t err;
err = extend_buffers (mctx, next_state_log_idx + 1);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
@@ -1748,7 +1713,6 @@ clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx)
}
static reg_errcode_t
-internal_function
merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst,
re_dfastate_t **src, Idx num)
{
@@ -1763,11 +1727,11 @@ merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst,
re_node_set merged_set;
err = re_node_set_init_union (&merged_set, &dst[st_idx]->nodes,
&src[st_idx]->nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
dst[st_idx] = re_acquire_state (&err, dfa, &merged_set);
re_node_set_free (&merged_set);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
}
@@ -1775,7 +1739,6 @@ merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst,
}
static reg_errcode_t
-internal_function
update_cur_sifted_state (const re_match_context_t *mctx,
re_sift_context_t *sctx, Idx str_idx,
re_node_set *dest_nodes)
@@ -1795,7 +1758,7 @@ update_cur_sifted_state (const re_match_context_t *mctx,
/* At first, add the nodes which can epsilon transit to a node in
DEST_NODE. */
err = add_epsilon_src_nodes (dfa, dest_nodes, candidates);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
/* Then, check the limitations in the current sift_context. */
@@ -1803,27 +1766,27 @@ update_cur_sifted_state (const re_match_context_t *mctx,
{
err = check_subexp_limits (dfa, dest_nodes, candidates, &sctx->limits,
mctx->bkref_ents, str_idx);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
}
sctx->sifted_states[str_idx] = re_acquire_state (&err, dfa, dest_nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
if (candidates && mctx->state_log[str_idx]->has_backref)
{
err = sift_states_bkref (mctx, sctx, str_idx, candidates);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
return REG_NOERROR;
}
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,
const re_node_set *candidates)
{
@@ -1831,19 +1794,19 @@ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,
Idx i;
re_dfastate_t *state = re_acquire_state (&err, dfa, dest_nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
if (!state->inveclosure.alloc)
{
err = re_node_set_alloc (&state->inveclosure, dest_nodes->nelem);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return REG_ESPACE;
for (i = 0; i < dest_nodes->nelem; i++)
{
err = re_node_set_merge (&state->inveclosure,
dfa->inveclosures + dest_nodes->elems[i]);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return REG_ESPACE;
}
}
@@ -1852,7 +1815,6 @@ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,
}
static reg_errcode_t
-internal_function
sub_epsilon_src_nodes (const re_dfa_t *dfa, Idx node, re_node_set *dest_nodes,
const re_node_set *candidates)
{
@@ -1879,7 +1841,7 @@ sub_epsilon_src_nodes (const re_dfa_t *dfa, Idx node, re_node_set *dest_nodes,
{
err = re_node_set_add_intersect (&except_nodes, candidates,
dfa->inveclosures + cur_node);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&except_nodes);
return err;
@@ -1901,7 +1863,6 @@ sub_epsilon_src_nodes (const re_dfa_t *dfa, Idx node, re_node_set *dest_nodes,
}
static bool
-internal_function
check_dst_limits (const re_match_context_t *mctx, const re_node_set *limits,
Idx dst_node, Idx dst_idx, Idx src_node, Idx src_idx)
{
@@ -1937,7 +1898,6 @@ check_dst_limits (const re_match_context_t *mctx, const re_node_set *limits,
}
static int
-internal_function
check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
Idx subexp_idx, Idx from_node, Idx bkref_idx)
{
@@ -2019,7 +1979,6 @@ check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
}
static int
-internal_function
check_dst_limits_calc_pos (const re_match_context_t *mctx, Idx limit,
Idx subexp_idx, Idx from_node, Idx str_idx,
Idx bkref_idx)
@@ -2049,7 +2008,6 @@ check_dst_limits_calc_pos (const re_match_context_t *mctx, Idx limit,
which are against limitations from DEST_NODES. */
static reg_errcode_t
-internal_function
check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
const re_node_set *candidates, re_node_set *limits,
struct re_backref_cache_entry *bkref_ents, Idx str_idx)
@@ -2089,7 +2047,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
{
err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes,
candidates);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
@@ -2107,7 +2065,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
Remove it form the current sifted state. */
err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
candidates);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
--node_idx;
}
@@ -2127,7 +2085,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
Remove it form the current sifted state. */
err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
candidates);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
}
@@ -2137,7 +2095,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
}
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
Idx str_idx, const re_node_set *candidates)
{
@@ -2193,27 +2151,27 @@ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
{
local_sctx = *sctx;
err = re_node_set_init_copy (&local_sctx.limits, &sctx->limits);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
}
local_sctx.last_node = node;
local_sctx.last_str_idx = str_idx;
ok = re_node_set_insert (&local_sctx.limits, enabled_idx);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
{
err = REG_ESPACE;
goto free_return;
}
cur_state = local_sctx.sifted_states[str_idx];
err = sift_states_backward (mctx, &local_sctx);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
if (sctx->limited_states != NULL)
{
err = merge_state_array (dfa, sctx->limited_states,
local_sctx.sifted_states,
str_idx + 1);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
}
local_sctx.sifted_states[str_idx] = cur_state;
@@ -2237,7 +2195,6 @@ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
#ifdef RE_ENABLE_I18N
static int
-internal_function
sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
Idx node_idx, Idx str_idx, Idx max_str_idx)
{
@@ -2267,7 +2224,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
update the destination of STATE_LOG. */
static re_dfastate_t *
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
transit_state (reg_errcode_t *err, re_match_context_t *mctx,
re_dfastate_t *state)
{
@@ -2276,10 +2233,10 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx,
#ifdef RE_ENABLE_I18N
/* If the current state can accept multibyte. */
- if (BE (state->accept_mb, 0))
+ if (__glibc_unlikely (state->accept_mb))
{
*err = transit_state_mb (mctx, state);
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
return NULL;
}
#endif /* RE_ENABLE_I18N */
@@ -2296,11 +2253,11 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx,
for (;;)
{
trtable = state->trtable;
- if (BE (trtable != NULL, 1))
+ if (__glibc_likely (trtable != NULL))
return trtable[ch];
trtable = state->word_trtable;
- if (BE (trtable != NULL, 1))
+ if (__glibc_likely (trtable != NULL))
{
unsigned int context;
context
@@ -2325,7 +2282,6 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx,
/* Update the state_log if we need */
static re_dfastate_t *
-internal_function
merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
re_dfastate_t *next_state)
{
@@ -2357,7 +2313,7 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
table_nodes = next_state->entrance_nodes;
*err = re_node_set_init_union (&next_nodes, table_nodes,
log_nodes);
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
return NULL;
}
else
@@ -2377,21 +2333,21 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
re_node_set_free (&next_nodes);
}
- if (BE (dfa->nbackref, 0) && next_state != NULL)
+ if (__glibc_unlikely (dfa->nbackref) && next_state != NULL)
{
/* Check OP_OPEN_SUBEXP in the current state in case that we use them
later. We must check them here, since the back references in the
next state might use them. */
*err = check_subexp_matching_top (mctx, &next_state->nodes,
cur_idx);
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
return NULL;
/* If the next state has back references. */
if (next_state->has_backref)
{
*err = transit_state_bkref (mctx, &next_state->nodes);
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
return NULL;
next_state = mctx->state_log[cur_idx];
}
@@ -2404,7 +2360,6 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
multi-byte match, then look in the log for a state
from which to restart matching. */
static re_dfastate_t *
-internal_function
find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
{
re_dfastate_t *cur_state;
@@ -2435,7 +2390,6 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
corresponding back references. */
static reg_errcode_t
-internal_function
check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes,
Idx str_idx)
{
@@ -2457,7 +2411,7 @@ check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes,
& ((bitset_word_t) 1 << dfa->nodes[node].opr.idx)))
{
err = match_ctx_add_subtop (mctx, node, str_idx);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
}
@@ -2479,7 +2433,7 @@ transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx,
unsigned int context;
*err = re_node_set_alloc (&next_nodes, state->nodes.nelem + 1);
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
return NULL;
for (node_cnt = 0; node_cnt < state->nodes.nelem; ++node_cnt)
{
@@ -2488,7 +2442,7 @@ transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx,
{
*err = re_node_set_merge (&next_nodes,
dfa->eclosures + dfa->nexts[cur_node]);
- if (BE (*err != REG_NOERROR, 0))
+ if (__glibc_unlikely (*err != REG_NOERROR))
{
re_node_set_free (&next_nodes);
return NULL;
@@ -2508,7 +2462,6 @@ transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx,
#ifdef RE_ENABLE_I18N
static reg_errcode_t
-internal_function
transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
{
const re_dfa_t *const dfa = mctx->dfa;
@@ -2548,7 +2501,7 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
mctx->max_mb_elem_len = ((mctx->max_mb_elem_len < naccepted) ? naccepted
: mctx->max_mb_elem_len);
err = clean_state_log_if_needed (mctx, dest_idx);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
#ifdef DEBUG
assert (dfa->nexts[cur_node_idx] != -1);
@@ -2562,7 +2515,7 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
{
err = re_node_set_init_union (&dest_nodes,
dest_state->entrance_nodes, new_nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
context = re_string_context_at (&mctx->input, dest_idx - 1,
@@ -2571,7 +2524,8 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
= re_acquire_state_context (&err, dfa, &dest_nodes, context);
if (dest_state != NULL)
re_node_set_free (&dest_nodes);
- if (BE (mctx->state_log[dest_idx] == NULL && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (mctx->state_log[dest_idx] == NULL
+ && err != REG_NOERROR))
return err;
}
return REG_NOERROR;
@@ -2579,7 +2533,6 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
#endif /* RE_ENABLE_I18N */
static reg_errcode_t
-internal_function
transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
{
const re_dfa_t *const dfa = mctx->dfa;
@@ -2611,7 +2564,7 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
Check the substring which the substring matched. */
bkc_idx = mctx->nbkref_ents;
err = get_subexp (mctx, node_idx, cur_str_idx);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
/* And add the epsilon closures (which is 'new_dest_nodes') of
@@ -2644,8 +2597,8 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
mctx->state_log[dest_str_idx]
= re_acquire_state_context (&err, dfa, new_dest_nodes,
context);
- if (BE (mctx->state_log[dest_str_idx] == NULL
- && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (mctx->state_log[dest_str_idx] == NULL
+ && err != REG_NOERROR))
goto free_return;
}
else
@@ -2654,7 +2607,7 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
err = re_node_set_init_union (&dest_nodes,
dest_state->entrance_nodes,
new_dest_nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&dest_nodes);
goto free_return;
@@ -2662,8 +2615,8 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
mctx->state_log[dest_str_idx]
= re_acquire_state_context (&err, dfa, &dest_nodes, context);
re_node_set_free (&dest_nodes);
- if (BE (mctx->state_log[dest_str_idx] == NULL
- && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (mctx->state_log[dest_str_idx] == NULL
+ && err != REG_NOERROR))
goto free_return;
}
/* We need to check recursively if the backreference can epsilon
@@ -2673,10 +2626,10 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
{
err = check_subexp_matching_top (mctx, new_dest_nodes,
cur_str_idx);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
err = transit_state_bkref (mctx, new_dest_nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto free_return;
}
}
@@ -2693,7 +2646,7 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
delay these checking for prune_impossible_nodes(). */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
{
const re_dfa_t *const dfa = mctx->dfa;
@@ -2737,7 +2690,8 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
at the back reference? */
if (sl_str_diff > 0)
{
- if (BE (bkref_str_off + sl_str_diff > mctx->input.valid_len, 0))
+ if (__glibc_unlikely (bkref_str_off + sl_str_diff
+ > mctx->input.valid_len))
{
/* Not enough chars for a successful match. */
if (bkref_str_off + sl_str_diff > mctx->input.len)
@@ -2746,7 +2700,7 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
err = clean_state_log_if_needed (mctx,
bkref_str_off
+ sl_str_diff);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
buf = (const char *) re_string_get_buffer (&mctx->input);
}
@@ -2765,7 +2719,7 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
if (err == REG_NOMATCH)
continue;
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
@@ -2784,14 +2738,14 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
at the back reference? */
if (sl_str_off > 0)
{
- if (BE (bkref_str_off >= mctx->input.valid_len, 0))
+ if (__glibc_unlikely (bkref_str_off >= mctx->input.valid_len))
{
/* If we are at the end of the input, we cannot match. */
if (bkref_str_off >= mctx->input.len)
break;
err = extend_buffers (mctx, bkref_str_off + 1);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
buf = (const char *) re_string_get_buffer (&mctx->input);
@@ -2822,15 +2776,18 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
OP_CLOSE_SUBEXP);
if (err == REG_NOMATCH)
continue;
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
sub_last = match_ctx_add_sublast (sub_top, cls_node, sl_str);
- if (BE (sub_last == NULL, 0))
+ if (__glibc_unlikely (sub_last == NULL))
return REG_ESPACE;
err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node,
bkref_str_idx);
+ buf = (const char *) re_string_get_buffer (&mctx->input);
if (err == REG_NOMATCH)
continue;
+ if (__glibc_unlikely (err != REG_NOERROR))
+ return err;
}
}
return REG_NOERROR;
@@ -2843,7 +2800,6 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
and SUB_LAST. */
static reg_errcode_t
-internal_function
get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top,
re_sub_match_last_t *sub_last, Idx bkref_node, Idx bkref_str)
{
@@ -2857,7 +2813,7 @@ get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top,
return err;
err = match_ctx_add_entry (mctx, bkref_node, bkref_str, sub_top->str_idx,
sub_last->str_idx);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
to_idx = bkref_str + sub_last->str_idx - sub_top->str_idx;
return clean_state_log_if_needed (mctx, to_idx);
@@ -2872,7 +2828,6 @@ get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top,
E.g. RE: (a){2} */
static Idx
-internal_function
find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
Idx subexp_idx, int type)
{
@@ -2894,7 +2849,7 @@ find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
Idx top_str, Idx last_node, Idx last_str, int type)
{
@@ -2908,19 +2863,19 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
subexp_num = dfa->nodes[top_node].opr.idx;
/* Extend the buffer if we need. */
- if (BE (path->alloc < last_str + mctx->max_mb_elem_len + 1, 0))
+ if (__glibc_unlikely (path->alloc < last_str + mctx->max_mb_elem_len + 1))
{
re_dfastate_t **new_array;
Idx old_alloc = path->alloc;
Idx incr_alloc = last_str + mctx->max_mb_elem_len + 1;
Idx new_alloc;
- if (BE (IDX_MAX - old_alloc < incr_alloc, 0))
+ if (__glibc_unlikely (IDX_MAX - old_alloc < incr_alloc))
return REG_ESPACE;
new_alloc = old_alloc + incr_alloc;
- if (BE (SIZE_MAX / sizeof (re_dfastate_t *) < new_alloc, 0))
+ if (__glibc_unlikely (SIZE_MAX / sizeof (re_dfastate_t *) < new_alloc))
return REG_ESPACE;
new_array = re_realloc (path->array, re_dfastate_t *, new_alloc);
- if (BE (new_array == NULL, 0))
+ if (__glibc_unlikely (new_array == NULL))
return REG_ESPACE;
path->array = new_array;
path->alloc = new_alloc;
@@ -2941,10 +2896,10 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
if (str_idx == top_str)
{
err = re_node_set_init_1 (&next_nodes, top_node);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&next_nodes);
return err;
@@ -2956,7 +2911,7 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
if (cur_state && cur_state->has_backref)
{
err = re_node_set_init_copy (&next_nodes, &cur_state->nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
else
@@ -2968,14 +2923,14 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
{
err = expand_bkref_cache (mctx, &next_nodes, str_idx,
subexp_num, type);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&next_nodes);
return err;
}
}
cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context);
- if (BE (cur_state == NULL && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (cur_state == NULL && err != REG_NOERROR))
{
re_node_set_free (&next_nodes);
return err;
@@ -2990,7 +2945,7 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
{
err = re_node_set_merge (&next_nodes,
&mctx->state_log[str_idx + 1]->nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&next_nodes);
return err;
@@ -3001,7 +2956,7 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
err = check_arrival_add_next_nodes (mctx, str_idx,
&cur_state->non_eps_nodes,
&next_nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&next_nodes);
return err;
@@ -3011,14 +2966,14 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
if (next_nodes.nelem)
{
err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&next_nodes);
return err;
}
err = expand_bkref_cache (mctx, &next_nodes, str_idx,
subexp_num, type);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&next_nodes);
return err;
@@ -3026,7 +2981,7 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
}
context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags);
cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context);
- if (BE (cur_state == NULL && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (cur_state == NULL && err != REG_NOERROR))
{
re_node_set_free (&next_nodes);
return err;
@@ -3059,7 +3014,7 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
Can't we unify them? */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
re_node_set *cur_nodes, re_node_set *next_nodes)
{
@@ -3095,22 +3050,22 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
if (dest_state)
{
err = re_node_set_merge (&union_set, &dest_state->nodes);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&union_set);
return err;
}
}
ok = re_node_set_insert (&union_set, next_node);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
{
re_node_set_free (&union_set);
return REG_ESPACE;
}
mctx->state_log[next_idx] = re_acquire_state (&err, dfa,
&union_set);
- if (BE (mctx->state_log[next_idx] == NULL
- && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (mctx->state_log[next_idx] == NULL
+ && err != REG_NOERROR))
{
re_node_set_free (&union_set);
return err;
@@ -3122,7 +3077,7 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
|| check_node_accept (mctx, dfa->nodes + cur_node, str_idx))
{
ok = re_node_set_insert (next_nodes, dfa->nexts[cur_node]);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
{
re_node_set_free (&union_set);
return REG_ESPACE;
@@ -3140,7 +3095,6 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
*/
static reg_errcode_t
-internal_function
check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
Idx ex_subexp, int type)
{
@@ -3151,7 +3105,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
assert (cur_nodes->nelem);
#endif
err = re_node_set_alloc (&new_nodes, cur_nodes->nelem);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
/* Create a new node set NEW_NODES with the nodes which are epsilon
closures of the node in CUR_NODES. */
@@ -3165,7 +3119,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
{
/* There are no problematic nodes, just merge them. */
err = re_node_set_merge (&new_nodes, eclosure);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&new_nodes);
return err;
@@ -3176,7 +3130,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
/* There are problematic nodes, re-calculate incrementally. */
err = check_arrival_expand_ecl_sub (dfa, &new_nodes, cur_node,
ex_subexp, type);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
{
re_node_set_free (&new_nodes);
return err;
@@ -3193,7 +3147,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
problematic append it to DST_NODES. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,
Idx target, Idx ex_subexp, int type)
{
@@ -3208,13 +3162,13 @@ check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,
if (type == OP_CLOSE_SUBEXP)
{
ok = re_node_set_insert (dst_nodes, cur_node);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
}
break;
}
ok = re_node_set_insert (dst_nodes, cur_node);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
return REG_ESPACE;
if (dfa->edests[cur_node].nelem == 0)
break;
@@ -3224,7 +3178,7 @@ check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,
err = check_arrival_expand_ecl_sub (dfa, dst_nodes,
dfa->edests[cur_node].elems[1],
ex_subexp, type);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
cur_node = dfa->edests[cur_node].elems[0];
@@ -3238,7 +3192,7 @@ check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,
in MCTX->BKREF_ENTS. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
Idx cur_str, Idx subexp_num, int type)
{
@@ -3276,8 +3230,8 @@ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
err2 = check_arrival_expand_ecl (dfa, &new_dests, subexp_num, type);
err3 = re_node_set_merge (cur_nodes, &new_dests);
re_node_set_free (&new_dests);
- if (BE (err != REG_NOERROR || err2 != REG_NOERROR
- || err3 != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR || err2 != REG_NOERROR
+ || err3 != REG_NOERROR))
{
err = (err != REG_NOERROR ? err
: (err2 != REG_NOERROR ? err2 : err3));
@@ -3299,7 +3253,7 @@ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
err = re_node_set_init_copy (&union_set,
&mctx->state_log[to_idx]->nodes);
ok = re_node_set_insert (&union_set, next_node);
- if (BE (err != REG_NOERROR || ! ok, 0))
+ if (__glibc_unlikely (err != REG_NOERROR || ! ok))
{
re_node_set_free (&union_set);
err = err != REG_NOERROR ? err : REG_ESPACE;
@@ -3309,13 +3263,13 @@ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
else
{
err = re_node_set_init_1 (&union_set, next_node);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
return err;
}
mctx->state_log[to_idx] = re_acquire_state (&err, dfa, &union_set);
re_node_set_free (&union_set);
- if (BE (mctx->state_log[to_idx] == NULL
- && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (mctx->state_log[to_idx] == NULL
+ && err != REG_NOERROR))
return err;
}
}
@@ -3327,7 +3281,6 @@ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
Return true if successful. */
static bool
-internal_function
build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
{
reg_errcode_t err;
@@ -3359,7 +3312,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
else
{
dests_alloc = re_malloc (struct dests_alloc, 1);
- if (BE (dests_alloc == NULL, 0))
+ if (__glibc_unlikely (dests_alloc == NULL))
return false;
dests_node_malloced = true;
}
@@ -3372,16 +3325,16 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
/* At first, group all nodes belonging to 'state' into several
destinations. */
ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch);
- if (BE (ndests <= 0, 0))
+ if (__glibc_unlikely (ndests <= 0))
{
if (dests_node_malloced)
- free (dests_alloc);
+ re_free (dests_alloc);
/* Return false in case of an error, true otherwise. */
if (ndests == 0)
{
state->trtable = (re_dfastate_t **)
calloc (sizeof (re_dfastate_t *), SBC_MAX);
- if (BE (state->trtable == NULL, 0))
+ if (__glibc_unlikely (state->trtable == NULL))
return false;
return true;
}
@@ -3389,14 +3342,14 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
}
err = re_node_set_alloc (&follows, ndests + 1);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto out_free;
/* Avoid arithmetic overflow in size calculation. */
- if (BE ((((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX)
- / (3 * sizeof (re_dfastate_t *)))
- < ndests),
- 0))
+ size_t ndests_max
+ = ((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX)
+ / (3 * sizeof (re_dfastate_t *)));
+ if (__glibc_unlikely (ndests_max < ndests))
goto out_free;
if (__libc_use_alloca ((sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX
@@ -3405,18 +3358,17 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
alloca (ndests * 3 * sizeof (re_dfastate_t *));
else
{
- dest_states = (re_dfastate_t **)
- malloc (ndests * 3 * sizeof (re_dfastate_t *));
- if (BE (dest_states == NULL, 0))
+ dest_states = re_malloc (re_dfastate_t *, ndests * 3);
+ if (__glibc_unlikely (dest_states == NULL))
{
out_free:
if (dest_states_malloced)
- free (dest_states);
+ re_free (dest_states);
re_node_set_free (&follows);
for (i = 0; i < ndests; ++i)
re_node_set_free (dests_node + i);
if (dests_node_malloced)
- free (dests_alloc);
+ re_free (dests_alloc);
return false;
}
dest_states_malloced = true;
@@ -3437,12 +3389,12 @@ out_free:
if (next_node != -1)
{
err = re_node_set_merge (&follows, dfa->eclosures + next_node);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto out_free;
}
}
dest_states[i] = re_acquire_state_context (&err, dfa, &follows, 0);
- if (BE (dest_states[i] == NULL && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (dest_states[i] == NULL && err != REG_NOERROR))
goto out_free;
/* If the new state has context constraint,
build appropriate states for these contexts. */
@@ -3450,7 +3402,8 @@ out_free:
{
dest_states_word[i] = re_acquire_state_context (&err, dfa, &follows,
CONTEXT_WORD);
- if (BE (dest_states_word[i] == NULL && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (dest_states_word[i] == NULL
+ && err != REG_NOERROR))
goto out_free;
if (dest_states[i] != dest_states_word[i] && dfa->mb_cur_max > 1)
@@ -3458,7 +3411,7 @@ out_free:
dest_states_nl[i] = re_acquire_state_context (&err, dfa, &follows,
CONTEXT_NEWLINE);
- if (BE (dest_states_nl[i] == NULL && err != REG_NOERROR, 0))
+ if (__glibc_unlikely (dest_states_nl[i] == NULL && err != REG_NOERROR))
goto out_free;
}
else
@@ -3469,7 +3422,7 @@ out_free:
bitset_merge (acceptable, dests_ch[i]);
}
- if (!BE (need_word_trtable, 0))
+ if (!__glibc_unlikely (need_word_trtable))
{
/* We don't care about whether the following character is a word
character, or we are in a single-byte character set so we can
@@ -3477,7 +3430,7 @@ out_free:
256-entry transition table. */
trtable = state->trtable =
(re_dfastate_t **) calloc (sizeof (re_dfastate_t *), SBC_MAX);
- if (BE (trtable == NULL, 0))
+ if (__glibc_unlikely (trtable == NULL))
goto out_free;
/* For all characters ch...: */
@@ -3485,7 +3438,7 @@ out_free:
for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
elem;
mask <<= 1, elem >>= 1, ++ch)
- if (BE (elem & 1, 0))
+ if (__glibc_unlikely (elem & 1))
{
/* There must be exactly one destination which accepts
character ch. See group_nodes_into_DFAstates. */
@@ -3508,7 +3461,7 @@ out_free:
starting at trtable[SBC_MAX]. */
trtable = state->word_trtable =
(re_dfastate_t **) calloc (sizeof (re_dfastate_t *), 2 * SBC_MAX);
- if (BE (trtable == NULL, 0))
+ if (__glibc_unlikely (trtable == NULL))
goto out_free;
/* For all characters ch...: */
@@ -3516,7 +3469,7 @@ out_free:
for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
elem;
mask <<= 1, elem >>= 1, ++ch)
- if (BE (elem & 1, 0))
+ if (__glibc_unlikely (elem & 1))
{
/* There must be exactly one destination which accepts
character ch. See group_nodes_into_DFAstates. */
@@ -3547,14 +3500,14 @@ out_free:
}
if (dest_states_malloced)
- free (dest_states);
+ re_free (dest_states);
re_node_set_free (&follows);
for (i = 0; i < ndests; ++i)
re_node_set_free (dests_node + i);
if (dests_node_malloced)
- free (dests_alloc);
+ re_free (dests_alloc);
return true;
}
@@ -3565,7 +3518,6 @@ out_free:
to DEST_CH[i]. This function return the number of destinations. */
static Idx
-internal_function
group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
re_node_set *dests_node, bitset_t *dests_ch)
{
@@ -3716,14 +3668,14 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
bitset_copy (dests_ch[ndests], remains);
bitset_copy (dests_ch[j], intersec);
err = re_node_set_init_copy (dests_node + ndests, &dests_node[j]);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto error_return;
++ndests;
}
/* Put the position in the current group. */
ok = re_node_set_insert (&dests_node[j], cur_nodes->elems[i]);
- if (BE (! ok, 0))
+ if (__glibc_unlikely (! ok))
goto error_return;
/* If all characters are consumed, go to next node. */
@@ -3735,7 +3687,7 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
{
bitset_copy (dests_ch[ndests], accepts);
err = re_node_set_init_1 (dests_node + ndests, cur_nodes->elems[i]);
- if (BE (err != REG_NOERROR, 0))
+ if (__glibc_unlikely (err != REG_NOERROR))
goto error_return;
++ndests;
bitset_empty (accepts);
@@ -3762,7 +3714,6 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
# endif
static int
-internal_function
check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
const re_string_t *input, Idx str_idx)
{
@@ -3770,10 +3721,10 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
int char_len, elem_len;
Idx i;
- if (BE (node->type == OP_UTF8_PERIOD, 0))
+ if (__glibc_unlikely (node->type == OP_UTF8_PERIOD))
{
unsigned char c = re_string_byte_at (input, str_idx), d;
- if (BE (c < 0xc2, 1))
+ if (__glibc_likely (c < 0xc2))
return 0;
if (str_idx + 2 > input->len)
@@ -3937,30 +3888,27 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
indirect = (const int32_t *)
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
int32_t idx = findidx (table, indirect, extra, &cp, elem_len);
+ int32_t rule = idx >> 24;
+ idx &= 0xffffff;
if (idx > 0)
- for (i = 0; i < cset->nequiv_classes; ++i)
- {
- int32_t equiv_class_idx = cset->equiv_classes[i];
- size_t weight_len = weights[idx & 0xffffff];
- if (weight_len == weights[equiv_class_idx & 0xffffff]
- && (idx >> 24) == (equiv_class_idx >> 24))
- {
- Idx cnt = 0;
-
- idx &= 0xffffff;
- equiv_class_idx &= 0xffffff;
-
- while (cnt <= weight_len
- && (weights[equiv_class_idx + 1 + cnt]
- == weights[idx + 1 + cnt]))
- ++cnt;
- if (cnt > weight_len)
- {
- match_len = elem_len;
- goto check_node_accept_bytes_match;
- }
- }
- }
+ {
+ size_t weight_len = weights[idx];
+ for (i = 0; i < cset->nequiv_classes; ++i)
+ {
+ int32_t equiv_class_idx = cset->equiv_classes[i];
+ int32_t equiv_class_rule = equiv_class_idx >> 24;
+ equiv_class_idx &= 0xffffff;
+ if (weights[equiv_class_idx] == weight_len
+ && equiv_class_rule == rule
+ && memcmp (weights + idx + 1,
+ weights + equiv_class_idx + 1,
+ weight_len) == 0)
+ {
+ match_len = elem_len;
+ goto check_node_accept_bytes_match;
+ }
+ }
+ }
}
}
else
@@ -3992,7 +3940,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
# ifdef _LIBC
static unsigned int
-internal_function
find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
{
uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
@@ -4056,7 +4003,6 @@ find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
byte of the INPUT. */
static bool
-internal_function
check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
Idx idx)
{
@@ -4106,22 +4052,22 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
/* Extend the buffers, if the buffers have run out. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
extend_buffers (re_match_context_t *mctx, int min_len)
{
reg_errcode_t ret;
re_string_t *pstr = &mctx->input;
/* Avoid overflow. */
- if (BE (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) / 2
- <= pstr->bufs_len, 0))
+ if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) / 2
+ <= pstr->bufs_len))
return REG_ESPACE;
/* Double the lengths of the buffers, but allocate at least MIN_LEN. */
ret = re_string_realloc_buffers (pstr,
MAX (min_len,
MIN (pstr->len, pstr->bufs_len * 2)));
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
if (mctx->state_log != NULL)
@@ -4132,7 +4078,7 @@ extend_buffers (re_match_context_t *mctx, int min_len)
does not have the right size. */
re_dfastate_t **new_array = re_realloc (mctx->state_log, re_dfastate_t *,
pstr->bufs_len + 1);
- if (BE (new_array == NULL, 0))
+ if (__glibc_unlikely (new_array == NULL))
return REG_ESPACE;
mctx->state_log = new_array;
}
@@ -4144,7 +4090,7 @@ extend_buffers (re_match_context_t *mctx, int min_len)
if (pstr->mb_cur_max > 1)
{
ret = build_wcs_upper_buffer (pstr);
- if (BE (ret != REG_NOERROR, 0))
+ if (__glibc_unlikely (ret != REG_NOERROR))
return ret;
}
else
@@ -4172,7 +4118,7 @@ extend_buffers (re_match_context_t *mctx, int min_len)
/* Initialize MCTX. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
match_ctx_init (re_match_context_t *mctx, int eflags, Idx n)
{
mctx->eflags = eflags;
@@ -4183,12 +4129,12 @@ match_ctx_init (re_match_context_t *mctx, int eflags, Idx n)
size_t max_object_size =
MAX (sizeof (struct re_backref_cache_entry),
sizeof (re_sub_match_top_t *));
- if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < n, 0))
+ if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / max_object_size) < n))
return REG_ESPACE;
mctx->bkref_ents = re_malloc (struct re_backref_cache_entry, n);
mctx->sub_tops = re_malloc (re_sub_match_top_t *, n);
- if (BE (mctx->bkref_ents == NULL || mctx->sub_tops == NULL, 0))
+ if (__glibc_unlikely (mctx->bkref_ents == NULL || mctx->sub_tops == NULL))
return REG_ESPACE;
}
/* Already zero-ed by the caller.
@@ -4207,7 +4153,6 @@ match_ctx_init (re_match_context_t *mctx, int eflags, Idx n)
of the input, or changes the input string. */
static void
-internal_function
match_ctx_clean (re_match_context_t *mctx)
{
Idx st_idx;
@@ -4227,7 +4172,7 @@ match_ctx_clean (re_match_context_t *mctx)
re_free (top->path->array);
re_free (top->path);
}
- free (top);
+ re_free (top);
}
mctx->nsub_tops = 0;
@@ -4237,7 +4182,6 @@ match_ctx_clean (re_match_context_t *mctx)
/* Free all the memory associated with MCTX. */
static void
-internal_function
match_ctx_free (re_match_context_t *mctx)
{
/* First, free all the memory associated with MCTX->SUB_TOPS. */
@@ -4252,7 +4196,7 @@ match_ctx_free (re_match_context_t *mctx)
*/
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from,
Idx to)
{
@@ -4261,7 +4205,7 @@ match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from,
struct re_backref_cache_entry* new_entry;
new_entry = re_realloc (mctx->bkref_ents, struct re_backref_cache_entry,
mctx->abkref_ents * 2);
- if (BE (new_entry == NULL, 0))
+ if (__glibc_unlikely (new_entry == NULL))
{
re_free (mctx->bkref_ents);
return REG_ESPACE;
@@ -4301,7 +4245,6 @@ match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from,
found. Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX. */
static Idx
-internal_function
search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
{
Idx left, right, mid, last;
@@ -4324,26 +4267,26 @@ search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
at STR_IDX. */
static reg_errcode_t
-internal_function __attribute_warn_unused_result__
+__attribute_warn_unused_result__
match_ctx_add_subtop (re_match_context_t *mctx, Idx node, Idx str_idx)
{
#ifdef DEBUG
assert (mctx->sub_tops != NULL);
assert (mctx->asub_tops > 0);
#endif
- if (BE (mctx->nsub_tops == mctx->asub_tops, 0))
+ if (__glibc_unlikely (mctx->nsub_tops == mctx->asub_tops))
{
Idx new_asub_tops = mctx->asub_tops * 2;
re_sub_match_top_t **new_array = re_realloc (mctx->sub_tops,
re_sub_match_top_t *,
new_asub_tops);
- if (BE (new_array == NULL, 0))
+ if (__glibc_unlikely (new_array == NULL))
return REG_ESPACE;
mctx->sub_tops = new_array;
mctx->asub_tops = new_asub_tops;
}
mctx->sub_tops[mctx->nsub_tops] = calloc (1, sizeof (re_sub_match_top_t));
- if (BE (mctx->sub_tops[mctx->nsub_tops] == NULL, 0))
+ if (__glibc_unlikely (mctx->sub_tops[mctx->nsub_tops] == NULL))
return REG_ESPACE;
mctx->sub_tops[mctx->nsub_tops]->node = node;
mctx->sub_tops[mctx->nsub_tops++]->str_idx = str_idx;
@@ -4354,23 +4297,22 @@ match_ctx_add_subtop (re_match_context_t *mctx, Idx node, Idx str_idx)
at STR_IDX, whose corresponding OP_OPEN_SUBEXP is SUB_TOP. */
static re_sub_match_last_t *
-internal_function
match_ctx_add_sublast (re_sub_match_top_t *subtop, Idx node, Idx str_idx)
{
re_sub_match_last_t *new_entry;
- if (BE (subtop->nlasts == subtop->alasts, 0))
+ if (__glibc_unlikely (subtop->nlasts == subtop->alasts))
{
Idx new_alasts = 2 * subtop->alasts + 1;
re_sub_match_last_t **new_array = re_realloc (subtop->lasts,
re_sub_match_last_t *,
new_alasts);
- if (BE (new_array == NULL, 0))
+ if (__glibc_unlikely (new_array == NULL))
return NULL;
subtop->lasts = new_array;
subtop->alasts = new_alasts;
}
new_entry = calloc (1, sizeof (re_sub_match_last_t));
- if (BE (new_entry != NULL, 1))
+ if (__glibc_likely (new_entry != NULL))
{
subtop->lasts[subtop->nlasts] = new_entry;
new_entry->node = node;
@@ -4381,7 +4323,6 @@ match_ctx_add_sublast (re_sub_match_top_t *subtop, Idx node, Idx str_idx)
}
static void
-internal_function
sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts,
re_dfastate_t **limited_sts, Idx last_node, Idx last_str_idx)
{
diff --git a/gnu/rename.c b/gnu/rename.c
index 9eb3220664da39fb14fd9e35e1350172de35913d..9d88e5c6a23fb2ca0bf83d9d09356701752a0e8f 100644
--- a/gnu/rename.c
+++ b/gnu/rename.c
@@ -1,6 +1,6 @@
/* Work around rename bugs in some systems.
- Copyright (C) 2001-2003, 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
#undef rename
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* The mingw rename has problems with trailing slashes; it also
requires use of native Windows calls to allow atomic renames over
existing files. */
diff --git a/gnu/renameat.c b/gnu/renameat.c
index 48cee4ba580a844a34433e59e0ad3ad75df5888a..1ac3f33c4ff1c73dbd79b3d6741a513f30ab21cf 100644
--- a/gnu/renameat.c
+++ b/gnu/renameat.c
@@ -1,5 +1,5 @@
/* Rename a file relative to open directories.
- Copyright 2017 Free Software Foundation, Inc.
+ Copyright 2017-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,10 +16,10 @@
#include <config.h>
#include <stdio.h>
-#include "renameat2.h"
+#include "renameatu.h"
int
renameat (int fd1, char const *src, int fd2, char const *dst)
{
- return renameat2 (fd1, src, fd2, dst, 0);
+ return renameatu (fd1, src, fd2, dst, 0);
}
diff --git a/gnu/renameat2.c b/gnu/renameatu.c
similarity index 92%
rename from gnu/renameat2.c
rename to gnu/renameatu.c
index 26cde8637e516c776758015ae0e7430a62df5621..7dd5a6370c4d6991b7a3de83c39376e2fd75af0e 100644
--- a/gnu/renameat2.c
+++ b/gnu/renameatu.c
@@ -1,5 +1,5 @@
/* Rename a file relative to open directories.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
#include <config.h>
-#include "renameat2.h"
+#include "renameatu.h"
#include <errno.h>
#include <stdio.h>
@@ -68,16 +68,22 @@ rename_noreplace (char const *src, char const *dst)
the restore_cwd fails, then give a diagnostic and exit nonzero.
Obey FLAGS when doing the renaming. If FLAGS is zero, this
- function is equivalent to renameat (FD1, SRC, FD2, DST). */
+ function is equivalent to renameat (FD1, SRC, FD2, DST).
+ Otherwise, attempt to implement FLAGS even if the implementation is
+ not atomic; this differs from the GNU/Linux native renameat2,
+ which fails if it cannot guarantee atomicity. */
int
-renameat2 (int fd1, char const *src, int fd2, char const *dst,
+renameatu (int fd1, char const *src, int fd2, char const *dst,
unsigned int flags)
{
int ret_val = -1;
int err = EINVAL;
-#ifdef SYS_renameat2
+#ifdef HAVE_RENAMEAT2
+ ret_val = renameat2 (fd1, src, fd2, dst, flags);
+ err = errno;
+#elif defined SYS_renameat2
ret_val = syscall (SYS_renameat2, fd1, src, fd2, dst, flags);
err = errno;
#elif defined RENAME_EXCL
diff --git a/gnu/renameat2.h b/gnu/renameatu.h
similarity index 79%
rename from gnu/renameat2.h
rename to gnu/renameatu.h
index 179210f91aa2db426b2f842ed037d59595dc1c0a..b4b1c3c60c5f213adc6858607f852a2274e34c9d 100644
--- a/gnu/renameat2.h
+++ b/gnu/renameatu.h
@@ -1,5 +1,5 @@
/* Rename a file relative to open directories.
- Copyright 2017 Free Software Foundation, Inc.
+ Copyright 2017-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,15 +16,13 @@
/* written by Paul Eggert */
-/* Get RENAME_* macros from linux/fs.h if present, otherwise supply
+/* Get RENAME_* macros from <stdio.h> if present, otherwise supply
the traditional Linux values. */
-#if HAVE_LINUX_FS_H
-# include <linux/fs.h>
-#endif
+#include <stdio.h>
#ifndef RENAME_NOREPLACE
# define RENAME_NOREPLACE (1 << 0)
# define RENAME_EXCHANGE (1 << 1)
# define RENAME_WHITEOUT (1 << 2)
#endif
-extern int renameat2 (int, char const *, int, char const *, unsigned int);
+extern int renameatu (int, char const *, int, char const *, unsigned int);
diff --git a/gnu/rewinddir.c b/gnu/rewinddir.c
index c477c4685f86a03005fc21f7c9db80140d5e81a7..b58a47d55337f8ad0943ce692d007cb6a8ac1341 100644
--- a/gnu/rewinddir.c
+++ b/gnu/rewinddir.c
@@ -1,5 +1,5 @@
/* Restart reading the entries of a directory from the beginning.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/rmdir.c b/gnu/rmdir.c
index 77d5e3e2bfd32ddf88ef6407899b88532a90e518..1d0882221912ddfb7f6a4ad8282a0bb986edd742 100644
--- a/gnu/rmdir.c
+++ b/gnu/rmdir.c
@@ -1,6 +1,6 @@
/* Work around rmdir bugs.
- Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2017 Free Software
+ Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/root-uid.h b/gnu/root-uid.h
index 4aa9dfe24f027045d61beecfff6d21e3ba1e73c5..eebfa943c45c8c20bb8a10da40163a41887c7313 100644
--- a/gnu/root-uid.h
+++ b/gnu/root-uid.h
@@ -1,6 +1,6 @@
/* The user ID that always has appropriate privileges in the POSIX sense.
- Copyright 2012-2017 Free Software Foundation, Inc.
+ Copyright 2012-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/rpmatch.c b/gnu/rpmatch.c
index 72797eada75d1c29786efe0129b59a69700bbba3..4c80973df849b8612576224ae1816b577f96252d 100644
--- a/gnu/rpmatch.c
+++ b/gnu/rpmatch.c
@@ -1,7 +1,7 @@
/* Determine whether string value is affirmation or negative response
according to current locale's data.
- Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2017 Free Software
+ Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/safe-read.c b/gnu/safe-read.c
index 896c115e9f8519a8a22664a5b37740389f9c505c..e6c54b75a6b75e941e3052cdea066b4b56fc87d1 100644
--- a/gnu/safe-read.c
+++ b/gnu/safe-read.c
@@ -1,6 +1,6 @@
/* An interface to read and write that retries after interrupts.
- Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2017 Free Software
+ Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@
# define IS_EINTR(x) 0
#endif
-#include <limits.h>
+#include "sys-limits.h"
#ifdef SAFE_WRITE
# define safe_rw safe_write
@@ -55,12 +55,6 @@
size_t
safe_rw (int fd, void const *buf, size_t count)
{
- /* Work around a bug in Tru64 5.1. Attempting to read more than
- INT_MAX bytes fails with errno == EINVAL. See
- <https://lists.gnu.org/r/bug-gnu-utils/2002-04/msg00010.html>.
- When decreasing COUNT, keep it block-aligned. */
- enum { BUGGY_READ_MAXIMUM = INT_MAX & ~8191 };
-
for (;;)
{
ssize_t result = rw (fd, buf, count);
@@ -69,8 +63,8 @@ safe_rw (int fd, void const *buf, size_t count)
return result;
else if (IS_EINTR (errno))
continue;
- else if (errno == EINVAL && BUGGY_READ_MAXIMUM < count)
- count = BUGGY_READ_MAXIMUM;
+ else if (errno == EINVAL && SYS_BUFSIZE_MAX < count)
+ count = SYS_BUFSIZE_MAX;
else
return result;
}
diff --git a/gnu/safe-read.h b/gnu/safe-read.h
index e17a72e189ef3938dd84b966305c0968b4373a6c..3f421f6bab87695975fb5c3a6029e74ba893207f 100644
--- a/gnu/safe-read.h
+++ b/gnu/safe-read.h
@@ -1,5 +1,5 @@
/* An interface to read() that retries after interrupts.
- Copyright (C) 2002, 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/safe-write.c b/gnu/safe-write.c
index d075df65dab5c470fd570fdf6dfa973032b6ec33..a6bbd8398e00bf04368d0e305c08cd205e42c5d3 100644
--- a/gnu/safe-write.c
+++ b/gnu/safe-write.c
@@ -1,5 +1,5 @@
/* An interface to write that retries after interrupts.
- Copyright (C) 2002, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/safe-write.h b/gnu/safe-write.h
index 20edfc5dceb96e4a5b5ad9f485ceeb305bc9ecd1..0474d5286a4efff1694e03247ba0674b4da3d80c 100644
--- a/gnu/safe-write.h
+++ b/gnu/safe-write.h
@@ -1,5 +1,5 @@
/* An interface to write() that retries after interrupts.
- Copyright (C) 2002, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/same-inode.h b/gnu/same-inode.h
index 43e8f7073b686e9857ebdf2b6a4fb269645f2d5a..06655b6b0d10644ee3bd04246234fa44cd90f043 100644
--- a/gnu/same-inode.h
+++ b/gnu/same-inode.h
@@ -1,6 +1,6 @@
/* Determine whether two stat buffers are known to refer to the same file.
- Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
&& (a).st_ino[1] == (b).st_ino[1] \
&& (a).st_ino[2] == (b).st_ino[2] \
&& (a).st_dev == (b).st_dev)
-# elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# elif defined _WIN32 && ! defined __CYGWIN__
/* Native Windows. */
# if _GL_WINDOWS_STAT_INODES
/* stat() and fstat() set st_dev and st_ino to 0 if information about
diff --git a/gnu/save-cwd.c b/gnu/save-cwd.c
index 53767a7e991bb20193045b0a5b33a918d3098653..a67d95d144314a29099bad8d6eda00987641396d 100644
--- a/gnu/save-cwd.c
+++ b/gnu/save-cwd.c
@@ -1,6 +1,6 @@
/* save-cwd.c -- Save and restore current working directory.
- Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2017 Free Software
+ Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/save-cwd.h b/gnu/save-cwd.h
index 597c752cea79f94de7db6c3f5e9ca8613b8d3286..6a780703c77d97c2d3566dd8d629fa1f274b3fc9 100644
--- a/gnu/save-cwd.h
+++ b/gnu/save-cwd.h
@@ -1,6 +1,6 @@
/* Save and restore current working directory.
- Copyright (C) 1995, 1997-1998, 2003, 2009-2017 Free Software Foundation,
+ Copyright (C) 1995, 1997-1998, 2003, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/savedir.c b/gnu/savedir.c
index 9381b3dec951f0f5218013b19ba0ddffab289c73..07e123d5133f43a9d3d72f63fc0330e3a7fff2c2 100644
--- a/gnu/savedir.c
+++ b/gnu/savedir.c
@@ -1,6 +1,6 @@
/* savedir.c -- save the list of files in a directory in a string
- Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2017 Free Software
+ Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/savedir.h b/gnu/savedir.h
index 23b0ea952fc8aa1af5db82667ac942377179394d..0374d255c9f46cd6e8074e48ea61955230d15a60 100644
--- a/gnu/savedir.h
+++ b/gnu/savedir.h
@@ -1,6 +1,6 @@
/* Save the list of files in a directory in a string.
- Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2017 Free Software
+ Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/se-selinux.in.h b/gnu/se-selinux.in.h
index 3e4cd158ca4f989e223813dda458fcc228325e63..b68e2c7e63c9cfa2eaa2255a4e2638919ac37583 100644
--- a/gnu/se-selinux.in.h
+++ b/gnu/se-selinux.in.h
@@ -1,5 +1,5 @@
/* Replacement <selinux/selinux.h> for platforms that lack it.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/selinux-at.c b/gnu/selinux-at.c
index cd4b5f949af153238654d738a5e133f489958c16..169a351209da411031d3b1b1b3fe9b71b6db5519 100644
--- a/gnu/selinux-at.c
+++ b/gnu/selinux-at.c
@@ -1,5 +1,5 @@
/* openat-style fd-relative functions for SE Linux
- Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/selinux-at.h b/gnu/selinux-at.h
index 67a33d948a8da9eb6f9266df6824f793402d2aef..35a1821b64dd841ef1ab82a901cf2ce1265d073a 100644
--- a/gnu/selinux-at.h
+++ b/gnu/selinux-at.h
@@ -1,5 +1,5 @@
/* Prototypes for openat-style fd-relative SELinux functions
- Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/set-permissions.c b/gnu/set-permissions.c
index b30841fca4054b63dcd41a4a19dca914f40b00a7..38cd30a5a1c7096ef0c00dec00472d360aef031a 100644
--- a/gnu/set-permissions.c
+++ b/gnu/set-permissions.c
@@ -1,6 +1,6 @@
/* Set permissions of a file. -*- coding: utf-8 -*-
- Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
#include "acl-internal.h"
#if USE_ACL
-# if ! defined HAVE_ACL_FROM_MODE && defined HAVE_ACL_FROM_TEXT /* FreeBSD, IRIX, Tru64 */
+# if ! defined HAVE_ACL_FROM_MODE && defined HAVE_ACL_FROM_TEXT /* FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */
# if HAVE_ACL_GET_FILE && !HAVE_ACL_TYPE_EXTENDED
static acl_t
@@ -32,7 +32,7 @@ acl_from_mode (mode_t mode)
{
# if HAVE_ACL_FREE_TEXT /* Tru64 */
char acl_text[] = "u::---,g::---,o::---,";
-# else /* FreeBSD, IRIX */
+# else /* FreeBSD, IRIX, Cygwin >= 2.5 */
char acl_text[] = "u::---,g::---,o::---";
# endif
@@ -51,7 +51,7 @@ acl_from_mode (mode_t mode)
# endif
# endif
-# if HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+# if HAVE_FACL && defined GETACL /* Solaris, Cygwin < 2.5, not HP-UX */
static int
set_acls_from_mode (const char *name, int desc, mode_t mode, bool *must_chmod)
{
@@ -229,14 +229,14 @@ set_acls_from_mode (const char *name, int desc, mode_t mode, bool *must_chmod)
if (ret < 0 && errno != EINVAL && errno != ENOTSUP)
{
if (errno == ENOSYS)
- {
- *must_chmod = true;
- return 0;
- }
+ {
+ *must_chmod = true;
+ return 0;
+ }
return -1;
}
if (ret == 0)
- return 0;
+ return 0;
}
# endif
@@ -256,18 +256,18 @@ set_acls_from_mode (const char *name, int desc, mode_t mode, bool *must_chmod)
if (desc != -1)
ret = facl (desc, SETACL,
- sizeof (entries) / sizeof (aclent_t), entries);
+ sizeof (entries) / sizeof (aclent_t), entries);
else
ret = acl (name, SETACL,
- sizeof (entries) / sizeof (aclent_t), entries);
+ sizeof (entries) / sizeof (aclent_t), entries);
if (ret < 0)
{
- if (errno == ENOSYS || errno == EOPNOTSUPP)
- {
- *must_chmod = true;
- return 0;
- }
- return -1;
+ if (errno == ENOSYS || errno == EOPNOTSUPP)
+ {
+ *must_chmod = true;
+ return 0;
+ }
+ return -1;
}
return 0;
}
@@ -483,15 +483,15 @@ context_acl_from_mode (struct permission_context *ctx)
static int
set_acls (struct permission_context *ctx, const char *name, int desc,
- int from_mode, bool *must_chmod, bool *acls_set)
+ int from_mode, bool *must_chmod, bool *acls_set)
{
int ret = 0;
# if HAVE_ACL_GET_FILE
/* POSIX 1003.1e (draft 17 -- abandoned) specific version. */
- /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+ /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
# if !HAVE_ACL_TYPE_EXTENDED
- /* Linux, FreeBSD, IRIX, Tru64 */
+ /* Linux, FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */
# ifndef HAVE_ACL_FROM_TEXT
# error Must have acl_from_text (see POSIX 1003.1e draft 17).
@@ -503,53 +503,53 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
if (! ctx->acls_not_supported)
{
if (ret == 0 && from_mode)
- {
- if (ctx->acl)
- acl_free (ctx->acl);
- ctx->acl = acl_from_mode (ctx->mode);
- if (ctx->acl == NULL)
- ret = -1;
- }
+ {
+ if (ctx->acl)
+ acl_free (ctx->acl);
+ ctx->acl = acl_from_mode (ctx->mode);
+ if (ctx->acl == NULL)
+ ret = -1;
+ }
if (ret == 0 && ctx->acl)
- {
- if (HAVE_ACL_SET_FD && desc != -1)
- ret = acl_set_fd (desc, ctx->acl);
- else
- ret = acl_set_file (name, ACL_TYPE_ACCESS, ctx->acl);
- if (ret != 0)
- {
- if (! acl_errno_valid (errno))
- {
- ctx->acls_not_supported = true;
- if (from_mode || acl_access_nontrivial (ctx->acl) == 0)
- ret = 0;
- }
- }
- else
- {
- *acls_set = true;
- if (S_ISDIR(ctx->mode))
- {
- if (! from_mode && ctx->default_acl &&
- acl_default_nontrivial (ctx->default_acl))
- ret = acl_set_file (name, ACL_TYPE_DEFAULT,
- ctx->default_acl);
- else
- ret = acl_delete_def_file (name);
- }
- }
- }
+ {
+ if (HAVE_ACL_SET_FD && desc != -1)
+ ret = acl_set_fd (desc, ctx->acl);
+ else
+ ret = acl_set_file (name, ACL_TYPE_ACCESS, ctx->acl);
+ if (ret != 0)
+ {
+ if (! acl_errno_valid (errno))
+ {
+ ctx->acls_not_supported = true;
+ if (from_mode || acl_access_nontrivial (ctx->acl) == 0)
+ ret = 0;
+ }
+ }
+ else
+ {
+ *acls_set = true;
+ if (S_ISDIR(ctx->mode))
+ {
+ if (! from_mode && ctx->default_acl &&
+ acl_default_nontrivial (ctx->default_acl))
+ ret = acl_set_file (name, ACL_TYPE_DEFAULT,
+ ctx->default_acl);
+ else
+ ret = acl_delete_def_file (name);
+ }
+ }
+ }
}
-# if HAVE_ACL_TYPE_NFS4 /* FreeBSD */
+# if HAVE_ACL_TYPE_NFS4 /* FreeBSD */
/* File systems either support POSIX ACLs (for example, ufs) or NFS4 ACLs
(for example, zfs). */
/* TODO: Implement setting ACLs once get_permissions() reads them. */
-# endif
+# endif
# else /* HAVE_ACL_TYPE_EXTENDED */
/* Mac OS X */
@@ -573,38 +573,38 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
/* Remove ACLs if the file has ACLs. */
if (HAVE_ACL_GET_FD && desc != -1)
- acl = acl_get_fd (desc);
+ acl = acl_get_fd (desc);
else
- acl = acl_get_file (name, ACL_TYPE_EXTENDED);
+ acl = acl_get_file (name, ACL_TYPE_EXTENDED);
if (acl)
- {
- acl_free (acl);
-
- acl = acl_init (0);
- if (acl)
- {
- if (HAVE_ACL_SET_FD && desc != -1)
- ret = acl_set_fd (desc, acl);
- else
- ret = acl_set_file (name, ACL_TYPE_EXTENDED, acl);
- acl_free (acl);
- }
- else
- ret = -1;
- }
+ {
+ acl_free (acl);
+
+ acl = acl_init (0);
+ if (acl)
+ {
+ if (HAVE_ACL_SET_FD && desc != -1)
+ ret = acl_set_fd (desc, acl);
+ else
+ ret = acl_set_file (name, ACL_TYPE_EXTENDED, acl);
+ acl_free (acl);
+ }
+ else
+ ret = -1;
+ }
}
else
{
if (HAVE_ACL_SET_FD && desc != -1)
- ret = acl_set_fd (desc, ctx->acl);
+ ret = acl_set_fd (desc, ctx->acl);
else
- ret = acl_set_file (name, ACL_TYPE_EXTENDED, ctx->acl);
+ ret = acl_set_file (name, ACL_TYPE_EXTENDED, ctx->acl);
if (ret != 0)
- {
- if (! acl_errno_valid (errno)
- && ! acl_extended_nontrivial (ctx->acl))
- ret = 0;
- }
+ {
+ if (! acl_errno_valid (errno)
+ && ! acl_extended_nontrivial (ctx->acl))
+ ret = 0;
+ }
}
*acls_set = true;
@@ -626,34 +626,34 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
if (ret == 0 && ctx->count)
{
if (desc != -1)
- ret = facl (desc, SETACL, ctx->count, ctx->entries);
+ ret = facl (desc, SETACL, ctx->count, ctx->entries);
else
- ret = acl (name, SETACL, ctx->count, ctx->entries);
+ ret = acl (name, SETACL, ctx->count, ctx->entries);
if (ret < 0)
- {
- if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
- && acl_nontrivial (ctx->count, ctx->entries) == 0)
- ret = 0;
- }
+ {
+ if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
+ && acl_nontrivial (ctx->count, ctx->entries) == 0)
+ ret = 0;
+ }
else
- *acls_set = true;
+ *acls_set = true;
}
# ifdef ACE_GETACL
if (ret == 0 && ctx->ace_count)
{
if (desc != -1)
- ret = facl (desc, ACE_SETACL, ctx->ace_count, ctx->ace_entries);
+ ret = facl (desc, ACE_SETACL, ctx->ace_count, ctx->ace_entries);
else
- ret = acl (name, ACE_SETACL, ctx->ace_count, ctx->ace_entries);
+ ret = acl (name, ACE_SETACL, ctx->ace_count, ctx->ace_entries);
if (ret < 0)
- {
- if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP)
- && acl_ace_nontrivial (ctx->ace_count, ctx->ace_entries) == 0)
- ret = 0;
- }
+ {
+ if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP)
+ && acl_ace_nontrivial (ctx->ace_count, ctx->ace_entries) == 0)
+ ret = 0;
+ }
else
- *acls_set = true;
+ *acls_set = true;
}
# endif
@@ -665,17 +665,17 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
if (ret == 0 && ctx->count > 0)
{
if (desc != -1)
- ret = fsetacl (desc, ctx->count, ctx->entries);
+ ret = fsetacl (desc, ctx->count, ctx->entries);
else
- ret = setacl (name, ctx->count, ctx->entries);
+ ret = setacl (name, ctx->count, ctx->entries);
if (ret < 0)
- {
- if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
- && (from_mode || !acl_nontrivial (ctx->count, ctx->entries)))
- ret = 0;
- }
+ {
+ if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
+ && (from_mode || !acl_nontrivial (ctx->count, ctx->entries)))
+ ret = 0;
+ }
else
- *acls_set = true;
+ *acls_set = true;
}
# if HAVE_ACLV_H
@@ -686,13 +686,13 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
{
ret = acl ((char *) name, ACL_SET, ctx->aclv_count, ctx->aclv_entries);
if (ret < 0)
- {
- if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
- && (from_mode || !aclv_nontrivial (ctx->aclv_count, ctx->aclv_entries)))
- ret = 0;
- }
+ {
+ if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
+ && (from_mode || !aclv_nontrivial (ctx->aclv_count, ctx->aclv_entries)))
+ ret = 0;
+ }
else
- *acls_set = true;
+ *acls_set = true;
}
# endif
@@ -711,16 +711,16 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
if (ret == 0 && ctx->have_u)
{
if (desc != -1)
- ret = fchacl (desc, &ctx->u.a, ctx->u.a.acl_len);
+ ret = fchacl (desc, &ctx->u.a, ctx->u.a.acl_len);
else
- ret = chacl ((char *) name, &ctx->u.a, ctx->u.a.acl_len);
+ ret = chacl ((char *) name, &ctx->u.a, ctx->u.a.acl_len);
if (ret < 0)
- {
- if (errno == ENOSYS && from_mode)
- ret = 0;
- }
+ {
+ if (errno == ENOSYS && from_mode)
+ ret = 0;
+ }
else
- *acls_set = true;
+ *acls_set = true;
}
# elif HAVE_ACLSORT /* NonStop Kernel */
@@ -732,12 +732,12 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
{
ret = acl ((char *) name, ACL_SET, ctx->count, ctx->entries);
if (ret != 0)
- {
- if (!acl_nontrivial (ctx->count, ctx->entries))
- ret = 0;
- }
+ {
+ if (!acl_nontrivial (ctx->count, ctx->entries))
+ ret = 0;
+ }
else
- *acls_set = true;
+ *acls_set = true;
}
# else /* No ACLs */
@@ -805,7 +805,7 @@ set_permissions (struct permission_context *ctx, const char *name, int desc)
{
ret = chmod_or_fchmod (name, desc, ctx->mode);
if (ret != 0)
- return -1;
+ return -1;
}
#if USE_ACL
@@ -815,18 +815,18 @@ set_permissions (struct permission_context *ctx, const char *name, int desc)
int saved_errno = ret ? errno : 0;
/* If we can't set an acl which we expect to be able to set, try setting
- the permissions to ctx->mode. Due to possible inherited permissions,
- we cannot simply chmod. */
+ the permissions to ctx->mode. Due to possible inherited permissions,
+ we cannot simply chmod. */
ret = set_acls (ctx, name, desc, true, &must_chmod, &acls_set);
if (! acls_set)
- must_chmod = true;
+ must_chmod = true;
if (saved_errno)
- {
- errno = saved_errno;
- ret = -1;
- }
+ {
+ errno = saved_errno;
+ ret = -1;
+ }
}
#endif
@@ -837,10 +837,10 @@ set_permissions (struct permission_context *ctx, const char *name, int desc)
ret = chmod_or_fchmod (name, desc, ctx->mode);
if (saved_errno)
- {
- errno = saved_errno;
- ret = -1;
- }
+ {
+ errno = saved_errno;
+ ret = -1;
+ }
}
return ret;
diff --git a/gnu/setenv.c b/gnu/setenv.c
index fb685e9aaaf079100fc4558445eaea64a9850451..733b257c272ffb2a11abe7a1bb73fccf6fc6a2ff 100644
--- a/gnu/setenv.c
+++ b/gnu/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2017 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/signal.in.h b/gnu/signal.in.h
index e8107c37bf5ada0790a043cf89aa9841b7188521..a6960a252d98d2457354bf05417faaaca0bfba18 100644
--- a/gnu/signal.in.h
+++ b/gnu/signal.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <signal.h>.
- Copyright (C) 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -137,7 +137,7 @@ _GL_FUNCDECL_RPL (pthread_sigmask, int,
_GL_CXXALIAS_RPL (pthread_sigmask, int,
(int how, const sigset_t *new_mask, sigset_t *old_mask));
# else
-# if !@HAVE_PTHREAD_SIGMASK@
+# if !(@HAVE_PTHREAD_SIGMASK@ || defined pthread_sigmask)
_GL_FUNCDECL_SYS (pthread_sigmask, int,
(int how, const sigset_t *new_mask, sigset_t *old_mask));
# endif
diff --git a/gnu/size_max.h b/gnu/size_max.h
index 5b78d938874bade0948a69b199f8d5262bd7377e..e265fb9726915987abe1fce8a5f6fb8bfd42f9ef 100644
--- a/gnu/size_max.h
+++ b/gnu/size_max.h
@@ -1,5 +1,5 @@
/* size_max.h -- declare SIZE_MAX through system headers
- Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
Written by Simon Josefsson.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/sleep.c b/gnu/sleep.c
index 5cd34d53a5bb3e07b5903555ff6ea44d347599c7..c5218e5fda6c8decfe4dc09aa3f6b708d9423ec8 100644
--- a/gnu/sleep.c
+++ b/gnu/sleep.c
@@ -1,5 +1,5 @@
/* Pausing execution of the current thread.
- Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2007.
This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@
#include "verify.h"
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# define WIN32_LEAN_AND_MEAN /* avoid including junk */
# include <windows.h>
diff --git a/gnu/snprintf.c b/gnu/snprintf.c
index 322af25060b44f4c66133834bb98cb8cb1991012..5cf1ede1f8d54c06c0a8b4eb58d3e6d302831ae7 100644
--- a/gnu/snprintf.c
+++ b/gnu/snprintf.c
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 2004, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2006-2019 Free Software Foundation, Inc.
Written by Simon Josefsson and Paul Eggert.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/stat-time.h b/gnu/stat-time.h
index 47a3bf8f21e5e1f7ac6ae9c6931f658bd62c9497..d4f1f96104e5eb33a1956a75a7b4da837bc8f498 100644
--- a/gnu/stat-time.h
+++ b/gnu/stat-time.h
@@ -1,6 +1,6 @@
/* stat-related time functions.
- Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,6 +20,10 @@
#ifndef STAT_TIME_H
#define STAT_TIME_H 1
+#include "intprops.h"
+
+#include <errno.h>
+#include <stddef.h>
#include <sys/stat.h>
#include <time.h>
@@ -98,15 +102,13 @@ get_stat_mtime_ns (struct stat const *st)
/* Return the nanosecond component of *ST's birth time. */
_GL_STAT_TIME_INLINE long int _GL_ATTRIBUTE_PURE
-get_stat_birthtime_ns (struct stat const *st)
+get_stat_birthtime_ns (struct stat const *st _GL_UNUSED)
{
# if defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC
return STAT_TIMESPEC (st, st_birthtim).tv_nsec;
# elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
return STAT_TIMESPEC_NS (st, st_birthtim);
# else
- /* Avoid a "parameter unused" warning. */
- (void) st;
return 0;
# endif
}
@@ -156,7 +158,7 @@ get_stat_mtime (struct stat const *st)
/* Return *ST's birth time, if available; otherwise return a value
with tv_sec and tv_nsec both equal to -1. */
_GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE
-get_stat_birthtime (struct stat const *st)
+get_stat_birthtime (struct stat const *st _GL_UNUSED)
{
struct timespec t;
@@ -166,7 +168,7 @@ get_stat_birthtime (struct stat const *st)
#elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
t.tv_sec = st->st_birthtime;
t.tv_nsec = st->st_birthtimensec;
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#elif defined _WIN32 && ! defined __CYGWIN__
/* Native Windows platforms (but not Cygwin) put the "file creation
time" in st_ctime (!). See
<https://msdn.microsoft.com/en-us/library/14h5k7ff(VS.80).aspx>. */
@@ -180,8 +182,6 @@ get_stat_birthtime (struct stat const *st)
/* Birth time is not supported. */
t.tv_sec = -1;
t.tv_nsec = -1;
- /* Avoid a "parameter unused" warning. */
- (void) st;
#endif
#if (defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC \
@@ -202,6 +202,47 @@ get_stat_birthtime (struct stat const *st)
return t;
}
+/* If a stat-like function returned RESULT, normalize the timestamps
+ in *ST, in case this platform suffers from the Solaris 11 bug where
+ tv_nsec might be negative. Return the adjusted RESULT, setting
+ errno to EOVERFLOW if normalization overflowed. This function
+ is intended to be private to this .h file. */
+_GL_STAT_TIME_INLINE int
+stat_time_normalize (int result, struct stat *st _GL_UNUSED)
+{
+#if defined __sun && defined STAT_TIMESPEC
+ if (result == 0)
+ {
+ long int timespec_hz = 1000000000;
+ short int const ts_off[] = { offsetof (struct stat, st_atim),
+ offsetof (struct stat, st_mtim),
+ offsetof (struct stat, st_ctim) };
+ int i;
+ for (i = 0; i < sizeof ts_off / sizeof *ts_off; i++)
+ {
+ struct timespec *ts = (struct timespec *) ((char *) st + ts_off[i]);
+ long int q = ts->tv_nsec / timespec_hz;
+ long int r = ts->tv_nsec % timespec_hz;
+ if (r < 0)
+ {
+ r += timespec_hz;
+ q--;
+ }
+ ts->tv_nsec = r;
+ /* Overflow is possible, as Solaris 11 stat can yield
+ tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000.
+ INT_ADD_WRAPV is OK, since time_t is signed on Solaris. */
+ if (INT_ADD_WRAPV (q, ts->tv_sec, &ts->tv_sec))
+ {
+ errno = EOVERFLOW;
+ return -1;
+ }
+ }
+ }
+#endif
+ return result;
+}
+
#ifdef __cplusplus
}
#endif
diff --git a/gnu/stat-w32.c b/gnu/stat-w32.c
index 5eb5dbd108e955b14b88d9d4c8210d86261b67c9..ffa99429d936c7ab6394f39925963bcb36131592 100644
--- a/gnu/stat-w32.c
+++ b/gnu/stat-w32.c
@@ -1,5 +1,5 @@
/* Core of implementation of fstat and stat for native Windows.
- Copyright (C) 2017 Free Software Foundation, Inc.
+ Copyright (C) 2017-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
#include <config.h>
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* Ensure that <windows.h> defines FILE_ID_INFO. */
#undef _WIN32_WINNT
@@ -38,6 +38,10 @@
#include "pathmax.h"
#include "verify.h"
+/* Avoid warnings from gcc -Wcast-function-type. */
+#define GetProcAddress \
+ (void *) GetProcAddress
+
#if _GL_WINDOWS_STAT_INODES == 2
/* GetFileInformationByHandleEx was introduced only in Windows Vista. */
typedef DWORD (WINAPI * GetFileInformationByHandleExFuncType) (HANDLE hFile,
diff --git a/gnu/stat-w32.h b/gnu/stat-w32.h
index cf6bcca6bd070553652fce9c8ce5e98380250898..6b961d7ff58fda52f20458bd6b210e8094d8492e 100644
--- a/gnu/stat-w32.h
+++ b/gnu/stat-w32.h
@@ -1,5 +1,5 @@
/* Core of implementation of fstat and stat for native Windows.
- Copyright (C) 2017 Free Software Foundation, Inc.
+ Copyright (C) 2017-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/stat.c b/gnu/stat.c
index 06149632213fc7a85ff8479840b7c7eea6977737..74f47954c15065f7562dad76810d57d48878ebb5 100644
--- a/gnu/stat.c
+++ b/gnu/stat.c
@@ -1,5 +1,5 @@
/* Work around platform bugs in stat.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
#include <sys/stat.h>
#undef __need_system_sys_stat_h
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# define WINDOWS_NATIVE
#endif
@@ -47,6 +47,8 @@ orig_stat (const char *filename, struct stat *buf)
above. */
#include "sys/stat.h"
+#include "stat-time.h"
+
#include <errno.h>
#include <limits.h>
#include <stdbool.h>
@@ -405,19 +407,23 @@ rpl_stat (char const *name, struct stat *buf)
}
#else
int result = orig_stat (name, buf);
-# if REPLACE_FUNC_STAT_FILE
- /* Solaris 9 mistakenly succeeds when given a non-directory with a
- trailing slash. */
- if (result == 0 && !S_ISDIR (buf->st_mode))
+ if (result == 0)
{
- size_t len = strlen (name);
- if (ISSLASH (name[len - 1]))
+# if REPLACE_FUNC_STAT_FILE
+ /* Solaris 9 mistakenly succeeds when given a non-directory with a
+ trailing slash. */
+ if (!S_ISDIR (buf->st_mode))
{
- errno = ENOTDIR;
- return -1;
+ size_t len = strlen (name);
+ if (ISSLASH (name[len - 1]))
+ {
+ errno = ENOTDIR;
+ return -1;
+ }
}
- }
# endif /* REPLACE_FUNC_STAT_FILE */
+ result = stat_time_normalize (result, buf);
+ }
return result;
#endif
}
diff --git a/gnu/stdalign.in.h b/gnu/stdalign.in.h
index 68e889e053c8682384da9e0a5b6b676268e44c92..d988d7c19bf8c087e95bee107fc4e4361bc0d3a1 100644
--- a/gnu/stdalign.in.h
+++ b/gnu/stdalign.in.h
@@ -1,6 +1,6 @@
/* A substitute for ISO C11 <stdalign.h>.
- Copyright 2011-2017 Free Software Foundation, Inc.
+ Copyright 2011-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/stdarg.in.h b/gnu/stdarg.in.h
index e2b59fc76dbb72e9a21f29d48038dc1ff604ab64..5eec8ba40c4f9cdfd8751d9217c298c082b5cd56 100644
--- a/gnu/stdarg.in.h
+++ b/gnu/stdarg.in.h
@@ -1,5 +1,5 @@
/* Substitute for and wrapper around <stdarg.h>.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/stdbool.in.h b/gnu/stdbool.in.h
index a7bc5b0603bdb8a9395d2f4ed6fdedb51b8a0498..8158b009f57244d7574a0998bdc7f45cdb6a01de 100644
--- a/gnu/stdbool.in.h
+++ b/gnu/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2017 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2019 Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/stddef.in.h b/gnu/stddef.in.h
index 758ccf63386ab459a3a7ae1285ac9c5a03aeef3e..5aad1210df0e96187c7ff4a0bbd4a2ac0f292094 100644
--- a/gnu/stddef.in.h
+++ b/gnu/stddef.in.h
@@ -1,6 +1,6 @@
/* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/stdint.in.h b/gnu/stdint.in.h
index df8b37d3d49cdac87988f2a8f2b8c32aaca5a761..21dd8d23e3c84e2aecb294c448ee33ab1a34a63c 100644
--- a/gnu/stdint.in.h
+++ b/gnu/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2017 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2019 Free Software Foundation, Inc.
Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
This file is part of gnulib.
diff --git a/gnu/stdio-impl.h b/gnu/stdio-impl.h
index 329801ad23b07800aeb5942e6b97009c9d9023fb..b2b2971f2ffd37ffc3c7b8d8342804452620f279 100644
--- a/gnu/stdio-impl.h
+++ b/gnu/stdio-impl.h
@@ -1,5 +1,5 @@
/* Implementation details of FILE streams.
- Copyright (C) 2007-2008, 2010-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2008, 2010-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ problem by defining it ourselves. FIXME: Do not rely on glibc
+ internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */
@@ -54,25 +60,79 @@
# define _flags pub._flags
# define _r pub._r
# define _w pub._w
+# elif defined __ANDROID__ /* Android */
+ /* Up to this commit from 2015-10-12
+ <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
+ the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
+ see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/fileext.h>
+ and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/local.h>.
+ After this commit, the innards of FILE are hidden. */
+# define fp_ ((struct { unsigned char *_p; \
+ int _r; \
+ int _w; \
+ int _flags; \
+ int _file; \
+ struct { unsigned char *_base; size_t _size; } _bf; \
+ int _lbfsize; \
+ void *_cookie; \
+ void *_close; \
+ void *_read; \
+ void *_seek; \
+ void *_write; \
+ struct { unsigned char *_base; size_t _size; } _ext; \
+ unsigned char *_up; \
+ int _ur; \
+ unsigned char _ubuf[3]; \
+ unsigned char _nbuf[1]; \
+ struct { unsigned char *_base; size_t _size; } _lb; \
+ int _blksize; \
+ fpos_t _offset; \
+ /* More fields, not relevant here. */ \
+ } *) fp)
# else
# define fp_ fp
# endif
-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Minix 3, Android */
+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */
/* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
- and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
+ and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
+ and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/lib/libc/stdio/fileext.h> */
struct __sfileext
{
struct __sbuf _ub; /* ungetc buffer */
/* More fields, not relevant here. */
};
# define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
-# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */
+# elif defined __ANDROID__ /* Android */
+ struct __sfileext
+ {
+ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */
+ /* More fields, not relevant here. */
+ };
+# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub
+# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
# define fp_ub fp_->_ub
# endif
# define HASUB(fp) (fp_ub._base != NULL)
+# if defined __ANDROID__ /* Android */
+ /* Needed after this commit from 2016-01-25
+ <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7> */
+# ifndef __SEOF
+# define __SLBF 1
+# define __SNBF 2
+# define __SRD 4
+# define __SWR 8
+# define __SRW 0x10
+# define __SEOF 0x20
+# define __SERR 0x40
+# endif
+# ifndef __SOFF
+# define __SOFF 0x1000
+# endif
+# endif
+
#endif
@@ -112,7 +172,7 @@
# define _flag __flag
# endif
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* newer Windows with MSVC */
+#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */
/* <stdio.h> does not define the innards of FILE any more. */
# define WINDOWS_OPAQUE_FILE
diff --git a/gnu/stdio.in.h b/gnu/stdio.in.h
index 505f3f49f4e365af97d2a1a93c5fff5f8c9c406e..acf29c4be09ea29e250ab8f81e6141b1ba63a830 100644
--- a/gnu/stdio.in.h
+++ b/gnu/stdio.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <stdio.h>.
- Copyright (C) 2004, 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2007-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -122,7 +122,7 @@
it before we #define perror rpl_perror. */
/* But in any case avoid namespace pollution on glibc systems. */
#if (@GNULIB_PERROR@ || defined GNULIB_POSIXCHECK) \
- && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+ && (defined _WIN32 && ! defined __CYGWIN__) \
&& ! defined __GLIBC__
# include <stdlib.h>
#endif
@@ -133,7 +133,7 @@
it before we #define rename rpl_rename. */
/* But in any case avoid namespace pollution on glibc systems. */
#if (@GNULIB_REMOVE@ || @GNULIB_RENAME@ || defined GNULIB_POSIXCHECK) \
- && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+ && (defined _WIN32 && ! defined __CYGWIN__) \
&& ! defined __GLIBC__
# include <io.h>
#endif
diff --git a/gnu/stdlib.in.h b/gnu/stdlib.in.h
index d5fa02b57aba0e0df86adf0f3fcb1abb8e664064..d80d7ec6b058b85aaf2d0c473c35b168a8bc4bcf 100644
--- a/gnu/stdlib.in.h
+++ b/gnu/stdlib.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <stdlib.h>.
- Copyright (C) 1995, 2001-2004, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001-2004, 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -47,11 +47,14 @@
/* Solaris declares getloadavg() in <sys/loadavg.h>. */
#if (@GNULIB_GETLOADAVG@ || defined GNULIB_POSIXCHECK) && @HAVE_SYS_LOADAVG_H@
+/* OpenIndiana has a bug: <sys/time.h> must be included before
+ <sys/loadavg.h>. */
+# include <sys/time.h>
# include <sys/loadavg.h>
#endif
/* Native Windows platforms declare mktemp() in <io.h>. */
-#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#if 0 && (defined _WIN32 && ! defined __CYGWIN__)
# include <io.h>
#endif
@@ -87,9 +90,10 @@ struct random_data
# endif
#endif
-#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_MKOSTEMP@ || @GNULIB_MKOSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !(defined _WIN32 && ! defined __CYGWIN__)
/* On Mac OS X 10.3, only <unistd.h> declares mkstemp. */
/* On Mac OS X 10.5, only <unistd.h> declares mkstemps. */
+/* On Mac OS X 10.13, only <unistd.h> declares mkostemp and mkostemps. */
/* On Cygwin 1.7.1, only <unistd.h> declares getsubopt. */
/* But avoid namespace pollution on glibc systems and native Windows. */
# include <unistd.h>
diff --git a/gnu/stpcpy.c b/gnu/stpcpy.c
index 079599db8682be2b77c6d51f2bfd898eca17df09..a1d32fdaf81c5738c52835382bcddb4f5b902f43 100644
--- a/gnu/stpcpy.c
+++ b/gnu/stpcpy.c
@@ -1,5 +1,5 @@
/* stpcpy.c -- copy a string and return pointer to end of new string
- Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2017 Free Software
+ Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2019 Free Software
Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gnu/strcasecmp.c b/gnu/strcasecmp.c
index b7fb4c721688cf2401c6fb29cddb94522ab21bfe..6cd0e1e370d97148e6c51af29e3766c1b0da294f 100644
--- a/gnu/strcasecmp.c
+++ b/gnu/strcasecmp.c
@@ -1,5 +1,5 @@
/* Case-insensitive string comparison function.
- Copyright (C) 1998-1999, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/strchrnul.c b/gnu/strchrnul.c
index c073c9421460dce76cf201205a43d2de00dba207..0f5dd81407441f8fb2bf0eaf8b20fdd512a4af41 100644
--- a/gnu/strchrnul.c
+++ b/gnu/strchrnul.c
@@ -1,5 +1,5 @@
/* Searching in a string.
- Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/strdup.c b/gnu/strdup.c
index ddabc5080d5edbbd6ce0fbd182c0b7071744858c..717cf65ba94aa5bfd40e6c9670ac5a858043171e 100644
--- a/gnu/strdup.c
+++ b/gnu/strdup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2017 Free Software
+/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2019 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/gnu/streq.h b/gnu/streq.h
index b4b726d80e641d183f13ec12b02fef84b47e7182..326537b6d020a4511a10ded659049c3cec1a6487 100644
--- a/gnu/streq.h
+++ b/gnu/streq.h
@@ -1,5 +1,5 @@
/* Optimized string comparison.
- Copyright (C) 2001-2002, 2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
diff --git a/gnu/strerror-override.c b/gnu/strerror-override.c
index 15ea21904d29f95884d4262f9f8542b76e8ba1b4..558a010a916921a86adc491ccd06c236c662b900 100644
--- a/gnu/strerror-override.c
+++ b/gnu/strerror-override.c
@@ -1,6 +1,6 @@
/* strerror-override.c --- POSIX compatible system error routine
- Copyright (C) 2010-2017 Free Software Foundation, Inc.
+ Copyright (C) 2010-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/strerror-override.h b/gnu/strerror-override.h
index 5b9ef675a0d83f7a0abffb5297a1208319d0ba25..255febcaf210c966cef7f65c24d12f0e4730b82b 100644
--- a/gnu/strerror-override.h
+++ b/gnu/strerror-override.h
@@ -1,6 +1,6 @@
/* strerror-override.h --- POSIX compatible system error routine
- Copyright (C) 2010-2017 Free Software Foundation, Inc.
+ Copyright (C) 2010-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/strerror.c b/gnu/strerror.c
index 3861ffdb2c9236d05d825a6f0f04da5ebb5bd08c..f5900fd14412cb2c0df5dbdaea29e319939350d5 100644
--- a/gnu/strerror.c
+++ b/gnu/strerror.c
@@ -1,6 +1,6 @@
/* strerror.c --- POSIX compatible system error routine
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/strftime.h b/gnu/strftime.h
index 9d91e5139cd91abbdc3d9e1dfa0e5643a5fabfd5..e4a720b016bfb62cb75bc0b2585fe1a0a4ea6789 100644
--- a/gnu/strftime.h
+++ b/gnu/strftime.h
@@ -1,6 +1,6 @@
/* declarations for strftime.c
- Copyright (C) 2002, 2004, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/string.in.h b/gnu/string.in.h
index 0e0e0c51f5e1bc7ad0f65a921733e05058ef5846..4a9292f74ade0fccd80a51e5520d6f9f0bc5cec0 100644
--- a/gnu/string.in.h
+++ b/gnu/string.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <string.h>.
- Copyright (C) 1995-1996, 2001-2017 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/strings.in.h b/gnu/strings.in.h
index a728401577e2f1a11d4b7fa4d86df117675f2f1e..21b1a85b3cacf3a1635cf8a6e873517a8fe574c0 100644
--- a/gnu/strings.in.h
+++ b/gnu/strings.in.h
@@ -1,6 +1,6 @@
/* A substitute <strings.h>.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/stripslash.c b/gnu/stripslash.c
index 41c589eda7e05dba58d190e85d4057bd49fef545..dfc15b43cc97267cde0d16764ea6e5fab6ee8913 100644
--- a/gnu/stripslash.c
+++ b/gnu/stripslash.c
@@ -1,6 +1,6 @@
/* stripslash.c -- remove redundant trailing slashes from a file name
- Copyright (C) 1990, 2001, 2003-2006, 2009-2017 Free Software Foundation,
+ Copyright (C) 1990, 2001, 2003-2006, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/strncasecmp.c b/gnu/strncasecmp.c
index 90b309dff578c322c21aa61e432aa43380ebec40..034011c56124be813a17cfe1687b0986df1f55e0 100644
--- a/gnu/strncasecmp.c
+++ b/gnu/strncasecmp.c
@@ -1,5 +1,5 @@
/* strncasecmp.c -- case insensitive string comparator
- Copyright (C) 1998-1999, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/strndup.c b/gnu/strndup.c
index cc8607239082c8a5811b08a956c7f2c166843fa6..5b74828469a865e819c4cd499face547ab385169 100644
--- a/gnu/strndup.c
+++ b/gnu/strndup.c
@@ -1,6 +1,6 @@
/* A replacement function, for systems that lack strndup.
- Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2017 Free Software
+ Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
diff --git a/gnu/strnlen.c b/gnu/strnlen.c
index a37f81f6d5f33754c25c872f5e48ef69ddfc7ad0..9fb663509a036ad8b7d0ba7b9135a01562a6a995 100644
--- a/gnu/strnlen.c
+++ b/gnu/strnlen.c
@@ -1,5 +1,5 @@
/* Find the length of STRING, but scan at most MAXLEN characters.
- Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
Written by Simon Josefsson.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/strnlen1.c b/gnu/strnlen1.c
index c443365392efa788a0dbaed0b80f060ed0746309..666a5572ca3e2db123597b8a6b4293352f03918f 100644
--- a/gnu/strnlen1.c
+++ b/gnu/strnlen1.c
@@ -1,5 +1,5 @@
/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
- Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/strnlen1.h b/gnu/strnlen1.h
index 4847e8aed6553c3feed9ef367b8bbe52604eb138..5d9524462636dddae9125dc71180602c9302cf33 100644
--- a/gnu/strnlen1.h
+++ b/gnu/strnlen1.h
@@ -1,5 +1,5 @@
/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
- Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/strtoimax.c b/gnu/strtoimax.c
index f7d46f040d7f2e937240315fe735ce6cd1bc1464..87b080c4f359160a5988e8ce94bff244626162ba 100644
--- a/gnu/strtoimax.c
+++ b/gnu/strtoimax.c
@@ -1,6 +1,6 @@
/* Convert string representation of a number into an intmax_t value.
- Copyright (C) 1999, 2001-2004, 2006, 2009-2017 Free Software Foundation,
+ Copyright (C) 1999, 2001-2004, 2006, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/strtol.c b/gnu/strtol.c
index 1ef88700fcaf61fd306c8ffb46086d9902decda1..1d920aff5441d44344a5c5e735b1e973993227cb 100644
--- a/gnu/strtol.c
+++ b/gnu/strtol.c
@@ -1,6 +1,6 @@
/* Convert string representation of a number into an integer value.
- Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2017 Free Software
+ Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2019 Free Software
Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C
@@ -117,35 +117,6 @@
# define STRTOL_LONG_MIN LLONG_MIN
# define STRTOL_LONG_MAX LLONG_MAX
# define STRTOL_ULONG_MAX ULLONG_MAX
-
-/* The extra casts in the following macros work around compiler bugs,
- e.g., in Cray C 5.0.3.0. */
-
-/* True if the arithmetic type T is signed. */
-# define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-
-/* Minimum and maximum values for integer types.
- These macros have undefined behavior for signed types that either
- have padding bits or do not use two's complement. If this is a
- problem for you, please let us know how to fix it for your host. */
-
-/* The maximum and minimum values for the integer type T. */
-# define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
-# define TYPE_MAXIMUM(t) \
- ((t) (! TYPE_SIGNED (t) \
- ? (t) -1 \
- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-
-# ifndef ULLONG_MAX
-# define ULLONG_MAX TYPE_MAXIMUM (unsigned long long)
-# endif
-# ifndef LLONG_MAX
-# define LLONG_MAX TYPE_MAXIMUM (long long int)
-# endif
-# ifndef LLONG_MIN
-# define LLONG_MIN TYPE_MINIMUM (long long int)
-# endif
-
# if __GNUC__ == 2 && __GNUC_MINOR__ < 7
/* Work around gcc bug with using this constant. */
static const unsigned long long int maxquad = ULLONG_MAX;
diff --git a/gnu/strtoll.c b/gnu/strtoll.c
index f6952f3cd236186ddd0123677eb13c5531cfc176..038362a308b3916972c4f1976331413cdf5d71e5 100644
--- a/gnu/strtoll.c
+++ b/gnu/strtoll.c
@@ -1,5 +1,5 @@
/* Function to parse a 'long long int' from text.
- Copyright (C) 1995-1997, 1999, 2001, 2009-2017 Free Software Foundation,
+ Copyright (C) 1995-1997, 1999, 2001, 2009-2019 Free Software Foundation,
Inc.
This file is part of the GNU C Library.
diff --git a/gnu/strtoul.c b/gnu/strtoul.c
index d4d538d50c90384ee592def6620438da121b2494..e098701fd1b7ebe725c71391866aaa051cc22a52 100644
--- a/gnu/strtoul.c
+++ b/gnu/strtoul.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2009-2017 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 2009-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/strtoull.c b/gnu/strtoull.c
index 96168f2987139730781b7884a345d10892774923..8ba92bf3c02684f790d49850a6293724a1f967bc 100644
--- a/gnu/strtoull.c
+++ b/gnu/strtoull.c
@@ -1,5 +1,5 @@
/* Function to parse an 'unsigned long long int' from text.
- Copyright (C) 1995-1997, 1999, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1995-1997, 1999, 2009-2019 Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@gnu.org.
diff --git a/gnu/symlink.c b/gnu/symlink.c
index 427f1f5f00c8f2f4c1e783b42fee02f1e98995d6..16432ee3275363102782ac1262d1d2c87ed41583 100644
--- a/gnu/symlink.c
+++ b/gnu/symlink.c
@@ -1,5 +1,5 @@
/* Stub for symlink().
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/symlinkat.c b/gnu/symlinkat.c
index 3269dc819ba1d7100449e9fa0a4b3a88df58fc12..7d58cd974c6808b8a4fec5e1cb9454c44315c423 100644
--- a/gnu/symlinkat.c
+++ b/gnu/symlinkat.c
@@ -1,5 +1,5 @@
/* Create a symlink relative to an open directory.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/sys-limits.h b/gnu/sys-limits.h
new file mode 100644
index 0000000000000000000000000000000000000000..5150e89738fe0bf9fcddf7322ea4cf841532363e
--- /dev/null
+++ b/gnu/sys-limits.h
@@ -0,0 +1,42 @@
+/* System call limits
+
+ Copyright 2018-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_LIMITS_H
+#define _SYS_LIMITS_H
+
+#include <limits.h>
+
+/* Maximum number of bytes to read or write in a single system call.
+ This can be useful for system calls like sendfile on GNU/Linux,
+ which do not handle more than MAX_RW_COUNT bytes correctly.
+ The Linux kernel MAX_RW_COUNT is at least INT_MAX >> 20 << 20,
+ where the 20 comes from the Hexagon port with 1 MiB pages; use that
+ as an approximation, as the exact value may not be available to us.
+
+ Using this also works around a serious Linux bug before 2.6.16; see
+ <https://bugzilla.redhat.com/show_bug.cgi?id=612839>.
+
+ Using this also works around a Tru64 5.1 bug, where attempting
+ to read INT_MAX bytes fails with errno == EINVAL. See
+ <https://lists.gnu.org/r/bug-gnu-utils/2002-04/msg00010.html>.
+
+ Using this is likely to work around similar bugs in other operating
+ systems. */
+
+enum { SYS_BUFSIZE_MAX = INT_MAX >> 20 << 20 };
+
+#endif
diff --git a/gnu/sys_stat.in.h b/gnu/sys_stat.in.h
index f0919e90d5cacead8ed7a60d442146a0ecf5de4d..58fa93fd0ad058617e6c7f7acdb9a5efa5ae2092 100644
--- a/gnu/sys_stat.in.h
+++ b/gnu/sys_stat.in.h
@@ -1,5 +1,5 @@
/* Provide a more complete sys/stat.h header file.
- Copyright (C) 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -57,13 +57,13 @@
/* Before doing "#define mkdir rpl_mkdir" below, we need to include all
headers that may declare mkdir(). Native Windows platforms declare mkdir
in <io.h> and/or <direct.h>, not in <unistd.h>. */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# include <io.h> /* mingw32, mingw64 */
# include <direct.h> /* mingw64, MSVC 9 */
#endif
/* Native Windows platforms declare umask() in <io.h>. */
-#if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#if 0 && (defined _WIN32 && ! defined __CYGWIN__)
# include <io.h>
#endif
@@ -576,7 +576,7 @@ _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode));
Additionally, it declares _mkdir (and depending on compile flags, an
alias mkdir), only in the nonstandard includes <direct.h> and <io.h>,
which are included above. */
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
# if !GNULIB_defined_rpl_mkdir
static int
diff --git a/gnu/sys_time.in.h b/gnu/sys_time.in.h
index 8a3c87d11d85cb4bd6f2534ac1bfbbbc43d0f1f4..539768889d086b3e68ed1e1f29251681257a5879 100644
--- a/gnu/sys_time.in.h
+++ b/gnu/sys_time.in.h
@@ -1,6 +1,6 @@
/* Provide a more complete sys/time.h.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/sys_types.in.h b/gnu/sys_types.in.h
index b0d6132a1630407bfa2cd0396c688da53920b67f..237e2068cf894df546ec3dac92c0b447e25063a9 100644
--- a/gnu/sys_types.in.h
+++ b/gnu/sys_types.in.h
@@ -1,6 +1,6 @@
/* Provide a more complete sys/types.h.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,6 +20,17 @@
#endif
@PRAGMA_COLUMNS@
+#if defined _WIN32 && !defined __CYGWIN__ \
+ && (defined __need_off_t || defined __need___off64_t \
+ || defined __need_ssize_t || defined __need_time_t)
+
+/* Special invocation convention inside mingw header files. */
+
+#@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@
+
+#else
+/* Normal invocation convention. */
+
#ifndef _@GUARD_PREFIX@_SYS_TYPES_H
/* The include_next requires a split double-inclusion guard. */
@@ -86,10 +97,10 @@ typedef unsigned long long int rpl_ino_t;
/* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>. */
/* But avoid namespace pollution on glibc systems. */
-#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
- && ! defined __GLIBC__
+#if (defined _WIN32 && ! defined __CYGWIN__) && ! defined __GLIBC__
# include <stddef.h>
#endif
#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
#endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
+#endif /* __need_XXX */
diff --git a/gnu/sysexits.in.h b/gnu/sysexits.in.h
index 66f04ca541a7df96b03eb217421be119bb4b3cfb..7043a0a9995c1fdde48d3b86d390cb7815a0fea4 100644
--- a/gnu/sysexits.in.h
+++ b/gnu/sysexits.in.h
@@ -1,5 +1,5 @@
/* exit() exit codes for some BSD system programs.
- Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/tempname.c b/gnu/tempname.c
index 2e3f95f3fb1339a74bd8f751a408f0e45a709708..be62ed9513c58a171ef1481e5fd9773db726aaa2 100644
--- a/gnu/tempname.c
+++ b/gnu/tempname.c
@@ -1,6 +1,6 @@
/* tempname.c - generate the name of a temporary file.
- Copyright (C) 1991-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1991-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/tempname.h b/gnu/tempname.h
index 245c8161abee7e4c5bd5b724b164e0d29bd27a68..fb203d3a10f1f00db78cda425f9ad8b2687e835a 100644
--- a/gnu/tempname.h
+++ b/gnu/tempname.h
@@ -1,6 +1,6 @@
/* Create a temporary file or directory.
- Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/time-internal.h b/gnu/time-internal.h
index 8caf11d8746dbff1c1577ca2826dd4eac018963a..57f2e7890b2f33f3c8e406b8e014dfd2e379cf07 100644
--- a/gnu/time-internal.h
+++ b/gnu/time-internal.h
@@ -1,6 +1,6 @@
/* Time internal interface
- Copyright 2015-2017 Free Software Foundation, Inc.
+ Copyright 2015-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/time.in.h b/gnu/time.in.h
index d210fbf80b128bf6ea0e12edb29b7bcd4a36c3d0..dd3b21273c9c00f04d263d103fe75cadf78c79b3 100644
--- a/gnu/time.in.h
+++ b/gnu/time.in.h
@@ -1,6 +1,6 @@
/* A more-standard <time.h>.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@
/* The definition of _GL_WARN_ON_USE is copied here. */
-/* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
+/* Some systems don't define struct timespec (e.g., AIX 4.1).
Or they define it with the wrong member names or define it in <sys/time.h>
(e.g., FreeBSD circa 1997). Stock Mingw prior to 3.0 does not define it,
but the pthreads-win32 library defines it in <pthread.h>. */
@@ -212,7 +212,7 @@ _GL_CXXALIASWARN (gmtime_r);
# define localtime rpl_localtime
# endif
_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer)
- _GL_ARG_NONNULL ((1)));
+ _GL_ARG_NONNULL ((1)));
_GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer));
# else
_GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer));
diff --git a/gnu/time_r.c b/gnu/time_r.c
index 8cf8329fe5dae40b7788d24e0a649e5922253249..a701ccc5b82d61d3ca4ab712a50e1cdf02cd82c4 100644
--- a/gnu/time_r.c
+++ b/gnu/time_r.c
@@ -1,6 +1,6 @@
/* Reentrant time functions like localtime_r.
- Copyright (C) 2003, 2006-2007, 2010-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006-2007, 2010-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/time_rz.c b/gnu/time_rz.c
index ad02edb23cb3bd0cc3cfd26e0f33b6587213dda7..42ae3d3649f0497b5acc60b82332d010d5cd2275 100644
--- a/gnu/time_rz.c
+++ b/gnu/time_rz.c
@@ -1,6 +1,6 @@
/* Time zone functions such as tzalloc and localtime_rz
- Copyright 2015-2017 Free Software Foundation, Inc.
+ Copyright 2015-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -286,6 +286,21 @@ revert_tz (timezone_t tz)
struct tm *
localtime_rz (timezone_t tz, time_t const *t, struct tm *tm)
{
+#ifdef HAVE_LOCALTIME_INFLOOP_BUG
+ /* The -67768038400665599 comes from:
+ https://lists.gnu.org/r/bug-gnulib/2017-07/msg00142.html
+ On affected platforms the greatest POSIX-compatible time_t value
+ that could return nonnull is 67768036191766798 (when
+ TZ="XXX24:59:59" it resolves to the year 2**31 - 1 + 1900, on
+ 12-31 at 23:59:59), so test for that too while we're in the
+ neighborhood. */
+ if (! (-67768038400665599 <= *t && *t <= 67768036191766798))
+ {
+ errno = EOVERFLOW;
+ return NULL;
+ }
+#endif
+
if (!tz)
return gmtime_r (t, tm);
else
diff --git a/gnu/timegm.c b/gnu/timegm.c
index 1cabf648264ebbbef7a39a89f3987a6104875dbc..2ca57444d4306fe3b9d80c7e045b761513874801 100644
--- a/gnu/timegm.c
+++ b/gnu/timegm.c
@@ -1,20 +1,21 @@
/* Convert UTC calendar time to simple time. Like mktime but assumes UTC.
- Copyright (C) 1994, 1997, 2003-2004, 2006-2007, 2009-2017 Free Software
- Foundation, Inc. This file is part of the GNU C Library.
+ Copyright (C) 1994-2019 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>. */
+ You should have received a copy of the GNU General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#ifndef _LIBC
# include <config.h>
@@ -22,14 +23,7 @@
#include <time.h>
-#ifdef _LIBC
-typedef time_t mktime_offset_t;
-#else
-# undef __gmtime_r
-# define __gmtime_r gmtime_r
-# define __mktime_internal mktime_internal
-# include "mktime-internal.h"
-#endif
+#include "mktime-internal.h"
time_t
timegm (struct tm *tmp)
diff --git a/gnu/timespec-sub.c b/gnu/timespec-sub.c
index 3872f1bc2db687f57954ae321d1a1b1a81a04b0d..48434e81506635ef00b2066ee6f74f4e53d6ad72 100644
--- a/gnu/timespec-sub.c
+++ b/gnu/timespec-sub.c
@@ -1,6 +1,6 @@
/* Subtract two struct timespec values.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
/* Return the difference between two timespec values A and B. On
overflow, return an extremal value. This assumes 0 <= tv_nsec <
- TIMESPEC_RESOLUTION. */
+ TIMESPEC_HZ. */
#include <config.h>
#include "timespec.h"
@@ -38,7 +38,7 @@ timespec_sub (struct timespec a, struct timespec b)
if (ns < 0)
{
- rns = ns + TIMESPEC_RESOLUTION;
+ rns = ns + TIMESPEC_HZ;
if (bs < tmax)
bs++;
else if (- TYPE_SIGNED (time_t) < rs)
@@ -63,7 +63,7 @@ timespec_sub (struct timespec a, struct timespec b)
else
{
rs = tmax;
- rns = TIMESPEC_RESOLUTION - 1;
+ rns = TIMESPEC_HZ - 1;
}
}
diff --git a/gnu/timespec.h b/gnu/timespec.h
index 84c8146a3ea760f00f7d60cf25fa8c594eeb72a2..26f1bc1a4c78ca21edc80c0f6e536940cb78cc4e 100644
--- a/gnu/timespec.h
+++ b/gnu/timespec.h
@@ -1,6 +1,6 @@
/* timespec -- System time interface
- Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2017 Free Software
+ Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -17,9 +17,9 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. */
#if ! defined TIMESPEC_H
-# define TIMESPEC_H
+#define TIMESPEC_H
-# include <time.h>
+#include <time.h>
#ifndef _GL_INLINE_HEADER_BEGIN
#error "Please include config.h first."
@@ -33,13 +33,20 @@ _GL_INLINE_HEADER_BEGIN
extern "C" {
#endif
+#include "arg-nonnull.h"
#include "verify.h"
-/* Resolution of timespec timestamps (in units per second), and log
- base 10 of the resolution. */
+/* Inverse resolution of timespec timestamps (in units per second),
+ and log base 10 of the inverse resolution. */
-enum { TIMESPEC_RESOLUTION = 1000000000 };
-enum { LOG10_TIMESPEC_RESOLUTION = 9 };
+enum { TIMESPEC_HZ = 1000000000 };
+enum { LOG10_TIMESPEC_HZ = 9 };
+
+/* Obsolescent names for backward compatibility.
+ They are misnomers, because TIMESPEC_RESOLUTION is not a resolution. */
+
+enum { TIMESPEC_RESOLUTION = TIMESPEC_HZ };
+enum { LOG10_TIMESPEC_RESOLUTION = LOG10_TIMESPEC_HZ };
/* Return a timespec with seconds S and nanoseconds NS. */
@@ -87,9 +94,9 @@ timespec_cmp (struct timespec a, struct timespec b)
return 1;
/* Pacify gcc -Wstrict-overflow (bleeding-edge circa 2017-10-02). See:
- http://lists.gnu.org/r/bug-gnulib/2017-10/msg00006.html */
- assume (-1 <= a.tv_nsec && a.tv_nsec <= 2 * TIMESPEC_RESOLUTION);
- assume (-1 <= b.tv_nsec && b.tv_nsec <= 2 * TIMESPEC_RESOLUTION);
+ https://lists.gnu.org/r/bug-gnulib/2017-10/msg00006.html */
+ assume (-1 <= a.tv_nsec && a.tv_nsec <= 2 * TIMESPEC_HZ);
+ assume (-1 <= b.tv_nsec && b.tv_nsec <= 2 * TIMESPEC_HZ);
return a.tv_nsec - b.tv_nsec;
}
@@ -116,8 +123,9 @@ timespectod (struct timespec a)
return a.tv_sec + a.tv_nsec / 1e9;
}
-void gettime (struct timespec *);
-int settime (struct timespec const *);
+struct timespec current_timespec (void);
+void gettime (struct timespec *) _GL_ARG_NONNULL ((1));
+int settime (struct timespec const *) _GL_ARG_NONNULL ((1));
#ifdef __cplusplus
}
diff --git a/gnu/tzset.c b/gnu/tzset.c
index a259774e146597125241c6d770f0174e87303066..a77633d2a4898805dde7eb12c8ebdcb5c5c2d446 100644
--- a/gnu/tzset.c
+++ b/gnu/tzset.c
@@ -1,6 +1,6 @@
/* Provide tzset for systems that don't have it or for which it's broken.
- Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ tzset (void)
struct tm save = *localtime_buffer_addr;
#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* Rectify the value of the environment variable TZ.
There are four possible kinds of such values:
- Traditional US time zone names, e.g. "PST8PDT". Syntax: see
diff --git a/gnu/unistd--.h b/gnu/unistd--.h
index cdfa2304339212645102e2ebeece9ea1939a0d1a..12688543703884abe6735493939dbb49f80e81e9 100644
--- a/gnu/unistd--.h
+++ b/gnu/unistd--.h
@@ -1,6 +1,6 @@
/* Like unistd.h, but redefine some names to avoid glitches.
- Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/unistd-safer.h b/gnu/unistd-safer.h
index 74f0591a978dc3260995e8494cae92f4853e526b..8eebffcae22474850330219a6903ab06a7288bb2 100644
--- a/gnu/unistd-safer.h
+++ b/gnu/unistd-safer.h
@@ -1,6 +1,6 @@
/* Invoke unistd-like functions, but avoid some glitches.
- Copyright (C) 2001, 2003, 2005, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003, 2005, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/unistd.in.h b/gnu/unistd.in.h
index 91447835811beacc3479c4cf260abe2434c51a2b..a10ca28a532a69bc571d57901563a293419f0897 100644
--- a/gnu/unistd.in.h
+++ b/gnu/unistd.in.h
@@ -1,5 +1,5 @@
/* Substitute for and wrapper around <unistd.h>.
- Copyright (C) 2003-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@
/* But avoid namespace pollution on glibc systems. */
#if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \
|| ((@GNULIB_UNLINK@ || defined GNULIB_POSIXCHECK) \
- && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) \
+ && (defined _WIN32 && ! defined __CYGWIN__)) \
|| ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \
&& defined __CYGWIN__)) \
&& ! defined __GLIBC__
@@ -94,13 +94,13 @@
lseek(), read(), unlink(), write() in <io.h>. */
#if ((@GNULIB_CHDIR@ || @GNULIB_GETCWD@ || @GNULIB_RMDIR@ \
|| defined GNULIB_POSIXCHECK) \
- && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+ && (defined _WIN32 && ! defined __CYGWIN__))
# include <io.h> /* mingw32, mingw64 */
# include <direct.h> /* mingw64, MSVC 9 */
#elif (@GNULIB_CLOSE@ || @GNULIB_DUP@ || @GNULIB_DUP2@ || @GNULIB_ISATTY@ \
|| @GNULIB_LSEEK@ || @GNULIB_READ@ || @GNULIB_UNLINK@ || @GNULIB_WRITE@ \
|| defined GNULIB_POSIXCHECK) \
- && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+ && (defined _WIN32 && ! defined __CYGWIN__)
# include <io.h>
#endif
@@ -400,6 +400,13 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - "
#if @GNULIB_ENVIRON@
+# if defined __CYGWIN__ && !defined __i386__
+/* The 'environ' variable is defined in a DLL. Therefore its declaration needs
+ the '__declspec(dllimport)' attribute, but the system's <unistd.h> lacks it.
+ This leads to a link error on 64-bit Cygwin when the option
+ -Wl,--disable-auto-import is in use. */
+_GL_EXTERN_C __declspec(dllimport) char **environ;
+# endif
# if !@HAVE_DECL_ENVIRON@
/* Set of environment variables and values. An array of strings of the form
"VARIABLE=VALUE", terminated with a NULL. */
@@ -425,12 +432,12 @@ extern char **environ;
#elif defined GNULIB_POSIXCHECK
# if HAVE_RAW_DECL_ENVIRON
_GL_UNISTD_INLINE char ***
+_GL_WARN_ON_USE_ATTRIBUTE ("environ is unportable - "
+ "use gnulib module environ for portability")
rpl_environ (void)
{
return &environ;
}
-_GL_WARN_ON_USE (rpl_environ, "environ is unportable - "
- "use gnulib module environ for portability");
# undef environ
# define environ (*rpl_environ ())
# endif
@@ -928,6 +935,36 @@ _GL_WARN_ON_USE (getpagesize, "getpagesize is unportable - "
#endif
+#if @GNULIB_GETPASS@
+/* Function getpass() from module 'getpass':
+ Read a password from /dev/tty or stdin.
+ Function getpass() from module 'getpass-gnu':
+ Read a password of arbitrary length from /dev/tty or stdin. */
+# if @REPLACE_GETPASS@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef getpass
+# define getpass rpl_getpass
+# endif
+_GL_FUNCDECL_RPL (getpass, char *, (const char *prompt)
+ _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (getpass, char *, (const char *prompt));
+# else
+# if !@HAVE_GETPASS@
+_GL_FUNCDECL_SYS (getpass, char *, (const char *prompt)
+ _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (getpass, char *, (const char *prompt));
+# endif
+_GL_CXXALIASWARN (getpass);
+#elif defined GNULIB_POSIXCHECK
+# undef getpass
+# if HAVE_RAW_DECL_GETPASS
+_GL_WARN_ON_USE (getpass, "getpass is unportable - "
+ "use gnulib module getpass or getpass-gnu for portability");
+# endif
+#endif
+
+
#if @GNULIB_GETUSERSHELL@
/* Return the next valid login shell on the system, or NULL when the end of
the list has been reached. */
@@ -1482,7 +1519,7 @@ _GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length)
_GL_ARG_NONNULL ((1)));
_GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length));
# else
-# if !@HAVE_TRUNCATE@
+# if !@HAVE_DECL_TRUNCATE@
_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length)
_GL_ARG_NONNULL ((1)));
# endif
diff --git a/gnu/unitypes.in.h b/gnu/unitypes.in.h
index 01e0495d1c408b9fcb3a217a84a3c31f3b378da4..631654bdbd0f605dd60372223e10b0d919cb80fb 100644
--- a/gnu/unitypes.in.h
+++ b/gnu/unitypes.in.h
@@ -1,5 +1,5 @@
/* Elementary types and macros for the GNU UniString library.
- Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
diff --git a/gnu/uniwidth.in.h b/gnu/uniwidth.in.h
index 360ff3336851b923578d79de273ab717c09063ef..80c5eeab385409cd30294b6040fa8a9d07820c41 100644
--- a/gnu/uniwidth.in.h
+++ b/gnu/uniwidth.in.h
@@ -1,5 +1,5 @@
/* Display width functions.
- Copyright (C) 2001-2002, 2005, 2007, 2009-2017 Free Software Foundation,
+ Copyright (C) 2001-2002, 2005, 2007, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify it
diff --git a/gnu/uniwidth/cjk.h b/gnu/uniwidth/cjk.h
index 95723f5ffe526c0bf296dbe07db5479e1fa44ae3..9870422ca6c701993fbcc607867d17381457830c 100644
--- a/gnu/uniwidth/cjk.h
+++ b/gnu/uniwidth/cjk.h
@@ -1,5 +1,5 @@
/* Test for CJK encoding.
- Copyright (C) 2001-2002, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2005-2007, 2009-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software: you can redistribute it and/or modify it
diff --git a/gnu/uniwidth/width.c b/gnu/uniwidth/width.c
index 3e286f49b7a9dda2df38bbc8e9783ed4049b262b..a7f59b18eba09bf415f373e184be5a30cd217fa5 100644
--- a/gnu/uniwidth/width.c
+++ b/gnu/uniwidth/width.c
@@ -1,5 +1,5 @@
/* Determine display width of Unicode character.
- Copyright (C) 2001-2002, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2006-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software: you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
* - Zero width characters; generated from
* "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt"
*/
-static const unsigned char nonspacing_table_data[36*64] = {
+static const unsigned char nonspacing_table_data[38*64] = {
/* 0x0000-0x01ff */
0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
@@ -73,7 +73,7 @@ static const unsigned char nonspacing_table_data[36*64] = {
0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */
0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
- 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, /* 0x08c0-0x08ff */
+ 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x08c0-0x08ff */
0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */
0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */
@@ -135,7 +135,7 @@ static const unsigned char nonspacing_table_data[36*64] = {
/* 0x1800-0x19ff */
0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1800-0x183f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1840-0x187f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18c0-0x18ff */
0x00, 0x00, 0x00, 0x00, 0x87, 0x01, 0x04, 0x0e, /* 0x1900-0x193f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1940-0x197f */
@@ -158,7 +158,7 @@ static const unsigned char nonspacing_table_data[36*64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xf0, /* 0x1dc0-0x1dff */
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xf8, /* 0x1dc0-0x1dff */
/* 0x2000-0x21ff */
0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */
0x00, 0x00, 0x00, 0x00, 0xdf, 0xff, 0x00, 0x00, /* 0x2040-0x207f */
@@ -199,7 +199,7 @@ static const unsigned char nonspacing_table_data[36*64] = {
0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */
- 0x10, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, /* 0xa8c0-0xa8ff */
+ 0x30, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, /* 0xa8c0-0xa8ff */
0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */
0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */
0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x13, /* 0xa980-0xa9bf */
@@ -268,7 +268,7 @@ static const unsigned char nonspacing_table_data[36*64] = {
0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x7f, /* 0x11180-0x111bf */
0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */
/* 0x11200-0x113ff */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd3, 0x00, /* 0x11200-0x1123f */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd3, 0x40, /* 0x11200-0x1123f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11240-0x1127f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11280-0x112bf */
0x00, 0x00, 0x00, 0x80, 0xf8, 0x07, 0x00, 0x00, /* 0x112c0-0x112ff */
@@ -277,8 +277,8 @@ static const unsigned char nonspacing_table_data[36*64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11380-0x113bf */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x113c0-0x113ff */
/* 0x11400-0x115ff */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11400-0x1143f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11440-0x1147f */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11400-0x1143f */
+ 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11440-0x1147f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x85, /* 0x11480-0x114bf */
0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x114c0-0x114ff */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11500-0x1153f */
@@ -294,6 +294,15 @@ static const unsigned char nonspacing_table_data[36*64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11740-0x1177f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11780-0x117bf */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x117c0-0x117ff */
+ /* 0x11c00-0x11dff */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x3f, /* 0x11c00-0x11c3f */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11c40-0x11c7f */
+ 0x00, 0x00, 0xfc, 0xff, 0xff, 0xfc, 0x6d, 0x00, /* 0x11c80-0x11cbf */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11cc0-0x11cff */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d00-0x11d3f */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d40-0x11d7f */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d80-0x11dbf */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11dc0-0x11dff */
/* 0x16a00-0x16bff */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a00-0x16a3f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a40-0x16a7f */
@@ -348,13 +357,22 @@ static const unsigned char nonspacing_table_data[36*64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db40-0x1db7f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db80-0x1dbbf */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1dbc0-0x1dbff */
+ /* 0x1e000-0x1e1ff */
+ 0x7f, 0xff, 0xff, 0xf9, 0xdb, 0x07, 0x00, 0x00, /* 0x1e000-0x1e03f */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e040-0x1e07f */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e080-0x1e0bf */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e0c0-0x1e0ff */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e100-0x1e13f */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e140-0x1e17f */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e180-0x1e1bf */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e1c0-0x1e1ff */
/* 0x1e800-0x1e9ff */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e800-0x1e83f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e840-0x1e87f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e880-0x1e8bf */
0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e8c0-0x1e8ff */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e900-0x1e93f */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e940-0x1e97f */
+ 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e940-0x1e97f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e980-0x1e9bf */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* 0x1e9c0-0x1e9ff */
};
@@ -376,20 +394,20 @@ static const signed char nonspacing_table_ind[248] = {
-1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */
-1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */
22, 23, -1, -1, -1, 24, -1, -1, /* 0x10000-0x10fff */
- 25, 26, 27, 28, -1, -1, -1, -1, /* 0x11000-0x11fff */
+ 25, 26, 27, 28, -1, -1, 29, -1, /* 0x11000-0x11fff */
-1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */
-1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
-1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
-1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */
- -1, -1, -1, -1, -1, 29, -1, 30, /* 0x16000-0x16fff */
+ -1, -1, -1, -1, -1, 30, -1, 31, /* 0x16000-0x16fff */
-1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */
-1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */
-1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */
-1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
- -1, -1, -1, -1, -1, -1, 31, -1, /* 0x1b000-0x1bfff */
+ -1, -1, -1, -1, -1, -1, 32, -1, /* 0x1b000-0x1bfff */
-1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */
- 32, 33, -1, -1, -1, 34, -1, -1, /* 0x1d000-0x1dfff */
- -1, -1, -1, -1, 35, -1, -1, -1 /* 0x1e000-0x1efff */
+ 33, 34, -1, -1, -1, 35, -1, -1, /* 0x1d000-0x1dfff */
+ 36, -1, -1, -1, 37, -1, -1, -1 /* 0x1e000-0x1efff */
};
/* Determine number of column positions required for UC. */
diff --git a/gnu/unlink.c b/gnu/unlink.c
index 7527c9af7287a2a7563f7dbebf76882deb582c34..90dc9d309a52c3b136dd4577a3c7810b08a1f654 100644
--- a/gnu/unlink.c
+++ b/gnu/unlink.c
@@ -1,6 +1,6 @@
/* Work around unlink bugs.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/unlinkat.c b/gnu/unlinkat.c
index d55bce7d583c4389561aa11dac5a99b40831e4e6..2b301ce3c81dd5ba597d777e6c5facc75d51f43f 100644
--- a/gnu/unlinkat.c
+++ b/gnu/unlinkat.c
@@ -1,6 +1,6 @@
/* Work around unlinkat bugs on Solaris 9 and Hurd.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/unlinkdir.c b/gnu/unlinkdir.c
index 69f0984fcb9f0d97de519f843cb41ae8ad6d674f..565f0c964f50d8595c46b334ad2e362c3d88e921 100644
--- a/gnu/unlinkdir.c
+++ b/gnu/unlinkdir.c
@@ -1,6 +1,6 @@
/* unlinkdir.c - determine whether we can unlink directories
- Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/unlinkdir.h b/gnu/unlinkdir.h
index 3706cd99a3541e266dd1b1e344b6ad24115e4d63..44cd77780bf7eec928d74b5453bc9476aec5d749 100644
--- a/gnu/unlinkdir.h
+++ b/gnu/unlinkdir.h
@@ -1,6 +1,6 @@
/* unlinkdir.h - determine (and maybe change) whether we can unlink directories
- Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/unlocked-io.h b/gnu/unlocked-io.h
index be5d2b5d84711a8d2ccfdbd74bd4c1d2daa9c0cf..ee1c06268fe4befbdd033aa19f3f0ce50503d5df 100644
--- a/gnu/unlocked-io.h
+++ b/gnu/unlocked-io.h
@@ -1,6 +1,6 @@
/* Prefer faster, non-thread-safe stdio functions if available.
- Copyright (C) 2001-2004, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/unsetenv.c b/gnu/unsetenv.c
index 05f4d8c108de1cfc8b351a6fc3e48f2c91fe8635..0199280c88cce1553cf7072c0bc2e79e35ad3648 100644
--- a/gnu/unsetenv.c
+++ b/gnu/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2017 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/unused-parameter.h b/gnu/unused-parameter.h
index 8bd04b1fba9175a2fc8304dfe9cf7f2cfab59a46..5e57de19fd45b3b7aa782222147770f3308335cf 100644
--- a/gnu/unused-parameter.h
+++ b/gnu/unused-parameter.h
@@ -1,5 +1,5 @@
/* A C macro for declaring that specific function parameters are not used.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
diff --git a/gnu/utime.c b/gnu/utime.c
index 6083e758740ebcc28e9054b6767cd57b367eab1e..88973e139d16b5d0dc0e2a3787ef0432186b57ff 100644
--- a/gnu/utime.c
+++ b/gnu/utime.c
@@ -1,5 +1,5 @@
/* Work around platform bugs in utime.
- Copyright (C) 2017 Free Software Foundation, Inc.
+ Copyright (C) 2017-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
/* Specification. */
#include <utime.h>
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# include <errno.h>
# include <stdbool.h>
diff --git a/gnu/utime.in.h b/gnu/utime.in.h
index bbf2aba1032efa16cbac2509945af417337d209d..f4b2804601a9db50e57b1948a5d4ab9d6f924d03 100644
--- a/gnu/utime.in.h
+++ b/gnu/utime.in.h
@@ -1,5 +1,5 @@
/* Substitute for and wrapper around <utime.h>.
- Copyright (C) 2017 Free Software Foundation, Inc.
+ Copyright (C) 2017-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@
/* The definition of _GL_WARN_ON_USE is copied here. */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* Define 'struct utimbuf' as an alias of 'struct _utimbuf'
(or possibly, if present, 'struct __utimbuf64'). */
diff --git a/gnu/utimens.c b/gnu/utimens.c
index 55545e8ce9b767f5feeb7ba6a4f7934c1c40bef6..34689bcd65566958e35e7fe3d759b86ed158ac80 100644
--- a/gnu/utimens.c
+++ b/gnu/utimens.c
@@ -1,6 +1,6 @@
/* Set file access and modification times.
- Copyright (C) 2003-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -39,8 +39,7 @@
GNU Emacs, which arranges for this in some other way and which
defines WIN32_LEAN_AND_MEAN itself. */
-#if ((defined _WIN32 || defined __WIN32__) \
- && ! defined __CYGWIN__ && ! defined EMACS_CONFIGURATION)
+#if defined _WIN32 && ! defined __CYGWIN__ && ! defined EMACS_CONFIGURATION
# define USE_SETFILETIME
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
@@ -92,11 +91,11 @@ validate_timespec (struct timespec timespec[2])
if ((timespec[0].tv_nsec != UTIME_NOW
&& timespec[0].tv_nsec != UTIME_OMIT
&& ! (0 <= timespec[0].tv_nsec
- && timespec[0].tv_nsec < TIMESPEC_RESOLUTION))
+ && timespec[0].tv_nsec < TIMESPEC_HZ))
|| (timespec[1].tv_nsec != UTIME_NOW
&& timespec[1].tv_nsec != UTIME_OMIT
&& ! (0 <= timespec[1].tv_nsec
- && timespec[1].tv_nsec < TIMESPEC_RESOLUTION)))
+ && timespec[1].tv_nsec < TIMESPEC_HZ)))
{
errno = EINVAL;
return -1;
diff --git a/gnu/utimens.h b/gnu/utimens.h
index f1dd9884dc1233e4c4902eee3b75fbf6b3b56b10..b17409603615a305e6efa81a68c92abbbf2b3c39 100644
--- a/gnu/utimens.h
+++ b/gnu/utimens.h
@@ -1,6 +1,6 @@
/* Set file access and modification times.
- Copyright 2012-2017 Free Software Foundation, Inc.
+ Copyright 2012-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/gnu/utimensat.c b/gnu/utimensat.c
index 807c4605e25581af05c90e852ed2c06d1189d686..e9ea626e049e33216b4c092a625e6445a95243e5 100644
--- a/gnu/utimensat.c
+++ b/gnu/utimensat.c
@@ -1,5 +1,5 @@
/* Set the access and modification time of a file relative to directory fd.
- Copyright (C) 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -94,10 +94,10 @@ rpl_utimensat (int fd, char const *file, struct timespec const times[2],
else if (times
&& ((times[0].tv_nsec != UTIME_NOW
&& ! (0 <= times[0].tv_nsec
- && times[0].tv_nsec < TIMESPEC_RESOLUTION))
+ && times[0].tv_nsec < TIMESPEC_HZ))
|| (times[1].tv_nsec != UTIME_NOW
&& ! (0 <= times[1].tv_nsec
- && times[1].tv_nsec < TIMESPEC_RESOLUTION))))
+ && times[1].tv_nsec < TIMESPEC_HZ))))
{
errno = EINVAL;
return -1;
diff --git a/gnu/vasnprintf.c b/gnu/vasnprintf.c
index 2462d7d573a90bd80c8aed8850c0349d0822ba1e..c475903726294157ecbbc45ee3dcb344f356219c 100644
--- a/gnu/vasnprintf.c
+++ b/gnu/vasnprintf.c
@@ -1,5 +1,5 @@
/* vsprintf with automatic memory allocation.
- Copyright (C) 1999, 2002-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -860,7 +860,9 @@ convert_to_decimal (mpn_t a, size_t extra_zeroes)
size_t a_len = a.nlimbs;
/* 0.03345 is slightly larger than log(2)/(9*log(10)). */
size_t c_len = 9 * ((size_t)(a_len * (GMP_LIMB_BITS * 0.03345f)) + 1);
- char *c_ptr = (char *) malloc (xsum (c_len, extra_zeroes));
+ /* We need extra_zeroes bytes for zeroes, followed by c_len bytes for the
+ digits of a, followed by 1 byte for the terminating NUL. */
+ char *c_ptr = (char *) malloc (xsum (xsum (extra_zeroes, c_len), 1));
if (c_ptr != NULL)
{
char *d_ptr = c_ptr;
@@ -2694,7 +2696,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
errno = EILSEQ;
return NULL;
}
- if (precision < count)
+ if (precision < (unsigned int) count)
break;
arg_end++;
characters += count;
@@ -4243,7 +4245,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
static const wchar_t decimal_format[] =
/* Produce the same number of exponent digits
as the native printf implementation. */
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
{ '%', '+', '.', '3', 'd', '\0' };
# else
{ '%', '+', '.', '2', 'd', '\0' };
@@ -4257,7 +4259,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
static const char decimal_format[] =
/* Produce the same number of exponent digits
as the native printf implementation. */
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
"%+.3d";
# else
"%+.2d";
@@ -4436,7 +4438,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
static const wchar_t decimal_format[] =
/* Produce the same number of exponent digits
as the native printf implementation. */
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
{ '%', '+', '.', '3', 'd', '\0' };
# else
{ '%', '+', '.', '2', 'd', '\0' };
@@ -4450,7 +4452,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
static const char decimal_format[] =
/* Produce the same number of exponent digits
as the native printf implementation. */
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
"%+.3d";
# else
"%+.2d";
@@ -4508,7 +4510,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
*p++ = '+';
/* Produce the same number of exponent digits as
the native printf implementation. */
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
*p++ = '0';
# endif
*p++ = '0';
@@ -4836,7 +4838,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
#if HAVE_LONG_LONG_INT
case TYPE_LONGLONGINT:
case TYPE_ULONGLONGINT:
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
*fbp++ = 'I';
*fbp++ = '6';
*fbp++ = '4';
@@ -4872,7 +4874,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
&& !defined __UCLIBC__) \
|| (defined __APPLE__ && defined __MACH__) \
- || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+ || (defined _WIN32 && ! defined __CYGWIN__))
fbp[1] = '%';
fbp[2] = 'n';
fbp[3] = '\0';
@@ -5125,7 +5127,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
{
/* Verify that snprintf() has NUL-terminated its
result. */
- if (count < maxlen
+ if ((unsigned int) count < maxlen
&& ((TCHAR_T *) (result + length)) [count] != '\0')
abort ();
/* Portability hack. */
diff --git a/gnu/vasnprintf.h b/gnu/vasnprintf.h
index 6454e3f44d5ee2631f571710b6dcb01542fd1ed3..5b192b21e9bcfd7e7cf6ddc290d4596211b0eee6 100644
--- a/gnu/vasnprintf.h
+++ b/gnu/vasnprintf.h
@@ -1,5 +1,5 @@
/* vsprintf with automatic memory allocation.
- Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2004, 2007-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/vasprintf.c b/gnu/vasprintf.c
index 0963f27d3d9b9a44e0367a951b2fb3f40dca8ffc..f5857ca1d29853befff9376f47066136e97c324d 100644
--- a/gnu/vasprintf.c
+++ b/gnu/vasprintf.c
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999, 2002, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2006-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/verify.h b/gnu/verify.h
index e0b48613374b24e623cdd55e844a4e23a89a4cfc..b2e5f6446e1e34f30a532a5c6e95331c259592a9 100644
--- a/gnu/verify.h
+++ b/gnu/verify.h
@@ -1,6 +1,6 @@
/* Compile-time assert-like macros.
- Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -276,7 +276,8 @@ template <int w>
when 'assume' silences warnings even with older GCCs. */
# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
#else
-# define assume(R) ((void) (0 && (R)))
+ /* Some tools grok NOTREACHED, e.g., Oracle Studio 12.6. */
+# define assume(R) ((R) ? (void) 0 : /*NOTREACHED*/ (void) 0)
#endif
/* @assert.h omit end@ */
diff --git a/gnu/version-etc-fsf.c b/gnu/version-etc-fsf.c
index 52900785889bee524e77982e0d09c2e917f305f2..b00819d103c985e6c3fd4f3fd62c4913ce9f48b3 100644
--- a/gnu/version-etc-fsf.c
+++ b/gnu/version-etc-fsf.c
@@ -1,5 +1,5 @@
/* Variable with FSF copyright information, for version-etc.
- Copyright (C) 1999-2006, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999-2006, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/version-etc.c b/gnu/version-etc.c
index 703740caf744c2cb949bbff6a42fe98a66168803..9ca9a562801c2bb3911b3d2210f53d0940bca331 100644
--- a/gnu/version-etc.c
+++ b/gnu/version-etc.c
@@ -1,5 +1,5 @@
/* Print --version and bug-reporting information in a consistent format.
- Copyright (C) 1999-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
#if USE_UNLOCKED_IO
# include "unlocked-io.h"
@@ -38,7 +37,7 @@
# define PACKAGE PACKAGE_TARNAME
#endif
-enum { COPYRIGHT_YEAR = 2017 };
+enum { COPYRIGHT_YEAR = 2019 };
/* The three functions below display the --version information the
standard way.
@@ -95,8 +94,9 @@ There is NO WARRANTY, to the extent permitted by law.\n\
switch (n_authors)
{
case 0:
- /* The caller must provide at least one author name. */
- abort ();
+ /* No authors are given. The caller should output authorship
+ info after calling this function. */
+ break;
case 1:
/* TRANSLATORS: %s denotes an author name. */
fprintf (stream, _("Written by %s.\n"), authors[0]);
diff --git a/gnu/version-etc.h b/gnu/version-etc.h
index c7323b85f7327ea2aeb29c7f316154c344f0b109..225cfcdd61cabfe38f12063c683314ecdbb218d9 100644
--- a/gnu/version-etc.h
+++ b/gnu/version-etc.h
@@ -1,5 +1,5 @@
/* Print --version and bug-reporting information in a consistent format.
- Copyright (C) 1999, 2003, 2005, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2003, 2005, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/vsnprintf.c b/gnu/vsnprintf.c
index 5aafe2869877a6cf9926e019e3a48c99a09e4f25..6a209f732f3e607785c0f0e31720a9183e123d2a 100644
--- a/gnu/vsnprintf.c
+++ b/gnu/vsnprintf.c
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 2004, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2006-2019 Free Software Foundation, Inc.
Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>.
This program is free software; you can redistribute it and/or modify
diff --git a/gnu/warn-on-use.h b/gnu/warn-on-use.h
index cae8c3eec5c39099130f2b59840bc9056ddacb78..7d11a1569113549cf778164a5e7aea3c3e1e5fdd 100644
--- a/gnu/warn-on-use.h
+++ b/gnu/warn-on-use.h
@@ -1,5 +1,5 @@
/* A C macro for emitting warnings if a function is used.
- Copyright (C) 2010-2017 Free Software Foundation, Inc.
+ Copyright (C) 2010-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
@@ -20,23 +20,32 @@
supported by the compiler. If the compiler does not support this
feature, the macro expands to an unused extern declaration.
- This macro is useful for marking a function as a potential
+ _GL_WARN_ON_USE_ATTRIBUTE ("literal string") expands to the
+ attribute used in _GL_WARN_ON_USE. If the compiler does not support
+ this feature, it expands to empty.
+
+ These macros are useful for marking a function as a potential
portability trap, with the intent that "literal string" include
instructions on the replacement function that should be used
- instead. However, one of the reasons that a function is a
- portability trap is if it has the wrong signature. Declaring
- FUNCTION with a different signature in C is a compilation error, so
- this macro must use the same type as any existing declaration so
- that programs that avoid the problematic FUNCTION do not fail to
- compile merely because they included a header that poisoned the
- function. But this implies that _GL_WARN_ON_USE is only safe to
- use if FUNCTION is known to already have a declaration. Use of
- this macro implies that there must not be any other macro hiding
- the declaration of FUNCTION; but undefining FUNCTION first is part
- of the poisoning process anyway (although for symbols that are
- provided only via a macro, the result is a compilation error rather
- than a warning containing "literal string"). Also note that in
- C++, it is only safe to use if FUNCTION has no overloads.
+ instead.
+ _GL_WARN_ON_USE is for functions with 'extern' linkage.
+ _GL_WARN_ON_USE_ATTRIBUTE is for functions with 'static' or 'inline'
+ linkage.
+
+ However, one of the reasons that a function is a portability trap is
+ if it has the wrong signature. Declaring FUNCTION with a different
+ signature in C is a compilation error, so this macro must use the
+ same type as any existing declaration so that programs that avoid
+ the problematic FUNCTION do not fail to compile merely because they
+ included a header that poisoned the function. But this implies that
+ _GL_WARN_ON_USE is only safe to use if FUNCTION is known to already
+ have a declaration. Use of this macro implies that there must not
+ be any other macro hiding the declaration of FUNCTION; but
+ undefining FUNCTION first is part of the poisoning process anyway
+ (although for symbols that are provided only via a macro, the result
+ is a compilation error rather than a warning containing
+ "literal string"). Also note that in C++, it is only safe to use if
+ FUNCTION has no overloads.
For an example, it is possible to poison 'getline' by:
- adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
@@ -54,12 +63,21 @@
(less common usage, like &environ, will cause a compilation error
rather than issue the nice warning, but the end result of informing
the developer about their portability problem is still achieved):
- #if HAVE_RAW_DECL_ENVIRON
- static char ***rpl_environ (void) { return &environ; }
- _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
- # undef environ
- # define environ (*rpl_environ ())
- #endif
+ #if HAVE_RAW_DECL_ENVIRON
+ static char ***
+ rpl_environ (void) { return &environ; }
+ _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
+ # undef environ
+ # define environ (*rpl_environ ())
+ #endif
+ or better (avoiding contradictory use of 'static' and 'extern'):
+ #if HAVE_RAW_DECL_ENVIRON
+ static char ***
+ _GL_WARN_ON_USE_ATTRIBUTE ("environ is not always properly declared")
+ rpl_environ (void) { return &environ; }
+ # undef environ
+ # define environ (*rpl_environ ())
+ #endif
*/
#ifndef _GL_WARN_ON_USE
@@ -67,13 +85,17 @@
/* A compiler attribute is available in gcc versions 4.3.0 and later. */
# define _GL_WARN_ON_USE(function, message) \
extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# define _GL_WARN_ON_USE_ATTRIBUTE(message) \
+ __attribute__ ((__warning__ (message)))
# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
/* Verify the existence of the function. */
# define _GL_WARN_ON_USE(function, message) \
extern __typeof__ (function) function
+# define _GL_WARN_ON_USE_ATTRIBUTE(message)
# else /* Unsupported. */
# define _GL_WARN_ON_USE(function, message) \
_GL_WARN_EXTERN_C int _gl_warn_on_use
+# define _GL_WARN_ON_USE_ATTRIBUTE(message)
# endif
#endif
diff --git a/gnu/wchar.in.h b/gnu/wchar.in.h
index b3c4b1ef8f90e9e07254f8b9dfe8060b5e6dfa19..17d569129ce3d7d40e88660eb5a1e8463e222514 100644
--- a/gnu/wchar.in.h
+++ b/gnu/wchar.in.h
@@ -1,6 +1,6 @@
/* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/wcrtomb.c b/gnu/wcrtomb.c
index e9f984638301e8adc2a8a6b49cc17ce083337a2f..9fc40cfc9e7a42437195d02618d82323fa832825 100644
--- a/gnu/wcrtomb.c
+++ b/gnu/wcrtomb.c
@@ -1,5 +1,5 @@
/* Convert wide character to multibyte character.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/wctype.in.h b/gnu/wctype.in.h
index f090387018870d76a21b37c3646f0b46eddbed3e..0a7471fd4991930f24f97e6d25e2146cf3599c36 100644
--- a/gnu/wctype.in.h
+++ b/gnu/wctype.in.h
@@ -1,6 +1,6 @@
/* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
- Copyright (C) 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@
isw* functions in <ctype.h>, <wchar.h> as well as in <wctype.h>. Include
<ctype.h>, <wchar.h> in advance to avoid rpl_ prefix being added to the
declarations. */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# include <ctype.h>
# include <wchar.h>
#endif
diff --git a/gnu/wcwidth.c b/gnu/wcwidth.c
index cb2e07f3944af32d9b517e11831a543b18d96cfc..1f081ccaa1203a9a5e54d60449fc6f3b147fb0da 100644
--- a/gnu/wcwidth.c
+++ b/gnu/wcwidth.c
@@ -1,5 +1,5 @@
/* Determine the number of screen columns needed for a character.
- Copyright (C) 2006-2007, 2010-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2007, 2010-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,17 +26,40 @@
#include "streq.h"
#include "uniwidth.h"
+/* Returns 1 if the current locale is an UTF-8 locale, 0 otherwise. */
+static inline int
+is_locale_utf8 (void)
+{
+ const char *encoding = locale_charset ();
+ return STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0);
+}
+
+#if GNULIB_WCHAR_SINGLE
+/* When we know that the locale does not change, provide a speedup by
+ caching the value of is_locale_utf8. */
+static int cached_is_locale_utf8 = -1;
+static inline int
+is_locale_utf8_cached (void)
+{
+ if (cached_is_locale_utf8 < 0)
+ cached_is_locale_utf8 = is_locale_utf8 ();
+ return cached_is_locale_utf8;
+}
+#else
+/* By default, don't make assumptions, hence no caching. */
+# define is_locale_utf8_cached is_locale_utf8
+#endif
+
int
wcwidth (wchar_t wc)
#undef wcwidth
{
/* In UTF-8 locales, use a Unicode aware width function. */
- const char *encoding = locale_charset ();
- if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
+ if (is_locale_utf8_cached ())
{
/* We assume that in a UTF-8 locale, a wide character is the same as a
Unicode character. */
- return uc_width (wc, encoding);
+ return uc_width (wc, "UTF-8");
}
else
{
diff --git a/gnu/write.c b/gnu/write.c
index 91b599170b732c364ee9c23ef56a7f08d6f81cb4..ffa0d068124ed3f790771a18f2ea25e0dabf0659 100644
--- a/gnu/write.c
+++ b/gnu/write.c
@@ -1,5 +1,5 @@
/* POSIX compatible write() function.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@
GetLastError() = ERROR_NO_DATA, and write() in consequence fails with
error EINVAL. */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# include <errno.h>
# include <signal.h>
diff --git a/gnu/xalloc-die.c b/gnu/xalloc-die.c
index 3626c8b5d271910753ccf0aca39b0fc3cee090db..295f8d8e758dd674b722e8062f224caf8d9436a0 100644
--- a/gnu/xalloc-die.c
+++ b/gnu/xalloc-die.c
@@ -1,6 +1,6 @@
/* Report a memory allocation failure and exit.
- Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2017 Free Software
+ Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/xalloc-oversized.h b/gnu/xalloc-oversized.h
index ae4fbc77f98d3a4f19887390bef3bbef5c106fd4..e3068c83c48fdb50f0aa2cbaf739878b0667fac7 100644
--- a/gnu/xalloc-oversized.h
+++ b/gnu/xalloc-oversized.h
@@ -1,6 +1,6 @@
/* xalloc-oversized.h -- memory allocation size checking
- Copyright (C) 1990-2000, 2003-2004, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 1990-2000, 2003-2004, 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/xalloc.h b/gnu/xalloc.h
index 4f675e0a259eb7058a0ee2f5c8083532fa77625a..fc7e86bd89b398a2fa0a7077047f9790d693adcb 100644
--- a/gnu/xalloc.h
+++ b/gnu/xalloc.h
@@ -1,6 +1,6 @@
/* xalloc.h -- malloc with out-of-memory checking
- Copyright (C) 1990-2000, 2003-2004, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 1990-2000, 2003-2004, 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -36,12 +36,6 @@ extern "C" {
#endif
-#if __GNUC__ >= 3
-# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
-#else
-# define _GL_ATTRIBUTE_MALLOC
-#endif
-
#if ! defined __clang__ && \
(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
diff --git a/gnu/xasprintf.c b/gnu/xasprintf.c
index 6de3c359a4059a40f498418e2ac559872e714cd1..8188983fbfb6fdbdfa1308d9f144ad5224616336 100644
--- a/gnu/xasprintf.c
+++ b/gnu/xasprintf.c
@@ -1,5 +1,5 @@
/* vasprintf and asprintf with out-of-memory checking.
- Copyright (C) 1999, 2002-2004, 2006, 2009-2017 Free Software Foundation,
+ Copyright (C) 1999, 2002-2004, 2006, 2009-2019 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/xgetcwd.c b/gnu/xgetcwd.c
index 25fa656083120bd46010708fe05a3bebca1dbe7c..acbbe1cbb00491f0d66c8388d4cefedcb6f340bc 100644
--- a/gnu/xgetcwd.c
+++ b/gnu/xgetcwd.c
@@ -1,6 +1,6 @@
/* xgetcwd.c -- return current directory with unlimited length
- Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2017 Free Software
+ Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/xgetcwd.h b/gnu/xgetcwd.h
index 2064d9bd311d6546c2d811870ebcedaa3f65daec..18b5b9fd762274c5f41b0551ab91da21e3463b2e 100644
--- a/gnu/xgetcwd.h
+++ b/gnu/xgetcwd.h
@@ -1,5 +1,5 @@
/* prototype for xgetcwd
- Copyright (C) 1995, 2001, 2003, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001, 2003, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/xmalloc.c b/gnu/xmalloc.c
index c8dbc6104f4f2c23e632f5d378c6a3270dcb422e..cbe9a4f5671e33d96b9cba0e611eec0a06e4c0c2 100644
--- a/gnu/xmalloc.c
+++ b/gnu/xmalloc.c
@@ -1,6 +1,6 @@
/* xmalloc.c -- malloc with out of memory checking
- Copyright (C) 1990-2000, 2002-2006, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 1990-2000, 2002-2006, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/xsize.h b/gnu/xsize.h
index becaea174f6718e766cf0f276c13d2c59db55a11..ecfd478dcd56f2b497a6aaec6e936c58b381c927 100644
--- a/gnu/xsize.h
+++ b/gnu/xsize.h
@@ -1,6 +1,6 @@
/* xsize.h -- Checked size_t computations.
- Copyright (C) 2003, 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2008-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/xstrndup.c b/gnu/xstrndup.c
index c63d7411c1ea5e232423557a215cf49650b7809f..a9738291130d2769bdfa07f04ee74e87fc54a8ac 100644
--- a/gnu/xstrndup.c
+++ b/gnu/xstrndup.c
@@ -1,6 +1,6 @@
/* Duplicate a bounded initial segment of a string, with out-of-memory
checking.
- Copyright (C) 2003, 2006-2007, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006-2007, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/xstrndup.h b/gnu/xstrndup.h
index 0da5449c888f168271a6ace052a2a2df4bd74aee..360ccfdbb1f233e3d54be15d080b308f88e3d7e3 100644
--- a/gnu/xstrndup.h
+++ b/gnu/xstrndup.h
@@ -1,6 +1,6 @@
/* Duplicate a bounded initial segment of a string, with out-of-memory
checking.
- Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2009-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
/* Return a newly allocated copy of at most N bytes of STRING.
In other words, return a copy of the initial segment of length N of
STRING. */
-extern char *xstrndup (const char *string, size_t n);
+extern char *xstrndup (const char *string, size_t n) _GL_ATTRIBUTE_MALLOC;
diff --git a/gnu/xstrtol-error.c b/gnu/xstrtol-error.c
index 98016d68c50c021098d15a939001a76f408d557a..a0d10c2856180268f8023d074f85f1130814a6fd 100644
--- a/gnu/xstrtol-error.c
+++ b/gnu/xstrtol-error.c
@@ -1,6 +1,6 @@
/* A more useful interface to strtol.
- Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2017 Free Software
+ Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/xstrtol.c b/gnu/xstrtol.c
index 4ff6034c4f908dbe47fef09c4ed83f8de363b1b5..ab73d0403f134633b3bbfcb8627566f3b47a8b0c 100644
--- a/gnu/xstrtol.c
+++ b/gnu/xstrtol.c
@@ -1,6 +1,6 @@
/* A more useful interface to strtol.
- Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2017 Free Software
+ Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -41,20 +41,8 @@
#include <string.h>
#include "assure.h"
-#include "intprops.h"
-/* xstrtoll.c and xstrtoull.c, which include this file, require that
- ULLONG_MAX, LLONG_MAX, LLONG_MIN are defined, but <limits.h> does not
- define them on all platforms. */
-#ifndef ULLONG_MAX
-# define ULLONG_MAX TYPE_MAXIMUM (unsigned long long)
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX TYPE_MAXIMUM (long long int)
-#endif
-#ifndef LLONG_MIN
-# define LLONG_MIN TYPE_MINIMUM (long long int)
-#endif
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
static strtol_error
bkm_scale (__strtol_t *x, int scale_factor)
diff --git a/gnu/xstrtol.h b/gnu/xstrtol.h
index 00ba14d26b72231387b721f14c675393fd113a5e..fff320d504120a10b5c3c975463e046915e73d90 100644
--- a/gnu/xstrtol.h
+++ b/gnu/xstrtol.h
@@ -1,6 +1,6 @@
/* A more useful interface to strtol.
- Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2017 Free Software
+ Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2019 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gnu/xvasprintf.c b/gnu/xvasprintf.c
index f165a384a598f3f54a289a9711c93dae7260f5bd..17b053a38be893913704dc46405a7bc5fad2f6d6 100644
--- a/gnu/xvasprintf.c
+++ b/gnu/xvasprintf.c
@@ -1,5 +1,5 @@
/* vasprintf and asprintf with out-of-memory checking.
- Copyright (C) 1999, 2002-2004, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002-2004, 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gnu/xvasprintf.h b/gnu/xvasprintf.h
index 453f7acba0994a2b22eac8a5e2b4046a18a36e84..d4debccaa53f9c37eeb639f4dfc567900a14f75c 100644
--- a/gnu/xvasprintf.h
+++ b/gnu/xvasprintf.h
@@ -1,5 +1,5 @@
/* vasprintf and asprintf with out-of-memory checking.
- Copyright (C) 2002-2004, 2006-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cc108feb3fef78d0e2bba1a91decb9905081196b..21b0ae85b9cc822c8f53055842149999ed2371c7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,6 @@
# Makefile for GNU tar library. -*- Makefile -*-
-# Copyright 1994-1997, 1999-2001, 2003-2007, 2009-2010, 2013-2014,
-# 2016-2017 Free Software Foundation, Inc.
+# Copyright 1994-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 91b399a9b8d1135420e7783f23fcf222585a90aa..52a0dc0641d7fd3e06328b3c86a3777519346935 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,8 +16,7 @@
# Makefile for GNU tar library. -*- Makefile -*-
-# Copyright 1994-1997, 1999-2001, 2003-2007, 2009-2010, 2013-2014,
-# 2016-2017 Free Software Foundation, Inc.
+# Copyright 1994-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -36,7 +35,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -100,13 +109,11 @@ build_triplet = @build@
host_triplet = @host@
@TAR_COND_XATTR_H_FALSE@am__append_1 = attr/xattr.h
subdir = lib
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+ $(top_srcdir)/m4/__inline.m4 \
$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \
- $(top_srcdir)/m4/asm-underscore.m4 \
$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \
$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \
$(top_srcdir)/m4/canonicalize.m4 \
@@ -126,11 +133,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/extern-inline.m4 \
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \
- $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \
- $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filenamecat.m4 \
- $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
- $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
+ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
+ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
+ $(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fileblocks.m4 \
+ $(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
+ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
+ $(top_srcdir)/m4/fnmatch_h.m4 $(top_srcdir)/m4/fpending.m4 \
$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
$(top_srcdir)/m4/futimens.m4 \
@@ -144,7 +152,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 \
$(top_srcdir)/m4/group-member.m4 \
- $(top_srcdir)/m4/hard-locale.m4 \
$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/human.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \
$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \
@@ -239,6 +246,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -309,6 +318,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/build-aux/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
@@ -400,6 +411,7 @@ GNULIB_FFSL = @GNULIB_FFSL@
GNULIB_FFSLL = @GNULIB_FFSLL@
GNULIB_FGETC = @GNULIB_FGETC@
GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FNMATCH = @GNULIB_FNMATCH@
GNULIB_FOPEN = @GNULIB_FOPEN@
GNULIB_FPRINTF = @GNULIB_FPRINTF@
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
@@ -432,6 +444,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
@@ -448,6 +461,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALENAME = @GNULIB_LOCALENAME@
GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_LSTAT = @GNULIB_LSTAT@
@@ -686,6 +700,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -709,6 +724,9 @@ HAVE_FEATURES_H = @HAVE_FEATURES_H@
HAVE_FFS = @HAVE_FFS@
HAVE_FFSL = @HAVE_FFSL@
HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FNMATCH = @HAVE_FNMATCH@
+HAVE_FNMATCH_H = @HAVE_FNMATCH_H@
+HAVE_FREELOCALE = @HAVE_FREELOCALE@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSTATAT = @HAVE_FSTATAT@
HAVE_FSYNC = @HAVE_FSYNC@
@@ -721,13 +739,16 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
HAVE_GETLOGIN = @HAVE_GETLOGIN@
HAVE_GETOPT_H = @HAVE_GETOPT_H@
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -760,6 +781,7 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -830,7 +852,6 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
HAVE_TIMEGM = @HAVE_TIMEGM@
HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
HAVE_TZSET = @HAVE_TZSET@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
@@ -885,8 +906,6 @@ HAVE_WMEMSET = @HAVE_WMEMSET@
HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
HAVE__BOOL = @HAVE__BOOL@
HAVE__EXIT = @HAVE__EXIT@
-HOST_CPU = @HOST_CPU@
-HOST_CPU_C_ABI = @HOST_CPU_C_ABI@
INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
@@ -931,6 +950,7 @@ NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
+NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
@@ -958,6 +978,7 @@ NEXT_DIRENT_H = @NEXT_DIRENT_H@
NEXT_ERRNO_H = @NEXT_ERRNO_H@
NEXT_FCNTL_H = @NEXT_FCNTL_H@
NEXT_FLOAT_H = @NEXT_FLOAT_H@
+NEXT_FNMATCH_H = @NEXT_FNMATCH_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
@@ -1018,9 +1039,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@
REPLACE_FDOPEN = @REPLACE_FDOPEN@
REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FNMATCH = @REPLACE_FNMATCH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREELOCALE = @REPLACE_FREELOCALE@
REPLACE_FREOPEN = @REPLACE_FREOPEN@
REPLACE_FSEEK = @REPLACE_FSEEK@
REPLACE_FSEEKO = @REPLACE_FSEEKO@
@@ -1038,6 +1061,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
REPLACE_GMTIME = @REPLACE_GMTIME@
REPLACE_ISATTY = @REPLACE_ISATTY@
@@ -1068,6 +1092,7 @@ REPLACE_MKNOD = @REPLACE_MKNOD@
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
REPLACE_MKTIME = @REPLACE_MKTIME@
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@
REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
@@ -1289,7 +1314,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnits lib/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1549,6 +1573,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
rmt-command.h : Makefile
$(AM_V_GEN)rm -f $@-t $@
$(AM_V_at)echo "#ifndef DEFAULT_RMT_COMMAND" >> $@-t
diff --git a/lib/attr-xattr.in.h b/lib/attr-xattr.in.h
index 5052aee69b66797c318222fcfe418b261db69822..62ea723c64767067dbefef2d9440cc8fd59618c4 100644
--- a/lib/attr-xattr.in.h
+++ b/lib/attr-xattr.in.h
@@ -1,5 +1,5 @@
/* Replacement <attr/xattr.h> for platforms that lack it.
- Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 2012-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/lib/stdopen.c b/lib/stdopen.c
index bb9ba6015e9c30a113bc857c016754eba21baac5..0e4f724c4839345d408d9f1f472c661a90c4605d 100644
--- a/lib/stdopen.c
+++ b/lib/stdopen.c
@@ -1,7 +1,6 @@
/* stdopen.c - ensure that the three standard file descriptors are in use
- Copyright 2005, 2007, 2013-2014, 2016-2017 Free Software Foundation,
- Inc.
+ Copyright 2005-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/lib/wordsplit.c b/lib/wordsplit.c
index f2ecadaf7a919f713f5b5a0e82d2cb63d8567056..661a4f8b83eb5fdafdcc9f38478bfb13e5b43d25 100644
--- a/lib/wordsplit.c
+++ b/lib/wordsplit.c
@@ -1,5 +1,5 @@
/* wordsplit - a word splitter
- Copyright (C) 2009-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2018 Sergey Poznyakoff
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -12,10 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
- with this program. If not, see <http://www.gnu.org/licenses/>.
-
- Written by Sergey Poznyakoff
-*/
+ with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -28,6 +25,8 @@
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
+#include <pwd.h>
+#include <glob.h>
#if ENABLE_NLS
# include <gettext.h>
@@ -37,6 +36,14 @@
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+# define FALLTHROUGH ((void) 0)
+# else
+# define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
+
#include <wordsplit.h>
#define ISWS(c) ((c)==' '||(c)=='\t'||(c)=='\n')
@@ -51,13 +58,19 @@
#define ISALNUM(c) (ISALPHA(c) || ISDIGIT(c))
#define ISPRINT(c) (' ' <= ((unsigned) (c)) && ((unsigned) (c)) <= 127)
+#define ISVARBEG(c) (ISALPHA(c) || c == '_')
+#define ISVARCHR(c) (ISALNUM(c) || c == '_')
+
+#define WSP_RETURN_DELIMS(wsp) \
+ ((wsp)->ws_flags & WRDSF_RETURN_DELIMS || ((wsp)->ws_options & WRDSO_MAXWORDS))
+
#define ALLOC_INIT 128
#define ALLOC_INCR 128
static void
_wsplt_alloc_die (struct wordsplit *wsp)
{
- wsp->ws_error (_("memory exhausted"));
+ wsp->ws_error ("%s", _("memory exhausted"));
abort ();
}
@@ -74,6 +87,15 @@ _wsplt_error (const char *fmt, ...)
static void wordsplit_free_nodes (struct wordsplit *);
+static int
+_wsplt_seterr (struct wordsplit *wsp, int ec)
+{
+ wsp->ws_errno = ec;
+ if (wsp->ws_flags & WRDSF_SHOWERR)
+ wordsplit_perror (wsp);
+ return ec;
+}
+
static int
_wsplt_nomem (struct wordsplit *wsp)
{
@@ -89,6 +111,84 @@ _wsplt_nomem (struct wordsplit *wsp)
return wsp->ws_errno;
}
+static int wordsplit_run (const char *command, size_t length,
+ struct wordsplit *wsp,
+ unsigned flags, int lvl);
+
+static int wordsplit_init (struct wordsplit *wsp, const char *input, size_t len,
+ unsigned flags);
+static int wordsplit_process_list (struct wordsplit *wsp, size_t start);
+static int wordsplit_finish (struct wordsplit *wsp);
+
+static int
+_wsplt_subsplit (struct wordsplit *wsp, struct wordsplit *wss,
+ char const *str, int len,
+ unsigned flags, int finalize)
+{
+ int rc;
+
+ wss->ws_delim = wsp->ws_delim;
+ wss->ws_debug = wsp->ws_debug;
+ wss->ws_error = wsp->ws_error;
+ wss->ws_alloc_die = wsp->ws_alloc_die;
+
+ if (!(flags & WRDSF_NOVAR))
+ {
+ wss->ws_env = wsp->ws_env;
+ wss->ws_getvar = wsp->ws_getvar;
+ flags |= wsp->ws_flags & (WRDSF_ENV | WRDSF_ENV_KV | WRDSF_GETVAR);
+ }
+ if (!(flags & WRDSF_NOCMD))
+ {
+ wss->ws_command = wsp->ws_command;
+ }
+
+ if ((flags & (WRDSF_NOVAR|WRDSF_NOCMD)) != (WRDSF_NOVAR|WRDSF_NOCMD))
+ {
+ wss->ws_closure = wsp->ws_closure;
+ flags |= wsp->ws_flags & WRDSF_CLOSURE;
+ }
+
+ wss->ws_options = wsp->ws_options;
+
+ flags |= WRDSF_DELIM
+ | WRDSF_ALLOC_DIE
+ | WRDSF_ERROR
+ | WRDSF_DEBUG
+ | (wsp->ws_flags & (WRDSF_SHOWDBG | WRDSF_SHOWERR | WRDSF_OPTIONS));
+
+ rc = wordsplit_init (wss, str, len, flags);
+ if (rc)
+ return rc;
+ wss->ws_lvl = wsp->ws_lvl + 1;
+ rc = wordsplit_process_list (wss, 0);
+ if (rc)
+ {
+ wordsplit_free_nodes (wss);
+ return rc;
+ }
+ if (finalize)
+ {
+ rc = wordsplit_finish (wss);
+ wordsplit_free_nodes (wss);
+ }
+ return rc;
+}
+
+static void
+_wsplt_seterr_sub (struct wordsplit *wsp, struct wordsplit *wss)
+{
+ if (wsp->ws_errno == WRDSE_USERERR)
+ free (wsp->ws_usererr);
+ wsp->ws_errno = wss->ws_errno;
+ if (wss->ws_errno == WRDSE_USERERR)
+ {
+ wsp->ws_usererr = wss->ws_usererr;
+ wss->ws_errno = WRDSE_EOF;
+ wss->ws_usererr = NULL;
+ }
+}
+
static void
wordsplit_init0 (struct wordsplit *wsp)
{
@@ -96,6 +196,7 @@ wordsplit_init0 (struct wordsplit *wsp)
{
if (!(wsp->ws_flags & WRDSF_APPEND))
wordsplit_free_words (wsp);
+ wordsplit_clearerr (wsp);
}
else
{
@@ -105,12 +206,13 @@ wordsplit_init0 (struct wordsplit *wsp)
}
wsp->ws_errno = 0;
- wsp->ws_head = wsp->ws_tail = NULL;
}
+char wordsplit_c_escape_tab[] = "\\\\\"\"a\ab\bf\fn\nr\rt\tv\v";
+
static int
wordsplit_init (struct wordsplit *wsp, const char *input, size_t len,
- int flags)
+ unsigned flags)
{
wsp->ws_flags = flags;
@@ -119,23 +221,21 @@ wordsplit_init (struct wordsplit *wsp, const char *input, size_t len,
if (!(wsp->ws_flags & WRDSF_ERROR))
wsp->ws_error = _wsplt_error;
- if (!(wsp->ws_flags & WRDSF_NOVAR)
- && !(wsp->ws_flags & (WRDSF_ENV | WRDSF_GETVAR)))
+ if (!(wsp->ws_flags & WRDSF_NOVAR))
{
- errno = EINVAL;
- wsp->ws_errno = WRDSE_USAGE;
- if (wsp->ws_flags & WRDSF_SHOWERR)
- wordsplit_perror (wsp);
- return wsp->ws_errno;
+ /* These will be initialized on first variable assignment */
+ wsp->ws_envidx = wsp->ws_envsiz = 0;
+ wsp->ws_envbuf = NULL;
}
if (!(wsp->ws_flags & WRDSF_NOCMD))
{
- errno = EINVAL;
- wsp->ws_errno = WRDSE_NOSUPP;
- if (wsp->ws_flags & WRDSF_SHOWERR)
- wordsplit_perror (wsp);
- return wsp->ws_errno;
+ if (!wsp->ws_command)
+ {
+ _wsplt_seterr (wsp, WRDSE_USAGE);
+ errno = EINVAL;
+ return wsp->ws_errno;
+ }
}
if (wsp->ws_flags & WRDSF_SHOWDBG)
@@ -166,10 +266,42 @@ wordsplit_init (struct wordsplit *wsp, const char *input, size_t len,
if (!(wsp->ws_flags & WRDSF_CLOSURE))
wsp->ws_closure = NULL;
+ if (!(wsp->ws_flags & WRDSF_OPTIONS))
+ wsp->ws_options = 0;
+
+ if (wsp->ws_flags & WRDSF_ESCAPE)
+ {
+ if (!wsp->ws_escape[WRDSX_WORD])
+ wsp->ws_escape[WRDSX_WORD] = "";
+ if (!wsp->ws_escape[WRDSX_QUOTE])
+ wsp->ws_escape[WRDSX_QUOTE] = "";
+ }
+ else
+ {
+ if (wsp->ws_flags & WRDSF_CESCAPES)
+ {
+ wsp->ws_escape[WRDSX_WORD] = wordsplit_c_escape_tab;
+ wsp->ws_escape[WRDSX_QUOTE] = wordsplit_c_escape_tab;
+ wsp->ws_options |= WRDSO_OESC_QUOTE | WRDSO_OESC_WORD
+ | WRDSO_XESC_QUOTE | WRDSO_XESC_WORD;
+ }
+ else
+ {
+ wsp->ws_escape[WRDSX_WORD] = "";
+ wsp->ws_escape[WRDSX_QUOTE] = "\\\\\"\"";
+ wsp->ws_options |= WRDSO_BSKEEP_QUOTE;
+ }
+ }
+
wsp->ws_endp = 0;
+ wsp->ws_wordi = 0;
+ if (wsp->ws_flags & WRDSF_REUSE)
+ wordsplit_free_nodes (wsp);
+ wsp->ws_head = wsp->ws_tail = NULL;
+
wordsplit_init0 (wsp);
-
+
return 0;
}
@@ -212,6 +344,7 @@ alloc_space (struct wordsplit *wsp, size_t count)
#define _WSNF_NOEXPAND 0x08 /* text is not subject to expansion */
#define _WSNF_JOIN 0x10 /* node must be joined with the next node */
#define _WSNF_SEXP 0x20 /* is a sed expression */
+#define _WSNF_DELIM 0x40 /* node is a delimiter */
#define _WSNF_EMPTYOK 0x0100 /* special flag indicating that
wordsplit_add_segm must add the
@@ -234,9 +367,9 @@ struct wordsplit_node
};
static const char *
-wsnode_flagstr (int flags)
+wsnode_flagstr (unsigned flags)
{
- static char retbuf[6];
+ static char retbuf[7];
char *p = retbuf;
if (flags & _WSNF_WORD)
@@ -261,6 +394,10 @@ wsnode_flagstr (int flags)
*p++ = 's';
else
*p++ = '-';
+ if (flags & _WSNF_DELIM)
+ *p++ = 'd';
+ else
+ *p++ = '-';
*p = 0;
return retbuf;
}
@@ -341,6 +478,14 @@ wsnode_remove (struct wordsplit *wsp, struct wordsplit_node *node)
node->next = node->prev = NULL;
}
+static struct wordsplit_node *
+wsnode_tail (struct wordsplit_node *p)
+{
+ while (p && p->next)
+ p = p->next;
+ return p;
+}
+
static void
wsnode_insert (struct wordsplit *wsp, struct wordsplit_node *node,
struct wordsplit_node *anchor, int before)
@@ -356,22 +501,24 @@ wsnode_insert (struct wordsplit *wsp, struct wordsplit_node *node,
wsnode_insert (wsp, node, anchor->prev, 0);
else
{
+ struct wordsplit_node *tail = wsnode_tail (node);
node->prev = NULL;
- node->next = anchor;
- anchor->prev = node;
+ tail->next = anchor;
+ anchor->prev = tail;
wsp->ws_head = node;
}
}
else
{
struct wordsplit_node *p;
+ struct wordsplit_node *tail = wsnode_tail (node);
p = anchor->next;
if (p)
- p->prev = node;
+ p->prev = tail;
else
- wsp->ws_tail = node;
- node->next = p;
+ wsp->ws_tail = tail;
+ tail->next = p;
node->prev = anchor;
anchor->next = node;
}
@@ -418,10 +565,12 @@ wordsplit_dump_nodes (struct wordsplit *wsp)
for (p = wsp->ws_head, n = 0; p; p = p->next, n++)
{
if (p->flags & _WSNF_WORD)
- wsp->ws_debug ("%4d: %p: %#04x (%s):%s;",
+ wsp->ws_debug ("(%02d) %4d: %p: %#04x (%s):%s;",
+ wsp->ws_lvl,
n, p, p->flags, wsnode_flagstr (p->flags), p->v.word);
else
- wsp->ws_debug ("%4d: %p: %#04x (%s):%.*s;",
+ wsp->ws_debug ("(%02d) %4d: %p: %#04x (%s):%.*s;",
+ wsp->ws_lvl,
n, p, p->flags, wsnode_flagstr (p->flags),
(int) (p->v.segm.end - p->v.segm.beg),
wsp->ws_input + p->v.segm.beg);
@@ -436,11 +585,15 @@ coalesce_segment (struct wordsplit *wsp, struct wordsplit_node *node)
char *buf, *cur;
int stop;
+ if (!(node->flags & _WSNF_JOIN))
+ return 0;
+
for (p = node; p && (p->flags & _WSNF_JOIN); p = p->next)
{
len += wsnode_len (p);
}
- len += wsnode_len (p);
+ if (p)
+ len += wsnode_len (p);
end = p;
buf = malloc (len + 1);
@@ -459,6 +612,7 @@ coalesce_segment (struct wordsplit *wsp, struct wordsplit_node *node)
cur += slen;
if (p != node)
{
+ node->flags |= p->flags & _WSNF_QUOTE;
wsnode_remove (wsp, p);
stop = p == end;
wsnode_free (p);
@@ -478,13 +632,14 @@ coalesce_segment (struct wordsplit *wsp, struct wordsplit_node *node)
return 0;
}
+static void wordsplit_string_unquote_copy (struct wordsplit *ws, int inquote,
+ char *dst, const char *src,
+ size_t n);
+
static int
wsnode_quoteremoval (struct wordsplit *wsp)
{
struct wordsplit_node *p;
- void (*uqfn) (char *, const char *, size_t) =
- (wsp->ws_flags & WRDSF_CESCAPES) ?
- wordsplit_c_unquote_copy : wordsplit_sh_unquote_copy;
for (p = wsp->ws_head; p; p = p->next)
{
@@ -493,9 +648,7 @@ wsnode_quoteremoval (struct wordsplit *wsp)
int unquote;
if (wsp->ws_flags & WRDSF_QUOTE)
- {
- unquote = !(p->flags & _WSNF_NOEXPAND);
- }
+ unquote = !(p->flags & _WSNF_NOEXPAND);
else
unquote = 0;
@@ -512,11 +665,8 @@ wsnode_quoteremoval (struct wordsplit *wsp)
p->flags |= _WSNF_WORD;
}
- if (wsp->ws_flags & WRDSF_ESCAPE)
- wordsplit_general_unquote_copy (p->v.word, str, slen,
- wsp->ws_escape);
- else
- uqfn (p->v.word, str, slen);
+ wordsplit_string_unquote_copy (wsp, p->flags & _WSNF_QUOTE,
+ p->v.word, str, slen);
}
}
return 0;
@@ -536,24 +686,161 @@ wsnode_coalesce (struct wordsplit *wsp)
return 0;
}
+static int
+wsnode_tail_coalesce (struct wordsplit *wsp, struct wordsplit_node *p)
+{
+ if (p->next)
+ {
+ struct wordsplit_node *np = p;
+ while (np && np->next)
+ {
+ np->flags |= _WSNF_JOIN;
+ np = np->next;
+ }
+ if (coalesce_segment (wsp, p))
+ return 1;
+ }
+ return 0;
+}
+
+static size_t skip_delim (struct wordsplit *wsp);
+
static int
wordsplit_finish (struct wordsplit *wsp)
{
struct wordsplit_node *p;
size_t n;
+ int delim;
- n = 0;
+ /* Postprocess delimiters. It would be rather simple, if it weren't for
+ the incremental operation.
- for (p = wsp->ws_head; p; p = p->next)
- n++;
+ Nodes of type _WSNF_DELIM get inserted to the node list if either
+ WRDSF_RETURN_DELIMS flag or WRDSO_MAXWORDS option is set.
+
+ The following cases should be distinguished:
+
+ 1. If both WRDSF_SQUEEZE_DELIMS and WRDSF_RETURN_DELIMS are set, compress
+ any runs of similar delimiter nodes to a single node. The nodes are
+ 'similar' if they point to the same delimiter character.
+
+ If WRDSO_MAXWORDS option is set, stop compressing when
+ ws_wordi + 1 == ws_maxwords, and coalesce the rest of nodes into
+ a single last node.
+
+ 2. If WRDSO_MAXWORDS option is set, but WRDSF_RETURN_DELIMS is not,
+ remove any delimiter nodes. Stop operation when
+ ws_wordi + 1 == ws_maxwords, and coalesce the rest of nodes into
+ a single last node.
+
+ 3. If incremental operation is in progress, restart the loop any time
+ a delimiter node is about to be returned, unless WRDSF_RETURN_DELIMS
+ is set.
+ */
+ again:
+ delim = 0; /* Delimiter being processed (if any) */
+ n = 0; /* Number of words processed so far */
+ p = wsp->ws_head; /* Current node */
+
+ while (p)
+ {
+ struct wordsplit_node *next = p->next;
+ if (p->flags & _WSNF_DELIM)
+ {
+ if (wsp->ws_flags & WRDSF_RETURN_DELIMS)
+ {
+ if (wsp->ws_flags & WRDSF_SQUEEZE_DELIMS)
+ {
+ char const *s = wsnode_ptr (wsp, p);
+ if (delim)
+ {
+ if (delim == *s)
+ {
+ wsnode_remove (wsp, p);
+ p = next;
+ continue;
+ }
+ else
+ {
+ delim = 0;
+ n++; /* Count this node; it will be returned */
+ }
+ }
+ else
+ {
+ delim = *s;
+ p = next;
+ continue;
+ }
+ }
+ }
+ else if (wsp->ws_options & WRDSO_MAXWORDS)
+ {
+ wsnode_remove (wsp, p);
+ p = next;
+ continue;
+ }
+ }
+ else
+ {
+ if (delim)
+ {
+ /* Last node was a delimiter or a compressed run of delimiters;
+ Count it, and clear the delimiter marker */
+ n++;
+ delim = 0;
+ }
+ if (wsp->ws_options & WRDSO_MAXWORDS)
+ {
+ if (wsp->ws_wordi + n + 1 == wsp->ws_maxwords)
+ break;
+ }
+ }
+ n++;
+ if (wsp->ws_flags & WRDSF_INCREMENTAL)
+ p = NULL; /* Break the loop */
+ else
+ p = next;
+ }
+
+ if (p)
+ {
+ /* We're here if WRDSO_MAXWORDS is in effect and wsp->ws_maxwords
+ words have already been collected. Reconstruct a single final
+ node from the remaining nodes. */
+ if (wsnode_tail_coalesce (wsp, p))
+ return wsp->ws_errno;
+ n++;
+ }
+
+ if (n == 0 && (wsp->ws_flags & WRDSF_INCREMENTAL))
+ {
+ /* The loop above have eliminated all nodes. Restart the
+ processing, if there's any input left. */
+ if (wsp->ws_endp < wsp->ws_len)
+ {
+ int rc;
+ if (wsp->ws_flags & WRDSF_SHOWDBG)
+ wsp->ws_debug (_("Restarting"));
+ rc = wordsplit_process_list (wsp, skip_delim (wsp));
+ if (rc)
+ return rc;
+ }
+ else
+ {
+ wsp->ws_error = WRDSE_EOF;
+ return WRDSE_EOF;
+ }
+ goto again;
+ }
if (alloc_space (wsp, n + 1))
- return 1;
+ return wsp->ws_errno;
- for (p = wsp->ws_head; p; p = p->next)
+ while (wsp->ws_head)
{
- const char *str = wsnode_ptr (wsp, p);
- size_t slen = wsnode_len (p);
+ const char *str = wsnode_ptr (wsp, wsp->ws_head);
+ size_t slen = wsnode_len (wsp->ws_head);
char *newstr = malloc (slen + 1);
/* Assign newstr first, even if it is NULL. This way
@@ -565,14 +852,47 @@ wordsplit_finish (struct wordsplit *wsp)
memcpy (newstr, str, slen);
newstr[slen] = 0;
+ wsnode_remove (wsp, wsp->ws_head);
+
wsp->ws_wordc++;
+ wsp->ws_wordi++;
+ if (wsp->ws_flags & WRDSF_INCREMENTAL)
+ break;
}
wsp->ws_wordv[wsp->ws_offs + wsp->ws_wordc] = NULL;
return 0;
}
+int
+wordsplit_append (wordsplit_t *wsp, int argc, char **argv)
+{
+ int rc;
+ size_t i;
+ rc = alloc_space (wsp, wsp->ws_wordc + argc + 1);
+ if (rc)
+ return rc;
+ for (i = 0; i < argc; i++)
+ {
+ char *newstr = strdup (argv[i]);
+ if (!newstr)
+ {
+ while (i > 0)
+ {
+ free (wsp->ws_wordv[wsp->ws_offs + wsp->ws_wordc + i - 1]);
+ wsp->ws_wordv[wsp->ws_offs + wsp->ws_wordc + i - 1] = NULL;
+ i--;
+ }
+ return _wsplt_nomem (wsp);
+ }
+ wsp->ws_wordv[wsp->ws_offs + wsp->ws_wordc + i] = newstr;
+ }
+ wsp->ws_wordc += i;
+ wsp->ws_wordv[wsp->ws_offs + wsp->ws_wordc] = NULL;
+ return 0;
+}
+
/* Variable expansion */
static int
node_split_prefix (struct wordsplit *wsp,
@@ -609,10 +929,10 @@ node_split_prefix (struct wordsplit *wsp,
}
static int
-find_closing_cbrace (const char *str, size_t i, size_t len, size_t * poff)
+find_closing_paren (const char *str, size_t i, size_t len, size_t *poff,
+ char const *paren)
{
- enum
- { st_init, st_squote, st_dquote } state = st_init;
+ enum { st_init, st_squote, st_dquote } state = st_init;
size_t level = 1;
for (; i < len; i++)
@@ -622,18 +942,23 @@ find_closing_cbrace (const char *str, size_t i, size_t len, size_t * poff)
case st_init:
switch (str[i])
{
- case '{':
- level++;
- break;
-
- case '}':
- if (--level == 0)
+ default:
+ if (str[i] == paren[0])
{
- *poff = i;
- return 0;
+ level++;
+ break;
+ }
+ else if (str[i] == paren[1])
+ {
+ if (--level == 0)
+ {
+ *poff = i;
+ return 0;
+ }
+ break;
}
break;
-
+
case '"':
state = st_dquote;
break;
@@ -660,13 +985,14 @@ find_closing_cbrace (const char *str, size_t i, size_t len, size_t * poff)
return 1;
}
-static const char *
-wordsplit_find_env (struct wordsplit *wsp, const char *name, size_t len)
+static int
+wordsplit_find_env (struct wordsplit *wsp, const char *name, size_t len,
+ char const **ret)
{
size_t i;
if (!(wsp->ws_flags & WRDSF_ENV))
- return NULL;
+ return WRDSE_UNDEF;
if (wsp->ws_flags & WRDSF_ENV_KV)
{
@@ -675,14 +1001,17 @@ wordsplit_find_env (struct wordsplit *wsp, const char *name, size_t len)
{
size_t elen = strlen (wsp->ws_env[i]);
if (elen == len && memcmp (wsp->ws_env[i], name, elen) == 0)
- return wsp->ws_env[i + 1];
+ {
+ *ret = wsp->ws_env[i + 1];
+ return WRDSE_OK;
+ }
/* Skip the value. Break the loop if it is NULL. */
i++;
if (wsp->ws_env[i] == NULL)
break;
}
}
- else
+ else if (wsp->ws_env)
{
/* Usual (A=B) environment. */
for (i = 0; wsp->ws_env[i]; i++)
@@ -694,27 +1023,137 @@ wordsplit_find_env (struct wordsplit *wsp, const char *name, size_t len)
if (name[j] != var[j])
break;
if (j == len && var[j] == '=')
- return var + j + 1;
+ {
+ *ret = var + j + 1;
+ return WRDSE_OK;
+ }
+ }
+ }
+ return WRDSE_UNDEF;
+}
+
+static int
+wsplt_assign_var (struct wordsplit *wsp, const char *name, size_t namelen,
+ char *value)
+{
+ int n = (wsp->ws_flags & WRDSF_ENV_KV) ? 2 : 1;
+ char *v;
+
+ if (wsp->ws_envidx + n >= wsp->ws_envsiz)
+ {
+ size_t sz;
+ char **newenv;
+
+ if (!wsp->ws_envbuf)
+ {
+ if (wsp->ws_flags & WRDSF_ENV)
+ {
+ size_t i = 0, j;
+
+ if (wsp->ws_env)
+ {
+ for (; wsp->ws_env[i]; i++)
+ ;
+ }
+
+ sz = i + n + 1;
+
+ newenv = calloc (sz, sizeof(newenv[0]));
+ if (!newenv)
+ return _wsplt_nomem (wsp);
+
+ for (j = 0; j < i; j++)
+ {
+ newenv[j] = strdup (wsp->ws_env[j]);
+ if (!newenv[j])
+ {
+ for (; j > 1; j--)
+ free (newenv[j-1]);
+ free (newenv[j-1]);
+ free (newenv);
+ return _wsplt_nomem (wsp);
+ }
+ }
+ newenv[j] = NULL;
+
+ wsp->ws_envbuf = newenv;
+ wsp->ws_envidx = i;
+ wsp->ws_envsiz = sz;
+ wsp->ws_env = (const char**) wsp->ws_envbuf;
+ }
+ else
+ {
+ newenv = calloc (WORDSPLIT_ENV_INIT, sizeof(newenv[0]));
+ if (!newenv)
+ return _wsplt_nomem (wsp);
+ wsp->ws_envbuf = newenv;
+ wsp->ws_envidx = 0;
+ wsp->ws_envsiz = WORDSPLIT_ENV_INIT;
+ wsp->ws_env = (const char**) wsp->ws_envbuf;
+ wsp->ws_flags |= WRDSF_ENV;
+ }
+ }
+ else
+ {
+ wsp->ws_envsiz *= 2;
+ newenv = realloc (wsp->ws_envbuf,
+ wsp->ws_envsiz * sizeof (wsp->ws_envbuf[0]));
+ if (!newenv)
+ return _wsplt_nomem (wsp);
+ wsp->ws_envbuf = newenv;
+ wsp->ws_env = (const char**) wsp->ws_envbuf;
+ }
+ }
+
+ if (wsp->ws_flags & WRDSF_ENV_KV)
+ {
+ /* A key-value pair environment */
+ char *p = malloc (namelen + 1);
+ if (!p)
+ return _wsplt_nomem (wsp);
+ memcpy (p, name, namelen);
+ p[namelen] = 0;
+
+ v = strdup (value);
+ if (!v)
+ {
+ free (p);
+ return _wsplt_nomem (wsp);
}
+ wsp->ws_env[wsp->ws_envidx++] = p;
+ wsp->ws_env[wsp->ws_envidx++] = v;
+ }
+ else
+ {
+ v = malloc (namelen + strlen(value) + 2);
+ if (!v)
+ return _wsplt_nomem (wsp);
+ memcpy (v, name, namelen);
+ v[namelen++] = '=';
+ strcpy(v + namelen, value);
+ wsp->ws_env[wsp->ws_envidx++] = v;
}
- return NULL;
+ wsp->ws_env[wsp->ws_envidx++] = NULL;
+ return WRDSE_OK;
}
static int
expvar (struct wordsplit *wsp, const char *str, size_t len,
- struct wordsplit_node **ptail, const char **pend, int flg)
+ struct wordsplit_node **ptail, const char **pend, unsigned flg)
{
size_t i = 0;
const char *defstr = NULL;
- const char *value;
+ char *value;
const char *vptr;
struct wordsplit_node *newnode;
const char *start = str - 1;
-
- if (ISALPHA (str[0]) || str[0] == '_')
+ int rc;
+ struct wordsplit ws;
+
+ if (ISVARBEG (str[0]))
{
for (i = 1; i < len; i++)
- if (!(ISALNUM (str[i]) || str[i] == '_'))
+ if (!ISVARCHR (str[i]))
break;
*pend = str + i - 1;
}
@@ -723,30 +1162,36 @@ expvar (struct wordsplit *wsp, const char *str, size_t len,
str++;
len--;
for (i = 1; i < len; i++)
- if (str[i] == '}' || str[i] == ':')
- break;
- if (str[i] == ':')
{
- size_t j;
-
- defstr = str + i + 1;
- if (find_closing_cbrace (str, i + 1, len, &j))
+ if (str[i] == ':')
{
- wsp->ws_errno = WRDSE_CBRACE;
- return 1;
+ size_t j;
+
+ defstr = str + i + 1;
+ if (find_closing_paren (str, i + 1, len, &j, "{}"))
+ return _wsplt_seterr (wsp, WRDSE_CBRACE);
+ *pend = str + j;
+ break;
+ }
+ else if (str[i] == '}')
+ {
+ defstr = NULL;
+ *pend = str + i;
+ break;
+ }
+ else if (strchr ("-+?=", str[i]))
+ {
+ size_t j;
+
+ defstr = str + i;
+ if (find_closing_paren (str, i, len, &j, "{}"))
+ return _wsplt_seterr (wsp, WRDSE_CBRACE);
+ *pend = str + j;
+ break;
}
- *pend = str + j;
- }
- else if (str[i] == '}')
- {
- defstr = NULL;
- *pend = str + i;
- }
- else
- {
- wsp->ws_errno = WRDSE_CBRACE;
- return 1;
}
+ if (i == len)
+ return _wsplt_seterr (wsp, WRDSE_CBRACE);
}
else
{
@@ -770,51 +1215,162 @@ expvar (struct wordsplit *wsp, const char *str, size_t len,
i - its length
defstr - default replacement str */
- vptr = wordsplit_find_env (wsp, str, i);
- if (vptr)
- {
- value = strdup (vptr);
- if (!value)
- return _wsplt_nomem (wsp);
- }
- else if (wsp->ws_flags & WRDSF_GETVAR)
- value = wsp->ws_getvar (str, i, wsp->ws_closure);
- else if (wsp->ws_flags & WRDSF_UNDEF)
+ if (defstr && strchr("-+?=", defstr[0]) == 0)
{
- wsp->ws_errno = WRDSE_UNDEF;
- if (wsp->ws_flags & WRDSF_SHOWERR)
- wordsplit_perror (wsp);
- return 1;
+ rc = WRDSE_UNDEF;
+ defstr = NULL;
}
else
{
- if (wsp->ws_flags & WRDSF_WARNUNDEF)
- wsp->ws_error (_("warning: undefined variable `%.*s'"), (int) i, str);
- if (wsp->ws_flags & WRDSF_KEEPUNDEF)
- value = NULL;
+ rc = wordsplit_find_env (wsp, str, i, &vptr);
+ if (rc == WRDSE_OK)
+ {
+ if (vptr)
+ {
+ value = strdup (vptr);
+ if (!value)
+ rc = WRDSE_NOSPACE;
+ }
+ else
+ rc = WRDSE_UNDEF;
+ }
+ else if (wsp->ws_flags & WRDSF_GETVAR)
+ rc = wsp->ws_getvar (&value, str, i, wsp->ws_closure);
else
- value = "";
- }
-
- /* FIXME: handle defstr */
- (void) defstr;
+ rc = WRDSE_UNDEF;
- if (value)
+ if (rc == WRDSE_OK
+ && (!value || value[0] == 0)
+ && defstr && defstr[-1] == ':')
+ {
+ free (value);
+ rc = WRDSE_UNDEF;
+ }
+ }
+
+ switch (rc)
{
- if (flg & _WSNF_QUOTE)
+ case WRDSE_OK:
+ if (defstr && *defstr == '+')
{
- if (wsnode_new (wsp, &newnode))
- return 1;
- wsnode_insert (wsp, newnode, *ptail, 0);
- *ptail = newnode;
- newnode->flags = _WSNF_WORD | _WSNF_NOEXPAND | flg;
- newnode->v.word = strdup (value);
- if (!newnode->v.word)
- return _wsplt_nomem (wsp);
+ size_t size = *pend - ++defstr;
+
+ rc = _wsplt_subsplit (wsp, &ws, defstr, size,
+ WRDSF_NOSPLIT | WRDSF_WS | WRDSF_QUOTE |
+ (wsp->ws_flags &
+ (WRDSF_NOVAR | WRDSF_NOCMD)), 1);
+ if (rc)
+ return rc;
+ free (value);
+ value = ws.ws_wordv[0];
+ ws.ws_wordv[0] = NULL;
+ wordsplit_free (&ws);
}
- else if (*value == 0)
+ break;
+
+ case WRDSE_UNDEF:
+ if (defstr)
{
- /* Empty string is a special case */
+ size_t size;
+ if (*defstr == '-' || *defstr == '=')
+ {
+ size = *pend - ++defstr;
+
+ rc = _wsplt_subsplit (wsp, &ws, defstr, size,
+ WRDSF_NOSPLIT | WRDSF_WS | WRDSF_QUOTE |
+ (wsp->ws_flags &
+ (WRDSF_NOVAR | WRDSF_NOCMD)),
+ 1);
+ if (rc)
+ return rc;
+
+ value = ws.ws_wordv[0];
+ ws.ws_wordv[0] = NULL;
+ wordsplit_free (&ws);
+
+ if (defstr[-1] == '=')
+ wsplt_assign_var (wsp, str, i, value);
+ }
+ else
+ {
+ if (*defstr == '?')
+ {
+ size = *pend - ++defstr;
+ if (size == 0)
+ wsp->ws_error (_("%.*s: variable null or not set"),
+ (int) i, str);
+ else
+ {
+ rc = _wsplt_subsplit (wsp, &ws, defstr, size,
+ WRDSF_NOSPLIT | WRDSF_WS |
+ WRDSF_QUOTE |
+ (wsp->ws_flags &
+ (WRDSF_NOVAR | WRDSF_NOCMD)),
+ 1);
+ if (rc == 0)
+ wsp->ws_error ("%.*s: %s",
+ (int) i, str, ws.ws_wordv[0]);
+ else
+ wsp->ws_error ("%.*s: %.*s",
+ (int) i, str, (int) size, defstr);
+ wordsplit_free (&ws);
+ }
+ }
+ value = NULL;
+ }
+ }
+ else if (wsp->ws_flags & WRDSF_UNDEF)
+ {
+ _wsplt_seterr (wsp, WRDSE_UNDEF);
+ return 1;
+ }
+ else
+ {
+ if (wsp->ws_flags & WRDSF_WARNUNDEF)
+ wsp->ws_error (_("warning: undefined variable `%.*s'"),
+ (int) i, str);
+ if (wsp->ws_flags & WRDSF_KEEPUNDEF)
+ value = NULL;
+ else
+ {
+ value = strdup ("");
+ if (!value)
+ return _wsplt_nomem (wsp);
+ }
+ }
+ break;
+
+ case WRDSE_NOSPACE:
+ return _wsplt_nomem (wsp);
+
+ case WRDSE_USERERR:
+ if (wsp->ws_errno == WRDSE_USERERR)
+ free (wsp->ws_usererr);
+ wsp->ws_usererr = value;
+ FALLTHROUGH;
+ default:
+ _wsplt_seterr (wsp, rc);
+ return 1;
+ }
+
+ if (value)
+ {
+ if (flg & _WSNF_QUOTE)
+ {
+ if (wsnode_new (wsp, &newnode))
+ {
+ free (value);
+ return 1;
+ }
+ wsnode_insert (wsp, newnode, *ptail, 0);
+ *ptail = newnode;
+ newnode->flags = _WSNF_WORD | _WSNF_NOEXPAND | flg;
+ newnode->v.word = value;
+ }
+ else if (*value == 0)
+ {
+ free (value);
+ /* Empty string is a special case */
if (wsnode_new (wsp, &newnode))
return 1;
wsnode_insert (wsp, newnode, *ptail, 0);
@@ -824,28 +1380,23 @@ expvar (struct wordsplit *wsp, const char *str, size_t len,
else
{
struct wordsplit ws;
- int i;
-
- ws.ws_delim = wsp->ws_delim;
- if (wordsplit (value, &ws,
- WRDSF_NOVAR | WRDSF_NOCMD | WRDSF_DELIM | WRDSF_WS))
+ int rc;
+
+ rc = _wsplt_subsplit (wsp, &ws, value, strlen (value),
+ WRDSF_NOVAR | WRDSF_NOCMD |
+ WRDSF_QUOTE
+ | (WSP_RETURN_DELIMS (wsp) ? WRDSF_RETURN_DELIMS : 0) ,
+ 0);
+ free (value);
+ if (rc)
{
+ _wsplt_seterr_sub (wsp, &ws);
wordsplit_free (&ws);
return 1;
}
- for (i = 0; i < ws.ws_wordc; i++)
- {
- if (wsnode_new (wsp, &newnode))
- return 1;
- wsnode_insert (wsp, newnode, *ptail, 0);
- *ptail = newnode;
- newnode->flags = _WSNF_WORD |
- _WSNF_NOEXPAND |
- (i + 1 < ws.ws_wordc ? (flg & ~_WSNF_JOIN) : flg);
- newnode->v.word = strdup (ws.ws_wordv[i]);
- if (!newnode->v.word)
- return _wsplt_nomem (wsp);
- }
+ wsnode_insert (wsp, ws.ws_head, *ptail, 0);
+ *ptail = ws.ws_tail;
+ ws.ws_head = ws.ws_tail = NULL;
wordsplit_free (&ws);
}
}
@@ -876,7 +1427,19 @@ expvar (struct wordsplit *wsp, const char *str, size_t len,
}
static int
-node_expand_vars (struct wordsplit *wsp, struct wordsplit_node *node)
+begin_var_p (int c)
+{
+ return c == '{' || ISVARBEG (c);
+}
+
+static int
+node_expand (struct wordsplit *wsp, struct wordsplit_node *node,
+ int (*beg_p) (int),
+ int (*ws_exp_fn) (struct wordsplit *wsp,
+ const char *str, size_t len,
+ struct wordsplit_node **ptail,
+ const char **pend,
+ unsigned flg))
{
const char *str = wsnode_ptr (wsp, node);
size_t slen = wsnode_len (node);
@@ -892,7 +1455,7 @@ node_expand_vars (struct wordsplit *wsp, struct wordsplit_node *node)
p++;
continue;
}
- if (*p == '$')
+ if (*p == '$' && beg_p (p[1]))
{
size_t n = p - str;
@@ -901,8 +1464,8 @@ node_expand_vars (struct wordsplit *wsp, struct wordsplit_node *node)
if (node_split_prefix (wsp, &tail, node, off, n, _WSNF_JOIN))
return 1;
p++;
- if (expvar (wsp, p, slen - n, &tail, &p,
- node->flags & (_WSNF_JOIN | _WSNF_QUOTE)))
+ if (ws_exp_fn (wsp, p, slen - n, &tail, &p,
+ node->flags & (_WSNF_JOIN | _WSNF_QUOTE)))
return 1;
off += p - str + 1;
str = p + 1;
@@ -913,7 +1476,7 @@ node_expand_vars (struct wordsplit *wsp, struct wordsplit_node *node)
if (tail != node)
tail->flags |= _WSNF_JOIN;
if (node_split_prefix (wsp, &tail, node, off, p - str,
- node->flags & _WSNF_JOIN))
+ node->flags & (_WSNF_JOIN|_WSNF_QUOTE)))
return 1;
}
if (tail != node)
@@ -923,8 +1486,8 @@ node_expand_vars (struct wordsplit *wsp, struct wordsplit_node *node)
}
return 0;
}
-
-/* Remove NULL lists */
+
+/* Remove NULL nodes from the list */
static void
wsnode_nullelim (struct wordsplit *wsp)
{
@@ -933,6 +1496,8 @@ wsnode_nullelim (struct wordsplit *wsp)
for (p = wsp->ws_head; p;)
{
struct wordsplit_node *next = p->next;
+ if (p->flags & _WSNF_DELIM && p->prev)
+ p->prev->flags &= ~_WSNF_JOIN;
if (p->flags & _WSNF_NULL)
{
wsnode_remove (wsp, p);
@@ -947,11 +1512,140 @@ wordsplit_varexp (struct wordsplit *wsp)
{
struct wordsplit_node *p;
+ for (p = wsp->ws_head; p;)
+ {
+ struct wordsplit_node *next = p->next;
+ if (!(p->flags & (_WSNF_NOEXPAND|_WSNF_DELIM)))
+ if (node_expand (wsp, p, begin_var_p, expvar))
+ return 1;
+ p = next;
+ }
+
+ wsnode_nullelim (wsp);
+ return 0;
+}
+
+static int
+begin_cmd_p (int c)
+{
+ return c == '(';
+}
+
+static int
+expcmd (struct wordsplit *wsp, const char *str, size_t len,
+ struct wordsplit_node **ptail, const char **pend, unsigned flg)
+{
+ int rc;
+ size_t j;
+ char *value;
+ struct wordsplit_node *newnode;
+
+ str++;
+ len--;
+
+ if (find_closing_paren (str, 0, len, &j, "()"))
+ {
+ _wsplt_seterr (wsp, WRDSE_PAREN);
+ return 1;
+ }
+
+ *pend = str + j;
+ if (wsp->ws_options & WRDSO_ARGV)
+ {
+ struct wordsplit ws;
+
+ rc = _wsplt_subsplit (wsp, &ws, str, j, WRDSF_WS | WRDSF_QUOTE, 1);
+ if (rc)
+ {
+ _wsplt_seterr_sub (wsp, &ws);
+ wordsplit_free (&ws);
+ return 1;
+ }
+ rc = wsp->ws_command (&value, str, j, ws.ws_wordv, wsp->ws_closure);
+ wordsplit_free (&ws);
+ }
+ else
+ rc = wsp->ws_command (&value, str, j, NULL, wsp->ws_closure);
+
+ if (rc == WRDSE_NOSPACE)
+ return _wsplt_nomem (wsp);
+ else if (rc)
+ {
+ if (rc == WRDSE_USERERR)
+ {
+ if (wsp->ws_errno == WRDSE_USERERR)
+ free (wsp->ws_usererr);
+ wsp->ws_usererr = value;
+ }
+ _wsplt_seterr (wsp, rc);
+ return 1;
+ }
+
+ if (value)
+ {
+ if (flg & _WSNF_QUOTE)
+ {
+ if (wsnode_new (wsp, &newnode))
+ return 1;
+ wsnode_insert (wsp, newnode, *ptail, 0);
+ *ptail = newnode;
+ newnode->flags = _WSNF_WORD | _WSNF_NOEXPAND | flg;
+ newnode->v.word = value;
+ }
+ else if (*value == 0)
+ {
+ free (value);
+ /* Empty string is a special case */
+ if (wsnode_new (wsp, &newnode))
+ return 1;
+ wsnode_insert (wsp, newnode, *ptail, 0);
+ *ptail = newnode;
+ newnode->flags = _WSNF_NULL;
+ }
+ else
+ {
+ struct wordsplit ws;
+ int rc;
+
+ rc = _wsplt_subsplit (wsp, &ws, value, strlen (value),
+ WRDSF_NOVAR | WRDSF_NOCMD
+ | WRDSF_WS | WRDSF_QUOTE
+ | (WSP_RETURN_DELIMS (wsp) ? WRDSF_RETURN_DELIMS : 0),
+ 0);
+ free (value);
+ if (rc)
+ {
+ _wsplt_seterr_sub (wsp, &ws);
+ wordsplit_free (&ws);
+ return 1;
+ }
+ wsnode_insert (wsp, ws.ws_head, *ptail, 0);
+ *ptail = ws.ws_tail;
+ ws.ws_head = ws.ws_tail = NULL;
+ wordsplit_free (&ws);
+ }
+ }
+ else
+ {
+ if (wsnode_new (wsp, &newnode))
+ return 1;
+ wsnode_insert (wsp, newnode, *ptail, 0);
+ *ptail = newnode;
+ newnode->flags = _WSNF_NULL;
+ }
+ return 0;
+}
+
+static int
+wordsplit_cmdexp (struct wordsplit *wsp)
+{
+ struct wordsplit_node *p;
+
for (p = wsp->ws_head; p;)
{
struct wordsplit_node *next = p->next;
if (!(p->flags & _WSNF_NOEXPAND))
- if (node_expand_vars (wsp, p))
+ if (node_expand (wsp, p, begin_cmd_p, expcmd))
return 1;
p = next;
}
@@ -963,7 +1657,7 @@ wordsplit_varexp (struct wordsplit *wsp)
/* Strip off any leading and trailing whitespace. This function is called
right after the initial scanning, therefore it assumes that every
node in the list is a text reference node. */
-static void
+static int
wordsplit_trimws (struct wordsplit *wsp)
{
struct wordsplit_node *p;
@@ -972,14 +1666,21 @@ wordsplit_trimws (struct wordsplit *wsp)
{
size_t n;
+ if (!(p->flags & _WSNF_QUOTE))
+ {
+ /* Skip leading whitespace: */
+ for (n = p->v.segm.beg; n < p->v.segm.end && ISWS (wsp->ws_input[n]);
+ n++)
+ ;
+ p->v.segm.beg = n;
+ }
+
+ while (p->next && (p->flags & _WSNF_JOIN))
+ p = p->next;
+
if (p->flags & _WSNF_QUOTE)
continue;
-
- /* Skip leading whitespace: */
- for (n = p->v.segm.beg; n < p->v.segm.end && ISWS (wsp->ws_input[n]);
- n++)
- ;
- p->v.segm.beg = n;
+
/* Trim trailing whitespace */
for (n = p->v.segm.end;
n > p->v.segm.beg && ISWS (wsp->ws_input[n - 1]); n--);
@@ -989,6 +1690,194 @@ wordsplit_trimws (struct wordsplit *wsp)
}
wsnode_nullelim (wsp);
+ return 0;
+}
+
+static int
+wordsplit_tildexpand (struct wordsplit *wsp)
+{
+ struct wordsplit_node *p;
+ char *uname = NULL;
+ size_t usize = 0;
+
+ for (p = wsp->ws_head; p; p = p->next)
+ {
+ const char *str;
+
+ if (p->flags & _WSNF_QUOTE)
+ continue;
+
+ str = wsnode_ptr (wsp, p);
+ if (str[0] == '~')
+ {
+ size_t i, size, dlen;
+ size_t slen = wsnode_len (p);
+ struct passwd *pw;
+ char *newstr;
+
+ for (i = 1; i < slen && str[i] != '/'; i++)
+ ;
+ if (i == slen)
+ continue;
+ if (i > 1)
+ {
+ if (i > usize)
+ {
+ char *p = realloc (uname, i);
+ if (!p)
+ {
+ free (uname);
+ return _wsplt_nomem (wsp);
+ }
+ uname = p;
+ usize = i;
+ }
+ --i;
+ memcpy (uname, str + 1, i);
+ uname[i] = 0;
+ pw = getpwnam (uname);
+ }
+ else
+ pw = getpwuid (getuid ());
+
+ if (!pw)
+ continue;
+
+ dlen = strlen (pw->pw_dir);
+ size = slen - i + dlen;
+ newstr = malloc (size);
+ if (!newstr)
+ {
+ free (uname);
+ return _wsplt_nomem (wsp);
+ }
+ --size;
+
+ memcpy (newstr, pw->pw_dir, dlen);
+ memcpy (newstr + dlen, str + i + 1, slen - i - 1);
+ newstr[size] = 0;
+ if (p->flags & _WSNF_WORD)
+ free (p->v.word);
+ p->v.word = newstr;
+ p->flags |= _WSNF_WORD;
+ }
+ }
+ free (uname);
+ return 0;
+}
+
+static int
+isglob (const char *s, int l)
+{
+ while (l--)
+ {
+ if (strchr ("*?[", *s++))
+ return 1;
+ }
+ return 0;
+}
+
+static int
+wordsplit_pathexpand (struct wordsplit *wsp)
+{
+ struct wordsplit_node *p, *next;
+ size_t slen;
+ int flags = 0;
+
+#ifdef GLOB_PERIOD
+ if (wsp->ws_options & WRDSO_DOTGLOB)
+ flags = GLOB_PERIOD;
+#endif
+
+ for (p = wsp->ws_head; p; p = next)
+ {
+ const char *str;
+
+ next = p->next;
+
+ if (p->flags & _WSNF_QUOTE)
+ continue;
+
+ str = wsnode_ptr (wsp, p);
+ slen = wsnode_len (p);
+
+ if (isglob (str, slen))
+ {
+ int i;
+ glob_t g;
+ struct wordsplit_node *prev;
+ char *pattern;
+
+ pattern = malloc (slen + 1);
+ if (!pattern)
+ return _wsplt_nomem (wsp);
+ memcpy (pattern, str, slen);
+ pattern[slen] = 0;
+
+ switch (glob (pattern, flags, NULL, &g))
+ {
+ case 0:
+ free (pattern);
+ break;
+
+ case GLOB_NOSPACE:
+ free (pattern);
+ return _wsplt_nomem (wsp);
+
+ case GLOB_NOMATCH:
+ if (wsp->ws_options & WRDSO_NULLGLOB)
+ {
+ wsnode_remove (wsp, p);
+ wsnode_free (p);
+ }
+ else if (wsp->ws_options & WRDSO_FAILGLOB)
+ {
+ char buf[128];
+ if (wsp->ws_errno == WRDSE_USERERR)
+ free (wsp->ws_usererr);
+ snprintf (buf, sizeof (buf), _("no files match pattern %s"),
+ pattern);
+ free (pattern);
+ wsp->ws_usererr = strdup (buf);
+ if (!wsp->ws_usererr)
+ return _wsplt_nomem (wsp);
+ else
+ return _wsplt_seterr (wsp, WRDSE_USERERR);
+ }
+ free (pattern);
+ continue;
+
+ default:
+ free (pattern);
+ return _wsplt_seterr (wsp, WRDSE_GLOBERR);
+ }
+
+ prev = p;
+ for (i = 0; i < g.gl_pathc; i++)
+ {
+ struct wordsplit_node *newnode;
+ char *newstr;
+
+ if (wsnode_new (wsp, &newnode))
+ return 1;
+ newstr = strdup (g.gl_pathv[i]);
+ if (!newstr)
+ {
+ wsnode_free (newnode);
+ return _wsplt_nomem (wsp);
+ }
+ newnode->v.word = newstr;
+ newnode->flags |= _WSNF_WORD|_WSNF_QUOTE;
+ wsnode_insert (wsp, newnode, prev, 0);
+ prev = newnode;
+ }
+ globfree (&g);
+
+ wsnode_remove (wsp, p);
+ wsnode_free (p);
+ }
+ }
+ return 0;
}
static int
@@ -1024,33 +1913,24 @@ skip_sed_expr (const char *command, size_t i, size_t len)
return i;
}
-static size_t
-skip_delim (struct wordsplit *wsp)
+/* wsp->ws_endp points to a delimiter character. If RETURN_DELIMS
+ is true, return its value, otherwise return the index past it. */
+static inline size_t
+skip_delim_internal (struct wordsplit *wsp, int return_delims)
{
- size_t start = wsp->ws_endp;
- if (wsp->ws_flags & WRDSF_SQUEEZE_DELIMS)
- {
- if ((wsp->ws_flags & WRDSF_RETURN_DELIMS) &&
- ISDELIM (wsp, wsp->ws_input[start]))
- {
- int delim = wsp->ws_input[start];
- do
- start++;
- while (start < wsp->ws_len && delim == wsp->ws_input[start]);
- }
- else
- {
- do
- start++;
- while (start < wsp->ws_len && ISDELIM (wsp, wsp->ws_input[start]));
- }
- start--;
- }
+ return return_delims ? wsp->ws_endp : wsp->ws_endp + 1;
+}
- if (!(wsp->ws_flags & WRDSF_RETURN_DELIMS))
- start++;
+static inline size_t
+skip_delim (struct wordsplit *wsp)
+{
+ return skip_delim_internal (wsp, WSP_RETURN_DELIMS (wsp));
+}
- return start;
+static inline size_t
+skip_delim_real (struct wordsplit *wsp)
+{
+ return skip_delim_internal (wsp, wsp->ws_flags & WRDSF_RETURN_DELIMS);
}
#define _WRDS_EOF 0
@@ -1058,7 +1938,7 @@ skip_delim (struct wordsplit *wsp)
#define _WRDS_ERR 2
static int
-scan_qstring (struct wordsplit *wsp, size_t start, size_t * end)
+scan_qstring (struct wordsplit *wsp, size_t start, size_t *end)
{
size_t j;
const char *command = wsp->ws_input;
@@ -1070,7 +1950,7 @@ scan_qstring (struct wordsplit *wsp, size_t start, size_t * end)
j++;
if (j < len && command[j] == q)
{
- int flags = _WSNF_QUOTE | _WSNF_EMPTYOK;
+ unsigned flags = _WSNF_QUOTE | _WSNF_EMPTYOK;
if (q == '\'')
flags |= _WSNF_NOEXPAND;
if (wordsplit_add_segm (wsp, start + 1, j, flags))
@@ -1080,23 +1960,22 @@ scan_qstring (struct wordsplit *wsp, size_t start, size_t * end)
else
{
wsp->ws_endp = start;
- wsp->ws_errno = WRDSE_QUOTE;
- if (wsp->ws_flags & WRDSF_SHOWERR)
- wordsplit_perror (wsp);
+ _wsplt_seterr (wsp, WRDSE_QUOTE);
return _WRDS_ERR;
}
return 0;
}
static int
-scan_word (struct wordsplit *wsp, size_t start)
+scan_word (struct wordsplit *wsp, size_t start, int consume_all)
{
size_t len = wsp->ws_len;
const char *command = wsp->ws_input;
const char *comment = wsp->ws_comment;
int join = 0;
- int flags = 0;
-
+ unsigned flags = 0;
+ struct wordsplit_node *np = wsp->ws_tail;
+
size_t i = start;
if (i >= len)
@@ -1113,7 +1992,7 @@ scan_word (struct wordsplit *wsp, size_t start)
flags = _WSNF_SEXP;
i = skip_sed_expr (command, i, len);
}
- else if (!ISDELIM (wsp, command[i]))
+ else if (consume_all || !ISDELIM (wsp, command[i]))
{
while (i < len)
{
@@ -1152,15 +2031,28 @@ scan_word (struct wordsplit *wsp, size_t start)
}
}
- if (ISDELIM (wsp, command[i]))
+ if (command[i] == '$')
+ {
+ if (!(wsp->ws_flags & WRDSF_NOVAR)
+ && command[i+1] == '{'
+ && find_closing_paren (command, i + 2, len, &i, "{}") == 0)
+ continue;
+ if (!(wsp->ws_flags & WRDSF_NOCMD)
+ && command[i+1] == '('
+ && find_closing_paren (command, i + 2, len, &i, "()") == 0)
+ continue;
+ }
+
+ if (!consume_all && ISDELIM (wsp, command[i]))
break;
else
i++;
}
}
- else if (wsp->ws_flags & WRDSF_RETURN_DELIMS)
+ else if (WSP_RETURN_DELIMS (wsp))
{
i++;
+ flags |= _WSNF_DELIM;
}
else if (!(wsp->ws_flags & WRDSF_SQUEEZE_DELIMS))
flags |= _WSNF_EMPTYOK;
@@ -1172,36 +2064,19 @@ scan_word (struct wordsplit *wsp, size_t start)
wsp->ws_endp = i;
if (wsp->ws_flags & WRDSF_INCREMENTAL)
return _WRDS_EOF;
- return _WRDS_OK;
-}
-
-static char quote_transtab[] = "\\\\\"\"a\ab\bf\fn\nr\rt\tv\v";
-
-int
-wordsplit_c_unquote_char (int c)
-{
- char *p;
-
- for (p = quote_transtab; *p; p += 2)
+
+ if (consume_all)
{
- if (*p == c)
- return p[1];
- }
- return c;
-}
-
-int
-wordsplit_c_quote_char (int c)
-{
- char *p;
-
- for (p = quote_transtab + sizeof (quote_transtab) - 2;
- p > quote_transtab; p -= 2)
- {
- if (*p == c)
- return p[-1];
+ if (!np)
+ np = wsp->ws_head;
+ while (np)
+ {
+ np->flags |= _WSNF_QUOTE;
+ np = np->next;
+ }
}
- return -1;
+
+ return _WRDS_OK;
}
#define to_num(c) \
@@ -1244,7 +2119,7 @@ wordsplit_c_quoted_length (const char *str, int quote_hex, int *quote)
len += 3;
else
{
- if (wordsplit_c_quote_char (*str) != -1)
+ if (wordsplit_c_quote_char (*str))
len += 2;
else
len += 4;
@@ -1253,47 +2128,56 @@ wordsplit_c_quoted_length (const char *str, int quote_hex, int *quote)
return len;
}
-void
-wordsplit_general_unquote_copy (char *dst, const char *src, size_t n,
- const char *escapable)
+static int
+wsplt_unquote_char (const char *transtab, int c)
{
- int i;
-
- for (i = 0; i < n;)
+ while (*transtab && transtab[1])
{
- if (src[i] == '\\' && i < n && strchr (escapable, src[i + 1]))
- i++;
- *dst++ = src[i++];
+ if (*transtab++ == c)
+ return *transtab;
+ ++transtab;
}
- *dst = 0;
+ return 0;
}
-void
-wordsplit_sh_unquote_copy (char *dst, const char *src, size_t n)
+static int
+wsplt_quote_char (const char *transtab, int c)
{
- int i;
-
- for (i = 0; i < n;)
+ for (; *transtab && transtab[1]; transtab += 2)
{
- if (src[i] == '\\')
- i++;
- *dst++ = src[i++];
+ if (transtab[1] == c)
+ return *transtab;
}
- *dst = 0;
+ return 0;
+}
+
+int
+wordsplit_c_unquote_char (int c)
+{
+ return wsplt_unquote_char (wordsplit_c_escape_tab, c);
+}
+
+int
+wordsplit_c_quote_char (int c)
+{
+ return wsplt_quote_char (wordsplit_c_escape_tab, c);
}
void
-wordsplit_c_unquote_copy (char *dst, const char *src, size_t n)
+wordsplit_string_unquote_copy (struct wordsplit *ws, int inquote,
+ char *dst, const char *src, size_t n)
{
int i = 0;
int c;
+ inquote = !!inquote;
while (i < n)
{
if (src[i] == '\\')
{
++i;
- if (src[i] == 'x' || src[i] == 'X')
+ if (WRDSO_ESC_TEST (ws, inquote, WRDSO_XESC)
+ && (src[i] == 'x' || src[i] == 'X'))
{
if (n - i < 2)
{
@@ -1316,7 +2200,8 @@ wordsplit_c_unquote_copy (char *dst, const char *src, size_t n)
}
}
}
- else if ((unsigned char) src[i] < 128 && ISDIGIT (src[i]))
+ else if (WRDSO_ESC_TEST (ws, inquote, WRDSO_OESC)
+ && (unsigned char) src[i] < 128 && ISDIGIT (src[i]))
{
if (n - i < 1)
{
@@ -1338,8 +2223,17 @@ wordsplit_c_unquote_copy (char *dst, const char *src, size_t n)
}
}
}
+ else if ((c = wsplt_unquote_char (ws->ws_escape[inquote], src[i])))
+ {
+ *dst++ = c;
+ ++i;
+ }
else
- *dst++ = wordsplit_c_unquote_char (src[i++]);
+ {
+ if (WRDSO_ESC_TEST (ws, inquote, WRDSO_BSKEEP))
+ *dst++ = '\\';
+ *dst++ = src[i++];
+ }
}
else
*dst++ = src[i++];
@@ -1373,7 +2267,7 @@ wordsplit_c_quote_copy (char *dst, const char *src, int quote_hex)
{
int c = wordsplit_c_quote_char (*src);
*dst++ = '\\';
- if (c != -1)
+ if (c)
*dst++ = c;
else
{
@@ -1386,20 +2280,82 @@ wordsplit_c_quote_copy (char *dst, const char *src, int quote_hex)
}
}
+
+/* This structure describes a single expansion phase */
+struct exptab
+{
+ char const *descr; /* Textual description (for debugging) */
+ int flag; /* WRDSF_ bit that controls this phase */
+ int opt; /* Entry-specific options (see EXPOPT_ flags below */
+ int (*expansion) (struct wordsplit *wsp); /* expansion function */
+};
+
+/* The following options control expansions: */
+/* Normally the exptab entry is run if its flag bit is set in struct
+ wordsplit. The EXPOPT_NEG option negates this test so that expansion
+ is performed if its associated flag bit is not set in struct wordsplit. */
+#define EXPOPT_NEG 0x01
+/* All bits in flag must be set in order for entry to match */
+#define EXPORT_ALLOF 0x02
+/* Coalesce the input list before running the expansion. */
+#define EXPOPT_COALESCE 0x04
+
+static struct exptab exptab[] = {
+ { N_("WS trimming"), WRDSF_WS, 0,
+ wordsplit_trimws },
+ { N_("command substitution"), WRDSF_NOCMD, EXPOPT_NEG|EXPOPT_COALESCE,
+ wordsplit_cmdexp },
+ { N_("coalesce list"), 0, EXPOPT_NEG|EXPOPT_COALESCE,
+ NULL },
+ { N_("tilde expansion"), WRDSF_PATHEXPAND, 0,
+ wordsplit_tildexpand },
+ { N_("variable expansion"), WRDSF_NOVAR, EXPOPT_NEG,
+ wordsplit_varexp },
+ { N_("quote removal"), 0, EXPOPT_NEG,
+ wsnode_quoteremoval },
+ { N_("coalesce list"), 0, EXPOPT_NEG|EXPOPT_COALESCE,
+ NULL },
+ { N_("path expansion"), WRDSF_PATHEXPAND, 0,
+ wordsplit_pathexpand },
+ { NULL }
+};
+
+static inline int
+exptab_matches(struct exptab *p, struct wordsplit *wsp)
+{
+ int result;
+
+ result = (wsp->ws_flags & p->flag);
+ if (p->opt & EXPORT_ALLOF)
+ result = result == p->flag;
+ if (p->opt & EXPOPT_NEG)
+ result = !result;
+
+ return result;
+}
+
static int
wordsplit_process_list (struct wordsplit *wsp, size_t start)
{
- if (wsp->ws_flags & WRDSF_NOSPLIT)
- {
- /* Treat entire input as a quoted argument */
- if (wordsplit_add_segm (wsp, start, wsp->ws_len, _WSNF_QUOTE))
+ struct exptab *p;
+
+ if (wsp->ws_flags & WRDSF_SHOWDBG)
+ wsp->ws_debug (_("(%02d) Input:%.*s;"),
+ wsp->ws_lvl, (int) wsp->ws_len, wsp->ws_input);
+
+ if ((wsp->ws_flags & WRDSF_NOSPLIT)
+ || ((wsp->ws_options & WRDSO_MAXWORDS)
+ && wsp->ws_wordi + 1 == wsp->ws_maxwords))
+ {
+ /* Treat entire input as a single word */
+ if (scan_word (wsp, start, 1) == _WRDS_ERR)
return wsp->ws_errno;
}
else
{
int rc;
- while ((rc = scan_word (wsp, start)) == _WRDS_OK)
+ while ((rc = scan_word (wsp, start, 0)) == _WRDS_OK)
start = skip_delim (wsp);
/* Make sure tail element is not joinable */
if (wsp->ws_tail)
@@ -1410,132 +2366,88 @@ wordsplit_process_list (struct wordsplit *wsp, size_t start)
if (wsp->ws_flags & WRDSF_SHOWDBG)
{
- wsp->ws_debug ("Initial list:");
+ wsp->ws_debug ("(%02d) %s", wsp->ws_lvl, _("Initial list:"));
wordsplit_dump_nodes (wsp);
}
- if (wsp->ws_flags & WRDSF_WS)
- {
- /* Trim leading and trailing whitespace */
- wordsplit_trimws (wsp);
- if (wsp->ws_flags & WRDSF_SHOWDBG)
- {
- wsp->ws_debug ("After WS trimming:");
- wordsplit_dump_nodes (wsp);
- }
- }
-
- /* Expand variables (FIXME: & commands) */
- if (!(wsp->ws_flags & WRDSF_NOVAR))
+ for (p = exptab; p->descr; p++)
{
- if (wordsplit_varexp (wsp))
+ if (exptab_matches(p, wsp))
{
- wordsplit_free_nodes (wsp);
- return wsp->ws_errno;
- }
- if (wsp->ws_flags & WRDSF_SHOWDBG)
- {
- wsp->ws_debug ("Expanded list:");
- wordsplit_dump_nodes (wsp);
- }
- }
-
- do
- {
- if (wsnode_quoteremoval (wsp))
- break;
- if (wsp->ws_flags & WRDSF_SHOWDBG)
- {
- wsp->ws_debug ("After quote removal:");
- wordsplit_dump_nodes (wsp);
- }
-
- if (wsnode_coalesce (wsp))
- break;
-
- if (wsp->ws_flags & WRDSF_SHOWDBG)
- {
- wsp->ws_debug ("Coalesced list:");
- wordsplit_dump_nodes (wsp);
+ if (p->opt & EXPOPT_COALESCE)
+ {
+ if (wsnode_coalesce (wsp))
+ break;
+ if (wsp->ws_flags & WRDSF_SHOWDBG)
+ {
+ wsp->ws_debug ("(%02d) %s", wsp->ws_lvl,
+ _("Coalesced list:"));
+ wordsplit_dump_nodes (wsp);
+ }
+ }
+ if (p->expansion)
+ {
+ if (p->expansion (wsp))
+ break;
+ if (wsp->ws_flags & WRDSF_SHOWDBG)
+ {
+ wsp->ws_debug ("(%02d) %s", wsp->ws_lvl, _(p->descr));
+ wordsplit_dump_nodes (wsp);
+ }
+ }
}
}
- while (0);
return wsp->ws_errno;
}
-int
-wordsplit_len (const char *command, size_t length, struct wordsplit *wsp,
- int flags)
+static int
+wordsplit_run (const char *command, size_t length, struct wordsplit *wsp,
+ unsigned flags, int lvl)
{
int rc;
size_t start;
- const char *cmdptr;
- size_t cmdlen;
if (!command)
{
if (!(flags & WRDSF_INCREMENTAL))
- return EINVAL;
+ return _wsplt_seterr (wsp, WRDSE_USAGE);
+
+ if (wsp->ws_head)
+ return wordsplit_finish (wsp);
- start = skip_delim (wsp);
+ start = skip_delim_real (wsp);
if (wsp->ws_endp == wsp->ws_len)
- {
- wsp->ws_errno = WRDSE_NOINPUT;
- if (wsp->ws_flags & WRDSF_SHOWERR)
- wordsplit_perror (wsp);
- return wsp->ws_errno;
- }
+ return _wsplt_seterr (wsp, WRDSE_NOINPUT);
- cmdptr = wsp->ws_input + wsp->ws_endp;
- cmdlen = wsp->ws_len - wsp->ws_endp;
wsp->ws_flags |= WRDSF_REUSE;
wordsplit_init0 (wsp);
}
else
{
- cmdptr = command;
- cmdlen = length;
start = 0;
- rc = wordsplit_init (wsp, cmdptr, cmdlen, flags);
+ rc = wordsplit_init (wsp, command, length, flags);
if (rc)
return rc;
+ wsp->ws_lvl = lvl;
}
- if (wsp->ws_flags & WRDSF_SHOWDBG)
- wsp->ws_debug ("Input:%.*s;", (int) cmdlen, cmdptr);
-
rc = wordsplit_process_list (wsp, start);
- if (rc == 0 && (flags & WRDSF_INCREMENTAL))
- {
- while (!wsp->ws_head && wsp->ws_endp < wsp->ws_len)
- {
- start = skip_delim (wsp);
- if (wsp->ws_flags & WRDSF_SHOWDBG)
- {
- cmdptr = wsp->ws_input + wsp->ws_endp;
- cmdlen = wsp->ws_len - wsp->ws_endp;
- wsp->ws_debug ("Restart:%.*s;", (int) cmdlen, cmdptr);
- }
- rc = wordsplit_process_list (wsp, start);
- if (rc)
- break;
- }
- }
if (rc)
- {
- wordsplit_free_nodes (wsp);
- return rc;
- }
- wordsplit_finish (wsp);
- wordsplit_free_nodes (wsp);
- return wsp->ws_errno;
+ return rc;
+ return wordsplit_finish (wsp);
+}
+
+int
+wordsplit_len (const char *command, size_t length, struct wordsplit *wsp,
+ unsigned flags)
+{
+ return wordsplit_run (command, length, wsp, flags, 0);
}
int
-wordsplit (const char *command, struct wordsplit *ws, int flags)
+wordsplit (const char *command, struct wordsplit *ws, unsigned flags)
{
- return wordsplit_len (command, command ? strlen (command) : 0, ws,
- flags);
+ return wordsplit_len (command, command ? strlen (command) : 0, ws, flags);
}
void
@@ -1555,67 +2467,69 @@ wordsplit_free_words (struct wordsplit *ws)
ws->ws_wordc = 0;
}
+void
+wordsplit_free_envbuf (struct wordsplit *ws)
+{
+ if (ws->ws_flags & WRDSF_NOCMD)
+ return;
+ if (ws->ws_envbuf)
+ {
+ size_t i;
+
+ for (i = 0; ws->ws_envbuf[i]; i++)
+ free (ws->ws_envbuf[i]);
+ free (ws->ws_envbuf);
+ ws->ws_envidx = ws->ws_envsiz = 0;
+ ws->ws_envbuf = NULL;
+ }
+}
+
+void
+wordsplit_clearerr (struct wordsplit *ws)
+{
+ if (ws->ws_errno == WRDSE_USERERR)
+ free (ws->ws_usererr);
+ ws->ws_usererr = NULL;
+ ws->ws_errno = WRDSE_OK;
+}
+
void
wordsplit_free (struct wordsplit *ws)
{
+ wordsplit_free_nodes (ws);
wordsplit_free_words (ws);
free (ws->ws_wordv);
ws->ws_wordv = NULL;
+ wordsplit_free_envbuf (ws);
}
-void
-wordsplit_perror (struct wordsplit *wsp)
+int
+wordsplit_get_words (struct wordsplit *ws, size_t *wordc, char ***wordv)
{
- switch (wsp->ws_errno)
- {
- case WRDSE_EOF:
- wsp->ws_error (_("no error"));
- break;
-
- case WRDSE_QUOTE:
- wsp->ws_error (_("missing closing %c (start near #%lu)"),
- wsp->ws_input[wsp->ws_endp],
- (unsigned long) wsp->ws_endp);
- break;
-
- case WRDSE_NOSPACE:
- wsp->ws_error (_("memory exhausted"));
- break;
-
- case WRDSE_NOSUPP:
- wsp->ws_error (_("command substitution is not yet supported"));
- break;
-
- case WRDSE_USAGE:
- wsp->ws_error (_("invalid wordsplit usage"));
- break;
-
- case WRDSE_CBRACE:
- wsp->ws_error (_("unbalanced curly brace"));
- break;
+ char **p = realloc (ws->ws_wordv,
+ (ws->ws_wordc + 1) * sizeof (ws->ws_wordv[0]));
+ if (!p)
+ return -1;
+ *wordv = p;
+ *wordc = ws->ws_wordc;
- case WRDSE_UNDEF:
- wsp->ws_error (_("undefined variable"));
- break;
-
- case WRDSE_NOINPUT:
- wsp->ws_error (_("input exhausted"));
- break;
+ ws->ws_wordv = NULL;
+ ws->ws_wordc = 0;
+ ws->ws_wordn = 0;
- default:
- wsp->ws_error (_("unknown error"));
- }
+ return 0;
}
const char *_wordsplit_errstr[] = {
N_("no error"),
N_("missing closing quote"),
N_("memory exhausted"),
- N_("command substitution is not yet supported"),
N_("invalid wordsplit usage"),
N_("unbalanced curly brace"),
N_("undefined variable"),
- N_("input exhausted")
+ N_("input exhausted"),
+ N_("unbalanced parenthesis"),
+ N_("globbing error")
};
int _wordsplit_nerrs =
sizeof (_wordsplit_errstr) / sizeof (_wordsplit_errstr[0]);
@@ -1623,7 +2537,26 @@ int _wordsplit_nerrs =
const char *
wordsplit_strerror (struct wordsplit *ws)
{
+ if (ws->ws_errno == WRDSE_USERERR)
+ return ws->ws_usererr;
if (ws->ws_errno < _wordsplit_nerrs)
return _wordsplit_errstr[ws->ws_errno];
return N_("unknown error");
}
+
+void
+wordsplit_perror (struct wordsplit *wsp)
+{
+ switch (wsp->ws_errno)
+ {
+ case WRDSE_QUOTE:
+ wsp->ws_error (_("missing closing %c (start near #%lu)"),
+ wsp->ws_input[wsp->ws_endp],
+ (unsigned long) wsp->ws_endp);
+ break;
+
+ default:
+ wsp->ws_error ("%s", wordsplit_strerror (wsp));
+ }
+}
+
diff --git a/lib/wordsplit.h b/lib/wordsplit.h
index 575865b6e687fc980f61244d07594c1962bc6db3..ff7f6e3753496f77bc446e6c7d18fefca049233a 100644
--- a/lib/wordsplit.h
+++ b/lib/wordsplit.h
@@ -1,5 +1,5 @@
/* wordsplit - a word splitter
- Copyright (C) 2009-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright (C) 2009-2018 Sergey Poznyakoff
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -12,10 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
- with this program. If not, see <http://www.gnu.org/licenses/>.
-
- Written by Sergey Poznyakoff
-*/
+ with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __WORDSPLIT_H
#define __WORDSPLIT_H
@@ -28,42 +25,106 @@
# define __WORDSPLIT_ATTRIBUTE_FORMAT(spec) /* empty */
#endif
-struct wordsplit
+typedef struct wordsplit wordsplit_t;
+
+/* Structure used to direct the splitting. Members marked with [Input]
+ can be defined before calling wordsplit(), those marked with [Output]
+ provide return values when the function returns. If neither mark is
+ used, the member is internal and must not be used by the caller.
+
+ In the comments below, the identifiers in parentheses indicate bits that
+ must be set (or unset, if starting with !) in ws_flags (if starting with
+ WRDSF_) or ws_options (if starting with WRDSO_) to initialize or use the
+ given member.
+
+ If not redefined explicitly, most of them are set to some reasonable
+ default value upon entry to wordsplit(). */
+struct wordsplit
{
- size_t ws_wordc;
- char **ws_wordv;
- size_t ws_offs;
- size_t ws_wordn;
- int ws_flags;
- const char *ws_delim;
- const char *ws_comment;
- const char *ws_escape;
- void (*ws_alloc_die) (struct wordsplit * wsp);
+ size_t ws_wordc; /* [Output] Number of words in ws_wordv. */
+ char **ws_wordv; /* [Output] Array of parsed out words. */
+ size_t ws_offs; /* [Input] (WRDSF_DOOFFS) Number of initial
+ elements in ws_wordv to fill with NULLs. */
+ size_t ws_wordn; /* Number of elements ws_wordv can accomodate. */
+ unsigned ws_flags; /* [Input] Flags passed to wordsplit. */
+ unsigned ws_options; /* [Input] (WRDSF_OPTIONS)
+ Additional options. */
+ size_t ws_maxwords; /* [Input] (WRDSO_MAXWORDS) Return at most that
+ many words */
+ size_t ws_wordi; /* [Output] (WRDSF_INCREMENTAL) Total number of
+ words returned so far */
+
+ const char *ws_delim; /* [Input] (WRDSF_DELIM) Word delimiters. */
+ const char *ws_comment; /* [Input] (WRDSF_COMMENT) Comment characters. */
+ const char *ws_escape[2]; /* [Input] (WRDSF_ESCAPE) Characters to be escaped
+ with backslash. */
+ void (*ws_alloc_die) (wordsplit_t *wsp);
+ /* [Input] (WRDSF_ALLOC_DIE) Function called when
+ out of memory. Must not return. */
void (*ws_error) (const char *, ...)
- __WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
+ __attribute__ ((__format__ (__printf__, 1, 2)));
+ /* [Input] (WRDSF_ERROR) Function used for error
+ reporting */
void (*ws_debug) (const char *, ...)
- __WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
+ __attribute__ ((__format__ (__printf__, 1, 2)));
+ /* [Input] (WRDSF_DEBUG) Function used for debug
+ output. */
+ const char **ws_env; /* [Input] (WRDSF_ENV, !WRDSF_NOVAR) Array of
+ environment variables. */
- const char **ws_env;
- const char *(*ws_getvar) (const char *, size_t, void *);
- void *ws_closure;
+ char **ws_envbuf;
+ size_t ws_envidx;
+ size_t ws_envsiz;
+
+ int (*ws_getvar) (char **ret, const char *var, size_t len, void *clos);
+ /* [Input] (WRDSF_GETVAR, !WRDSF_NOVAR) Looks up
+ the name VAR (LEN bytes long) in the table of
+ variables and if found returns in memory
+ location pointed to by RET the value of that
+ variable. Returns WRDSE_OK (0) on success,
+ and an error code (see WRDSE_* defines below)
+ on error. User-specific errors can be returned
+ by storing the error diagnostic string in RET
+ and returning WRDSE_USERERR.
+ Whatever is stored in RET, it must be allocated
+ using malloc(3). */
+ void *ws_closure; /* [Input] (WRDSF_CLOSURE) Passed as the CLOS
+ argument to ws_getvar and ws_command. */
+ int (*ws_command) (char **ret, const char *cmd, size_t len, char **argv,
+ void *clos);
+ /* [Input] (!WRDSF_NOCMD) Returns in the memory
+ location pointed to by RET the expansion of
+ the command CMD (LEN bytes long). If WRDSO_ARGV
+ option is set, ARGV contains CMD split out to
+ words. Otherwise ARGV is NULL.
- const char *ws_input;
- size_t ws_len;
- size_t ws_endp;
- int ws_errno;
+ See ws_getvar for a discussion of possible
+ return values. */
+
+ const char *ws_input; /* Input string (the S argument to wordsplit. */
+ size_t ws_len; /* Length of ws_input. */
+ size_t ws_endp; /* Points past the last processed byte in
+ ws_input. */
+ int ws_errno; /* [Output] Error code, if an error occurred. */
+ char *ws_usererr; /* Points to textual description of
+ the error, if ws_errno is WRDSE_USERERR. Must
+ be allocated with malloc(3). */
struct wordsplit_node *ws_head, *ws_tail;
+ /* Doubly-linked list of parsed out nodes. */
+ int ws_lvl; /* Invocation nesting level. */
};
-/* Wordsplit flags. Only 2 bits of a 32-bit word remain unused.
- It is getting crowded... */
+/* Initial size for ws_env, if allocated automatically */
+#define WORDSPLIT_ENV_INIT 16
+
+/* Wordsplit flags. */
/* Append the words found to the array resulting from a previous
call. */
#define WRDSF_APPEND 0x00000001
-/* Insert we_offs initial NULLs in the array ws_wordv.
+/* Insert ws_offs initial NULLs in the array ws_wordv.
(These are not counted in the returned ws_wordc.) */
#define WRDSF_DOOFFS 0x00000002
-/* Don't do command substitution. Reserved for future use. */
+/* Don't do command substitution. */
#define WRDSF_NOCMD 0x00000004
/* The parameter p resulted from a previous call to
wordsplit(), and wordsplit_free() was not called. Reuse the
@@ -71,10 +132,8 @@ struct wordsplit
#define WRDSF_REUSE 0x00000008
/* Print errors */
#define WRDSF_SHOWERR 0x00000010
-/* Consider it an error if an undefined shell variable
- is expanded. */
+/* Consider it an error if an undefined variable is expanded. */
#define WRDSF_UNDEF 0x00000020
-
/* Don't do variable expansion. */
#define WRDSF_NOVAR 0x00000040
/* Abort on ENOMEM error */
@@ -85,7 +144,7 @@ struct wordsplit
#define WRDSF_SQUOTE 0x00000200
/* Handle double quotes */
#define WRDSF_DQUOTE 0x00000400
-/* Handle quotes and escape directives */
+/* Handle single and double quotes */
#define WRDSF_QUOTE (WRDSF_SQUOTE|WRDSF_DQUOTE)
/* Replace each input sequence of repeated delimiters with a single
delimiter */
@@ -113,56 +172,106 @@ struct wordsplit
/* Don't split input into words. Useful for side effects. */
#define WRDSF_NOSPLIT 0x00400000
/* Keep undefined variables in place, instead of expanding them to
- empty string */
+ empty strings. */
#define WRDSF_KEEPUNDEF 0x00800000
/* Warn about undefined variables */
#define WRDSF_WARNUNDEF 0x01000000
/* Handle C escapes */
#define WRDSF_CESCAPES 0x02000000
-
/* ws_closure is set */
#define WRDSF_CLOSURE 0x04000000
/* ws_env is a Key/Value environment, i.e. the value of a variable is
stored in the element that follows its name. */
#define WRDSF_ENV_KV 0x08000000
-
/* ws_escape is set */
#define WRDSF_ESCAPE 0x10000000
-
/* Incremental mode */
#define WRDSF_INCREMENTAL 0x20000000
+/* Perform pathname and tilde expansion */
+#define WRDSF_PATHEXPAND 0x40000000
+/* ws_options is initialized */
+#define WRDSF_OPTIONS 0x80000000
#define WRDSF_DEFFLAGS \
(WRDSF_NOVAR | WRDSF_NOCMD | \
WRDSF_QUOTE | WRDSF_SQUEEZE_DELIMS | WRDSF_CESCAPES)
-#define WRDSE_EOF 0
+/* Remove the word that produces empty string after path expansion */
+#define WRDSO_NULLGLOB 0x00000001
+/* Print error message if path expansion produces empty string */
+#define WRDSO_FAILGLOB 0x00000002
+/* Allow a leading period to be matched by metacharacters. */
+#define WRDSO_DOTGLOB 0x00000004
+/* ws_command needs argv parameter */
+#define WRDSO_ARGV 0x00000008
+/* Keep backslash in unrecognized escape sequences in words */
+#define WRDSO_BSKEEP_WORD 0x00000010
+/* Handle octal escapes in words */
+#define WRDSO_OESC_WORD 0x00000020
+/* Handle hex escapes in words */
+#define WRDSO_XESC_WORD 0x00000040
+
+/* ws_maxwords field is initialized */
+#define WRDSO_MAXWORDS 0x00000080
+
+/* Keep backslash in unrecognized escape sequences in quoted strings */
+#define WRDSO_BSKEEP_QUOTE 0x00000100
+/* Handle octal escapes in quoted strings */
+#define WRDSO_OESC_QUOTE 0x00000200
+/* Handle hex escapes in quoted strings */
+#define WRDSO_XESC_QUOTE 0x00000400
+
+#define WRDSO_BSKEEP WRDSO_BSKEEP_WORD
+#define WRDSO_OESC WRDSO_OESC_WORD
+#define WRDSO_XESC WRDSO_XESC_WORD
+
+/* Indices into ws_escape */
+#define WRDSX_WORD 0
+#define WRDSX_QUOTE 1
+
+/* Set escape option F in WS for words (Q==0) or quoted strings (Q==1) */
+#define WRDSO_ESC_SET(ws,q,f) ((ws)->ws_options |= ((f) << 4*(q)))
+/* Test WS for escape option F for words (Q==0) or quoted strings (Q==1) */
+#define WRDSO_ESC_TEST(ws,q,f) ((ws)->ws_options & ((f) << 4*(q)))
+
+#define WRDSE_OK 0
+#define WRDSE_EOF WRDSE_OK
#define WRDSE_QUOTE 1
#define WRDSE_NOSPACE 2
-#define WRDSE_NOSUPP 3
-#define WRDSE_USAGE 4
-#define WRDSE_CBRACE 5
-#define WRDSE_UNDEF 6
-#define WRDSE_NOINPUT 7
-
-int wordsplit (const char *s, struct wordsplit *p, int flags);
-int wordsplit_len (const char *s, size_t len,
- struct wordsplit *p, int flags);
-void wordsplit_free (struct wordsplit *p);
-void wordsplit_free_words (struct wordsplit *ws);
+#define WRDSE_USAGE 3
+#define WRDSE_CBRACE 4
+#define WRDSE_UNDEF 5
+#define WRDSE_NOINPUT 6
+#define WRDSE_PAREN 7
+#define WRDSE_GLOBERR 8
+#define WRDSE_USERERR 9
+
+int wordsplit (const char *s, wordsplit_t *ws, unsigned flags);
+int wordsplit_len (const char *s, size_t len, wordsplit_t *ws, unsigned flags);
+void wordsplit_free (wordsplit_t *ws);
+void wordsplit_free_words (wordsplit_t *ws);
+void wordsplit_free_envbuf (wordsplit_t *ws);
+int wordsplit_get_words (wordsplit_t *ws, size_t *wordc, char ***wordv);
+
+static inline void wordsplit_getwords (wordsplit_t *ws, size_t *wordc, char ***wordv)
+ __attribute__ ((deprecated));
+
+static inline void
+wordsplit_getwords (wordsplit_t *ws, size_t *wordc, char ***wordv)
+{
+ wordsplit_get_words (ws, wordc, wordv);
+}
+
+int wordsplit_append (wordsplit_t *wsp, int argc, char **argv);
int wordsplit_c_unquote_char (int c);
int wordsplit_c_quote_char (int c);
-size_t wordsplit_c_quoted_length (const char *str, int quote_hex,
- int *quote);
-void wordsplit_general_unquote_copy (char *dst, const char *src, size_t n,
- const char *escapable);
-void wordsplit_sh_unquote_copy (char *dst, const char *src, size_t n);
-void wordsplit_c_unquote_copy (char *dst, const char *src, size_t n);
+size_t wordsplit_c_quoted_length (const char *str, int quote_hex, int *quote);
void wordsplit_c_quote_copy (char *dst, const char *src, int quote_hex);
-void wordsplit_perror (struct wordsplit *ws);
-const char *wordsplit_strerror (struct wordsplit *ws);
+void wordsplit_perror (wordsplit_t *ws);
+const char *wordsplit_strerror (wordsplit_t *ws);
+void wordsplit_clearerr (wordsplit_t *ws);
#endif
diff --git a/lib/xattr-at.c b/lib/xattr-at.c
index 3bba552f9a1e2225ef18462b84ded47c189a7920..89cfad427ea6db295f7e878e438817446741fcf5 100644
--- a/lib/xattr-at.c
+++ b/lib/xattr-at.c
@@ -1,7 +1,7 @@
/* openat-style fd-relative functions for operating with extended file
attributes.
- Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 2012-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/lib/xattr-at.h b/lib/xattr-at.h
index 09a63d076e77f458c8e88b97f11dcf2706e9344e..c278fb7f223b27abd33aa23e5c88e6912a1cba5a 100644
--- a/lib/xattr-at.h
+++ b/lib/xattr-at.h
@@ -1,7 +1,7 @@
/* Prototypes for openat-style fd-relative functions for operating with
extended file attributes.
- Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 2012-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4
index bb3512fd528a18c2dc531a54601925cbb6b34acc..e3e0fb6daa21ed823fbfdf509a2a712918855ec6 100644
--- a/m4/00gnulib.m4
+++ b/m4/00gnulib.m4
@@ -1,5 +1,5 @@
# 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/__inline.m4 b/m4/__inline.m4
new file mode 100644
index 0000000000000000000000000000000000000000..e1aa310c95738e2fffd6932648864810eae8960a
--- /dev/null
+++ b/m4/__inline.m4
@@ -0,0 +1,22 @@
+# Test for __inline keyword
+dnl Copyright 2017-2019 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl___INLINE],
+[
+ AC_CACHE_CHECK([whether the compiler supports the __inline keyword],
+ [gl_cv_c___inline],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[typedef int foo_t;
+ static __inline foo_t foo (void) { return 0; }]],
+ [[return foo ();]])],
+ [gl_cv_c___inline=yes],
+ [gl_cv_c___inline=no])])
+ if test $gl_cv_c___inline = yes; then
+ AC_DEFINE([HAVE___INLINE], [1],
+ [Define to 1 if the compiler supports the keyword '__inline'.])
+ fi
+])
diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4
index c73adc82d2314b7189b7fe5abb6a2e0e6d24faa9..a8f2cba173f39d504b2899f2c7a749579af1bc17 100644
--- a/m4/absolute-header.m4
+++ b/m4/absolute-header.m4
@@ -1,5 +1,5 @@
# absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/acl.m4 b/m4/acl.m4
index bf988d55c5c8f9eec29cee2955a7783021b43436..5234a80f93f8eb5b0635a98f466f177b069eefd6 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,7 +1,7 @@
# acl.m4 - check for access control list (ACL) primitives
-# serial 22
+# serial 23
-# Copyright (C) 2002, 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -30,7 +30,8 @@ AC_DEFUN([gl_FUNC_ACL],
ac_save_LIBS=$LIBS
dnl Test for POSIX-draft-like API (GNU/Linux, FreeBSD, Mac OS X,
- dnl IRIX, Tru64). -lacl is needed on GNU/Linux, -lpacl on OSF/1.
+ dnl IRIX, Tru64, Cygwin >= 2.5).
+ dnl -lacl is needed on GNU/Linux, -lpacl on OSF/1.
if test $use_acl = 0; then
AC_SEARCH_LIBS([acl_get_file], [acl pacl],
[if test "$ac_cv_search_acl_get_file" != "none required"; then
diff --git a/m4/alloca.m4 b/m4/alloca.m4
index 867954a2e3772c293f21a4df73b378ba8e4c6fa7..46d60f9c8c87ea15656d2dd149a7863922c30444 100644
--- a/m4/alloca.m4
+++ b/m4/alloca.m4
@@ -1,5 +1,5 @@
# alloca.m4 serial 14
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/argp.m4 b/m4/argp.m4
index 2a4592c8f3fbae1b404a410bd77d892bd8a12d75..8b2e2d85486e5c8a6f252fb9ae4005ce68f65e50 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -1,5 +1,5 @@
# argp.m4 serial 15
-dnl Copyright (C) 2003-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/asm-underscore.m4 b/m4/asm-underscore.m4
deleted file mode 100644
index 07270c92f420d3447e88fe7540897c0c71b6ff57..0000000000000000000000000000000000000000
--- a/m4/asm-underscore.m4
+++ /dev/null
@@ -1,71 +0,0 @@
-# asm-underscore.m4 serial 3
-dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible. Based on as-underscore.m4 in GNU clisp.
-
-# gl_ASM_SYMBOL_PREFIX
-# Tests for the prefix of C symbols at the assembly language level and the
-# linker level. This prefix is either an underscore or empty. Defines the
-# C macro USER_LABEL_PREFIX to this prefix, and sets ASM_SYMBOL_PREFIX to
-# a stringified variant of this prefix.
-
-AC_DEFUN([gl_ASM_SYMBOL_PREFIX],
-[
- dnl We don't use GCC's __USER_LABEL_PREFIX__ here, because
- dnl 1. It works only for GCC.
- dnl 2. It is incorrectly defined on some platforms, in some GCC versions.
- AC_REQUIRE([gl_C_ASM])
- AC_CACHE_CHECK(
- [whether C symbols are prefixed with underscore at the linker level],
- [gl_cv_prog_as_underscore],
- [cat > conftest.c <<EOF
-#ifdef __cplusplus
-extern "C" int foo (void);
-#endif
-int foo(void) { return 0; }
-EOF
- # Look for the assembly language name in the .s file.
- AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
- if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then
- gl_cv_prog_as_underscore=yes
- else
- gl_cv_prog_as_underscore=no
- fi
- rm -f conftest*
- ])
- if test $gl_cv_prog_as_underscore = yes; then
- USER_LABEL_PREFIX=_
- else
- USER_LABEL_PREFIX=
- fi
- AC_DEFINE_UNQUOTED([USER_LABEL_PREFIX], [$USER_LABEL_PREFIX],
- [Define to the prefix of C symbols at the assembler and linker level,
- either an underscore or empty.])
- ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
- AC_SUBST([ASM_SYMBOL_PREFIX])
-])
-
-# gl_C_ASM
-# Determines how to produce an assembly language file from C source code.
-# Sets the variables:
-# gl_asmext - the extension of assembly language output,
-# gl_c_asm_opt - the C compiler option that produces assembly language output.
-
-AC_DEFUN([gl_C_ASM],
-[
- AC_EGREP_CPP([MicrosoftCompiler],
- [
-#ifdef _MSC_VER
-MicrosoftCompiler
-#endif
- ],
- [gl_asmext='asm'
- gl_c_asm_opt='-c -Fa'
- ],
- [gl_asmext='s'
- gl_c_asm_opt='-S'
- ])
-])
diff --git a/m4/backupfile.m4 b/m4/backupfile.m4
index 1bc228212f0c679bc09bd91edde8654a157d4ece..5c45625165a96a5ababdc4275646f767b06f3ded 100644
--- a/m4/backupfile.m4
+++ b/m4/backupfile.m4
@@ -1,5 +1,5 @@
# backupfile.m4 serial 14
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/bison.m4 b/m4/bison.m4
index 1bcfdf6e12ef38c2a0c9552a63660cfbea83ec33..d64883bd883519a95e47f8d8656c5e19cac1a1ab 100644
--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -1,6 +1,6 @@
# serial 7
-# Copyright (C) 2002, 2005, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2005, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -8,15 +8,16 @@
AC_DEFUN([gl_BISON],
[
# parse-datetime.y works with bison only.
- : ${YACC='bison -y'}
+ : ${YACC='bison -o y.tab.c'}
dnl
dnl Declaring YACC & YFLAGS precious will not be necessary after GNULIB
dnl requires an Autoconf greater than 2.59c, but it will probably still be
dnl useful to override the description of YACC in the --help output, re
-dnl parse-datetime.y assuming 'bison -y'.
+dnl parse-datetime.y assuming 'bison -o y.tab.c'.
AC_ARG_VAR([YACC],
-[The "Yet Another C Compiler" implementation to use. Defaults to 'bison -y'.
-Values other than 'bison -y' will most likely break on most systems.])dnl
+[The "Yet Another C Compiler" implementation to use. Defaults to
+'bison -o y.tab.c'. Values other than 'bison -o y.tab.c' will most likely
+break on most systems.])dnl
AC_ARG_VAR([YFLAGS],
[YFLAGS contains the list arguments that will be passed by default to Bison.
This script will default YFLAGS to the empty string to avoid a default value of
diff --git a/m4/btowc.m4 b/m4/btowc.m4
index f59db65acc5808608e628dade917544bc969cd5c..85c2cbf6dcabb263e0600391ff9f3c7e70169558 100644
--- a/m4/btowc.m4
+++ b/m4/btowc.m4
@@ -1,5 +1,5 @@
# btowc.m4 serial 11
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/builtin-expect.m4 b/m4/builtin-expect.m4
index aa3364bffd38e6424bd1fc2619e3eeff13288976..b65fbf87a62f1ca86a017944729d98e6c66d4e6f 100644
--- a/m4/builtin-expect.m4
+++ b/m4/builtin-expect.m4
@@ -1,6 +1,6 @@
dnl Check for __builtin_expect.
-dnl Copyright 2016-2017 Free Software Foundation, Inc.
+dnl Copyright 2016-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index 53b1597d33881338ec5cc7c1cab82e16db6ad14a..5b6e25dfcd6fb6dff55aaaca6ab4372b775b73af 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,6 +1,6 @@
# canonicalize.m4 serial 29
-dnl Copyright (C) 2003-2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -35,8 +35,8 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
HAVE_REALPATH=0
else
case "$gl_cv_func_realpath_works" in
- *yes) ;;
- *) REPLACE_REALPATH=1 ;;
+ *yes) ;;
+ *) REPLACE_REALPATH=1 ;;
esac
fi
else
diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4
index c4c07b5003796388333ff4ecf32e45c85a3134af..64b5ef9411a2dadabb3fc4e6019de7f37b3d7d85 100644
--- a/m4/chdir-long.m4
+++ b/m4/chdir-long.m4
@@ -6,7 +6,7 @@
# never fails with ENAMETOOLONG.
# Arrange to compile chdir-long.c only on systems that define PATH_MAX.
-dnl Copyright (C) 2004-2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/chown.m4 b/m4/chown.m4
index cf2f35f742274e4d2ed52164991525c7b015a31c..d92fd1c1955bef5e29cf1af5274fea69f98fe14d 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,7 +1,7 @@
-# serial 28
+# serial 30
# Determine whether we need the chown wrapper.
-dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2017 Free Software
+dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2019 Free Software
dnl Foundation, Inc.
dnl This file is free software; the Free Software Foundation
@@ -46,12 +46,14 @@ AC_DEFUN([AC_FUNC_CHOWN],
[ac_cv_func_chown_works=yes],
[ac_cv_func_chown_works=no],
[case "$host_os" in # ((
- # Guess yes on glibc systems.
- *-gnu*) ac_cv_func_chown_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) ac_cv_func_chown_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) ac_cv_func_chown_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) ac_cv_func_chown_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) ac_cv_func_chown_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) ac_cv_func_chown_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) ac_cv_func_chown_works="guessing no" ;;
esac
])
rm -f conftest.chown
diff --git a/m4/clock_time.m4 b/m4/clock_time.m4
index 21b6f2567699c4fb278d78b7ace1e3168a5a5585..8f7a7fcd10344205c781fbfe662e2dbb299af500 100644
--- a/m4/clock_time.m4
+++ b/m4/clock_time.m4
@@ -1,5 +1,5 @@
# clock_time.m4 serial 10
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/close-stream.m4 b/m4/close-stream.m4
index 65a1acce6d4c3b0efd012ee0bbb86379c0e6b295..5d31221b0cf6d2016e24009f6cb58b1a54ceed78 100644
--- a/m4/close-stream.m4
+++ b/m4/close-stream.m4
@@ -1,5 +1,5 @@
#serial 4
-dnl Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/close.m4 b/m4/close.m4
index ed357ab92490b278674e40cbd967831add3804c4..7013a130433b666500daff67a115aa3ec2c2aa72 100644
--- a/m4/close.m4
+++ b/m4/close.m4
@@ -1,5 +1,5 @@
# close.m4 serial 9
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/closedir.m4 b/m4/closedir.m4
index 69e41b3c61ac0e4bfa1a2f415fb74a13673dd320..37dc541446bdaa8d09dca9dd50b25ab313962ba7 100644
--- a/m4/closedir.m4
+++ b/m4/closedir.m4
@@ -1,5 +1,5 @@
# closedir.m4 serial 6
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/closeout.m4 b/m4/closeout.m4
index 3c3aa2ffb78206661107db606322d44e361886ec..c02179b7602db487558dc0d5625665820d47949c 100644
--- a/m4/closeout.m4
+++ b/m4/closeout.m4
@@ -1,5 +1,5 @@
# closeout.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index bc98201e39d91327707db7db3dae0480e4638bcd..280f556fe83dfb4ac832f8533cfc5610feb57275 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,6 +1,6 @@
# codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019 Free Software
+dnl Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/configmake.m4 b/m4/configmake.m4
index b783296b628da6f2bab1fa3d48c86562ac556811..057195264cc2aa487869eb3caa3b4367e524042d 100644
--- a/m4/configmake.m4
+++ b/m4/configmake.m4
@@ -1,55 +1,27 @@
-# configmake.m4 serial 2
-dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
+# configmake.m4 serial 3
+dnl Copyright (C) 2010-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
+AC_PREREQ([2.60])
+
# gl_CONFIGMAKE_PREP
# ------------------
# Guarantee all of the standard directory variables, even when used with
-# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir
-# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b,
-# and runstatedir in 1.14.1).
+# autoconf 2.63 (runstatedir wasn't supported before 2.70) or
+# automake 1.11 (runstatedir isn't supported even in 1.16.1).
AC_DEFUN([gl_CONFIGMAKE_PREP],
[
- dnl Technically, datadir should default to datarootdir. But if
- dnl autoconf is too old to provide datarootdir, then reversing the
- dnl definition is a reasonable compromise. Only AC_SUBST a variable
- dnl if it was not already defined earlier by autoconf.
- if test "x$datarootdir" = x; then
- AC_SUBST([datarootdir], ['${datadir}'])
- fi
- dnl Copy the approach used in autoconf 2.60.
- if test "x$docdir" = x; then
- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
- ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
- ['${datarootdir}/doc/${PACKAGE}'])])
- fi
- dnl The remaining variables missing from autoconf 2.59 are easier.
- if test "x$htmldir" = x; then
- AC_SUBST([htmldir], ['${docdir}'])
- fi
- if test "x$dvidir" = x; then
- AC_SUBST([dvidir], ['${docdir}'])
- fi
- if test "x$pdfdir" = x; then
- AC_SUBST([pdfdir], ['${docdir}'])
- fi
- if test "x$psdir" = x; then
- AC_SUBST([psdir], ['${docdir}'])
- fi
if test "x$lispdir" = x; then
AC_SUBST([lispdir], ['${datarootdir}/emacs/site-lisp'])
fi
- if test "x$localedir" = x; then
- AC_SUBST([localedir], ['${datarootdir}/locale'])
- fi
- dnl Added in autoconf 2.70
+ dnl Added in autoconf 2.70.
if test "x$runstatedir" = x; then
AC_SUBST([runstatedir], ['${localstatedir}/run'])
fi
- dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely
- dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe.
+ dnl Automake 1.11 provides pkglibexecdir merely without AC_SUBST.
+ dnl This blind use of AC_SUBST is safe.
AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}'])
])
diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index 376045cc3be3e97cdb6fbb36d1b4d496b6e6d8b8..f1420ccff2accbdf278bfb407843d4886f3d86a0 100644
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -5,7 +5,7 @@ dnl
dnl Check whether struct dirent has a member named d_ino.
dnl
-# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2017 Free Software
+# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2019 Free Software
# Foundation, Inc.
# This file is free software; the Free Software Foundation
diff --git a/m4/dirent-safer.m4 b/m4/dirent-safer.m4
index 2ee00e4aecc17bf6ba4f97673503b2be22afc4fe..3089ea63b75d995a010ae39299a13401e367c25d 100644
--- a/m4/dirent-safer.m4
+++ b/m4/dirent-safer.m4
@@ -1,5 +1,5 @@
#serial 2
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4
index 1f9c4f31f7dcb34102feb29ac4aef257763aba58..732aa554c20e83c56677b222c98b125dbd176c0e 100644
--- a/m4/dirent_h.m4
+++ b/m4/dirent_h.m4
@@ -1,5 +1,5 @@
# dirent_h.m4 serial 16
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index d472c38549dd609930daa8336d4067ac17d6d847..5c7586997fdb6c78655a759fcb36572252a4f827 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -2,7 +2,7 @@
dnl Find out how to get the file descriptor associated with an open DIR*.
-# Copyright (C) 2001-2006, 2008-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2006, 2008-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/dirname.m4 b/m4/dirname.m4
index 46f5394c7c59639106bd166978ca4ee1df409590..32141ae6ff0d2d9b0dfdd86d32fd5f43ea80f7a2 100644
--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,5 +1,5 @@
#serial 10 -*- autoconf -*-
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4
index c80f9eada254eee098ca68998c79ba1a1e4b112b..0c5afb17156d1da2ab3d1e03551f8ca6117b2805 100644
--- a/m4/double-slash-root.m4
+++ b/m4/double-slash-root.m4
@@ -1,5 +1,5 @@
# double-slash-root.m4 serial 4 -*- Autoconf -*-
-dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/dup.m4 b/m4/dup.m4
index 42ef5d7a1a135c569c6866ff15549173d96b3ad5..005f1ea7e0aad1ca86915860ef7ba5868a170b56 100644
--- a/m4/dup.m4
+++ b/m4/dup.m4
@@ -1,5 +1,5 @@
# dup.m4 serial 6
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/dup2.m4 b/m4/dup2.m4
index bdb9ae250187c7cd8e2765da4f45629a147c92ef..b314247d3bc360bc460ac2bcd86f32e1f719e6d3 100644
--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -1,5 +1,5 @@
#serial 25
-dnl Copyright (C) 2002, 2005, 2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005, 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/eealloc.m4 b/m4/eealloc.m4
index 96b9bca5ae00644cae93a4c24f3f3f64815edc13..2a4b120a172fac47269c524aaede94ad732d99e7 100644
--- a/m4/eealloc.m4
+++ b/m4/eealloc.m4
@@ -1,5 +1,5 @@
# eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/environ.m4 b/m4/environ.m4
index 3b9fa5f58bd74b5fdcc09b5f779900d4e08141bf..c1a6fa374687cd913d317e73d3c48d87fe416846 100644
--- a/m4/environ.m4
+++ b/m4/environ.m4
@@ -1,5 +1,5 @@
-# environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc.
+# environ.m4 serial 7
+dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -29,16 +29,14 @@ AC_DEFUN_ONCE([gl_ENVIRON],
AC_DEFUN([gt_CHECK_VAR_DECL],
[
define([gt_cv_var], [gt_cv_var_]$2[_declaration])
- AC_MSG_CHECKING([if $2 is properly declared])
- AC_CACHE_VAL([gt_cv_var], [
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[$1
- extern struct { int foo; } $2;]],
- [[$2.foo = 1;]])],
- [gt_cv_var=no],
- [gt_cv_var=yes])])
- AC_MSG_RESULT([$gt_cv_var])
+ AC_CACHE_CHECK([if $2 is properly declared], [gt_cv_var],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[$1
+ extern struct { int foo; } $2;]],
+ [[$2.foo = 1;]])],
+ [gt_cv_var=no],
+ [gt_cv_var=yes])])
if test $gt_cv_var = yes; then
AC_DEFINE([HAVE_]m4_translit($2, [a-z], [A-Z])[_DECL], 1,
[Define if you have the declaration of $2.])
diff --git a/m4/errno_h.m4 b/m4/errno_h.m4
index 9f0f2f2fb32078374226c8a3597e2e29610e8fb6..2388854e05731abe0edc9a58164280cdfd0c782a 100644
--- a/m4/errno_h.m4
+++ b/m4/errno_h.m4
@@ -1,9 +1,11 @@
-# errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2017 Free Software Foundation, Inc.
+# errno_h.m4 serial 13
+dnl Copyright (C) 2004, 2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
+AC_PREREQ([2.61])
+
AC_DEFUN_ONCE([gl_HEADER_ERRNO_H],
[
AC_REQUIRE([AC_PROG_CC])
@@ -129,9 +131,3 @@ yes
AC_SUBST($1[_VALUE])
fi
])
-
-dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
-dnl Remove this when we can assume autoconf >= 2.61.
-m4_ifdef([AC_COMPUTE_INT], [], [
- AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
-])
diff --git a/m4/error.m4 b/m4/error.m4
index 57c6f125c5accbf8f56069b8d71e0a972d44eb1a..393adb54c64e4bd366957bba64626eebb6631986 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,6 +1,6 @@
#serial 14
-# Copyright (C) 1996-1998, 2001-2004, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2019 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4
index 02fca2917612aa33df3013865a60f4f66d4c6c79..8e840e63c2f23935eea1395ad7be68136f0fdc5e 100644
--- a/m4/euidaccess.m4
+++ b/m4/euidaccess.m4
@@ -1,5 +1,5 @@
# euidaccess.m4 serial 15
-dnl Copyright (C) 2002-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/exponentd.m4 b/m4/exponentd.m4
index cd64b92d0fb3fe71481713d4901a1af1c7c975d8..90870dfa40623459fd4f5c40694fb7f64b263584 100644
--- a/m4/exponentd.m4
+++ b/m4/exponentd.m4
@@ -1,5 +1,5 @@
# exponentd.m4 serial 3
-dnl Copyright (C) 2007-2008, 2010-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2008, 2010-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/extensions.m4 b/m4/extensions.m4
index f8543386795d0448078674e03cd2bfc22c7cfeb6..fd1ce817f069f4841643f53e20ca060773b2ed6b 100644
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -1,7 +1,7 @@
-# serial 17 -*- Autoconf -*-
+# serial 18 -*- Autoconf -*-
# Enable extensions on systems that normally disable them.
-# Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -118,6 +118,11 @@ dnl configure.ac when using autoheader 2.62.
#ifndef _XOPEN_SOURCE
# undef _XOPEN_SOURCE
#endif
+/* Enable X/Open compliant socket functions that do not require linking
+ with -lxnet on HP-UX 11.11. */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
@@ -163,6 +168,7 @@ dnl configure.ac when using autoheader 2.62.
[ac_cv_should_define__xopen_source=yes])])])
test $ac_cv_should_define__xopen_source = yes &&
AC_DEFINE([_XOPEN_SOURCE], [500])
+ AC_DEFINE([_HPUX_ALT_XOPEN_SOCKET_API])
])# AC_USE_SYSTEM_EXTENSIONS
# gl_USE_SYSTEM_EXTENSIONS
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index 207aa6a0895965a15c7b015ae045ad8406c6faf1..ec9f2218bf33c31f37ca41f8a914116d055010a0 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -1,6 +1,6 @@
dnl 'extern inline' a la ISO C99.
-dnl Copyright 2012-2017 Free Software Foundation, Inc.
+dnl Copyright 2012-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -25,7 +25,8 @@ AC_DEFUN([gl_EXTERN_INLINE],
if isdigit is mistakenly implemented via a static inline function,
a program containing an extern inline function that calls isdigit
may not work since the C standard prohibits extern inline functions
- from calling static functions. This bug is known to occur on:
+ from calling static functions (ISO C 99 section 6.7.4.(3).
+ This bug is known to occur on:
OS X 10.8 and earlier; see:
https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html
@@ -38,7 +39,18 @@ AC_DEFUN([gl_EXTERN_INLINE],
OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
for clang but remains for g++; see <https://trac.macports.org/ticket/41033>.
- Assume DragonFly and FreeBSD will be similar. */
+ Assume DragonFly and FreeBSD will be similar.
+
+ GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+ inline semantics, unless -fgnu89-inline is used. It defines a macro
+ __GNUC_STDC_INLINE__ to indicate this situation or a macro
+ __GNUC_GNU_INLINE__ to indicate the opposite situation.
+ GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline
+ semantics but warns, unless -fgnu89-inline is used:
+ warning: C99 inline functions are not supported; using GNU89
+ warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute
+ It defines a macro __GNUC_GNU_INLINE__ to indicate this situation.
+ */
#if (((defined __APPLE__ && defined __MACH__) \
|| defined __DragonFly__ || defined __FreeBSD__) \
&& (defined __header_inline \
diff --git a/m4/faccessat.m4 b/m4/faccessat.m4
index c64545abd4674cf31acee497c1ee72492973de8b..6c7d79b008190be40e1805b8cb8e11aa9029a5dd 100644
--- a/m4/faccessat.m4
+++ b/m4/faccessat.m4
@@ -1,7 +1,7 @@
# serial 8
# See if we need to provide faccessat replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fchdir.m4 b/m4/fchdir.m4
index 0ef04ed8e996fb8c16bf7746a8901778a1a1c030..ea5a4f91e99e5c9bb577c85fca7ca86a92a723e1 100644
--- a/m4/fchdir.m4
+++ b/m4/fchdir.m4
@@ -1,5 +1,5 @@
-# fchdir.m4 serial 22
-dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# fchdir.m4 serial 24
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -31,12 +31,14 @@ AC_DEFUN([gl_FUNC_FCHDIR],
[gl_cv_func_open_directory_works=yes],
[gl_cv_func_open_directory_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_open_directory_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_open_directory_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_open_directory_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_open_directory_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_open_directory_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_open_directory_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_open_directory_works="guessing no" ;;
esac
])])
case "$gl_cv_func_open_directory_works" in
diff --git a/m4/fchmodat.m4 b/m4/fchmodat.m4
index 43b302b7b5285d2ee678dd62f3e7db79ea3a408d..2797d3d60cda0c7efd004ec541f9938681e2f285 100644
--- a/m4/fchmodat.m4
+++ b/m4/fchmodat.m4
@@ -1,5 +1,5 @@
# fchmodat.m4 serial 1
-dnl Copyright (C) 2004-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fchownat.m4 b/m4/fchownat.m4
index 58eee3b3204992237565f211f1d68ecb3bf7b6c5..5cca8b5a7d0b5b921c819a68965f6291a93ea67d 100644
--- a/m4/fchownat.m4
+++ b/m4/fchownat.m4
@@ -1,5 +1,5 @@
# fchownat.m4 serial 2
-dnl Copyright (C) 2004-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4
index b388d8935a166949bdcb99f2f32497e47b7c273f..6ab3387dafab1f7105fb0f4c019fa6822982026f 100644
--- a/m4/fcntl-o.m4
+++ b/m4/fcntl-o.m4
@@ -1,22 +1,20 @@
-# fcntl-o.m4 serial 5
-dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+# fcntl-o.m4 serial 6
+dnl Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl Written by Paul Eggert.
+AC_PREREQ([2.60])
+
# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
AC_DEFUN([gl_FCNTL_O_FLAGS],
[
dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
- dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
- dnl AC_GNU_SOURCE.
- m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
- [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
- [AC_REQUIRE([AC_GNU_SOURCE])])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
AC_CHECK_HEADERS_ONCE([unistd.h])
diff --git a/m4/fcntl-safer.m4 b/m4/fcntl-safer.m4
new file mode 100644
index 0000000000000000000000000000000000000000..bacacb17e91a0440d654ee7d6fa28aab0180163a
--- /dev/null
+++ b/m4/fcntl-safer.m4
@@ -0,0 +1,16 @@
+#serial 9
+dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FCNTL_SAFER],
+[
+ dnl Prerequisites of lib/open-safer.c.
+ AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T])
+])
+
+AC_DEFUN([gl_OPENAT_SAFER],
+[
+ AC_REQUIRE([gl_FCNTL_SAFER])
+])
diff --git a/m4/fcntl.m4 b/m4/fcntl.m4
index dda3b5f2c74914a49f5ef36692193fb377724810..e409e96b1c8975bd986579882ed413079833f82d 100644
--- a/m4/fcntl.m4
+++ b/m4/fcntl.m4
@@ -1,5 +1,5 @@
# fcntl.m4 serial 9
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4
index 09c21eff91bfdbb94241889bf8ae35cfee2989cf..a86fdae5feb6ba160c068261d5d0a54814c95fa2 100644
--- a/m4/fcntl_h.m4
+++ b/m4/fcntl_h.m4
@@ -1,6 +1,6 @@
# serial 15
# Configure fcntl.h.
-dnl Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
index 51c2b64b03f7cc95d88df0a96feccd22d9d3d12f..04905519d0b66741fa9cee7027ad3bd852c1bea2 100644
--- a/m4/fdopendir.m4
+++ b/m4/fdopendir.m4
@@ -1,7 +1,7 @@
# serial 10
# See if we need to provide fdopendir.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4
index 6707d707edff5ef9b374c63083afd08e6fe147a7..17b5f8d775bef96e25fcd742e5a8295f8694ac8e 100644
--- a/m4/fileblocks.m4
+++ b/m4/fileblocks.m4
@@ -1,5 +1,5 @@
# fileblocks.m4 serial 6
-dnl Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4
index ce60cb471861ffba0845cf1a434b2f69d0a40613..351715a7fdb48cc32ada0803e1e2dcfd06c8294c 100644
--- a/m4/filenamecat.m4
+++ b/m4/filenamecat.m4
@@ -1,5 +1,5 @@
# filenamecat.m4 serial 11
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/flexmember.m4 b/m4/flexmember.m4
index 9d3b50d15752aaaaf5b0d75d707fbeed9239b527..1347068fe3c6fc01c158be8004aa213d547b0913 100644
--- a/m4/flexmember.m4
+++ b/m4/flexmember.m4
@@ -1,7 +1,7 @@
# serial 5
# Check for flexible array member support.
-# Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/float_h.m4 b/m4/float_h.m4
index 24bd06ecc18adbd419526a4760b755e25ad337a6..1cd28a0bd2a3070789afce97398ca6dbf2aafdb1 100644
--- a/m4/float_h.m4
+++ b/m4/float_h.m4
@@ -1,5 +1,5 @@
# float_h.m4 serial 12
-dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index 7292c1aab11172ac6568043617cdde39a640afbf..c264ca71f971c20821fcbc65af75d60fe6a9dcf8 100644
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -1,6 +1,6 @@
-# Check for fnmatch - serial 9. -*- coding: utf-8 -*-
+# Check for fnmatch - serial 13. -*- coding: utf-8 -*-
-# Copyright (C) 2000-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2000-2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,124 +13,120 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
[
m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX])
- dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc.
- dnl This is only needed if gl_fnmatch_required = GNU. It would be possible
- dnl to avoid this dependency for gl_FUNC_FNMATCH_POSIX by putting
- dnl gl_FUNC_FNMATCH_GNU into a separate .m4 file.
- AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
- FNMATCH_H=
+ AC_REQUIRE([gl_FNMATCH_H])
gl_fnmatch_required_lowercase=`
echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]'
`
- gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
- AC_CACHE_CHECK([for working $gl_fnmatch_required fnmatch],
- [$gl_fnmatch_cache_var],
- [dnl Some versions of Solaris, SCO, and the GNU C Library
- dnl have a broken or incompatible fnmatch.
- dnl So we run a test program. If we are cross-compiling, take no chance.
- dnl Thanks to John Oleynick, François Pinard, and Paul Eggert for this
- dnl test.
- if test $gl_fnmatch_required = GNU; then
- gl_fnmatch_gnu_start=
- gl_fnmatch_gnu_end=
- else
- gl_fnmatch_gnu_start='#if 0'
- gl_fnmatch_gnu_end='#endif'
- fi
- AC_RUN_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <fnmatch.h>
- static int
- y (char const *pattern, char const *string, int flags)
- {
- return fnmatch (pattern, string, flags) == 0;
- }
- static int
- n (char const *pattern, char const *string, int flags)
- {
- return fnmatch (pattern, string, flags) == FNM_NOMATCH;
- }
- ]],
- [[char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]";
- char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]";
- static char const A_1[] = { 'A' - 1, 0 };
- static char const A01[] = { 'A' + 1, 0 };
- static char const a_1[] = { 'a' - 1, 0 };
- static char const a01[] = { 'a' + 1, 0 };
- static char const bs_1[] = { '\\\\' - 1, 0 };
- static char const bs01[] = { '\\\\' + 1, 0 };
- int result = 0;
- if (!n ("a*", "", 0))
- return 1;
- if (!y ("a*", "abc", 0))
- return 1;
- if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */
- return 1;
- if (!n ("d*/*1", "d/s/1", FNM_PATHNAME))
- return 2;
- if (!y ("a\\\\bc", "abc", 0))
- return 3;
- if (!n ("a\\\\bc", "abc", FNM_NOESCAPE))
- return 3;
- if (!y ("*x", ".x", 0))
- return 4;
- if (!n ("*x", ".x", FNM_PERIOD))
- return 4;
- if (!y (Apat, "\\\\", 0))
- return 5;
- if (!y (Apat, "A", 0))
- return 5;
- if (!y (apat, "\\\\", 0))
- return 5;
- if (!y (apat, "a", 0))
- return 5;
- if (!(n (Apat, A_1, 0) == ('A' < '\\\\')))
- return 5;
- if (!(n (apat, a_1, 0) == ('a' < '\\\\')))
- return 5;
- if (!(y (Apat, A01, 0) == ('A' < '\\\\')))
- return 5;
- if (!(y (apat, a01, 0) == ('a' < '\\\\')))
- return 5;
- if (!(y (Apat, bs_1, 0) == ('A' < '\\\\')))
- return 5;
- if (!(y (apat, bs_1, 0) == ('a' < '\\\\')))
- return 5;
- if (!(n (Apat, bs01, 0) == ('A' < '\\\\')))
- return 5;
- if (!(n (apat, bs01, 0) == ('a' < '\\\\')))
- return 5;
- $gl_fnmatch_gnu_start
- if (!y ("xxXX", "xXxX", FNM_CASEFOLD))
- result |= 8;
- if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH))
- result |= 16;
- if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME))
- result |= 32;
- if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR))
- result |= 64;
- if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR))
- result |= 64;
- if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR))
- result |= 64;
- $gl_fnmatch_gnu_end
- return result;
- ]])],
- [eval "$gl_fnmatch_cache_var=yes"],
- [eval "$gl_fnmatch_cache_var=no"],
- [eval "$gl_fnmatch_cache_var=\"guessing no\""])
- ])
- eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
- if test "$gl_fnmatch_result" = yes; then
- dnl Not strictly necessary. Only to avoid spurious leftover files if people
- dnl don't do "make distclean".
- rm -f "$gl_source_base/fnmatch.h"
+ AC_CHECK_FUNCS_ONCE([fnmatch])
+ if test $ac_cv_func_fnmatch = no; then
+ HAVE_FNMATCH=0
else
- FNMATCH_H=fnmatch.h
+ gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
+ AC_CACHE_CHECK([for working $gl_fnmatch_required fnmatch],
+ [$gl_fnmatch_cache_var],
+ [dnl Some versions of Solaris, SCO, and the GNU C Library
+ dnl have a broken or incompatible fnmatch.
+ dnl So we run a test program. If we are cross-compiling, take no chance.
+ dnl Thanks to John Oleynick, François Pinard, and Paul Eggert for this
+ dnl test.
+ if test $gl_fnmatch_required = GNU; then
+ gl_fnmatch_gnu_start=
+ gl_fnmatch_gnu_end=
+ else
+ gl_fnmatch_gnu_start='#if 0'
+ gl_fnmatch_gnu_end='#endif'
+ fi
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <fnmatch.h>
+ static int
+ y (char const *pattern, char const *string, int flags)
+ {
+ return fnmatch (pattern, string, flags) == 0;
+ }
+ static int
+ n (char const *pattern, char const *string, int flags)
+ {
+ return fnmatch (pattern, string, flags) == FNM_NOMATCH;
+ }
+ ]],
+ [[char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]";
+ char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]";
+ static char const A_1[] = { 'A' - 1, 0 };
+ static char const A01[] = { 'A' + 1, 0 };
+ static char const a_1[] = { 'a' - 1, 0 };
+ static char const a01[] = { 'a' + 1, 0 };
+ static char const bs_1[] = { '\\\\' - 1, 0 };
+ static char const bs01[] = { '\\\\' + 1, 0 };
+ int result = 0;
+ if (!n ("a*", "", 0))
+ return 1;
+ if (!y ("a*", "abc", 0))
+ return 1;
+ if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */
+ return 1;
+ if (!n ("d*/*1", "d/s/1", FNM_PATHNAME))
+ return 2;
+ if (!y ("a\\\\bc", "abc", 0))
+ return 3;
+ if (!n ("a\\\\bc", "abc", FNM_NOESCAPE))
+ return 3;
+ if (!y ("*x", ".x", 0))
+ return 4;
+ if (!n ("*x", ".x", FNM_PERIOD))
+ return 4;
+ if (!y (Apat, "\\\\", 0))
+ return 5;
+ if (!y (Apat, "A", 0))
+ return 5;
+ if (!y (apat, "\\\\", 0))
+ return 5;
+ if (!y (apat, "a", 0))
+ return 5;
+ if (!(n (Apat, A_1, 0) == ('A' < '\\\\')))
+ return 5;
+ if (!(n (apat, a_1, 0) == ('a' < '\\\\')))
+ return 5;
+ if (!(y (Apat, A01, 0) == ('A' < '\\\\')))
+ return 5;
+ if (!(y (apat, a01, 0) == ('a' < '\\\\')))
+ return 5;
+ if (!(y (Apat, bs_1, 0) == ('A' < '\\\\')))
+ return 5;
+ if (!(y (apat, bs_1, 0) == ('a' < '\\\\')))
+ return 5;
+ if (!(n (Apat, bs01, 0) == ('A' < '\\\\')))
+ return 5;
+ if (!(n (apat, bs01, 0) == ('a' < '\\\\')))
+ return 5;
+ $gl_fnmatch_gnu_start
+ if (!y ("xxXX", "xXxX", FNM_CASEFOLD))
+ result |= 8;
+ if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH))
+ result |= 16;
+ if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME))
+ result |= 32;
+ if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR))
+ result |= 64;
+ if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR))
+ result |= 64;
+ if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR))
+ result |= 64;
+ $gl_fnmatch_gnu_end
+ return result;
+ ]])],
+ [eval "$gl_fnmatch_cache_var=yes"],
+ [eval "$gl_fnmatch_cache_var=no"],
+ [eval "$gl_fnmatch_cache_var=\"guessing no\""])
+ ])
+ eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
+ if test "$gl_fnmatch_result" != yes; then
+ REPLACE_FNMATCH=1
+ fi
+ fi
+ if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
+ gl_REPLACE_FNMATCH_H
fi
- AC_SUBST([FNMATCH_H])
- AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"])
])
# Request a POSIX compliant fnmatch function with GNU extensions.
@@ -143,11 +139,6 @@ AC_DEFUN([gl_FUNC_FNMATCH_GNU],
AC_DEFUN([gl_PREREQ_FNMATCH],
[
- dnl We must choose a different name for our function, since on ELF systems
- dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
- dnl compiled into a shared library.
- AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
- [Define to a replacement function name for fnmatch().])
dnl Prerequisites of lib/fnmatch.c.
AC_REQUIRE([AC_TYPE_MBSTATE_T])
AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]])
diff --git a/m4/fnmatch_h.m4 b/m4/fnmatch_h.m4
new file mode 100644
index 0000000000000000000000000000000000000000..fba6f868bfe9f7bea6390a67c44cfa6560208929
--- /dev/null
+++ b/m4/fnmatch_h.m4
@@ -0,0 +1,75 @@
+# fnmatch_h.m4 serial 4
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN_ONCE([gl_FNMATCH_H],
+[
+ AC_REQUIRE([gl_FNMATCH_H_DEFAULTS])
+ m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])])
+ AC_CHECK_HEADERS_ONCE([fnmatch.h])
+ gl_CHECK_NEXT_HEADERS([fnmatch.h])
+
+ dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc.
+ dnl This is only needed if gl_fnmatch_required = GNU. It would be possible
+ dnl to avoid this dependency for gl_FUNC_FNMATCH_POSIX by putting
+ dnl gl_FUNC_FNMATCH_GNU into a separate .m4 file.
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+ if test $ac_cv_header_fnmatch_h = yes; then
+ HAVE_FNMATCH_H=1
+ else
+ HAVE_FNMATCH_H=0
+ fi
+ AC_SUBST([HAVE_FNMATCH_H])
+
+ m4_ifdef([gl_POSIXCHECK],
+ [FNMATCH_H=fnmatch.h],
+ [FNMATCH_H=''
+ if m4_ifdef([gl_ANSI_CXX], [test "$CXX" != no], [false]); then
+ dnl Override <fnmatch.h> always, to support the C++ GNULIB_NAMESPACE.
+ FNMATCH_H=fnmatch.h
+ else
+ if test $ac_cv_header_fnmatch_h != yes; then
+ dnl Provide a substitute <fnmatch.h> file.
+ FNMATCH_H=fnmatch.h
+ fi
+ fi
+ ])
+ AC_SUBST([FNMATCH_H])
+ AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"])
+
+ dnl Check for declarations of anything we want to poison if the
+ dnl corresponding gnulib module is not in use.
+ gl_WARN_ON_USE_PREPARE([[#include <fnmatch.h>
+ ]],
+ [fnmatch])
+])
+
+dnl Unconditionally enables the replacement of <fnmatch.h>.
+AC_DEFUN([gl_REPLACE_FNMATCH_H],
+[
+ AC_REQUIRE([gl_FNMATCH_H_DEFAULTS])
+ FNMATCH_H='fnmatch.h'
+ AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"])
+])
+
+AC_DEFUN([gl_FNMATCH_MODULE_INDICATOR],
+[
+ dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+ AC_REQUIRE([gl_FNMATCH_H_DEFAULTS])
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+ dnl Define it also as a C macro, for the benefit of the unit tests.
+ gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_FNMATCH_H_DEFAULTS],
+[
+ GNULIB_FNMATCH=0; AC_SUBST([GNULIB_FNMATCH])
+ dnl Assume POSIX behavior unless another module says otherwise.
+ HAVE_FNMATCH=1; AC_SUBST([HAVE_FNMATCH])
+ REPLACE_FNMATCH=0; AC_SUBST([REPLACE_FNMATCH])
+])
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index 3a5e934c251da0a7d189475250cc9e1f3f9df65f..402ec4033164cc85e915079a35080c1f4b231e13 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,6 +1,6 @@
# serial 22
-# Copyright (C) 2000-2001, 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2004-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/fseek.m4 b/m4/fseek.m4
index 4664ac167b4e6df9d5d2636b10628c77ac5476d6..2dfeecb700234b13115717c394b9dff16e3e419c 100644
--- a/m4/fseek.m4
+++ b/m4/fseek.m4
@@ -1,5 +1,5 @@
# fseek.m4 serial 4
-dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fseeko.m4 b/m4/fseeko.m4
index 5c30df220f37ed36970116ec4e522fd96f4d4d53..1e2b08dbfc53fcafad02c2fd761478b50276a617 100644
--- a/m4/fseeko.m4
+++ b/m4/fseeko.m4
@@ -1,5 +1,5 @@
-# fseeko.m4 serial 18
-dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+# fseeko.m4 serial 19
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -68,7 +68,10 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET],
# Prerequisites of lib/fseeko.c.
AC_DEFUN([gl_PREREQ_FSEEKO],
[
- dnl Native Windows has the function _fseeki64. mingw hides it, but mingw64
- dnl makes it usable again.
+ dnl Native Windows has the function _fseeki64. mingw hides it in some
+ dnl circumstances, but mingw64 makes it usable again.
AC_CHECK_FUNCS([_fseeki64])
+ if test $ac_cv_func__fseeki64 = yes; then
+ AC_CHECK_DECLS([_fseeki64])
+ fi
])
diff --git a/m4/fstat.m4 b/m4/fstat.m4
index e70e533e7a0c5e6af18e347387a70a039418fa40..2a59c8ff4063d07ddb60c25906bd21e351d7f78a 100644
--- a/m4/fstat.m4
+++ b/m4/fstat.m4
@@ -1,5 +1,5 @@
-# fstat.m4 serial 5
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# fstat.m4 serial 6
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -10,9 +10,10 @@ AC_DEFUN([gl_FUNC_FSTAT],
AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
case "$host_os" in
- mingw*)
- dnl On this platform, the original stat() returns st_atime, st_mtime,
+ mingw* | solaris*)
+ dnl On MinGW, the original stat() returns st_atime, st_mtime,
dnl st_ctime values that are affected by the time zone.
+ dnl Solaris stat can return a negative tv_nsec.
REPLACE_FSTAT=1
;;
esac
diff --git a/m4/fstatat.m4 b/m4/fstatat.m4
index 7dba52796e28331718b2311e4173c1ea979eab11..489a55a3151e41d15c1f0c21c86ae1342fd3d08c 100644
--- a/m4/fstatat.m4
+++ b/m4/fstatat.m4
@@ -1,5 +1,5 @@
-# fstatat.m4 serial 3
-dnl Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# fstatat.m4 serial 4
+dnl Copyright (C) 2004-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_FSTATAT],
AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ AC_REQUIRE([AC_CANONICAL_HOST])
AC_CHECK_FUNCS_ONCE([fstatat])
if test $ac_cv_func_fstatat = no; then
@@ -46,15 +46,20 @@ AC_DEFUN([gl_FUNC_FSTATAT],
case $gl_cv_func_fstatat_zero_flag+$gl_cv_func_lstat_dereferences_slashed_symlink in
*yes+*yes) ;;
- *) REPLACE_FSTATAT=1
- case $gl_cv_func_fstatat_zero_flag in
- *yes)
+ *) REPLACE_FSTATAT=1 ;;
+ esac
+
+ case $host_os in
+ solaris*)
+ REPLACE_FSTATAT=1 ;;
+ esac
+
+ case $REPLACE_FSTATAT,$gl_cv_func_fstatat_zero_flag in
+ 1,*yes)
AC_DEFINE([HAVE_WORKING_FSTATAT_ZERO_FLAG], [1],
[Define to 1 if fstatat (..., 0) works.
For example, it does not work in AIX 7.1.])
;;
- esac
- ;;
esac
fi
])
diff --git a/m4/futimens.m4 b/m4/futimens.m4
index d68bff3a7d798a5a06de35831a9b22b2804a0047..3cfa4a198826dd2004e3ae1775dbda7174529bc1 100644
--- a/m4/futimens.m4
+++ b/m4/futimens.m4
@@ -1,7 +1,7 @@
# serial 7
# See if we need to provide futimens replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4
index b16bb5abbb1a07c040a7dc7f72f6ded2e33551b1..7929b674c806025db2a4ef93bf954a10fde6f82d 100644
--- a/m4/getcwd-abort-bug.m4
+++ b/m4/getcwd-abort-bug.m4
@@ -1,9 +1,9 @@
-# serial 8
+# serial 9
# Determine whether getcwd aborts when the length of the working directory
# name is unusually large. Any length between 4k and 16k trigger the bug
# when using glibc-2.4.90-9 or older.
-# Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,7 +16,13 @@ AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG],
AC_CHECK_DECLS_ONCE([getcwd])
AC_CHECK_HEADERS_ONCE([unistd.h])
AC_REQUIRE([gl_PATHMAX_SNIPPET_PREREQ])
- AC_CHECK_FUNCS([getpagesize])
+
+ gl_CHECK_FUNC_GETPAGESIZE
+ if test $gl_cv_func_getpagesize = yes; then
+ AC_DEFINE_UNQUOTED([HAVE_GETPAGESIZE], [1],
+ [Define to 1 if the system has the 'getpagesize' function.])
+ fi
+
AC_CACHE_CHECK([whether getcwd aborts when 4k < cwd_length < 16k],
[gl_cv_func_getcwd_abort_bug],
[# Remove any remnants of a previous test.
diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4
index 71e7cd075e85ea8369f6ef19332280ad0bf42136..2cefc00ad1c561f0a081605d88d2514149572627 100644
--- a/m4/getcwd-path-max.m4
+++ b/m4/getcwd-path-max.m4
@@ -1,4 +1,4 @@
-# serial 20
+# serial 21
# Check for several getcwd bugs with long file names.
# If so, arrange to compile the wrapper function.
@@ -6,7 +6,7 @@
# I've heard that this is due to a Linux kernel bug, and that it has
# been fixed between 2.4.21-pre3 and 2.4.21-pre4.
-# Copyright (C) 2003-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -209,9 +209,21 @@ main ()
32) gl_cv_func_getcwd_path_max='yes, but with shorter paths';;
*) gl_cv_func_getcwd_path_max=no;;
esac],
- [case "$host_os" in
- aix*) gl_cv_func_getcwd_path_max='no, it has the AIX bug';;
- *) gl_cv_func_getcwd_path_max=no;;
- esac])
+ [# Cross-compilation guesses:
+ case "$host_os" in
+ aix*) # On AIX, it has the AIX bug.
+ gl_cv_func_getcwd_path_max='no, it has the AIX bug' ;;
+ gnu*) # On Hurd, it is 'yes'.
+ gl_cv_func_getcwd_path_max=yes ;;
+ linux* | kfreebsd*)
+ # On older Linux+glibc it's 'no, but it is partly working',
+ # on newer Linux+glibc it's 'yes'.
+ # On Linux+musl libc, it's 'no, but it is partly working'.
+ # On kFreeBSD+glibc, it's 'no, but it is partly working'.
+ gl_cv_func_getcwd_path_max='no, but it is partly working' ;;
+ *) # If we don't know, assume the worst.
+ gl_cv_func_getcwd_path_max=no ;;
+ esac
+ ])
])
])
diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
index a3f62c46225935bcf4e807eab5eb119e9aa632c5..4929b5114329fe7887af54e432859c6725ea14db 100644
--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -1,12 +1,12 @@
# getcwd.m4 - check for working getcwd that is compatible with glibc
-# Copyright (C) 2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Written by Paul Eggert.
-# serial 14
+# serial 16
AC_DEFUN([gl_FUNC_GETCWD_NULL],
[
@@ -25,7 +25,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
char *getcwd ();
# endif
]], [[
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
/* mingw cwd does not start with '/', but getcwd does allocate.
However, mingw fails to honor non-zero size. */
#else
@@ -48,12 +48,12 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
[gl_cv_func_getcwd_null=yes],
[gl_cv_func_getcwd_null=no],
[[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_getcwd_null="guessing yes";;
- # Guess yes on Cygwin.
- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
- # If we don't know, assume the worst.
- *) gl_cv_func_getcwd_null="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";;
+ # Guess yes on Cygwin.
+ cygwin*) gl_cv_func_getcwd_null="guessing yes";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_getcwd_null="guessing no";;
esac
]])])
])
diff --git a/m4/getdelim.m4 b/m4/getdelim.m4
index 67afdbab09ac251e1ce2e8c224a0d45db76a9baa..bf17c57274561651e4730c05c69e024ffedc111d 100644
--- a/m4/getdelim.m4
+++ b/m4/getdelim.m4
@@ -1,6 +1,6 @@
# getdelim.m4 serial 12
-dnl Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
dnl
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4
index f1e4f5f699efbf1ade89ef90723796ab605b424f..96aa241b1922bc9013340f67cced8b2a73d350f7 100644
--- a/m4/getdtablesize.m4
+++ b/m4/getdtablesize.m4
@@ -1,5 +1,5 @@
# getdtablesize.m4 serial 7
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 17f7409944e881efe8f73e8b0d73564890231544..2ce986ea79b1ea6592e10deeeea2cceebf7b93cd 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,9 +1,9 @@
-# serial 19
+# serial 21
dnl From Jim Meyering.
dnl A wrapper around AC_FUNC_GETGROUPS.
-# Copyright (C) 1996-1997, 1999-2004, 2008-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-1997, 1999-2004, 2008-2019 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -34,16 +34,16 @@ AC_DEFUN([AC_FUNC_GETGROUPS],
[AC_RUN_IFELSE(
[AC_LANG_PROGRAM(
[AC_INCLUDES_DEFAULT],
- [[/* On Ultrix 4.3, getgroups (0, 0) always fails. */
+ [[/* On NeXTstep 3.2, getgroups (0, 0) always fails. */
return getgroups (0, 0) == -1;]])
],
[ac_cv_func_getgroups_works=yes],
[ac_cv_func_getgroups_works=no],
[case "$host_os" in # ((
- # Guess yes on glibc systems.
- *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) ac_cv_func_getgroups_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) ac_cv_func_getgroups_works="guessing no" ;;
esac
])
])
@@ -93,10 +93,10 @@ AC_DEFUN([gl_FUNC_GETGROUPS],
[gl_cv_func_getgroups_works=yes],
[gl_cv_func_getgroups_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_getgroups_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_getgroups_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_getgroups_works="guessing no" ;;
esac
])])
case "$gl_cv_func_getgroups_works" in
diff --git a/m4/getline.m4 b/m4/getline.m4
index bd91befab76950c2c0df2094092b21dea1748a42..5b2ead2876b404091229adfd6eea072c768dd7c7 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,6 +1,6 @@
# getline.m4 serial 28
-dnl Copyright (C) 1998-2003, 2005-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 1998-2003, 2005-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl
dnl This file is free software; the Free Software Foundation
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 3ebc7b7edf515484f1275c0d524f1a64c6882b80..5991bf83e8916c9ed24895f2b3a2af8ff3c69d42 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,5 +1,5 @@
# getopt.m4 serial 46
-dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4
index f891200f146c16f9ca19b95d33bdbe044bba6dcf..546c3ad11ebee5e916c416dd821c5f37846bc241 100644
--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,5 +1,5 @@
-# getpagesize.m4 serial 9
-dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2017 Free Software Foundation,
+# getpagesize.m4 serial 10
+dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,8 +9,8 @@ AC_DEFUN([gl_FUNC_GETPAGESIZE],
[
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
AC_REQUIRE([AC_CANONICAL_HOST])
- AC_CHECK_FUNCS([getpagesize])
- if test $ac_cv_func_getpagesize = no; then
+ gl_CHECK_FUNC_GETPAGESIZE
+ if test $gl_cv_func_getpagesize = no; then
HAVE_GETPAGESIZE=0
AC_CHECK_HEADERS([OS.h])
if test $ac_cv_header_OS_h = yes; then
@@ -30,3 +30,20 @@ AC_DEFUN([gl_FUNC_GETPAGESIZE],
dnl mingw has getpagesize() in libgcc.a but doesn't declare it.
AC_CHECK_DECL([getpagesize], , [HAVE_DECL_GETPAGESIZE=0])
])
+
+dnl Tests whether the function getpagesize() exists.
+dnl Sets gl_cv_func_getpagesize.
+AC_DEFUN([gl_CHECK_FUNC_GETPAGESIZE],
+[
+ dnl We can't use AC_CHECK_FUNC here, because getpagesize() is defined as a
+ dnl static inline function when compiling for Android 4.4 or older.
+ AC_CACHE_CHECK([for getpagesize], [gl_cv_func_getpagesize],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <unistd.h>]],
+ [[return getpagesize();]])
+ ],
+ [gl_cv_func_getpagesize=yes],
+ [gl_cv_func_getpagesize=no])
+ ])
+])
diff --git a/m4/getprogname.m4 b/m4/getprogname.m4
index efc06e78e575b0710aea61acf6be7400672951e7..4a96d066aa3da7f37c8a78959aefabae1c815b20 100644
--- a/m4/getprogname.m4
+++ b/m4/getprogname.m4
@@ -1,6 +1,6 @@
# getprogname.m4 - check for getprogname or replacements for it
-# Copyright (C) 2016-2017 Free Software Foundation, Inc.
+# Copyright (C) 2016-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index eef5073b32cbbb94d33cd34075cf12d6e2703f16..fec3804575840c85b1d0d1302896f1d10b7f4aac 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,5 +1,5 @@
-# gettext.m4 serial 68 (gettext-0.19.8)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+# gettext.m4 serial 69 (gettext-0.19.9)
+dnl Copyright (C) 1995-2014, 2016, 2018-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -91,8 +91,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
dnl again, outside any 'if'. There are two solutions:
dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
- dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
- dnl documented, we avoid it.
+ dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
ifelse(gt_included_intl, yes, , [
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
])
diff --git a/m4/gettime.m4 b/m4/gettime.m4
index 1cdab2780d62b61f72bd09d990a80391e4394405..60d8ea183bcca194508316241a64561736c70fe6 100644
--- a/m4/gettime.m4
+++ b/m4/gettime.m4
@@ -1,5 +1,5 @@
-# gettime.m4 serial 8
-dnl Copyright (C) 2002, 2004-2006, 2009-2017 Free Software Foundation, Inc.
+# gettime.m4 serial 9
+dnl Copyright (C) 2002, 2004-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -9,5 +9,5 @@ AC_DEFUN([gl_GETTIME],
dnl Prerequisites of lib/gettime.c.
AC_REQUIRE([gl_CLOCK_TIME])
AC_REQUIRE([gl_TIMESPEC])
- AC_CHECK_FUNCS_ONCE([gettimeofday nanotime])
+ AC_CHECK_FUNCS_ONCE([gettimeofday])
])
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index efa114dfaffba2da0f4194d7345c969b5024f02f..d29b4bff2ff9feda54bac857d3166e3cb283d2a6 100644
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -1,6 +1,6 @@
-# serial 24
+# serial 25
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -103,12 +103,12 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
[gl_cv_func_gettimeofday_clobber=yes],
[# When cross-compiling:
case "$host_os" in
- # Guess all is fine on glibc systems.
- *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_gettimeofday_clobber="guessing yes" ;;
+ # Guess all is fine on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_gettimeofday_clobber="guessing yes" ;;
esac
])])
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 2e30ed6884b249ae3a08948e49a1799f57ba0760..0ab0f235a66224be382dfaacade43e977f3a3855 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,5 +1,5 @@
# glibc21.m4 serial 5
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2017 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index bea5a650e7675d38a9d507a2384e9ad746f3d4f4..7c0e3e8fa4a77bb90c733ec6a3dc401a503c28f5 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,9 +1,11 @@
-# gnulib-common.m4 serial 38
-dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 41
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
+AC_PREREQ([2.62])
+
# gl_COMMON
# is expanded unconditionally through gnulib-tool magic.
AC_DEFUN([gl_COMMON], [
@@ -14,12 +16,15 @@ AC_DEFUN([gl_COMMON], [
AC_DEFUN([gl_COMMON_BODY], [
AH_VERBATIM([_Noreturn],
[/* The _Noreturn keyword of C11. */
-#if ! (defined _Noreturn \
- || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
- || 0x5110 <= __SUNPRO_C)
+#ifndef _Noreturn
+# if 201103 <= (defined __cplusplus ? __cplusplus : 0)
+# define _Noreturn [[noreturn]]
+# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
+ || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+ /* _Noreturn works as-is. */
+# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
# define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
+# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0)
# define _Noreturn __declspec (noreturn)
# else
# define _Noreturn
@@ -72,6 +77,13 @@ AC_DEFUN([gl_COMMON_BODY], [
#else
# define _GL_ATTRIBUTE_CONST /* empty */
#endif
+
+/* The __malloc__ attribute was added in gcc 3. */
+#if 3 <= __GNUC__
+# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+#else
+# define _GL_ATTRIBUTE_MALLOC /* empty */
+#endif
])
dnl Preparation for running test programs:
dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
@@ -207,13 +219,6 @@ AC_DEFUN([gl_FEATURES_H],
AC_SUBST([HAVE_FEATURES_H])
])
-# m4_foreach_w
-# is a backport of autoconf-2.59c's m4_foreach_w.
-# Remove this macro when we can assume autoconf >= 2.60.
-m4_ifndef([m4_foreach_w],
- [m4_define([m4_foreach_w],
- [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
-
# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
# ----------------------------------------------------
# Backport of autoconf-2.63b's macro.
@@ -226,7 +231,6 @@ m4_ifndef([AS_VAR_IF],
# Modifies the value of the shell variable CC in an attempt to make $CC
# understand ISO C99 source code.
# This is like AC_PROG_CC_C99, except that
-# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60,
# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
# <https://lists.gnu.org/r/bug-gnulib/2011-09/msg00367.html>,
# but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
@@ -315,25 +319,6 @@ Amsterdam
AC_SUBST([RANLIB])
])
-# AC_PROG_MKDIR_P
-# is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
-# for interoperability with automake-1.9.6 from autoconf-2.62.
-# Remove this macro when we can assume autoconf >= 2.62 or
-# autoconf >= 2.60 && automake >= 1.10.
-# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
-m4_ifndef([AC_AUTOCONF_VERSION],[
-m4_ifdef([AC_PROG_MKDIR_P], [
- dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
- m4_define([AC_PROG_MKDIR_P],
- m4_defn([AC_PROG_MKDIR_P])[
- AC_SUBST([MKDIR_P])])], [
- dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P.
- AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
- [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
- MKDIR_P='$(mkdir_p)'
- AC_SUBST([MKDIR_P])])])
-])
-
# AC_C_RESTRICT
# This definition is copied from post-2.69 Autoconf and overrides the
# AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed
@@ -347,16 +332,16 @@ AC_DEFUN([AC_C_RESTRICT],
for ac_kw in __restrict __restrict__ _Restrict restrict; do
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
- [[typedef int *int_ptr;
- int foo (int_ptr $ac_kw ip) { return ip[0]; }
- int bar (int [$ac_kw]); /* Catch GCC bug 14050. */
- int bar (int ip[$ac_kw]) { return ip[0]; }
- ]],
- [[int s[1];
- int *$ac_kw t = s;
- t[0] = 0;
- return foo (t) + bar (t);
- ]])],
+ [[typedef int *int_ptr;
+ int foo (int_ptr $ac_kw ip) { return ip[0]; }
+ int bar (int [$ac_kw]); /* Catch GCC bug 14050. */
+ int bar (int ip[$ac_kw]) { return ip[0]; }
+ ]],
+ [[int s[1];
+ int *$ac_kw t = s;
+ t[0] = 0;
+ return foo (t) + bar (t);
+ ]])],
[ac_cv_c_restrict=$ac_kw])
test "$ac_cv_c_restrict" != no && break
done
@@ -407,61 +392,3 @@ AC_DEFUN([gl_CACHE_VAL_SILENT],
# AS_VAR_COPY was added in autoconf 2.63b
m4_define_default([AS_VAR_COPY],
[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
-
-# AC_PROG_SED was added in autoconf 2.59b
-m4_ifndef([AC_PROG_SED],
-[AC_DEFUN([AC_PROG_SED],
-[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
- [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
- dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed.
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
- for ac_i in 1 2 3 4 5 6 7; do
- ac_script="$ac_script$as_nl$ac_script"
- done
- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- AS_UNSET([ac_script])
- if test -z "$SED"; then
- ac_path_SED_found=false
- _AS_PATH_WALK([], [
- for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- AS_EXECUTABLE_P(["$ac_path_SED"]) || continue
- case `"$ac_path_SED" --version 2>&1` in
- *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
- *)
- ac_count=0
- _AS_ECHO_N([0123456789]) >conftest.in
- while :
- do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >> conftest.nl
- "$ac_path_SED" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
- diff conftest.out conftest.nl >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${ac_path_SED_max-0}; then
- # Best so far, but keep looking for better
- ac_cv_path_SED=$ac_path_SED
- ac_path_SED_max=$ac_count
- fi
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
- $ac_path_SED_found && break 3
- done
- done])
- if test -z "$ac_cv_path_SED"; then
- AC_ERROR([no acceptable sed could be found in \$PATH])
- fi
- else
- ac_cv_path_SED=$SED
- fi
- ])
- SED="$ac_cv_path_SED"
- AC_SUBST([SED])dnl
- rm -f conftest.sed
-])
-])
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 15e7c4b7bd08e66893912d9433c6136e30b34156..1800eab075f36f713567ee60f98ca98cd564ea2f 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
# DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -101,6 +101,7 @@ AC_DEFUN([gl_EARLY],
# Code from module fchownat:
# Code from module fcntl:
# Code from module fcntl-h:
+ # Code from module fcntl-safer:
# Code from module fd-hook:
# Code from module fd-safer-flag:
# Code from module fdopendir:
@@ -113,6 +114,7 @@ AC_DEFUN([gl_EARLY],
# Code from module float:
# Code from module fnmatch:
# Code from module fnmatch-gnu:
+ # Code from module fnmatch-h:
# Code from module fpending:
# Code from module fprintftime:
# Code from module fseek:
@@ -141,7 +143,6 @@ AC_DEFUN([gl_EARLY],
# Code from module hard-locale:
# Code from module hash:
# Code from module havelib:
- # Code from module host-cpu-c-abi:
# Code from module human:
# Code from module include_next:
# Code from module intprops:
@@ -153,6 +154,7 @@ AC_DEFUN([gl_EARLY],
# Code from module largefile:
AC_REQUIRE([AC_SYS_LARGEFILE])
# Code from module lchown:
+ # Code from module libc-config:
# Code from module limits-h:
# Code from module link:
# Code from module link-follow:
@@ -198,7 +200,9 @@ AC_DEFUN([gl_EARLY],
# Code from module openat:
# Code from module openat-die:
# Code from module openat-h:
+ # Code from module openat-safer:
# Code from module opendir:
+ # Code from module opendirat:
# Code from module parse-datetime:
# Code from module pathmax:
# Code from module priv-set:
@@ -216,7 +220,7 @@ AC_DEFUN([gl_EARLY],
# Code from module regex:
# Code from module rename:
# Code from module renameat:
- # Code from module renameat2:
+ # Code from module renameatu:
# Code from module rewinddir:
# Code from module rmdir:
# Code from module root-uid:
@@ -246,9 +250,7 @@ AC_DEFUN([gl_EARLY],
# Code from module stdalign:
# Code from module stdarg:
dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
- dnl for the builtin va_copy to work. With Autoconf 2.60 or later,
- dnl gl_PROG_CC_C99 arranges for this. With older Autoconf gl_PROG_CC_C99
- dnl shouldn't hurt, though installers are on their own to set c99 mode.
+ dnl for the builtin va_copy to work. gl_PROG_CC_C99 arranges for this.
gl_PROG_CC_C99
# Code from module stdbool:
# Code from module stddef:
@@ -467,6 +469,8 @@ AC_DEFUN([gl_INIT],
fi
gl_FCNTL_MODULE_INDICATOR([fcntl])
gl_FCNTL_H
+ gl_FCNTL_SAFER
+ gl_MODULE_INDICATOR([fcntl-safer])
gl_MODULE_INDICATOR([fd-safer-flag])
gl_FUNC_FDOPENDIR
if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then
@@ -491,15 +495,18 @@ AC_DEFUN([gl_INIT],
AC_LIBOBJ([itold])
fi
gl_FUNC_FNMATCH_POSIX
- if test -n "$FNMATCH_H"; then
+ if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
AC_LIBOBJ([fnmatch])
gl_PREREQ_FNMATCH
fi
+ gl_FNMATCH_MODULE_INDICATOR([fnmatch])
gl_FUNC_FNMATCH_GNU
- if test -n "$FNMATCH_H"; then
+ if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
AC_LIBOBJ([fnmatch])
gl_PREREQ_FNMATCH
fi
+ gl_MODULE_INDICATOR([fnmatch-gnu])
+ gl_FNMATCH_H
gl_FUNC_FPENDING
if test $gl_cv_func___fpending = no; then
AC_LIBOBJ([fpending])
@@ -606,8 +613,6 @@ AC_DEFUN([gl_INIT],
gl_PREREQ_GROUP_MEMBER
fi
gl_UNISTD_MODULE_INDICATOR([group-member])
- gl_HARD_LOCALE
- AC_REQUIRE([gl_HOST_CPU_C_ABI])
gl_HUMAN
gl_INTTOSTR
gl_INTTYPES_H
@@ -628,6 +633,7 @@ AC_DEFUN([gl_INIT],
AC_LIBOBJ([lchown])
fi
gl_UNISTD_MODULE_INDICATOR([lchown])
+ gl___INLINE
gl_LIMITS_H
gl_FUNC_LINK
if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then
@@ -642,7 +648,8 @@ AC_DEFUN([gl_INIT],
fi
gl_UNISTD_MODULE_INDICATOR([linkat])
gl_LOCALCHARSET
- LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+ dnl For backward compatibility. Some packages still use this.
+ LOCALCHARSET_TESTS_ENVIRONMENT=
AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
gl_LOCALE_H
gl_FUNC_LOCALECONV
@@ -800,6 +807,8 @@ AC_DEFUN([gl_INIT],
fi
gl_MODULE_INDICATOR([openat]) dnl for lib/getcwd.c
gl_FCNTL_MODULE_INDICATOR([openat])
+ gl_OPENAT_SAFER
+ gl_MODULE_INDICATOR([openat-safer])
gl_FUNC_OPENDIR
if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then
AC_LIBOBJ([opendir])
@@ -1067,7 +1076,7 @@ AC_DEFUN([gl_INIT],
gl_UNISTD_SAFER
gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h])
gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniwidth.h])
- gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/width])
+ gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/width])
gl_FUNC_UNLINK
if test $REPLACE_UNLINK = 1; then
AC_LIBOBJ([unlink])
@@ -1119,6 +1128,7 @@ AC_DEFUN([gl_INIT],
gl_FUNC_WCWIDTH
if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
AC_LIBOBJ([wcwidth])
+ gl_PREREQ_WCWIDTH
fi
gl_WCHAR_MODULE_INDICATOR([wcwidth])
gl_FUNC_WRITE
@@ -1337,6 +1347,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/canonicalize-lgpl.c
lib/careadlinkat.c
lib/careadlinkat.h
+ lib/cdefs.h
lib/chdir-long.c
lib/chdir-long.h
lib/chmodat.c
@@ -1350,7 +1361,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/closedir.c
lib/closeout.c
lib/closeout.h
- lib/config.charset
+ lib/creat-safer.c
lib/dirent--.h
lib/dirent-private.h
lib/dirent-safer.h
@@ -1377,6 +1388,8 @@ AC_DEFUN([gl_FILE_LIST], [
lib/fchmodat.c
lib/fchown-stub.c
lib/fchownat.c
+ lib/fcntl--.h
+ lib/fcntl-safer.h
lib/fcntl.c
lib/fcntl.in.h
lib/fd-hook.c
@@ -1447,6 +1460,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/itold.c
lib/langinfo.in.h
lib/lchown.c
+ lib/libc-config.h
lib/limits.in.h
lib/link.c
lib/linkat.c
@@ -1461,7 +1475,6 @@ AC_DEFUN([gl_FILE_LIST], [
lib/malloc.c
lib/malloca.c
lib/malloca.h
- lib/malloca.valgrind
lib/mbchar.c
lib/mbchar.h
lib/mbrtowc.c
@@ -1499,14 +1512,18 @@ AC_DEFUN([gl_FILE_LIST], [
lib/obstack.c
lib/obstack.h
lib/offtostr.c
+ lib/open-safer.c
lib/open.c
lib/openat-die.c
lib/openat-priv.h
lib/openat-proc.c
+ lib/openat-safer.c
lib/openat.c
lib/openat.h
lib/opendir-safer.c
lib/opendir.c
+ lib/opendirat.c
+ lib/opendirat.h
lib/parse-datetime.h
lib/parse-datetime.y
lib/pathmax.h
@@ -1530,8 +1547,6 @@ AC_DEFUN([gl_FILE_LIST], [
lib/readlink.c
lib/readlinkat.c
lib/realloc.c
- lib/ref-add.sin
- lib/ref-del.sin
lib/regcomp.c
lib/regex.c
lib/regex.h
@@ -1540,8 +1555,8 @@ AC_DEFUN([gl_FILE_LIST], [
lib/regexec.c
lib/rename.c
lib/renameat.c
- lib/renameat2.c
- lib/renameat2.h
+ lib/renameatu.c
+ lib/renameatu.h
lib/rewinddir.c
lib/rmdir.c
lib/root-uid.h
@@ -1608,6 +1623,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/strtoumax.c
lib/symlink.c
lib/symlinkat.c
+ lib/sys-limits.h
lib/sys_stat.in.h
lib/sys_time.in.h
lib/sys_types.in.h
@@ -1679,11 +1695,11 @@ AC_DEFUN([gl_FILE_LIST], [
lib/xvasprintf.c
lib/xvasprintf.h
m4/00gnulib.m4
+ m4/__inline.m4
m4/absolute-header.m4
m4/acl.m4
m4/alloca.m4
m4/argp.m4
- m4/asm-underscore.m4
m4/backupfile.m4
m4/bison.m4
m4/btowc.m4
@@ -1719,6 +1735,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/fchmodat.m4
m4/fchownat.m4
m4/fcntl-o.m4
+ m4/fcntl-safer.m4
m4/fcntl.m4
m4/fcntl_h.m4
m4/fdopendir.m4
@@ -1727,6 +1744,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/flexmember.m4
m4/float_h.m4
m4/fnmatch.m4
+ m4/fnmatch_h.m4
m4/fpending.m4
m4/fseek.m4
m4/fseeko.m4
@@ -1750,12 +1768,12 @@ AC_DEFUN([gl_FILE_LIST], [
m4/glibc21.m4
m4/gnulib-common.m4
m4/group-member.m4
- m4/hard-locale.m4
m4/host-cpu-c-abi.m4
m4/human.m4
m4/iconv.m4
m4/include_next.m4
m4/intdiv0.m4
+ m4/intl-thread-locale.m4
m4/intl.m4
m4/intldir.m4
m4/intlmacosx.m4
diff --git a/m4/group-member.m4 b/m4/group-member.m4
index a68538d24dcd28dcac4cdb8c88f64336a861fce0..77d389de6934a0ff2199d7adda3650feb8f00246 100644
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,6 +1,6 @@
# serial 14
-# Copyright (C) 1999-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/hard-locale.m4 b/m4/hard-locale.m4
deleted file mode 100644
index d79acd6581c55bd56f3abff1742b1eb4307183d2..0000000000000000000000000000000000000000
--- a/m4/hard-locale.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-# hard-locale.m4 serial 8
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl No prerequisites of lib/hard-locale.c.
-AC_DEFUN([gl_HARD_LOCALE],
-[
- :
-])
diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4
index 9370c3185845295199b12dde0095cef2a544ccea..4407296d0849c39a782fbd44a9c873aeb52cdc76 100644
--- a/m4/host-cpu-c-abi.m4
+++ b/m4/host-cpu-c-abi.m4
@@ -1,5 +1,5 @@
-# host-cpu-c-abi.m4 serial 8
-dnl Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# host-cpu-c-abi.m4 serial 11
+dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -135,7 +135,7 @@ changequote([,])dnl
echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c
# Look for a reference to the register d0 in the .s file.
AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
- if LC_ALL=C grep -E 'd0,' conftest.$gl_asmext >/dev/null; then
+ if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then
gl_cv_host_cpu_c_abi=armhf
else
gl_cv_host_cpu_c_abi=arm
@@ -237,6 +237,60 @@ changequote([,])dnl
gl_cv_host_cpu_c_abi=powerpc
;;
+ riscv32 | riscv64 )
+ # There are 2 architectures (with variants): rv32* and rv64*.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if __riscv_xlen == 64
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [cpu=riscv64],
+ [cpu=riscv32])
+ # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
+ # Size of 'long' and 'void *':
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if defined __LP64__
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [main_abi=lp64],
+ [main_abi=ilp32])
+ # Float ABIs:
+ # __riscv_float_abi_double:
+ # 'float' and 'double' are passed in floating-point registers.
+ # __riscv_float_abi_single:
+ # 'float' are passed in floating-point registers.
+ # __riscv_float_abi_soft:
+ # No values are passed in floating-point registers.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if defined __riscv_float_abi_double
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [float_abi=d],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if defined __riscv_float_abi_single
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [float_abi=f],
+ [float_abi=''])
+ ])
+ gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}"
+ ;;
+
s390* )
# On s390x, the C compiler may be generating 64-bit (= s390x) code
# or 31-bit (= s390) code.
@@ -349,6 +403,39 @@ EOF
#ifndef __powerpc64_elfv2__
#undef __powerpc64_elfv2__
#endif
+#ifndef __riscv32__
+#undef __riscv32__
+#endif
+#ifndef __riscv64__
+#undef __riscv64__
+#endif
+#ifndef __riscv32_ilp32__
+#undef __riscv32_ilp32__
+#endif
+#ifndef __riscv32_ilp32f__
+#undef __riscv32_ilp32f__
+#endif
+#ifndef __riscv32_ilp32d__
+#undef __riscv32_ilp32d__
+#endif
+#ifndef __riscv64_ilp32__
+#undef __riscv64_ilp32__
+#endif
+#ifndef __riscv64_ilp32f__
+#undef __riscv64_ilp32f__
+#endif
+#ifndef __riscv64_ilp32d__
+#undef __riscv64_ilp32d__
+#endif
+#ifndef __riscv64_lp64__
+#undef __riscv64_lp64__
+#endif
+#ifndef __riscv64_lp64f__
+#undef __riscv64_lp64f__
+#endif
+#ifndef __riscv64_lp64d__
+#undef __riscv64_lp64d__
+#endif
#ifndef __s390__
#undef __s390__
#endif
@@ -367,3 +454,191 @@ EOF
])
])
+
+
+dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI
+dnl (application binary interface) is a 32-bit one, or to 'no' otherwise.
+dnl This is a simplified variant of gl_HOST_CPU_C_ABI.
+AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
+[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit],
+ [if test -n "$gl_cv_host_cpu_c_abi"; then
+ case "$gl_cv_host_cpu_c_abi" in
+ i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+ gl_cv_host_cpu_c_abi_32bit=yes ;;
+ *)
+ gl_cv_host_cpu_c_abi_32bit=no ;;
+ esac
+ else
+ case "$host_cpu" in
+
+changequote(,)dnl
+ i[4567]86 )
+changequote([,])dnl
+ gl_cv_host_cpu_c_abi_32bit=yes
+ ;;
+
+ x86_64 )
+ # On x86_64 systems, the C compiler may be generating code in one of
+ # these ABIs:
+ # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
+ # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
+ # with native Windows (mingw, MSVC).
+ # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if (defined __x86_64__ || defined __amd64__ \
+ || defined _M_X64 || defined _M_AMD64) \
+ && !(defined __ILP32__ || defined _ILP32)
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_host_cpu_c_abi_32bit=no],
+ [gl_cv_host_cpu_c_abi_32bit=yes])
+ ;;
+
+ arm* | aarch64 )
+ # Assume arm with EABI.
+ # On arm64 systems, the C compiler may be generating code in one of
+ # these ABIs:
+ # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
+ # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_host_cpu_c_abi_32bit=no],
+ [gl_cv_host_cpu_c_abi_32bit=yes])
+ ;;
+
+ hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
+ # On hppa, the C compiler may be generating 32-bit code or 64-bit
+ # code. In the latter case, it defines _LP64 and __LP64__.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#ifdef __LP64__
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_host_cpu_c_abi_32bit=no],
+ [gl_cv_host_cpu_c_abi_32bit=yes])
+ ;;
+
+ ia64* )
+ # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
+ # 32-bit code. In the latter case, it defines _ILP32.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#ifdef _ILP32
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_host_cpu_c_abi_32bit=yes],
+ [gl_cv_host_cpu_c_abi_32bit=no])
+ ;;
+
+ mips* )
+ # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
+ # at 32.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_host_cpu_c_abi_32bit=no],
+ [gl_cv_host_cpu_c_abi_32bit=yes])
+ ;;
+
+ powerpc* )
+ # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
+ # No need to distinguish them here; the caller may distinguish
+ # them based on the OS.
+ # On powerpc64 systems, the C compiler may still be generating
+ # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
+ # be generating 64-bit code.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if defined __powerpc64__ || defined _ARCH_PPC64
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_host_cpu_c_abi_32bit=no],
+ [gl_cv_host_cpu_c_abi_32bit=yes])
+ ;;
+
+ rs6000 )
+ gl_cv_host_cpu_c_abi_32bit=yes
+ ;;
+
+ riscv32 | riscv64 )
+ # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
+ # Size of 'long' and 'void *':
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if defined __LP64__
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_host_cpu_c_abi_32bit=no],
+ [gl_cv_host_cpu_c_abi_32bit=yes])
+ ;;
+
+ s390* )
+ # On s390x, the C compiler may be generating 64-bit (= s390x) code
+ # or 31-bit (= s390) code.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if defined __LP64__ || defined __s390x__
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_host_cpu_c_abi_32bit=no],
+ [gl_cv_host_cpu_c_abi_32bit=yes])
+ ;;
+
+ sparc | sparc64 )
+ # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
+ # C compiler still generates 32-bit code.
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#if defined __sparcv9 || defined __arch64__
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_host_cpu_c_abi_32bit=no],
+ [gl_cv_host_cpu_c_abi_32bit=yes])
+ ;;
+
+ *)
+ gl_cv_host_cpu_c_abi_32bit=no
+ ;;
+ esac
+ fi
+ ])
+
+ HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
+])
diff --git a/m4/human.m4 b/m4/human.m4
index 550c9bfd9a2aee78ac4531892cc8fe295b68c096..6f02956a8ed9b709a44e8486318f54d22fef5081 100644
--- a/m4/human.m4
+++ b/m4/human.m4
@@ -1,5 +1,5 @@
#serial 11
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index b33ecd0475046453e0c4a9135eeb1b832656c908..a285e9daa5ea78453c0db5bb1640f7d59b7aa000 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,6 @@
# iconv.m4 serial 21
-dnl Copyright (C) 2000-2002, 2007-2014, 2016-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2019 Free Software Foundation,
+dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/include_next.m4 b/m4/include_next.m4
index 068f6f60a41c6ef3353a83d02fa2b7ab976bbdea..86eb2c97c925bbdee4fa337e4661a9f728669e9e 100644
--- a/m4/include_next.m4
+++ b/m4/include_next.m4
@@ -1,5 +1,5 @@
# include_next.m4 serial 24
-dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
index aca924c6cd3a930004c2df053006ba4e87aab217..7a474270bd9840f644b1d1d6d900b6517d1e514d 100644
--- a/m4/intlmacosx.m4
+++ b/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
-# intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 6 (gettext-0.19.9)
+dnl Copyright (C) 2004-2014, 2016, 2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@ dnl Checks for special options needed on Mac OS X.
dnl Defines INTL_MACOSX_LIBS.
AC_DEFUN([gt_INTL_MACOSX],
[
- dnl Check for API introduced in Mac OS X 10.2.
+ dnl Check for API introduced in Mac OS X 10.4.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
[gt_cv_func_CFPreferencesCopyAppValue],
[gt_save_LIBS="$LIBS"
@@ -33,7 +33,7 @@ AC_DEFUN([gt_INTL_MACOSX],
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
[Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
fi
- dnl Check for API introduced in Mac OS X 10.3.
+ dnl Check for API introduced in Mac OS X 10.5.
AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
[gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
@@ -48,8 +48,24 @@ AC_DEFUN([gt_INTL_MACOSX],
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
[Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
fi
+ AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
+ [gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <CoreFoundation/CFLocale.h>]],
+ [[CFLocaleCopyPreferredLanguages();]])],
+ [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
+ [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+ AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
+ [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
+ fi
INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+ || test $gt_cv_func_CFLocaleCopyCurrent = yes \
+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
fi
AC_SUBST([INTL_MACOSX_LIBS])
diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4
index ff143e9d894be0ba72eca8bc68f3c5d99a16e95e..5ded16e3c5ab38e087a4d3d179c69ce9f1dc7bd0 100644
--- a/m4/intmax_t.m4
+++ b/m4/intmax_t.m4
@@ -1,5 +1,5 @@
# intmax_t.m4 serial 8
-dnl Copyright (C) 1997-2004, 2006-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 1997-2004, 2006-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/inttostr.m4 b/m4/inttostr.m4
index 3120f959e5847e5fe69536ad9e6e230a734af30a..e0ea533eba175e01f125fcac69db31102567aa01 100644
--- a/m4/inttostr.m4
+++ b/m4/inttostr.m4
@@ -1,5 +1,5 @@
#serial 8
-dnl Copyright (C) 2004-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index 205578782f36fea3375ff2ff3002a6e470a395ce..38fe118a3426f64f0db3d60ef98b3cb07453a9b5 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
# inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2002, 2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index 434a7ee2bca898762d5a693afcc9f35638a964e9..c58a1bec4744437efe43a774d8c061b6e15293f1 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,5 +1,5 @@
-# inttypes.m4 serial 26
-dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# inttypes.m4 serial 27
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -147,6 +147,7 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV])
HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
+ HAVE_IMAXDIV_T=1; AC_SUBST([HAVE_IMAXDIV_T])
REPLACE_STRTOIMAX=0; AC_SUBST([REPLACE_STRTOIMAX])
REPLACE_STRTOUMAX=0; AC_SUBST([REPLACE_STRTOUMAX])
INT32_MAX_LT_INTMAX_MAX=1; AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index 92403050579e1799bf706d87ff136ef60d9f7f31..d20422a44998bf64c972ffb23a218abe6dce33c2 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
# inttypes_h.m4 serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/iswblank.m4 b/m4/iswblank.m4
index e9d6975e8d2d8391df7a84959eb42e0de22d6fd2..ad216cc96c20b2eb1e7a559cbca4b7c0f6d34b22 100644
--- a/m4/iswblank.m4
+++ b/m4/iswblank.m4
@@ -1,5 +1,5 @@
# iswblank.m4 serial 4
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4
index ea94b4ed2bf00f5c3568739bf005a079b9e4bd42..76385d817c433f9f70d76fc22d4aeae309ba8fc2 100644
--- a/m4/langinfo_h.m4
+++ b/m4/langinfo_h.m4
@@ -1,5 +1,5 @@
-# langinfo_h.m4 serial 7
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# langinfo_h.m4 serial 8
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,7 @@ AC_DEFUN([gl_LANGINFO_H],
dnl Determine whether <langinfo.h> exists. It is missing on mingw and BeOS.
HAVE_LANGINFO_CODESET=0
HAVE_LANGINFO_T_FMT_AMPM=0
+ HAVE_LANGINFO_ALTMON=0
HAVE_LANGINFO_ERA=0
HAVE_LANGINFO_YESEXPR=0
AC_CHECK_HEADERS_ONCE([langinfo.h])
@@ -24,6 +25,7 @@ AC_DEFUN([gl_LANGINFO_H],
HAVE_LANGINFO_H=1
dnl Determine what <langinfo.h> defines. CODESET and ERA etc. are missing
dnl on OpenBSD 3.8. T_FMT_AMPM and YESEXPR, NOEXPR are missing on IRIX 5.3.
+ dnl ALTMON_* are missing on glibc 2.26 and many other systems.
AC_CACHE_CHECK([whether langinfo.h defines CODESET],
[gl_cv_header_langinfo_codeset],
[AC_COMPILE_IFELSE(
@@ -48,6 +50,18 @@ int a = T_FMT_AMPM;
if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then
HAVE_LANGINFO_T_FMT_AMPM=1
fi
+ AC_CACHE_CHECK([whether langinfo.h defines ALTMON_1],
+ [gl_cv_header_langinfo_altmon],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = ALTMON_1;
+]])],
+ [gl_cv_header_langinfo_altmon=yes],
+ [gl_cv_header_langinfo_altmon=no])
+ ])
+ if test $gl_cv_header_langinfo_altmon = yes; then
+ HAVE_LANGINFO_ALTMON=1
+ fi
AC_CACHE_CHECK([whether langinfo.h defines ERA],
[gl_cv_header_langinfo_era],
[AC_COMPILE_IFELSE(
@@ -78,6 +92,7 @@ int a = YESEXPR;
AC_SUBST([HAVE_LANGINFO_H])
AC_SUBST([HAVE_LANGINFO_CODESET])
AC_SUBST([HAVE_LANGINFO_T_FMT_AMPM])
+ AC_SUBST([HAVE_LANGINFO_ALTMON])
AC_SUBST([HAVE_LANGINFO_ERA])
AC_SUBST([HAVE_LANGINFO_YESEXPR])
diff --git a/m4/largefile.m4 b/m4/largefile.m4
index edc1a9b41baa15d244ead651d8c04de3c05afc17..1938188c17b998ff7eb1c5edb2b439d824aab4b6 100644
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -1,6 +1,6 @@
# Enable large files on systems where this is not the default.
-# Copyright 1992-1996, 1998-2017 Free Software Foundation, Inc.
+# Copyright 1992-1996, 1998-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/lchown.m4 b/m4/lchown.m4
index 0a5d871f7f4423546db1aeacc570f738ef5759c5..3d52419992514eb52fb153c79a54dbdd941a18ea 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,7 +1,7 @@
# serial 17
# Determine whether we need the lchown wrapper.
-dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 0f0c599fba4a245f8beb5657bef991fda73f386d..a18719630d59538c0c03a8677aca2adcd63313aa 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,5 +1,5 @@
# lib-ld.m4 serial 9
-dnl Copyright (C) 1996-2003, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 1ce9a5ab36d22cad4d0d60cd8e39326f419f441e..0ff10731facd82df2d2e94453bbbf44b0d475965 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,12 +1,12 @@
-# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# lib-link.m4 serial 28
+dnl Copyright (C) 2001-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
-AC_PREREQ([2.54])
+AC_PREREQ([2.61])
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
@@ -124,8 +124,8 @@ dnl acl_hardcode_direct,
dnl acl_hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH],
[
- dnl Tell automake >= 1.10 to complain if config.rpath is missing.
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+ dnl Complain if config.rpath is missing.
+ AC_REQUIRE_AUX_FILE([config.rpath])
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
@@ -187,17 +187,15 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
- dnl Autoconf >= 2.61 supports dots in --with options.
- pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
dnl By default, look in $includedir and $libdir.
use_additional=yes
AC_LIB_WITH_FINAL_PREFIX([
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
])
- AC_ARG_WITH(P_A_C_K[-prefix],
-[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
- --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
+ AC_ARG_WITH(PACK[-prefix],
+[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
+ --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
[
if test "X$withval" = "Xno"; then
use_additional=no
@@ -211,7 +209,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem"
if test "$acl_libdirstem2" != "$acl_libdirstem" \
- && ! test -d "$withval/$acl_libdirstem"; then
+ && test ! -d "$withval/$acl_libdirstem"; then
additional_libdir="$withval/$acl_libdirstem2"
fi
fi
@@ -670,7 +668,6 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
done
fi
- popdef([P_A_C_K])
popdef([PACKLIBS])
popdef([PACKUP])
popdef([PACK])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 9fc47a16dcda6c77cbcffa2f2daedc47159bce8c..8adb17bb9167df0d9efa87e3da6e5bec47033389 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,18 +1,11 @@
-# lib-prefix.m4 serial 11
-dnl Copyright (C) 2001-2005, 2008-2017 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 14
+dnl Copyright (C) 2001-2005, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
dnl to access previously installed libraries. The basic assumption is that
dnl a user will want packages to use other packages he previously installed
@@ -32,9 +25,9 @@ AC_DEFUN([AC_LIB_PREFIX],
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
])
- AC_LIB_ARG_WITH([lib-prefix],
-[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
- --without-lib-prefix don't search for libraries in includedir and libdir],
+ AC_ARG_WITH([lib-prefix],
+[[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+ --without-lib-prefix don't search for libraries in includedir and libdir]],
[
if test "X$withval" = "Xno"; then
use_additional=no
@@ -174,7 +167,24 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([gl_HOST_CPU_C_ABI])
+ AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
+
+ case "$host_os" in
+ solaris*)
+ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#ifdef _LP64
+ int ok;
+ #else
+ error fail
+ #endif
+ ]])],
+ [gl_cv_solaris_64bit=yes],
+ [gl_cv_solaris_64bit=no])
+ ]);;
+ esac
+
dnl Allow the user to override the result by setting acl_cv_libdirstems.
AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
[acl_cv_libdirstems],
@@ -187,18 +197,6 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
dnl symlink is missing, so we set acl_libdirstem2 too.
- AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
- [AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE(
- [[#ifdef _LP64
- int ok;
- #else
- error fail
- #endif
- ]])],
- [gl_cv_solaris_64bit=yes],
- [gl_cv_solaris_64bit=no])
- ])
if test $gl_cv_solaris_64bit = yes; then
acl_libdirstem=lib/64
case "$host_cpu" in
@@ -210,40 +208,36 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
*)
dnl If $CC generates code for a 32-bit ABI, the libraries are
dnl surely under $prefix/lib, not $prefix/lib64.
- case "$gl_cv_host_cpu_c_abi" in
- i386 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | s390 | sparc)
- ;;
- *) # x86_64 | arm64 | hppa64 | ia64 | mips64 | powerpc64* | s390x | sparc64 | ...
- dnl The result is a property of the system. However, non-system
- dnl compilers sometimes have odd library search paths. Therefore
- dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
- searchpath=`(if test -f /usr/bin/gcc \
- && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
- LC_ALL=C /usr/bin/gcc -print-search-dirs; \
- else \
- LC_ALL=C $CC -print-search-dirs; \
- fi) 2>/dev/null \
- | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= }"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- */../ | */.. )
- # Better ignore directories of this form. They are misleading.
- ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
- fi
- done
- IFS="$acl_save_IFS"
- fi
- ;;
- esac
+ if test "$HOST_CPU_C_ABI_32BIT" != yes; then
+ dnl The result is a property of the system. However, non-system
+ dnl compilers sometimes have odd library search paths. Therefore
+ dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
+ searchpath=`(if test -f /usr/bin/gcc \
+ && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
+ LC_ALL=C /usr/bin/gcc -print-search-dirs; \
+ else \
+ LC_ALL=C $CC -print-search-dirs; \
+ fi) 2>/dev/null \
+ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+ fi
;;
esac
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4
index ee648f272afa1e38c0d7b5d91f0bb4ddd30e0914..829e71cf303c8fcb258a96628426a7d08997d569 100644
--- a/m4/libunistring-base.m4
+++ b/m4/libunistring-base.m4
@@ -1,5 +1,5 @@
# libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/limits-h.m4 b/m4/limits-h.m4
index 443f91b4dc9796bf4c75811e17b1b7ecd523f1dd..68f724c777ed0372950cb7ff3b47b8038c8f0085 100644
--- a/m4/limits-h.m4
+++ b/m4/limits-h.m4
@@ -1,6 +1,6 @@
dnl Check whether limits.h has needed features.
-dnl Copyright 2016-2017 Free Software Foundation, Inc.
+dnl Copyright 2016-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -11,14 +11,18 @@ AC_DEFUN_ONCE([gl_LIMITS_H],
[
gl_CHECK_NEXT_HEADERS([limits.h])
- AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.],
+ AC_CACHE_CHECK([whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.],
[gl_cv_header_limits_width],
[AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
- #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
- #endif
- #include <limits.h>
- int ullw = ULLONG_WIDTH;]])],
+ [AC_LANG_PROGRAM(
+ [[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+ #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+ #endif
+ #include <limits.h>
+ long long llm = LLONG_MAX;
+ int wb = WORD_BIT;
+ int ullw = ULLONG_WIDTH;
+ ]])],
[gl_cv_header_limits_width=yes],
[gl_cv_header_limits_width=no])])
if test "$gl_cv_header_limits_width" = yes; then
@@ -29,3 +33,11 @@ AC_DEFUN_ONCE([gl_LIMITS_H],
AC_SUBST([LIMITS_H])
AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
])
+
+dnl Unconditionally enables the replacement of <limits.h>.
+AC_DEFUN([gl_REPLACE_LIMITS_H],
+[
+ AC_REQUIRE([gl_LIMITS_H])
+ LIMITS_H='limits.h'
+ AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
+])
diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 587b03ff04f63021b1a6e7ca8ec4f96bfad26c62..cbd2dcadf9a0834eca534922fadf1ddd54e6bec5 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,8 +1,8 @@
-# serial 19
+# serial 20
dnl Run a program to determine whether link(2) follows symlinks.
dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
-# Copyright (C) 1999-2001, 2004-2006, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2004-2006, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -86,10 +86,10 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
dnl The past results are "yes" on Mac OS X, FreeBSD, NetBSD,
dnl OpenBSD, Minix, AIX, HP-UX, OSF/1, and "no" on Linux, Cygwin.
case "$host_os" in
- # On glibc/Linux we know the result.
- linux*-gnu*) gl_cv_func_link_follows_symlink="guessing no" ;;
- # Otherwise, we don't know.
- *) gl_cv_func_link_follows_symlink=unknown ;;
+ # On glibc/Linux we know the result.
+ linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;;
+ # Otherwise, we don't know.
+ *) gl_cv_func_link_follows_symlink=unknown ;;
esac
])
rm -f conftest.file conftest.sym conftest.hard
diff --git a/m4/link.m4 b/m4/link.m4
index 021c30140edaac17162969883a397c6b7af18983..a6d77b8a0162490df2da28ac5ce60eeb9695156a 100644
--- a/m4/link.m4
+++ b/m4/link.m4
@@ -1,5 +1,5 @@
-# link.m4 serial 8
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# link.m4 serial 10
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -39,10 +39,12 @@ AC_DEFUN([gl_FUNC_LINK],
]])],
[gl_cv_func_link_works=yes], [gl_cv_func_link_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_link_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_link_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_link_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_link_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_link_works="guessing no" ;;
esac
])
rm -f conftest.a conftest.b conftest.lnk])
diff --git a/m4/linkat.m4 b/m4/linkat.m4
index 31d87289a3ce7fedf118ff891d923d4c9bff36cf..860abf3676747b514ce4fa52053bcccfc8a4c908 100644
--- a/m4/linkat.m4
+++ b/m4/linkat.m4
@@ -1,7 +1,7 @@
-# serial 7
+# serial 9
# See if we need to provide linkat replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -96,10 +96,14 @@ AC_DEFUN([gl_FUNC_LINKAT],
]])],
[gl_cv_func_linkat_slash=yes],
[gl_cv_func_linkat_slash=no],
- [# Guess yes on glibc systems, no otherwise.
+ [
case "$host_os" in
- *-gnu*) gl_cv_func_linkat_slash="guessing yes";;
- *) gl_cv_func_linkat_slash="guessing no";;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_linkat_slash="guessing yes";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_linkat_slash="guessing yes";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_linkat_slash="guessing no";;
esac
])
rm -rf conftest.a conftest.b conftest.c conftest.d conftest.e conftest.s])
diff --git a/m4/localcharset.m4 b/m4/localcharset.m4
index 0c1ff3868841f89f867c13070b846639c03b6057..2a7f82d06f065dede1eb925c0eff3e9cee20284a 100644
--- a/m4/localcharset.m4
+++ b/m4/localcharset.m4
@@ -1,5 +1,5 @@
-# localcharset.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2009-2017 Free Software Foundation, Inc.
+# localcharset.m4 serial 8
+dnl Copyright (C) 2002, 2004, 2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -8,10 +8,4 @@ AC_DEFUN([gl_LOCALCHARSET],
[
dnl Prerequisites of lib/localcharset.c.
AC_REQUIRE([AM_LANGINFO_CODESET])
- AC_REQUIRE([gl_FCNTL_O_FLAGS])
- AC_CHECK_DECLS_ONCE([getc_unlocked])
-
- dnl Prerequisites of the lib/Makefile.am snippet.
- AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([gl_GLIBC21])
])
diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4
index d974b0357631df7b32f949ea6f6bb9452aeb8e1e..cfa068d594ed3c44161caa28549fd26a4c952e27 100644
--- a/m4/locale-fr.m4
+++ b/m4/locale-fr.m4
@@ -1,5 +1,5 @@
-# locale-fr.m4 serial 18
-dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc.
+# locale-fr.m4 serial 19
+dnl Copyright (C) 2003, 2005-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -31,7 +31,7 @@ int main () {
return 1;
#else
/* Check whether the given locale name is recognized by the system. */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# if defined _WIN32 && !defined __CYGWIN__
/* On native Windows, setlocale(category, "") looks at the system settings,
not at the environment variables. Also, when an encoding suffix such
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
@@ -160,7 +160,7 @@ int main () {
variables, and all locales use the UTF-8 encoding. */
#if !(defined __BEOS__ || defined __HAIKU__)
/* Check whether the given locale name is recognized by the system. */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# if defined _WIN32 && !defined __CYGWIN__
/* On native Windows, setlocale(category, "") looks at the system settings,
not at the environment variables. Also, when an encoding suffix such
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4
index 48d18d6174894b4840531798c17977770409b2b5..487f68bdc3f2408c4bc4fe478f5a7e38344d2670 100644
--- a/m4/locale-ja.m4
+++ b/m4/locale-ja.m4
@@ -1,5 +1,5 @@
-# locale-ja.m4 serial 13
-dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc.
+# locale-ja.m4 serial 14
+dnl Copyright (C) 2003, 2005-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -32,7 +32,7 @@ int main ()
return 1;
#else
/* Check whether the given locale name is recognized by the system. */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# if defined _WIN32 && !defined __CYGWIN__
/* On native Windows, setlocale(category, "") looks at the system settings,
not at the environment variables. Also, when an encoding suffix such
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4
index 5fb7f538c56c43a92f68b0cf959935079ece80fe..8b813263ae55cc7332df340865847b68c2928b21 100644
--- a/m4/locale-zh.m4
+++ b/m4/locale-zh.m4
@@ -1,5 +1,5 @@
-# locale-zh.m4 serial 13
-dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc.
+# locale-zh.m4 serial 14
+dnl Copyright (C) 2003, 2005-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -33,7 +33,7 @@ int main ()
return 1;
#else
/* Check whether the given locale name is recognized by the system. */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+# if defined _WIN32 && !defined __CYGWIN__
/* On native Windows, setlocale(category, "") looks at the system settings,
not at the environment variables. Also, when an encoding suffix such
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
diff --git a/m4/locale_h.m4 b/m4/locale_h.m4
index db005a5b2e5cf221ec0474d51d9836f255092d85..d28ba0c2df59739204f1d84bcd2302846b267ab4 100644
--- a/m4/locale_h.m4
+++ b/m4/locale_h.m4
@@ -1,5 +1,5 @@
-# locale_h.m4 serial 20
-dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+# locale_h.m4 serial 21
+dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -96,7 +96,7 @@ AC_DEFUN([gl_LOCALE_H],
# include <xlocale.h>
#endif
]],
- [setlocale duplocale])
+ [setlocale newlocale duplocale freelocale])
])
AC_DEFUN([gl_LOCALE_MODULE_INDICATOR],
@@ -113,10 +113,15 @@ AC_DEFUN([gl_LOCALE_H_DEFAULTS],
GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV])
GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE])
GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE])
+ GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME])
dnl Assume proper GNU behavior unless another module says otherwise.
+ HAVE_NEWLOCALE=1; AC_SUBST([HAVE_NEWLOCALE])
HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE])
+ HAVE_FREELOCALE=1; AC_SUBST([HAVE_FREELOCALE])
REPLACE_LOCALECONV=0; AC_SUBST([REPLACE_LOCALECONV])
REPLACE_SETLOCALE=0; AC_SUBST([REPLACE_SETLOCALE])
+ REPLACE_NEWLOCALE=0; AC_SUBST([REPLACE_NEWLOCALE])
REPLACE_DUPLOCALE=0; AC_SUBST([REPLACE_DUPLOCALE])
+ REPLACE_FREELOCALE=0; AC_SUBST([REPLACE_FREELOCALE])
REPLACE_STRUCT_LCONV=0; AC_SUBST([REPLACE_STRUCT_LCONV])
])
diff --git a/m4/localeconv.m4 b/m4/localeconv.m4
index c287aa526e2a3542c0eaff1e1453c8694a4b52a2..9bb78f0d8389ed82f785ba53e719f85ce56a444f 100644
--- a/m4/localeconv.m4
+++ b/m4/localeconv.m4
@@ -1,5 +1,5 @@
# localeconv.m4 serial 1
-dnl Copyright (C) 2012-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/localtime-buffer.m4 b/m4/localtime-buffer.m4
index 3965b5d9f2bddad212f1f841e7f7755f8a118dfd..6d9982879bdc4f6c9b4640617b2b94c5db4d3b39 100644
--- a/m4/localtime-buffer.m4
+++ b/m4/localtime-buffer.m4
@@ -1,5 +1,5 @@
# localtime-buffer.m4 serial 1
-dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2017-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index 9a3294bc2cab5454d1df1569a9d6b78593d9d919..08d0e36300d320478d23bbbced0e46a8905e7ca3 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,14 +1,15 @@
-# longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2017 Free Software Foundation, Inc.
+# longlong.m4 serial 18
+dnl Copyright (C) 1999-2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
+AC_PREREQ([2.62])
+
# Define HAVE_LONG_LONG_INT if 'long long int' works.
-# This fixes a bug in Autoconf 2.61, and can be faster
-# than what's in Autoconf 2.62 through 2.68.
+# This can be faster than what's in Autoconf 2.62 through 2.68.
# Note: If the type 'long long int' exists but is only 32 bits large
# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
@@ -56,8 +57,7 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT],
])
# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
-# This fixes a bug in Autoconf 2.61, and can be faster
-# than what's in Autoconf 2.62 through 2.68.
+# This can be faster than what's in Autoconf 2.62 through 2.68.
# Note: If the type 'unsigned long long int' exists but is only 32 bits
# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
diff --git a/m4/lseek.m4 b/m4/lseek.m4
index 627e772ed829804829f1cba2e395379e223db6c2..d55ec2a3b112bd6e590546c6f3aa67a3c51788c7 100644
--- a/m4/lseek.m4
+++ b/m4/lseek.m4
@@ -1,5 +1,5 @@
# lseek.m4 serial 10
-dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 0b6e5d70cba38f063065f763de77eeb9276532da..ace163867e22731234fd80bead0caf5ed69d8200 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,6 +1,6 @@
-# serial 29
+# serial 32
-# Copyright (C) 1997-2001, 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2019 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10,14 +10,15 @@ dnl From Jim Meyering.
AC_DEFUN([gl_FUNC_LSTAT],
[
+ AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
dnl If lstat does not exist, the replacement <sys/stat.h> does
dnl "#define lstat stat", and lstat.c is a no-op.
AC_CHECK_FUNCS_ONCE([lstat])
if test $ac_cv_func_lstat = yes; then
AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
- case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
- *no)
+ case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in
+ solaris* | *no)
REPLACE_LSTAT=1
;;
esac
@@ -52,7 +53,10 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
[gl_cv_func_lstat_dereferences_slashed_symlink=yes],
[gl_cv_func_lstat_dereferences_slashed_symlink=no],
[case "$host_os" in
- *-gnu*)
+ linux-* | linux)
+ # Guess yes on Linux systems.
+ gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+ *-gnu* | gnu*)
# Guess yes on glibc systems.
gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
mingw*)
diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 5e6a83a67f9aa91a1754d57b67d27981e35d34ec..f78a484f1fe2090f974b85da7aca1f2d96a658cb 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,5 +1,5 @@
-# malloc.m4 serial 15
-dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+# malloc.m4 serial 17
+dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
[ac_cv_func_malloc_0_nonnull=no],
[case "$host_os" in
# Guess yes on platforms where we know the result.
- *-gnu* | freebsd* | netbsd* | openbsd* \
+ *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
| hpux* | solaris* | cygwin* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
@@ -91,7 +91,7 @@ AC_DEFUN([gl_CHECK_MALLOC_POSIX],
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[]],
- [[#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+ [[#if defined _WIN32 && ! defined __CYGWIN__
choke me
#endif
]])],
diff --git a/m4/malloca.m4 b/m4/malloca.m4
index 6956baf2098456c57d5388a65ee4e2865e80418c..820f40a8a88cce48935d3b0a61804141e97b71b2 100644
--- a/m4/malloca.m4
+++ b/m4/malloca.m4
@@ -1,5 +1,5 @@
# malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index d10bcd08a0eb2834e7985c040cbad7d54e3952a1..e0488a5cb3866de5790bef13ed0527e14313d241 100644
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -1,5 +1,5 @@
-# manywarnings.m4 serial 13
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+# manywarnings.m4 serial 17
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -51,54 +51,53 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
dnl Check if -W -Werror -Wno-missing-field-initializers is supported
dnl with the current $CC $CFLAGS $CPPFLAGS.
- AC_MSG_CHECKING([whether -Wno-missing-field-initializers is supported])
- AC_CACHE_VAL([gl_cv_cc_nomfi_supported], [
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers"
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[]], [[]])],
- [gl_cv_cc_nomfi_supported=yes],
- [gl_cv_cc_nomfi_supported=no])
- CFLAGS="$gl_save_CFLAGS"])
- AC_MSG_RESULT([$gl_cv_cc_nomfi_supported])
+ AC_CACHE_CHECK([whether -Wno-missing-field-initializers is supported],
+ [gl_cv_cc_nomfi_supported],
+ [gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[]], [[]])],
+ [gl_cv_cc_nomfi_supported=yes],
+ [gl_cv_cc_nomfi_supported=no])
+ CFLAGS="$gl_save_CFLAGS"
+ ])
if test "$gl_cv_cc_nomfi_supported" = yes; then
dnl Now check whether -Wno-missing-field-initializers is needed
dnl for the { 0, } construct.
- AC_MSG_CHECKING([whether -Wno-missing-field-initializers is needed])
- AC_CACHE_VAL([gl_cv_cc_nomfi_needed], [
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -W -Werror"
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[int f (void)
- {
- typedef struct { int a; int b; } s_t;
- s_t s1 = { 0, };
- return s1.b;
- }
- ]],
- [[]])],
- [gl_cv_cc_nomfi_needed=no],
- [gl_cv_cc_nomfi_needed=yes])
- CFLAGS="$gl_save_CFLAGS"
- ])
- AC_MSG_RESULT([$gl_cv_cc_nomfi_needed])
+ AC_CACHE_CHECK([whether -Wno-missing-field-initializers is needed],
+ [gl_cv_cc_nomfi_needed],
+ [gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -W -Werror"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[int f (void)
+ {
+ typedef struct { int a; int b; } s_t;
+ s_t s1 = { 0, };
+ return s1.b;
+ }
+ ]],
+ [[]])],
+ [gl_cv_cc_nomfi_needed=no],
+ [gl_cv_cc_nomfi_needed=yes])
+ CFLAGS="$gl_save_CFLAGS"
+ ])
fi
dnl Next, check if -Werror -Wuninitialized is useful with the
dnl user's choice of $CFLAGS; some versions of gcc warn that it
dnl has no effect if -O is not also used
- AC_MSG_CHECKING([whether -Wuninitialized is supported])
- AC_CACHE_VAL([gl_cv_cc_uninitialized_supported], [
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Werror -Wuninitialized"
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[]], [[]])],
- [gl_cv_cc_uninitialized_supported=yes],
- [gl_cv_cc_uninitialized_supported=no])
- CFLAGS="$gl_save_CFLAGS"])
- AC_MSG_RESULT([$gl_cv_cc_uninitialized_supported])
+ AC_CACHE_CHECK([whether -Wuninitialized is supported],
+ [gl_cv_cc_uninitialized_supported],
+ [gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror -Wuninitialized"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[]], [[]])],
+ [gl_cv_cc_uninitialized_supported=yes],
+ [gl_cv_cc_uninitialized_supported=no])
+ CFLAGS="$gl_save_CFLAGS"
+ ])
fi
@@ -106,18 +105,17 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
# To compare this list to your installed GCC's, run this Bash command:
#
# comm -3 \
- # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \
- # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort |
- # grep -v -x -F -f <(
- # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec))
+ # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\) .*/\1/p' manywarnings.m4; \
+ # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec) | sort) \
+ # <(LC_ALL=C gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort)
gl_manywarn_set=
for gl_manywarn_item in -fno-common \
-W \
- -Wabi \
-Waddress \
-Waggressive-loop-optimizations \
-Wall \
+ -Wattribute-alias \
-Wattributes \
-Wbad-function-cast \
-Wbool-compare \
@@ -125,8 +123,9 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
-Wbuiltin-declaration-mismatch \
-Wbuiltin-macro-redefined \
-Wcast-align \
+ -Wcast-align=strict \
+ -Wcast-function-type \
-Wchar-subscripts \
- -Wchkp \
-Wclobbered \
-Wcomment \
-Wcomments \
@@ -160,6 +159,7 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
-Wframe-address \
-Wfree-nonheap-object \
-Whsa \
+ -Wif-not-aligned \
-Wignored-attributes \
-Wignored-qualifiers \
-Wimplicit \
@@ -173,7 +173,6 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
-Wint-to-pointer-cast \
-Winvalid-memory-model \
-Winvalid-pch \
- -Wjump-misses-init \
-Wlogical-not-parentheses \
-Wlogical-op \
-Wmain \
@@ -181,6 +180,7 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
-Wmemset-elt-size \
-Wmemset-transposed-args \
-Wmisleading-indentation \
+ -Wmissing-attributes \
-Wmissing-braces \
-Wmissing-declarations \
-Wmissing-field-initializers \
@@ -188,6 +188,7 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
-Wmissing-parameter-type \
-Wmissing-prototypes \
-Wmultichar \
+ -Wmultistatement-macros \
-Wnarrowing \
-Wnested-externs \
-Wnonnull \
@@ -202,6 +203,7 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
-Woverride-init \
-Wpacked \
-Wpacked-bitfield-compat \
+ -Wpacked-not-aligned \
-Wparentheses \
-Wpointer-arith \
-Wpointer-compare \
@@ -219,20 +221,23 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
-Wshift-count-overflow \
-Wshift-negative-value \
-Wsizeof-array-argument \
+ -Wsizeof-pointer-div \
-Wsizeof-pointer-memaccess \
-Wstack-protector \
-Wstrict-aliasing \
-Wstrict-overflow \
-Wstrict-prototypes \
+ -Wstringop-truncation \
+ -Wsuggest-attribute=cold \
-Wsuggest-attribute=const \
-Wsuggest-attribute=format \
+ -Wsuggest-attribute=malloc \
-Wsuggest-attribute=noreturn \
-Wsuggest-attribute=pure \
-Wsuggest-final-methods \
-Wsuggest-final-types \
-Wswitch \
-Wswitch-bool \
- -Wswitch-default \
-Wswitch-unreachable \
-Wsync-nand \
-Wsystem-headers \
diff --git a/m4/mbchar.m4 b/m4/mbchar.m4
index 60ea12444ae9ca4c1290bff42c8760baa7b91afa..3d163422695e1fc668b5c3582683d6fb89707772 100644
--- a/m4/mbchar.m4
+++ b/m4/mbchar.m4
@@ -1,5 +1,5 @@
# mbchar.m4 serial 9
-dnl Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbiter.m4 b/m4/mbiter.m4
index add403442603a212618dddbe5e1f6b39078e405c..58889feff3a5a030d0908f25ec0c81df108573f8 100644
--- a/m4/mbiter.m4
+++ b/m4/mbiter.m4
@@ -1,5 +1,5 @@
# mbiter.m4 serial 7
-dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index 216594eb94c5fb6e9b8d5134e49bb783ba6c465e..4811af5d0007cf670c48e75932c131d72df527d4 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 29 -*- coding: utf-8 -*-
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2017 Free Software Foundation,
+# mbrtowc.m4 serial 31 -*- coding: utf-8 -*-
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -563,12 +563,11 @@ AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT],
dnl is present.
changequote(,)dnl
case "$host_os" in
- # Guess no on AIX and glibc systems.
- aix* | *-gnu*)
- gl_cv_func_mbrtowc_empty_input="guessing no" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
- *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+ # Guess no on AIX and glibc systems.
+ aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+ *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
esac
changequote([,])dnl
AC_RUN_IFELSE(
@@ -635,6 +634,7 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE],
# Prerequisites of lib/mbrtowc.c.
AC_DEFUN([gl_PREREQ_MBRTOWC], [
+ AC_REQUIRE([AC_C_INLINE])
:
])
diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4
index 5904a5107be430d5ef7c29b7bd121cc17d77a810..e2f45e75a1e1d048ee9643b2ae48f3ee7216bd2f 100644
--- a/m4/mbsinit.m4
+++ b/m4/mbsinit.m4
@@ -1,5 +1,5 @@
# mbsinit.m4 serial 8
-dnl Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4
index 79b8d767b647bc3633d806398b25bed80fc823b0..cbdde2c55e72bc67a1d7313d77835ba277fb7a09 100644
--- a/m4/mbsrtowcs.m4
+++ b/m4/mbsrtowcs.m4
@@ -1,5 +1,5 @@
# mbsrtowcs.m4 serial 13
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index 6325cf3a49438a8cccdab99a036a6d7175e3f7f9..f669753c07e43b4b5f7f6d13532eecf2cd7293b8 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -1,5 +1,5 @@
# mbstate_t.m4 serial 13
-dnl Copyright (C) 2000-2002, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4
index 378a4e258adaa646280a579b30f3c8733943408e..202c3fbdb5616ee1ac68f98c06e27a7a0f52a7db 100644
--- a/m4/mbtowc.m4
+++ b/m4/mbtowc.m4
@@ -1,5 +1,5 @@
# mbtowc.m4 serial 2
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/memchr.m4 b/m4/memchr.m4
index 0cca69d6f34a91202371fded2eff717f2a64a146..db227e7de178c57ae88431706198621b6dc5c29c 100644
--- a/m4/memchr.m4
+++ b/m4/memchr.m4
@@ -1,5 +1,5 @@
# memchr.m4 serial 13
-dnl Copyright (C) 2002-2004, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index 3faec3c8fc4e08ebeed41d25de73f6e5e27372ee..b6090eed285263f2712347ca50375dd960738d69 100644
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,5 +1,5 @@
# mempcpy.m4 serial 11
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/memrchr.m4 b/m4/memrchr.m4
index e180f6105fdede33cca75101eda452f167440aad..e907590e38a082be5935e91f5ed213abffbf833f 100644
--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -1,5 +1,5 @@
# memrchr.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/minmax.m4 b/m4/minmax.m4
index 6845fce89c4a159aa72f499d6597bde3a80cb483..1e0d30b9806553acc2b3c015666dd1f8875c36cf 100644
--- a/m4/minmax.m4
+++ b/m4/minmax.m4
@@ -1,5 +1,5 @@
# minmax.m4 serial 4
-dnl Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mkdir.m4 b/m4/mkdir.m4
index fa15b15789e13cc946109587ade6bdd02e917ac4..4cd95903b7b98571133f81da6a8218317c6f4059 100644
--- a/m4/mkdir.m4
+++ b/m4/mkdir.m4
@@ -1,6 +1,6 @@
-# serial 12
+# serial 14
-# Copyright (C) 2001, 2003-2004, 2006, 2008-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2004, 2006, 2008-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -23,19 +23,21 @@ AC_DEFUN([gl_FUNC_MKDIR],
[gl_cv_func_mkdir_trailing_slash_works=yes],
[gl_cv_func_mkdir_trailing_slash_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;;
- # Guess yes on MSVC, no on mingw.
- mingw*) AC_EGREP_CPP([Known], [
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;;
+ # Guess yes on MSVC, no on mingw.
+ mingw*) AC_EGREP_CPP([Known], [
#ifdef _MSC_VER
Known
#endif
- ],
- [gl_cv_func_mkdir_trailing_slash_works="guessing yes"],
- [gl_cv_func_mkdir_trailing_slash_works="guessing no"])
- ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;;
+ ],
+ [gl_cv_func_mkdir_trailing_slash_works="guessing yes"],
+ [gl_cv_func_mkdir_trailing_slash_works="guessing no"])
+ ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;;
esac
])
rm -rf conftest.dir
@@ -58,12 +60,12 @@ AC_DEFUN([gl_FUNC_MKDIR],
[gl_cv_func_mkdir_trailing_dot_works=yes],
[gl_cv_func_mkdir_trailing_dot_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
esac
])
rm -rf conftest.dir
diff --git a/m4/mkdirat.m4 b/m4/mkdirat.m4
index b54cf2a5ed6f98a7ed4c639a1c1c071b30bdb06d..76719938e7de1e4d54d78332e583bb8a6424ceb2 100644
--- a/m4/mkdirat.m4
+++ b/m4/mkdirat.m4
@@ -1,5 +1,5 @@
# mkdirat.m4 serial 1
-dnl Copyright (C) 2004-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mkdtemp.m4 b/m4/mkdtemp.m4
index e66c195f2408f038bb9ea949b35ad7b8f7f94808..412bb39b2808eb8527501748a5c5c34429f55427 100644
--- a/m4/mkdtemp.m4
+++ b/m4/mkdtemp.m4
@@ -1,5 +1,5 @@
# mkdtemp.m4 serial 8
-dnl Copyright (C) 2001-2003, 2006-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2001-2003, 2006-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/mkfifo.m4 b/m4/mkfifo.m4
index f2516a9d65074ada660e8669d78124090eb8f0e4..37a6fc70d31f936bc56697ddf287a3d99a9b7b7b 100644
--- a/m4/mkfifo.m4
+++ b/m4/mkfifo.m4
@@ -1,7 +1,7 @@
-# serial 4
+# serial 8
# See if we need to provide mkfifo replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -12,10 +12,23 @@ AC_DEFUN([gl_FUNC_MKFIFO],
[
AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
- AC_CHECK_FUNCS_ONCE([mkfifo])
- if test $ac_cv_func_mkfifo = no; then
+
+ dnl We can't use AC_CHECK_FUNC here, because mkfifo() is defined as a
+ dnl static inline function when compiling for Android 4.4 or older.
+ AC_CACHE_CHECK([for mkfifo], [gl_cv_func_mkfifo],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <sys/stat.h>]],
+ [[return mkfifo("/",0);]])
+ ],
+ [gl_cv_func_mkfifo=yes],
+ [gl_cv_func_mkfifo=no])
+ ])
+ if test $gl_cv_func_mkfifo = no; then
HAVE_MKFIFO=0
else
+ AC_DEFINE([HAVE_MKFIFO], [1],
+ [Define to 1 if you have a 'mkfifo' function.])
dnl Check for Solaris 9 and FreeBSD bug with trailing slash.
AC_CHECK_FUNCS_ONCE([lstat])
AC_CACHE_CHECK([whether mkfifo rejects trailing slashes],
@@ -39,10 +52,12 @@ AC_DEFUN([gl_FUNC_MKFIFO],
]])],
[gl_cv_func_mkfifo_works=yes], [gl_cv_func_mkfifo_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_mkfifo_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_mkfifo_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_mkfifo_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_mkfifo_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_mkfifo_works="guessing no" ;;
esac
])
rm -f conftest.tmp conftest.lnk])
diff --git a/m4/mkfifoat.m4 b/m4/mkfifoat.m4
index e8bc027f8936c86bb045e27eedbb7baef88951e6..c48cbc2bc185e7a2df26c6dfeadc7130939953f4 100644
--- a/m4/mkfifoat.m4
+++ b/m4/mkfifoat.m4
@@ -1,7 +1,7 @@
# serial 3
# See if we need to provide mkfifoat/mknodat replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mknod.m4 b/m4/mknod.m4
index 98ecea296723fa7eb35463d70f8df335e0800de7..710784d05f7a65b508314e95dcd9297ece424369 100644
--- a/m4/mknod.m4
+++ b/m4/mknod.m4
@@ -1,7 +1,7 @@
-# serial 5
+# serial 7
# See if we need to provide mknod replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -43,10 +43,12 @@ AC_DEFUN([gl_FUNC_MKNOD],
fi
gl_cv_func_mknod_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_mknod_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_mknod_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_mknod_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_mknod_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_mknod_works="guessing no" ;;
esac
])
rm -f conftest.fifo])
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 1461905fb93123b6172f33ba1174bcc50d171b30..a86e1eebc68ddc3855dce0650d897245ccb12ea6 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,5 +1,5 @@
# serial 30
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 263687d1adf0a75b64b7600a213188fe8570f4bf..50c380824c7624ae73ec5447a000ec712c4328cc 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -1,5 +1,5 @@
# mmap-anon.m4 serial 10
-dnl Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mode_t.m4 b/m4/mode_t.m4
index 75d372a4a8a6cbd834154dd33e6506e7a654e3fe..ba840dca99d592a3bdaac4447a1777cd8d450e13 100644
--- a/m4/mode_t.m4
+++ b/m4/mode_t.m4
@@ -1,5 +1,5 @@
# mode_t.m4 serial 2
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/modechange.m4 b/m4/modechange.m4
index 025c3814eb9f645fb6a7dca8b0416b49228f8aec..65705a8befd9097c8719c5f27ac1a858106b0a60 100644
--- a/m4/modechange.m4
+++ b/m4/modechange.m4
@@ -1,5 +1,5 @@
# modechange.m4 serial 7
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/msvc-inval.m4 b/m4/msvc-inval.m4
index 3324375118c0a52d67abda7ca2e2e53646b786a0..4b958762d2a3785b64c383d2f7436e68265313c0 100644
--- a/m4/msvc-inval.m4
+++ b/m4/msvc-inval.m4
@@ -1,5 +1,5 @@
# msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/msvc-nothrow.m4 b/m4/msvc-nothrow.m4
index 3014661f06b8aa76a20f21a75cda50fdfdc6bad1..7e73b40b63257c818f280fe35667f970388cc84b 100644
--- a/m4/msvc-nothrow.m4
+++ b/m4/msvc-nothrow.m4
@@ -1,5 +1,5 @@
# msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/multiarch.m4 b/m4/multiarch.m4
index 30006cb337bbc97573d24dfc00f7fef31f90414c..d48316e0ed7712376a4fb790a940f950326b6cea 100644
--- a/m4/multiarch.m4
+++ b/m4/multiarch.m4
@@ -1,5 +1,5 @@
# multiarch.m4 serial 7
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4
index 16de8de302feb4b187d0a5ad76d88ad0914e42d9..66eee41d8895dc8545459475a1c615faba21c515 100644
--- a/m4/nl_langinfo.m4
+++ b/m4/nl_langinfo.m4
@@ -1,5 +1,5 @@
-# nl_langinfo.m4 serial 5
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# nl_langinfo.m4 serial 6
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -36,8 +36,11 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS],
[$FUNC_NL_LANGINFO_YESEXPR_WORKS],
[Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.])
- if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \
- && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then
+ if test $HAVE_LANGINFO_CODESET = 1 \
+ && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \
+ && test $HAVE_LANGINFO_ALTMON = 1 \
+ && test $HAVE_LANGINFO_ERA = 1 \
+ && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then
:
else
REPLACE_NL_LANGINFO=1
diff --git a/m4/nls.m4 b/m4/nls.m4
index afdb9cacd0a10b6c85787a514c7b2f7f18857875..b62f6148570087e0dedc2704cd664fc8644fb467 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,5 +1,5 @@
# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software
dnl Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/nocrash.m4 b/m4/nocrash.m4
index 2c2c5fb4570da0288c75397c45b5e75da7888e6e..4d9f0226906fe81ce9fed34db6506dd8193679fa 100644
--- a/m4/nocrash.m4
+++ b/m4/nocrash.m4
@@ -1,5 +1,5 @@
-# nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
+# nocrash.m4 serial 5
+dnl Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -79,7 +79,7 @@ nocrash_init (void)
}
}
}
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#elif defined _WIN32 && ! defined __CYGWIN__
/* Avoid a crash on native Windows. */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/m4/nstrftime.m4 b/m4/nstrftime.m4
index d2dac9e232854e71530a97ee7e4756c0a50daea7..546c240827760a8eeb649f4d8f107027724a4f74 100644
--- a/m4/nstrftime.m4
+++ b/m4/nstrftime.m4
@@ -1,6 +1,6 @@
# serial 34
-# Copyright (C) 1996-1997, 1999-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-1997, 1999-2007, 2009-2019 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/obstack.m4 b/m4/obstack.m4
index 612376202815de353676233c6ae76d2f3e43b932..b56fca4caae5f63778aff2fd5e8b5ea23e238755 100644
--- a/m4/obstack.m4
+++ b/m4/obstack.m4
@@ -1,6 +1,6 @@
# See if we need to provide obstacks.
-dnl Copyright 1996-2017 Free Software Foundation, Inc.
+dnl Copyright 1996-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/off_t.m4 b/m4/off_t.m4
index 92c45ef785ccc891ed59f7d84f19a4c6b564d175..711a2d44fbe41bdb0aafcc41f127d44feae06594 100644
--- a/m4/off_t.m4
+++ b/m4/off_t.m4
@@ -1,5 +1,5 @@
# off_t.m4 serial 1
-dnl Copyright (C) 2012-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/open-cloexec.m4 b/m4/open-cloexec.m4
index 897af66910f99152a6fe156b8944ffe04af4f46c..52498d953b8db3c5a1d75f52a23c90a7e4328794 100644
--- a/m4/open-cloexec.m4
+++ b/m4/open-cloexec.m4
@@ -1,6 +1,6 @@
# Test whether O_CLOEXEC is defined.
-dnl Copyright 2017 Free Software Foundation, Inc.
+dnl Copyright 2017-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/open.m4 b/m4/open.m4
index 68253e15ffd85b57de4b82558a5f2e73e9d96576..5d73f4de1acb87e07a86e344ad486aa771b3577e 100644
--- a/m4/open.m4
+++ b/m4/open.m4
@@ -1,5 +1,5 @@
# open.m4 serial 15
-dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/openat.m4 b/m4/openat.m4
index d0d244a0f4137b3595b99dfeedad64b123e57c68..005a2b43187182ead4b896874d32723df1cfb563 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -1,7 +1,7 @@
# serial 46
# See if we need to use our replacement for Solaris' openat et al functions.
-dnl Copyright (C) 2004-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/opendir.m4 b/m4/opendir.m4
index 0047d34947e07860e53af308f6471655b6255b0e..8f0d80423e9a144642d133d6feae188d1a7ac424 100644
--- a/m4/opendir.m4
+++ b/m4/opendir.m4
@@ -1,5 +1,5 @@
# opendir.m4 serial 5
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/parse-datetime.m4 b/m4/parse-datetime.m4
index c01d237c3e9f1a50df7caf1f124c1053a11d485c..597a44c552374084f27be1f482c8e575fedd3461 100644
--- a/m4/parse-datetime.m4
+++ b/m4/parse-datetime.m4
@@ -1,5 +1,5 @@
# parse-datetime.m4 serial 22
-dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/pathmax.m4 b/m4/pathmax.m4
index c6c9f24d06f782f32e171abf843797f7bba4d8f1..0770aca3aac7e4ffc0fe9598ad38dc087c5d7ea8 100644
--- a/m4/pathmax.m4
+++ b/m4/pathmax.m4
@@ -1,5 +1,5 @@
-# pathmax.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation,
+# pathmax.m4 serial 11
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -29,7 +29,7 @@ AC_DEFUN([gl_PATHMAX_SNIPPET], [[
# undef PATH_MAX
# define PATH_MAX 1024
#endif
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
# undef PATH_MAX
# define PATH_MAX 260
#endif
diff --git a/m4/po.m4 b/m4/po.m4
index c5a2f6bf2a922a5464d683660359c647bf53e08e..ce72d01737c1b059545dfd5fc8b7c04b45e15c06 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
-# po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+# po.m4 serial 24a
+dnl Copyright (C) 1995-2014, 2016, 2018-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -83,12 +83,6 @@ changequote([,])dnl
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
[$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
- dnl Installation directories.
- dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
- dnl have to define it here, so that it can be used in po/Makefile.
- test -n "$localedir" || localedir='${datadir}/locale'
- AC_SUBST([localedir])
-
dnl Support for AM_XGETTEXT_OPTION.
test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
@@ -130,14 +124,11 @@ changequote([,])dnl
if test -n "$OBSOLETE_ALL_LINGUAS"; then
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
fi
# Compute POFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -208,9 +199,8 @@ changequote([,])dnl
esac
done]],
[# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
- # from automake < 1.5.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
+ OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
# Capture the value of LINGUAS because we need it to compute CATALOGS.
LINGUAS="${LINGUAS-%UNSET%}"
])
@@ -311,15 +301,13 @@ changequote([,])dnl
fi
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
# The LINGUAS file contains the set of available languages.
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
- ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+ ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
fi
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
# Compute POFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
# Compute UPDATEPOFILES
diff --git a/m4/printf.m4 b/m4/printf.m4
index 3b167ecb26fe9a6e00956692f9fbb33f8c112775..1db13bf846b97da6aa11baabd1e3c2bc4ffc9ae1 100644
--- a/m4/printf.m4
+++ b/m4/printf.m4
@@ -1,5 +1,5 @@
-# printf.m4 serial 57
-dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
+# printf.m4 serial 59
+dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -61,7 +61,7 @@ int main ()
case "$host_os" in
changequote(,)dnl
# Guess yes on glibc systems.
- *-gnu*) gl_cv_func_printf_sizes_c99="guessing yes";;
+ *-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
@@ -234,7 +234,7 @@ int main ()
case "$host_os" in
changequote(,)dnl
# Guess yes on glibc systems.
- *-gnu*) gl_cv_func_printf_infinite="guessing yes";;
+ *-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";;
# Guess yes on FreeBSD >= 6.
freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
@@ -449,7 +449,7 @@ int main ()
case "$host_os" in
changequote(,)dnl
# Guess yes on glibc systems.
- *-gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";;
+ *-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";;
# Guess yes on FreeBSD >= 6.
freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
@@ -554,7 +554,7 @@ int main ()
[
case "$host_os" in
# Guess yes on glibc >= 2.5 systems.
- *-gnu*)
+ *-gnu* | gnu*)
AC_EGREP_CPP([BZ2908], [
#include <features.h>
#ifdef __GNU_LIBRARY__
@@ -613,7 +613,7 @@ int main ()
case "$host_os" in
changequote(,)dnl
# Guess yes on glibc systems.
- *-gnu*) gl_cv_func_printf_directive_f="guessing yes";;
+ *-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";;
# Guess yes on FreeBSD >= 6.
freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
@@ -935,14 +935,14 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
- # Guess yes on BeOS.
- beos*) gl_cv_func_printf_flag_zero="guessing yes";;
- # Guess no on native Windows.
- mingw*) gl_cv_func_printf_flag_zero="guessing no";;
- # If we don't know, assume the worst.
- *) gl_cv_func_printf_flag_zero="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
+ # Guess yes on BeOS.
+ beos*) gl_cv_func_printf_flag_zero="guessing yes";;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_printf_flag_zero="guessing no";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_printf_flag_zero="guessing no";;
esac
changequote([,])dnl
])
@@ -1095,28 +1095,28 @@ changequote([,])dnl
if test "$gl_cv_func_printf_enomem" = "guessing no"; then
changequote(,)dnl
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on Solaris.
- solaris*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on AIX.
- aix*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on HP-UX/hppa.
- hpux*) case "$host_cpu" in
- hppa*) gl_cv_func_printf_enomem="guessing yes";;
- *) gl_cv_func_printf_enomem="guessing no";;
- esac
- ;;
- # Guess yes on IRIX.
- irix*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on OSF/1.
- osf*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on BeOS.
- beos*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on Haiku.
- haiku*) gl_cv_func_printf_enomem="guessing yes";;
- # If we don't know, assume the worst.
- *) gl_cv_func_printf_enomem="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on Solaris.
+ solaris*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on AIX.
+ aix*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on HP-UX/hppa.
+ hpux*) case "$host_cpu" in
+ hppa*) gl_cv_func_printf_enomem="guessing yes";;
+ *) gl_cv_func_printf_enomem="guessing no";;
+ esac
+ ;;
+ # Guess yes on IRIX.
+ irix*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on OSF/1.
+ osf*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on BeOS.
+ beos*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on Haiku.
+ haiku*) gl_cv_func_printf_enomem="guessing yes";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_printf_enomem="guessing no";;
esac
changequote([,])dnl
fi
@@ -1176,7 +1176,7 @@ int main ()
changequote(,)dnl
case "$host_os" in
# Guess yes on glibc systems.
- *-gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
+ *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
@@ -1276,7 +1276,7 @@ int main ()
[case "$host_os" in
changequote(,)dnl
# Guess yes on glibc systems.
- *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
@@ -1366,7 +1366,7 @@ int main ()
changequote(,)dnl
case "$host_os" in
# Guess yes on glibc systems.
- *-gnu*) gl_cv_func_snprintf_directive_n="guessing yes";;
+ *-gnu* | gnu*) gl_cv_func_snprintf_directive_n="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
@@ -1516,7 +1516,7 @@ int main()
changequote(,)dnl
case "$host_os" in
# Guess yes on glibc systems.
- *-gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
@@ -1606,6 +1606,7 @@ dnl OpenBSD 3.9, 4.0 . . # # # # . # . # . # . # .
dnl Cygwin 1.7.0 (2009) . . . # . . . ? . . . . . ? . . . . . .
dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . # . . . . . .
dnl Cygwin 1.5.19 (2006) # . . # # # . # . # . # # # . . . . . .
+dnl Solaris 11.4 . . # # # . . # . . . # . . . . . . . .
dnl Solaris 11.3 . . . . # . . # . . . . . . . . . . . .
dnl Solaris 11.0 . . # # # . . # . . . # . . . . . . . .
dnl Solaris 10 . . # # # . . # . . . # # . . . . . . .
diff --git a/m4/priv-set.m4 b/m4/priv-set.m4
index 48e35b7c0beec03e94682d90e428000b72a9c5c5..258dc4312539c3c0ba25e653accf9618d533e673 100644
--- a/m4/priv-set.m4
+++ b/m4/priv-set.m4
@@ -1,6 +1,6 @@
# serial 8
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2019 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 303bc31824feb853947dce84a59eacf7914507cd..5f186b14909c5e3c1ec6723629ca6a52f338f396 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,5 +1,5 @@
# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/quote.m4 b/m4/quote.m4
index 92be1e7287126a18efd95d508b1fc01d2ebe8f43..feaa7351142f7e279d60a6b46c5feee952ec904f 100644
--- a/m4/quote.m4
+++ b/m4/quote.m4
@@ -1,5 +1,5 @@
# quote.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/quotearg.m4 b/m4/quotearg.m4
index 5fae4f3e16ad733dcab5897bbafcc401499c4700..c478f5058ee7253c77062397618cacaa78fd27b5 100644
--- a/m4/quotearg.m4
+++ b/m4/quotearg.m4
@@ -1,5 +1,5 @@
# quotearg.m4 serial 9
-dnl Copyright (C) 2002, 2004-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/raise.m4 b/m4/raise.m4
index fe6e06858e76617148fe4c1eb4cc49ef5a76e132..f7661e6597bcb4d17f6f30cb47533da640104e87 100644
--- a/m4/raise.m4
+++ b/m4/raise.m4
@@ -1,5 +1,5 @@
# raise.m4 serial 4
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4
index f800ed4d5908d386d0d8c88c450d3eab29d3d92c..03a8804965dbe00bc64a8bc4df3c437464e1867d 100644
--- a/m4/rawmemchr.m4
+++ b/m4/rawmemchr.m4
@@ -1,5 +1,5 @@
# rawmemchr.m4 serial 2
-dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/read.m4 b/m4/read.m4
index 24668028ea1567580f98dd7b8e9ebd254fb2404c..b1e77d2e7b450fd6486c938f425294d6ff86e13a 100644
--- a/m4/read.m4
+++ b/m4/read.m4
@@ -1,5 +1,5 @@
# read.m4 serial 5
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/readdir.m4 b/m4/readdir.m4
index cb7f2ea4c71b7bbb7c08de1c974d4dfe69ab7d4f..d09cb9fe8d2f2e58eb69b3b7064817103e5be4d6 100644
--- a/m4/readdir.m4
+++ b/m4/readdir.m4
@@ -1,5 +1,5 @@
# readdir.m4 serial 1
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/readlink.m4 b/m4/readlink.m4
index d3ba0ad4213f1b4fc7c89b0c324e2bb9f9909c31..2d7681576ccdb7821ab726960a5eb17fe9c944c7 100644
--- a/m4/readlink.m4
+++ b/m4/readlink.m4
@@ -1,5 +1,5 @@
-# readlink.m4 serial 12
-dnl Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc.
+# readlink.m4 serial 14
+dnl Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -34,10 +34,12 @@ AC_DEFUN([gl_FUNC_READLINK],
return readlink ("conftest.lnk2/", buf, sizeof buf) != -1;]])],
[gl_cv_func_readlink_works=yes], [gl_cv_func_readlink_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_readlink_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_readlink_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_readlink_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_readlink_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_readlink_works="guessing no" ;;
esac
])
rm -f conftest.link conftest.lnk2])
diff --git a/m4/readlinkat.m4 b/m4/readlinkat.m4
index e173e41327c2f401e70709fd16356b4b8555ee45..b63f213d92599bd5fd86364aa8737fd77473b9b8 100644
--- a/m4/readlinkat.m4
+++ b/m4/readlinkat.m4
@@ -1,7 +1,7 @@
# serial 5
# See if we need to provide readlinkat replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/realloc.m4 b/m4/realloc.m4
index dbac45f121358de607493dc93180e87d967879a1..1281a3539fd6ac28908945b25c11db072ba7146b 100644
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -1,5 +1,5 @@
-# realloc.m4 serial 14
-dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+# realloc.m4 serial 15
+dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF],
[ac_cv_func_realloc_0_nonnull=no],
[case "$host_os" in
# Guess yes on platforms where we know the result.
- *-gnu* | freebsd* | netbsd* | openbsd* \
+ *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
| hpux* | solaris* | cygwin* | mingw*)
ac_cv_func_realloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
diff --git a/m4/regex.m4 b/m4/regex.m4
index 55524033774701910b883727f29875f6941dbfb2..35119c5c85fab372253e07f755b2475e69608dcb 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,6 +1,6 @@
-# serial 67
+# serial 68
-# Copyright (C) 1996-2001, 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2019 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -213,6 +213,17 @@ AC_DEFUN([gl_REGEX],
if (! REG_STARTEND)
result |= 64;
+ /* Matching with the compiled form of this regexp would provoke
+ an assertion failure prior to glibc-2.28:
+ regexec.c:1375: pop_fail_stack: Assertion 'num >= 0' failed
+ With glibc-2.28, compilation fails and reports the invalid
+ back reference. */
+ re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+ memset (®ex, 0, sizeof regex);
+ s = re_compile_pattern ("0|()0|\\1|0", 10, ®ex);
+ if (!s || strcmp (s, "Invalid back reference"))
+ result |= 64;
+
#if 0
/* It would be nice to reject hosts whose regoff_t values are too
narrow (including glibc on hosts with 64-bit ptrdiff_t and
diff --git a/m4/rename.m4 b/m4/rename.m4
index 33cd00a00cadd40544ed11c74c43513b11ab7cfe..7318e757719002e5246de083721a558c522d6665 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,6 +1,6 @@
-# serial 29
+# serial 31
-# Copyright (C) 2001, 2003, 2005-2006, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005-2006, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_RENAME],
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
AC_CHECK_FUNCS_ONCE([lstat])
- dnl Solaris 11, AIX 7.1 mistakenly allow rename("file","name/").
+ dnl Solaris 11.3, AIX 7.1 mistakenly allow rename("file","name/").
dnl NetBSD 1.6 mistakenly forbids rename("dir","name/").
dnl FreeBSD 7.2 mistakenly allows rename("file","link-to-file/").
dnl The Solaris bug can be worked around without stripping
@@ -55,12 +55,14 @@ AC_DEFUN([gl_FUNC_RENAME],
[gl_cv_func_rename_slash_dst_works=no],
dnl When crosscompiling, assume rename is broken.
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_rename_slash_dst_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rename_slash_dst_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_rename_slash_dst_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rename_slash_dst_works="guessing no" ;;
esac
])
rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk
@@ -109,12 +111,14 @@ AC_DEFUN([gl_FUNC_RENAME],
[gl_cv_func_rename_slash_src_works=no],
dnl When crosscompiling, assume rename is broken.
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rename_slash_src_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rename_slash_src_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rename_slash_src_works="guessing no" ;;
esac
])
rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk
@@ -169,12 +173,14 @@ AC_DEFUN([gl_FUNC_RENAME],
[gl_cv_func_rename_link_works=no],
dnl When crosscompiling, assume rename is broken.
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_rename_link_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rename_link_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rename_link_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_rename_link_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rename_link_works="guessing no" ;;
esac
])
else
@@ -220,12 +226,14 @@ AC_DEFUN([gl_FUNC_RENAME],
[gl_cv_func_rename_dest_works=no],
dnl When crosscompiling, assume rename is broken.
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rename_dest_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_rename_dest_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rename_dest_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rename_dest_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_rename_dest_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_rename_dest_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rename_dest_works="guessing no" ;;
esac
])
rm -rf conftest.f conftest.d1 conftest.d2
diff --git a/m4/renameat.m4 b/m4/renameat.m4
index 1b9777444d2cb07915d68ed3b141f668f46cecf0..fdbaeafcdb95274df498bca0c5c0e9aa60efbba6 100644
--- a/m4/renameat.m4
+++ b/m4/renameat.m4
@@ -1,7 +1,7 @@
# serial 3
# See if we need to provide renameat replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_RENAMEAT],
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_CHECK_HEADERS([linux/fs.h])
- AC_CHECK_FUNCS_ONCE([renameat])
+ AC_CHECK_FUNCS_ONCE([renameat renameat2])
if test $ac_cv_func_renameat = no; then
HAVE_RENAMEAT=0
elif test $REPLACE_RENAME = 1; then
diff --git a/m4/rewinddir.m4 b/m4/rewinddir.m4
index a73c886f6f703b1917d499d5373cbb41d007db43..c14224c36f1cbabb4ed82c3303e96bf1d7e44c6a 100644
--- a/m4/rewinddir.m4
+++ b/m4/rewinddir.m4
@@ -1,5 +1,5 @@
# rewinddir.m4 serial 1
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index 37237d2afe1403e11cffe30d13c25cbfb954b255..5d32caaa4ba6e453deeed489fc5a1e42b5d322cf 100644
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,5 +1,5 @@
-# rmdir.m4 serial 14
-dnl Copyright (C) 2002, 2005, 2009-2017 Free Software Foundation, Inc.
+# rmdir.m4 serial 16
+dnl Copyright (C) 2002, 2005, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -33,12 +33,14 @@ AC_DEFUN([gl_FUNC_RMDIR],
]])],
[gl_cv_func_rmdir_works=yes], [gl_cv_func_rmdir_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_rmdir_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_rmdir_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_rmdir_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_rmdir_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_rmdir_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_rmdir_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_rmdir_works="guessing no" ;;
esac
])
rm -rf conftest.dir conftest.file])
diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4
index dfa3315af9222cb676814330e6526f1e8da7f04a..d10a005b78aab2228b47845c65ae96ea26495e9a 100644
--- a/m4/rpmatch.m4
+++ b/m4/rpmatch.m4
@@ -1,5 +1,5 @@
# rpmatch.m4 serial 10
-dnl Copyright (C) 2002-2003, 2007-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/safe-read.m4 b/m4/safe-read.m4
index 022bb654a5dde335bfea02c5a577146be630fe9f..d133e0567b08217accac4f8b5a215f5d60e0ba21 100644
--- a/m4/safe-read.m4
+++ b/m4/safe-read.m4
@@ -1,5 +1,5 @@
# safe-read.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/safe-write.m4 b/m4/safe-write.m4
index 09a2226ef995e8e91eeacb6c3bd899ccab44dc82..907a5c62a1e650eb96ebda2e1d6ca303ef55227f 100644
--- a/m4/safe-write.m4
+++ b/m4/safe-write.m4
@@ -1,5 +1,5 @@
# safe-write.m4 serial 4
-dnl Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4
index 4b00f9b4956ee6c17c6ce5bb839a08acc2f46f99..816fd7035f83ccf7cd8e30eb462a14d7a2839923 100644
--- a/m4/save-cwd.m4
+++ b/m4/save-cwd.m4
@@ -1,5 +1,5 @@
# serial 10
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/savedir.m4 b/m4/savedir.m4
index 1ec1063a8d78b2d1bccad09e2b117d5875358e2e..55d2d9d2abf34d7a9b1d0220e97bcb616b3ab100 100644
--- a/m4/savedir.m4
+++ b/m4/savedir.m4
@@ -1,5 +1,5 @@
# savedir.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/selinux-context-h.m4 b/m4/selinux-context-h.m4
index 761113dd6604fbb1c7284d076c77f707ddf94a5d..c45026f2545ccf195ed9df2865d74a5b50f4b506 100644
--- a/m4/selinux-context-h.m4
+++ b/m4/selinux-context-h.m4
@@ -1,5 +1,5 @@
# serial 3 -*- Autoconf -*-
-# Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4
index f25cd43bdc315c74a9e086b9024a337b7360ce0f..8bbbf0535affaa26c0e6137afdb0a71bf04ac5c8 100644
--- a/m4/selinux-selinux-h.m4
+++ b/m4/selinux-selinux-h.m4
@@ -1,5 +1,5 @@
# serial 5 -*- Autoconf -*-
-# Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/setenv.m4 b/m4/setenv.m4
index 005aa8cfedab67f3a63ed8a84261dbb35dbb77d1..6101274e6918908bd21e707ba1210747bbff5244 100644
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,5 +1,5 @@
-# setenv.m4 serial 26
-dnl Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc.
+# setenv.m4 serial 27
+dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -35,10 +35,10 @@ AC_DEFUN([gl_FUNC_SETENV],
]])],
[gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_setenv_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_setenv_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_setenv_works="guessing no" ;;
esac
])])
case "$gl_cv_func_setenv_works" in
diff --git a/m4/signal_h.m4 b/m4/signal_h.m4
index eaf5ce98e4abacfd2c96c7c65dd9887b14970fc0..3acec64f881ca266a21e8821e5906df6605ac8f1 100644
--- a/m4/signal_h.m4
+++ b/m4/signal_h.m4
@@ -1,5 +1,5 @@
# signal_h.m4 serial 18
-dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/size_max.m4 b/m4/size_max.m4
index 05ad1b602a4e77f69ab3db96fe98784df49d487f..ab79052d6ecfc37338bff1801c1a01cfe8be96e1 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,11 +1,13 @@
-# size_max.m4 serial 10
-dnl Copyright (C) 2003, 2005-2006, 2008-2017 Free Software Foundation, Inc.
+# size_max.m4 serial 11
+dnl Copyright (C) 2003, 2005-2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
+AC_PREREQ([2.61])
+
AC_DEFUN([gl_SIZE_MAX],
[
AC_CHECK_HEADERS([stdint.h])
@@ -71,9 +73,3 @@ Found it
# undef SIZE_MAX
#endif])
])
-
-dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
-dnl Remove this when we can assume autoconf >= 2.61.
-m4_ifdef([AC_COMPUTE_INT], [], [
- AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
-])
diff --git a/m4/sleep.m4 b/m4/sleep.m4
index e2d27be275463df7c44ac1b32c2c23d7380baa9e..5f71cc7889de3af35d2770d1d8a6265fdbbd0fc7 100644
--- a/m4/sleep.m4
+++ b/m4/sleep.m4
@@ -1,5 +1,5 @@
-# sleep.m4 serial 8
-dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+# sleep.m4 serial 9
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -46,12 +46,12 @@ handle_alarm (int sig)
]])],
[gl_cv_func_sleep_works=yes], [gl_cv_func_sleep_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_sleep_works="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_sleep_works="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_sleep_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_sleep_works="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_sleep_works="guessing no" ;;
esac
])])
case "$gl_cv_func_sleep_works" in
diff --git a/m4/snprintf.m4 b/m4/snprintf.m4
index e5155f7987dfefa9feb54301a9257b8a3cb39bda..6fd566dea920e1b8bcb2b97b6d75d98b0120ea83 100644
--- a/m4/snprintf.m4
+++ b/m4/snprintf.m4
@@ -1,5 +1,5 @@
# snprintf.m4 serial 7
-dnl Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4
index 66ba9d4ea25ee3787e7b43a62e1b8c4a50fd728a..38bcee1c7d997372918aaa6f0db7810e6e165c9c 100644
--- a/m4/ssize_t.m4
+++ b/m4/ssize_t.m4
@@ -1,5 +1,5 @@
# ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stat-time.m4 b/m4/stat-time.m4
index 4017fc9d7f1c66e6a0f96a09570a9238f0d3f1f4..1685788e05fd7e65a368c665d091e55256acd589 100644
--- a/m4/stat-time.m4
+++ b/m4/stat-time.m4
@@ -1,6 +1,6 @@
# Checks for stat-related time functions.
-# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2017 Free Software
+# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2019 Free Software
# Foundation, Inc.
# This file is free software; the Free Software Foundation
diff --git a/m4/stat.m4 b/m4/stat.m4
index 286fcba845e8f3c335925b071ca8723074a3efc4..60040d13756e20f7d4c4ccc8ae321e8081011743 100644
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -1,6 +1,6 @@
-# serial 12
+# serial 15
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2019 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -43,10 +43,12 @@ AC_DEFUN([gl_FUNC_STAT],
]])],
[gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_stat_file_slash="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_stat_file_slash="guessing no" ;;
esac
])
rm -f conftest.tmp conftest.lnk])
@@ -56,6 +58,11 @@ AC_DEFUN([gl_FUNC_STAT],
AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs
help when passed a file name with a trailing slash]);;
esac
+ case $host_os in
+ dnl Solaris stat can return a negative tv_nsec.
+ solaris*)
+ REPLACE_FSTAT=1 ;;
+ esac
;;
esac
])
diff --git a/m4/stdalign.m4 b/m4/stdalign.m4
index f091aa58c29fb19cc241120469000b13db246c92..601fd21f03b9c78d313b1357dfbb314d7346c073 100644
--- a/m4/stdalign.m4
+++ b/m4/stdalign.m4
@@ -1,6 +1,6 @@
# Check for stdalign.h that conforms to C11.
-dnl Copyright 2011-2017 Free Software Foundation, Inc.
+dnl Copyright 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdarg.m4 b/m4/stdarg.m4
index 40db5e43f3c849e7f8cc49a8e1d4ba0213e8b0f8..f43fe20b8f630cb500730132c2e0183541332f4b 100644
--- a/m4/stdarg.m4
+++ b/m4/stdarg.m4
@@ -1,5 +1,5 @@
-# stdarg.m4 serial 6
-dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc.
+# stdarg.m4 serial 7
+dnl Copyright (C) 2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -11,19 +11,19 @@ AC_DEFUN([gl_STDARG_H],
[
STDARG_H=''
NEXT_STDARG_H='<stdarg.h>'
- AC_MSG_CHECKING([for va_copy])
- AC_CACHE_VAL([gl_cv_func_va_copy], [
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <stdarg.h>]],
- [[
+ AC_CACHE_CHECK([for va_copy],
+ [gl_cv_func_va_copy],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <stdarg.h>]],
+ [[
#ifndef va_copy
void (*func) (va_list, va_list) = va_copy;
#endif
- ]])],
- [gl_cv_func_va_copy=yes],
- [gl_cv_func_va_copy=no])])
- AC_MSG_RESULT([$gl_cv_func_va_copy])
+ ]])],
+ [gl_cv_func_va_copy=yes],
+ [gl_cv_func_va_copy=no])
+ ])
if test $gl_cv_func_va_copy = no; then
dnl Provide a substitute.
dnl Usually a simple definition in <config.h> is enough. Not so on AIX 5
diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
index 9e714d47611c47bf05f97159ee7d398f51c1b4a9..acb852244f786cbb98fcd4001ceb1a07c75c5851 100644
--- a/m4/stdbool.m4
+++ b/m4/stdbool.m4
@@ -1,6 +1,6 @@
# Check for stdbool.h that conforms to C99.
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4
index f45def101387d746277ed8cade64714d4ab7d2dd..979e3cf7e794d3def8d6886b1d8ee74b327abe1b 100644
--- a/m4/stddef_h.m4
+++ b/m4/stddef_h.m4
@@ -1,6 +1,6 @@
dnl A placeholder for <stddef.h>, for platforms that have issues.
-# stddef_h.m4 serial 5
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# stddef_h.m4 serial 6
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -10,13 +10,33 @@ AC_DEFUN([gl_STDDEF_H],
AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
AC_REQUIRE([gt_TYPE_WCHAR_T])
STDDEF_H=
- AC_CHECK_TYPE([max_align_t], [], [HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h],
- [[#include <stddef.h>
- ]])
+
+ dnl Test whether the type max_align_t exists and whether its alignment
+ dnl "is as great as is supported by the implementation in all contexts".
+ AC_CACHE_CHECK([for good max_align_t],
+ [gl_cv_type_max_align_t],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <stddef.h>
+ unsigned int s = sizeof (max_align_t);
+ #if defined __GNUC__ || defined __IBM__ALIGNOF__
+ int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1];
+ int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1];
+ #endif
+ ]])],
+ [gl_cv_type_max_align_t=yes],
+ [gl_cv_type_max_align_t=no])
+ ])
+ if test $gl_cv_type_max_align_t = no; then
+ HAVE_MAX_ALIGN_T=0
+ STDDEF_H=stddef.h
+ fi
+
if test $gt_cv_c_wchar_t = no; then
HAVE_WCHAR_T=0
STDDEF_H=stddef.h
fi
+
AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions],
[gl_cv_decl_null_works],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
@@ -28,6 +48,7 @@ AC_DEFUN([gl_STDDEF_H],
REPLACE_NULL=1
STDDEF_H=stddef.h
fi
+
AC_SUBST([STDDEF_H])
AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"])
if test -n "$STDDEF_H"; then
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 4bf3e4745153f533bff5953e0203bcb5b3cbbeac..11d8e8e52d45b20872c3cd476bfee70f24bd1b0c 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,5 +1,5 @@
-# stdint.m4 serial 51
-dnl Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# stdint.m4 serial 53
+dnl Copyright (C) 2001-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert and Bruno Haible.
dnl Test whether <stdint.h> is supported or must be substituted.
+AC_PREREQ([2.61])
+
AC_DEFUN_ONCE([gl_STDINT_H],
[
AC_PREREQ([2.59])dnl
@@ -364,8 +366,7 @@ int32_t i32 = INT32_C (0x7fffffff);
esac
dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH.
- LIMITS_H=limits.h
- AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
+ gl_REPLACE_LIMITS_H
AC_SUBST([HAVE_C99_STDINT_H])
AC_SUBST([HAVE_SYS_BITYPES_H])
@@ -541,9 +542,3 @@ AC_DEFUN([gl_STDINT_TYPE_PROPERTIES],
BITSIZEOF_WINT_T=32
fi
])
-
-dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
-dnl Remove this when we can assume autoconf >= 2.61.
-m4_ifdef([AC_COMPUTE_INT], [], [
- AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
-])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 786eaa3c9599bf8a02fe7d76253736d4f18ddb63..6d5f1af0a18fb9d62115f51a085bd7ff1514d6e9 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,5 +1,5 @@
# stdint_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
index 9ffbb852ead712b30647c1ef393189f9f7f16bdd..6c9c104044aacb7d1ecdf463f78f2039317b75b0 100644
--- a/m4/stdio_h.m4
+++ b/m4/stdio_h.m4
@@ -1,5 +1,5 @@
-# stdio_h.m4 serial 48
-dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+# stdio_h.m4 serial 49
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -28,7 +28,7 @@ AC_DEFUN([gl_STDIO_H],
/* For non-mingw systems, compilation will trivially succeed.
For mingw, compilation will succeed for older mingw (system
printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */
- #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \
+ #if (defined _WIN32 && ! defined __CYGWIN__) && \
(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1];
#endif
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 35373463682e560327c92ceb785e8ce4cd1a4337..cf064284b6461c25b3cf0979b900340eb7f40166 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
-# stdlib_h.m4 serial 44
-dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+# stdlib_h.m4 serial 45
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -14,6 +14,9 @@ AC_DEFUN([gl_STDLIB_H],
dnl guaranteed by C89.
gl_WARN_ON_USE_PREPARE([[#include <stdlib.h>
#if HAVE_SYS_LOADAVG_H
+/* OpenIndiana has a bug: <sys/time.h> must be included before
+ <sys/loadavg.h>. */
+# include <sys/time.h>
# include <sys/loadavg.h>
#endif
#if HAVE_RANDOM_H
diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4
index 368656723d1f560c54e7829ebde7e42ce8a24f54..7af2e8189e12220af02b5757803761f355e32896 100644
--- a/m4/stpcpy.m4
+++ b/m4/stpcpy.m4
@@ -1,5 +1,5 @@
# stpcpy.m4 serial 8
-dnl Copyright (C) 2002, 2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strcase.m4 b/m4/strcase.m4
index de20eb61186fd88d8dfb919ac93ea2b5b9cbc594..9baef789cba31c340877f5f76a3d2f9922711d75 100644
--- a/m4/strcase.m4
+++ b/m4/strcase.m4
@@ -1,5 +1,5 @@
# strcase.m4 serial 11
-dnl Copyright (C) 2002, 2005-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4
index 320d5fb60581455d35848705a9ca0933aaf903a9..93cf112e10dd0316690c15b281c8fb3c5b4cc3d4 100644
--- a/m4/strchrnul.m4
+++ b/m4/strchrnul.m4
@@ -1,5 +1,5 @@
# strchrnul.m4 serial 9
-dnl Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strdup.m4 b/m4/strdup.m4
index a92dbd63b598434d6fdd8bbdebc056da7724e9a7..82d74202dfeb4bca65bde3259cd70e0a5a0895e1 100644
--- a/m4/strdup.m4
+++ b/m4/strdup.m4
@@ -1,6 +1,6 @@
# strdup.m4 serial 13
-dnl Copyright (C) 2002-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/strerror.m4 b/m4/strerror.m4
index 279efd60f61f7b4c6d2a16d0f18945d66f4a8b99..b452f7f8949b17b661679395f6417609e80d75e6 100644
--- a/m4/strerror.m4
+++ b/m4/strerror.m4
@@ -1,5 +1,5 @@
-# strerror.m4 serial 18
-dnl Copyright (C) 2002, 2007-2017 Free Software Foundation, Inc.
+# strerror.m4 serial 19
+dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -24,10 +24,10 @@ AC_DEFUN([gl_FUNC_STRERROR],
[gl_cv_func_working_strerror=yes],
[gl_cv_func_working_strerror=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_working_strerror="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_working_strerror="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_working_strerror="guessing no" ;;
esac
])
])
@@ -78,12 +78,12 @@ AC_DEFUN([gl_FUNC_STRERROR_0],
[gl_cv_func_strerror_0_works=yes],
[gl_cv_func_strerror_0_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_strerror_0_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_strerror_0_works="guessing no" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_strerror_0_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_strerror_0_works="guessing no" ;;
esac
])
])
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index 8c42cf1b851c532423bfa524b929926723a01a66..0c0e3a71af3c3963dda8169e13e9cb2d5fad584a 100644
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -1,6 +1,6 @@
# Configure a GNU-like replacement for <string.h>.
-# Copyright (C) 2007-2017 Free Software Foundation, Inc.
+# Copyright (C) 2007-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/strings_h.m4 b/m4/strings_h.m4
index 1163a6328f943afd86f3494a4fd143d3afda7a12..76128cfb712abe16bf145ba16aaf4f2086ef1641 100644
--- a/m4/strings_h.m4
+++ b/m4/strings_h.m4
@@ -1,7 +1,7 @@
# Configure a replacement for <strings.h>.
# serial 6
-# Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/strndup.m4 b/m4/strndup.m4
index 7a28f21c2f551a75bd5a7d580dfec1a91f27cca8..325af5d13d6abb718e944c7f1c66336ec30ccfb2 100644
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,5 +1,5 @@
# strndup.m4 serial 22
-dnl Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
index bf05027167c46fc9e7619c7aa650e4241b8e475f..c283c3ece9f0bd01c01ca1a1ad0205ed90a0f5d1 100644
--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -1,5 +1,5 @@
# strnlen.m4 serial 13
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index 61809c8b5dbf02a641cca7a2763c8b7df411d0db..9632279a183d5137b08360c488e20a67f3790878 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,5 +1,5 @@
# strtoimax.m4 serial 15
-dnl Copyright (C) 2002-2004, 2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtol.m4 b/m4/strtol.m4
index a45e128c9637e164c7cbc42a6e649b8aa841c712..3ba3b55271eea9f6e3d6b13ab35038e7610382d0 100644
--- a/m4/strtol.m4
+++ b/m4/strtol.m4
@@ -1,5 +1,5 @@
# strtol.m4 serial 6
-dnl Copyright (C) 2002-2003, 2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index 9c2a903428ac81e08f9088a517726c0e6b1331fd..3ba7e223b582334041f01f9faa77c6bc1d13aa2d 100644
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,5 +1,5 @@
# strtoll.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtoul.m4 b/m4/strtoul.m4
index b0eea6a2fad5cf96184427ce13efc8a38a1b6c27..46d11081820f0e9d041da9ed0a216fbd7f94012a 100644
--- a/m4/strtoul.m4
+++ b/m4/strtoul.m4
@@ -1,5 +1,5 @@
# strtoul.m4 serial 5
-dnl Copyright (C) 2002, 2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index c6b215072b620ec886dbd2d9ab75647cd0ef41dc..532139c5f2600b0c19c962f9d2879c51ed5277bd 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,5 +1,5 @@
# strtoull.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index 43ef5b5abbf33db9d4138df344e860c2bc4f183e..89b503f291d7d4820b3d34bdaae94533e168c015 100644
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,5 +1,5 @@
# strtoumax.m4 serial 12
-dnl Copyright (C) 2002-2004, 2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/symlink.m4 b/m4/symlink.m4
index 220ea1922e76e2f314da1c518133446ee9c162ef..508e94dd41016cb8b743e8a62068bf836d07de13 100644
--- a/m4/symlink.m4
+++ b/m4/symlink.m4
@@ -1,7 +1,7 @@
-# serial 6
+# serial 8
# See if we need to provide symlink replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -36,10 +36,12 @@ AC_DEFUN([gl_FUNC_SYMLINK],
]])],
[gl_cv_func_symlink_works=yes], [gl_cv_func_symlink_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_symlink_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_symlink_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_symlink_works="guessing no" ;;
esac
])
rm -f conftest.f conftest.link conftest.lnk2])
diff --git a/m4/symlinkat.m4 b/m4/symlinkat.m4
index b1a8a99323ec02e4b483ae85d98ab4d69c385963..99ff25806847ddc87fa3d245498a563422b5f5ce 100644
--- a/m4/symlinkat.m4
+++ b/m4/symlinkat.m4
@@ -1,7 +1,7 @@
-# serial 7
+# serial 9
# See if we need to provide symlinkat replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -37,10 +37,12 @@ AC_DEFUN([gl_FUNC_SYMLINKAT],
[gl_cv_func_symlinkat_works=yes],
[gl_cv_func_symlinkat_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_symlinkat_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_symlinkat_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_symlinkat_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_symlinkat_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_symlinkat_works="guessing no" ;;
esac
])
rm -f conftest.f conftest.link conftest.lnk2])
diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
index 3ecbe7c021323eecce6a516532e2c94e94f91f67..1ea7b0b3f320c4c1d07abfd72a34ad49923d5234 100644
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -1,5 +1,5 @@
# sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4
index 8934278982808f67d4cb3bb54736a1637d166b21..361ac3fc14154c8b4928a001f22cecbd3c761b9e 100644
--- a/m4/sys_stat_h.m4
+++ b/m4/sys_stat_h.m4
@@ -1,5 +1,5 @@
# sys_stat_h.m4 serial 31 -*- Autoconf -*-
-dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index 1c8c3cfcc3272c61697e852e5687b662b6667ed2..3d9233aa998dabc321fbb62a4be52ed733d28b5d 100644
--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -1,7 +1,7 @@
# Configure a replacement for <sys/time.h>.
# serial 9
-# Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index 75097713d98cf9a8dbafa93b082a66fe493622be..be0655900d5ff409394fd847a114893a11bfbbbc 100644
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -1,5 +1,5 @@
# sys_types_h.m4 serial 9
-dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sysexits.m4 b/m4/sysexits.m4
index 64deb70ed0ee29fda7d523cb1a13d53a56d870b5..1e9f171ba78fbf0aa3680a529b683370bf84fa16 100644
--- a/m4/sysexits.m4
+++ b/m4/sysexits.m4
@@ -1,5 +1,5 @@
# sysexits.m4 serial 6
-dnl Copyright (C) 2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/tempname.m4 b/m4/tempname.m4
index a59f4c086810912c318c75fcf8aa13bae469026a..664a6322f3827d952edf045a46924d1f0bd275d9 100644
--- a/m4/tempname.m4
+++ b/m4/tempname.m4
@@ -1,6 +1,6 @@
#serial 5
-# Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/time_h.m4 b/m4/time_h.m4
index 28e22092e14fc4633188ce79f4d08f2063a40249..f08f29b35ea5fe7c56d37bb70e8a51bfbe7494bb 100644
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -1,6 +1,6 @@
# Configure a more-standard replacement for <time.h>.
-# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
# serial 11
diff --git a/m4/time_r.m4 b/m4/time_r.m4
index 3e24ccb2e0b82c585e708b3c2eee66007dace289..5caeca75093743a88dcdee647d76752950dd35dc 100644
--- a/m4/time_r.m4
+++ b/m4/time_r.m4
@@ -1,6 +1,6 @@
dnl Reentrant time functions: localtime_r, gmtime_r.
-dnl Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/time_rz.m4 b/m4/time_rz.m4
index 3991118b61cb5050cf2dba741e813f73021009a0..5564559c867fe4ef8be972e4aa3120d8883766c4 100644
--- a/m4/time_rz.m4
+++ b/m4/time_rz.m4
@@ -1,6 +1,6 @@
dnl Time zone functions: tzalloc, localtime_rz, etc.
-dnl Copyright (C) 2015-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2015-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -13,6 +13,39 @@ AC_DEFUN([gl_TIME_RZ],
AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
AC_REQUIRE([AC_STRUCT_TIMEZONE])
+ # Mac OS X 10.6 loops forever with some time_t values.
+ # See Bug#27706, Bug#27736, and
+ # https://lists.gnu.org/r/bug-gnulib/2017-07/msg00142.html
+ AC_CACHE_CHECK([whether localtime loops forever near extrema],
+ [gl_cv_func_localtime_infloop_bug],
+ [gl_cv_func_localtime_infloop_bug=no
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <time.h>
+ ]], [[
+ time_t t = -67768038400666600;
+ struct tm *tm;
+ char *tz = getenv ("TZ");
+ if (! (tz && strcmp (tz, "QQQ0") == 0))
+ return 0;
+ alarm (2);
+ tm = localtime (&t);
+ /* Use TM and *TM to suppress over-optimization. */
+ return tm && tm->tm_isdst;
+ ]])],
+ [(TZ=QQQ0 ./conftest$EXEEXT) >/dev/null 2>&1 ||
+ gl_cv_func_localtime_infloop_bug=yes],
+ [],
+ [gl_cv_func_localtime_infloop_bug="guessing no"])])
+ if test "$gl_cv_func_localtime_infloop_bug" = yes; then
+ AC_DEFINE([HAVE_LOCALTIME_INFLOOP_BUG], 1,
+ [Define if localtime-like functions can loop forever on
+ extreme arguments.])
+ fi
+
AC_CHECK_TYPES([timezone_t], [], [], [[#include <time.h>]])
if test "$ac_cv_type_timezone_t" = yes; then
HAVE_TIMEZONE_T=1
diff --git a/m4/timegm.m4 b/m4/timegm.m4
index 1f18552e9f58bea3f87f4654dc9927d52fddb264..d9d40de69a7f93de18f77042f85063403f1a3b63 100644
--- a/m4/timegm.m4
+++ b/m4/timegm.m4
@@ -1,5 +1,5 @@
# timegm.m4 serial 12
-dnl Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/timespec.m4 b/m4/timespec.m4
index c901468ed80edc9f0d8e323dcc59018ab205d22e..3db9943a74a1f2342af0df43549ebc62f00c130e 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,6 +1,6 @@
#serial 15
-# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4
index 32db008d941fee2c0f4e3ee532291bbb4694e801..31b841fe5978ed5286c145d15d5577b0da382c60 100644
--- a/m4/tm_gmtoff.m4
+++ b/m4/tm_gmtoff.m4
@@ -1,5 +1,5 @@
# tm_gmtoff.m4 serial 3
-dnl Copyright (C) 2002, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/tzset.m4 b/m4/tzset.m4
index 11ceeabed6253ffb7eebf75cf470e3dc4346f40a..1278801593e9bb8d55cd953b9bbbf2478b801824 100644
--- a/m4/tzset.m4
+++ b/m4/tzset.m4
@@ -1,6 +1,6 @@
-# serial 10
+# serial 11
-# Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,12 +68,12 @@ main ()
[gl_cv_func_tzset_clobber=no],
[gl_cv_func_tzset_clobber=yes],
[case "$host_os" in
- # Guess all is fine on glibc systems.
- *-gnu*) gl_cv_func_tzset_clobber="guessing no" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_tzset_clobber="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_tzset_clobber="guessing yes" ;;
+ # Guess all is fine on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_tzset_clobber="guessing no" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_tzset_clobber="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_tzset_clobber="guessing yes" ;;
esac
])
])
diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4
index 7a3e4c527035ea98b8544857beb3215139810537..5e2a1bed688aa90a2946f765926656fb431cb23e 100644
--- a/m4/unistd-safer.m4
+++ b/m4/unistd-safer.m4
@@ -1,5 +1,5 @@
#serial 9
-dnl Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 60e7ea4d04975eac0d56b0e4cd31305475553ff2..a04055d2aa8c7dc44b7863d7a1e2661a362e01f3 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 71
-dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# unistd_h.m4 serial 74
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -37,13 +37,13 @@ AC_DEFUN([gl_UNISTD_H],
# include <fcntl.h>
# include <stdio.h>
# include <stdlib.h>
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
# include <io.h>
# endif
#endif
]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat
fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups
- gethostname getlogin getlogin_r getpagesize
+ gethostname getlogin getlogin_r getpagesize getpass
getusershell setusershell endusershell
group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
readlink readlinkat rmdir sethostname sleep symlink symlinkat
@@ -83,6 +83,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN])
GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R])
GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE])
+ GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS])
GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL])
GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER])
GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY])
@@ -126,6 +127,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME])
HAVE_GETLOGIN=1; AC_SUBST([HAVE_GETLOGIN])
HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE])
+ HAVE_GETPASS=1; AC_SUBST([HAVE_GETPASS])
HAVE_GROUP_MEMBER=1; AC_SUBST([HAVE_GROUP_MEMBER])
HAVE_LCHOWN=1; AC_SUBST([HAVE_LCHOWN])
HAVE_LINK=1; AC_SUBST([HAVE_LINK])
@@ -140,7 +142,6 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP])
HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK])
HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT])
- HAVE_TRUNCATE=1; AC_SUBST([HAVE_TRUNCATE])
HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT])
HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP])
HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON])
@@ -152,6 +153,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME])
+ HAVE_DECL_TRUNCATE=1; AC_SUBST([HAVE_DECL_TRUNCATE])
HAVE_DECL_TTYNAME_R=1; AC_SUBST([HAVE_DECL_TTYNAME_R])
HAVE_OS_H=0; AC_SUBST([HAVE_OS_H])
HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H])
@@ -168,6 +170,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R])
REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS])
REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE])
+ REPLACE_GETPASS=0; AC_SUBST([REPLACE_GETPASS])
REPLACE_ISATTY=0; AC_SUBST([REPLACE_ISATTY])
REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN])
REPLACE_LINK=0; AC_SUBST([REPLACE_LINK])
diff --git a/m4/unlink.m4 b/m4/unlink.m4
index ac86e7fe313fde1a99cad03fd45ae86138240233..69fd1af7f8ae6f1bdc26a739e8f02f1054161f83 100644
--- a/m4/unlink.m4
+++ b/m4/unlink.m4
@@ -1,5 +1,5 @@
-# unlink.m4 serial 12
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# unlink.m4 serial 13
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -43,12 +43,14 @@ AC_DEFUN([gl_FUNC_UNLINK],
[gl_cv_func_unlink_honors_slashes=yes],
[gl_cv_func_unlink_honors_slashes=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_unlink_honors_slashes="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_unlink_honors_slashes="guessing no" ;;
esac
])
rm -f conftest.file conftest.lnk])
diff --git a/m4/unlinkat.m4 b/m4/unlinkat.m4
index ca46c21d227748254e5c67d7790749e17b541159..8a1e275814cf4dc857fe72b834bd3bd4bd10a13e 100644
--- a/m4/unlinkat.m4
+++ b/m4/unlinkat.m4
@@ -1,5 +1,5 @@
# unlinkat.m4 serial 2
-dnl Copyright (C) 2004-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4
index abee7ccdda69e1112d02bd2df02c2a782935d1ed..7a9c02733dc9b49f7b1d47515f6aa72d972f98be 100644
--- a/m4/unlinkdir.m4
+++ b/m4/unlinkdir.m4
@@ -1,6 +1,6 @@
# serial 7
-# Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4
index 448ccac2f0e911ba942198597b17dc66aa14f7a5..ea55a1a2d82d0c5682f007dabeeff04732da1933 100644
--- a/m4/unlocked-io.m4
+++ b/m4/unlocked-io.m4
@@ -1,6 +1,6 @@
# unlocked-io.m4 serial 15
-# Copyright (C) 1998-2006, 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 1998-2006, 2009-2019 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/utime.m4 b/m4/utime.m4
index 7d4a6032f9c136f3fd32f525261b31a2a08894ce..ddd4ee154d710150a40b4a509f408619e7a4c927 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -1,5 +1,5 @@
# utime.m4 serial 1
-dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2017-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/utime_h.m4 b/m4/utime_h.m4
index 550f7642c77e4d20cdc5da243b434b02d82d7182..b0950d011d7e3a178a90347322517f04d4c04d9d 100644
--- a/m4/utime_h.m4
+++ b/m4/utime_h.m4
@@ -1,5 +1,5 @@
-# utime_h.m4 serial 1
-dnl Copyright (C) 2017 Free Software Foundation, Inc.
+# utime_h.m4 serial 3
+dnl Copyright (C) 2017-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,7 @@ AC_DEFUN([gl_UTIME_H],
[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([gl_UTIME_H_DEFAULTS])
+ m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])])
AC_CHECK_HEADERS_ONCE([utime.h])
gl_CHECK_NEXT_HEADERS([utime.h])
@@ -20,17 +21,25 @@ AC_DEFUN([gl_UTIME_H],
fi
AC_SUBST([HAVE_UTIME_H])
- UTIME_H=''
- if test $ac_cv_header_utime_h != yes; then
- dnl Provide a substitute <utime.h> file.
- UTIME_H=utime.h
- else
- case "$host_os" in
- mingw*) dnl Need special handling of 'struct utimbuf'.
- UTIME_H=utime.h
- ;;
- esac
- fi
+ m4_ifdef([gl_POSIXCHECK],
+ [UTIME_H=utime.h],
+ [UTIME_H=''
+ if m4_ifdef([gl_ANSI_CXX], [test "$CXX" != no], [false]); then
+ dnl Override <utime.h> always, to support the C++ GNULIB_NAMESPACE.
+ UTIME_H=utime.h
+ else
+ if test $ac_cv_header_utime_h != yes; then
+ dnl Provide a substitute <utime.h> file.
+ UTIME_H=utime.h
+ else
+ case "$host_os" in
+ mingw*) dnl Need special handling of 'struct utimbuf'.
+ UTIME_H=utime.h
+ ;;
+ esac
+ fi
+ fi
+ ])
AC_SUBST([UTIME_H])
AM_CONDITIONAL([GL_GENERATE_UTIME_H], [test -n "$UTIME_H"])
diff --git a/m4/utimens.m4 b/m4/utimens.m4
index f3feab38da34f59a178280dfe2ff83d8bc4a510a..dda86b09d77a32406ba20376e927aa0b16ab3f96 100644
--- a/m4/utimens.m4
+++ b/m4/utimens.m4
@@ -1,9 +1,9 @@
-dnl Copyright (C) 2003-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
-dnl serial 8
+dnl serial 9
AC_DEFUN([gl_UTIMENS],
[
@@ -31,10 +31,12 @@ AC_DEFUN([gl_UTIMENS],
[gl_cv_func_futimesat_works=yes],
[gl_cv_func_futimesat_works=no],
[case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_futimesat_works="guessing no" ;;
+ # Guess yes on Linux systems.
+ linux-* | linux) gl_cv_func_futimesat_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_futimesat_works="guessing no" ;;
esac
])
rm -f conftest.file])
diff --git a/m4/utimensat.m4 b/m4/utimensat.m4
index 78da3cc9443e0d1d78797ae4f0495a72b3002c5a..5628f8efebab30503ed260dc645568ad76019392 100644
--- a/m4/utimensat.m4
+++ b/m4/utimensat.m4
@@ -1,7 +1,7 @@
# serial 6
# See if we need to provide utimensat replacement.
-dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/utimes.m4 b/m4/utimes.m4
index 847b2eba78fd0edcf96f560936791e8dad6b497b..7209b6dd59923c8661aa837fa859f2d0e9c59130 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,7 +1,7 @@
# Detect some bugs in glibc's implementation of utimes.
# serial 5
-dnl Copyright (C) 2003-2005, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4
index 47c5951cb54a844954eda368fbfe2d2901434236..b763a3da620cb2e14e55f61c147d52c5464aae61 100644
--- a/m4/vasnprintf.m4
+++ b/m4/vasnprintf.m4
@@ -1,5 +1,5 @@
# vasnprintf.m4 serial 36
-dnl Copyright (C) 2002-2004, 2006-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4
index a75c6f180462c00ecd1af23d63c9b9c651003ea3..cd96229cb021e9f53c75c98100f97ac3265aa74f 100644
--- a/m4/vasprintf.m4
+++ b/m4/vasprintf.m4
@@ -1,5 +1,5 @@
# vasprintf.m4 serial 6
-dnl Copyright (C) 2002-2003, 2006-2007, 2009-2017 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/version-etc.m4 b/m4/version-etc.m4
index c099101fcd0246c159845926634745a6df10af72..4b2c4ffad7d1965ecd06d14d41260e17cc057155 100644
--- a/m4/version-etc.m4
+++ b/m4/version-etc.m4
@@ -1,5 +1,5 @@
# version-etc.m4 serial 1
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4
index 9c37bca9c54787859f52a0c96615e392f5962e6a..739c9048c9a6665633bad31f3ce7115546ebc215 100644
--- a/m4/vsnprintf.m4
+++ b/m4/vsnprintf.m4
@@ -1,5 +1,5 @@
# vsnprintf.m4 serial 7
-dnl Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4
index 25ce7378984806e1d72b9ffdd9c7d62595682a11..7ebe2d317a519d6879551f5ed5ee7c7f4b8eb0d6 100644
--- a/m4/warn-on-use.m4
+++ b/m4/warn-on-use.m4
@@ -1,11 +1,13 @@
-# warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
+# warn-on-use.m4 serial 6
+dnl Copyright (C) 2010-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
# gl_WARN_ON_USE_PREPARE(INCLUDES, NAMES)
# ---------------------------------------
+# If the module 'posixcheck' is in use:
+#
# For each whitespace-separated element in the list of NAMES, define
# HAVE_RAW_DECL_name if the function has a declaration among INCLUDES
# even after being undefined as a macro.
@@ -23,25 +25,27 @@ dnl with or without modifications, as long as this notice is preserved.
# needing gl_WARN_ON_USE_PREPARE.
AC_DEFUN([gl_WARN_ON_USE_PREPARE],
[
- m4_foreach_w([gl_decl], [$2],
- [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
- [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
- undefining macros.])])dnl
+ m4_ifdef([gl_POSIXCHECK],
+ [m4_foreach_w([gl_decl], [$2],
+ [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
+ [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
+ undefining macros.])])dnl
dnl FIXME: gl_Symbol must be used unquoted until we can assume
dnl autoconf 2.64 or newer.
- for gl_func in m4_flatten([$2]); do
- AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
- AC_CACHE_CHECK([whether $gl_func is declared without a macro],
- gl_Symbol,
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],
+ for gl_func in m4_flatten([$2]); do
+ AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
+ AC_CACHE_CHECK([whether $gl_func is declared without a macro],
+ gl_Symbol,
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],
[@%:@undef $gl_func
(void) $gl_func;])],
- [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])])
- AS_VAR_IF(gl_Symbol, [yes],
- [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
- dnl shortcut - if the raw declaration exists, then set a cache
- dnl variable to allow skipping any later AC_CHECK_DECL efforts
- eval ac_cv_have_decl_$gl_func=yes])
- AS_VAR_POPDEF([gl_Symbol])dnl
- done
+ [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])])
+ AS_VAR_IF(gl_Symbol, [yes],
+ [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
+ dnl shortcut - if the raw declaration exists, then set a cache
+ dnl variable to allow skipping any later AC_CHECK_DECL efforts
+ eval ac_cv_have_decl_$gl_func=yes])
+ AS_VAR_POPDEF([gl_Symbol])dnl
+ done
+ ])
])
diff --git a/m4/warnings.m4 b/m4/warnings.m4
index 870472b624bc57bf40bf39abe9b97a9c9b7e276d..235cac6171c0477c023f8e63878c2900654d5284 100644
--- a/m4/warnings.m4
+++ b/m4/warnings.m4
@@ -1,5 +1,5 @@
-# warnings.m4 serial 13
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+# warnings.m4 serial 14
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -76,6 +76,15 @@ m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)],
AC_LANG_POP([C++])
])
+# Specialization for _AC_LANG = Objective C. This macro can be AC_REQUIREd.
+# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b.
+m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(Objective C)],
+[
+ AC_LANG_PUSH([Objective C])
+ gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL
+ AC_LANG_POP([Objective C])
+])
+
AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL],
[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option],
[gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'],
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4
index d09ea08cb02762cee93ae7a1476b688b53a057ca..cd20e7a0c174abb3d16b2bbb2516d0d53d0f625a 100644
--- a/m4/wchar_h.m4
+++ b/m4/wchar_h.m4
@@ -1,13 +1,13 @@
dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
-dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl Written by Eric Blake.
-# wchar_h.m4 serial 42
+# wchar_h.m4 serial 43
AC_DEFUN([gl_WCHAR_H],
[
@@ -90,7 +90,8 @@ int main () { return zero(); }
dnl that the object file has the latter name from the start.
save_ac_compile="$ac_compile"
ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
- if AC_TRY_EVAL([ac_compile]); then
+ if echo '#include "conftest.c"' >conftest1.c &&
+ AC_TRY_EVAL([ac_compile]); then
AC_LANG_CONFTEST([
AC_LANG_SOURCE([[#define wcstod renamed_wcstod
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -105,7 +106,8 @@ int zero (void) { return 0; }
]])])
dnl See note above about renaming object files.
ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
- if AC_TRY_EVAL([ac_compile]); then
+ if echo '#include "conftest.c"' >conftest2.c &&
+ AC_TRY_EVAL([ac_compile]); then
if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
:
else
@@ -114,7 +116,7 @@ int zero (void) { return 0; }
fi
fi
ac_compile="$save_ac_compile"
- rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
+ rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext
])
if test $gl_cv_header_wchar_h_correct_inline = no; then
AC_MSG_ERROR([<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
index 11783d299a71d1f13fd6ec16bf2e920cfc814640..5db5815209d458444ed31c4cc5408ea95b2a1d3d 100644
--- a/m4/wchar_t.m4
+++ b/m4/wchar_t.m4
@@ -1,5 +1,5 @@
# wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4
index fcc3f8c82a8d795c7eaff654fabe82072d3f3c92..f4f37f567099efe290c9bf71bed841a6fc695c4a 100644
--- a/m4/wcrtomb.m4
+++ b/m4/wcrtomb.m4
@@ -1,5 +1,5 @@
-# wcrtomb.m4 serial 12
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+# wcrtomb.m4 serial 13
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -34,8 +34,8 @@ AC_DEFUN([gl_FUNC_WCRTOMB],
if test $REPLACE_MBSTATE_T = 1; then
REPLACE_WCRTOMB=1
else
- dnl On AIX 4.3, OSF/1 5.1 and Solaris 10, wcrtomb (NULL, 0, NULL) sometimes
- dnl returns 0 instead of 1.
+ dnl On AIX 4.3, OSF/1 5.1 and Solaris <= 11.3, wcrtomb (NULL, 0, NULL)
+ dnl sometimes returns 0 instead of 1.
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([gt_LOCALE_FR])
AC_REQUIRE([gt_LOCALE_FR_UTF8])
diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4
index 596f26b58249cc3d445aaa3f887ad560c2b48748..6903d7583c770735632d290d589a3e5fb6a0a0c2 100644
--- a/m4/wctype_h.m4
+++ b/m4/wctype_h.m4
@@ -2,7 +2,7 @@
dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
-dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index 1243606311217b771e7569dd2e4dfafd06955e1e..baa20029492951df5f4059db360017719d0c3e7d 100644
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,5 +1,5 @@
-# wcwidth.m4 serial 25
-dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# wcwidth.m4 serial 27
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -98,9 +98,9 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- # Guess yes on glibc and AIX 7 systems.
- *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
- *) gl_cv_func_wcwidth_works="guessing no";;
+ # Guess yes on glibc and AIX 7 systems.
+ *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
+ *) gl_cv_func_wcwidth_works="guessing no";;
esac
changequote([,])dnl
])
@@ -115,3 +115,9 @@ changequote([,])dnl
dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
dnl have the wcwidth function, then it does not declare it.
])
+
+# Prerequisites of lib/wcwidth.c.
+AC_DEFUN([gl_PREREQ_WCWIDTH], [
+ AC_REQUIRE([AC_C_INLINE])
+ :
+])
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
index d30b8bcf837ebf422f312a87f33701f9b37fd1ec..61e8a23d2785b2d3fc43a678a7b3c9151ce82577 100644
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@@ -1,5 +1,5 @@
# wint_t.m4 serial 7
-dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/write.m4 b/m4/write.m4
index 2f4a23538edd38db6b106bf64b131e2109af399c..34cb42ea5c7c39fddd9f5cbb82cbbb68b304ee34 100644
--- a/m4/write.m4
+++ b/m4/write.m4
@@ -1,5 +1,5 @@
# write.m4 serial 6
-dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xalloc.m4 b/m4/xalloc.m4
index 53aba149acec2669fffa3047102a5f3b33f20069..dfff94319b7e63655149b8059125ff6dee04e843 100644
--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,5 +1,5 @@
# xalloc.m4 serial 18
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xgetcwd.m4 b/m4/xgetcwd.m4
index e261a628cae9372f8574569dc97fcc5ce4427da7..c7e5e014eabae124f9c1130fe243f3a383b3eb09 100644
--- a/m4/xgetcwd.m4
+++ b/m4/xgetcwd.m4
@@ -1,5 +1,5 @@
#serial 8
-dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xsize.m4 b/m4/xsize.m4
index 5f8505770c3c81559ed387ed4249d304ff304686..f2898ba1a7896d3b2f006b3a08c06b558de664c3 100644
--- a/m4/xsize.m4
+++ b/m4/xsize.m4
@@ -1,5 +1,5 @@
# xsize.m4 serial 5
-dnl Copyright (C) 2003-2004, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4
index efb94a1af5490ad231febb2165065fd57c400cb2..32dc51bede4b978139a7bcc232660ca8208f3a7e 100644
--- a/m4/xstrndup.m4
+++ b/m4/xstrndup.m4
@@ -1,5 +1,5 @@
# xstrndup.m4 serial 2
-dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4
index 035588ea9efc6f466a031172438ce2bcd0302839..ee86a563301cb99e54f0bd23b7c1ca8a963f5741 100644
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,5 +1,5 @@
#serial 11
-dnl Copyright (C) 2002-2007, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xvasprintf.m4 b/m4/xvasprintf.m4
index b7ce7b5238f5caf29c8f83a4b70b5cdef84f9b4e..c6a7f7c845fd93f394ca199472d29b7629d05b95 100644
--- a/m4/xvasprintf.m4
+++ b/m4/xvasprintf.m4
@@ -1,5 +1,5 @@
# xvasprintf.m4 serial 2
-dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 38c293d2ed2f6e905ccdd4ce532e50fc90e1adf3..69155a752fee9bfc72fa2138f9533d9be8e41022 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,6 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2000-2019 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
@@ -232,13 +233,15 @@ $(POFILES): $(POFILESDEPS)
if test -f "$(srcdir)/$${lang}.po"; then \
test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \
cd $(srcdir) \
&& { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+ 0.1[6-7] | 0.1[6-7].*) \
+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \
*) \
- $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \
esac; \
}; \
else \
@@ -373,6 +376,8 @@ check: all
info dvi ps pdf html tags TAGS ctags CTAGS ID:
+install-dvi install-ps install-pdf install-html:
+
mostlyclean:
rm -f remove-potcdate.sed
rm -f stamp-poT
@@ -439,13 +444,15 @@ update-po: Makefile
tmpdir=`pwd`; \
echo "$$lang:"; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
$(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+ 0.1[6-7] | 0.1[6-7].*) \
+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
*) \
- $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
esac; \
}; then \
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 21bc9a675a67bf29b601b05860c62380fa638291..8fac9f34e08d38693169038c48758c4accd3c648 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
# List of files which contain translatable strings.
-# Copyright 1996, 1999-2000, 2003-2005, 2007, 2013-2014, 2016-2017 Free
-# Software Foundation, Inc.
+# Copyright 1996-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/po/bg.gmo b/po/bg.gmo
index 4aa0f25860eb37e90dfe006a24882e60d5e50adc..4bdf73e2a0c1440075519993af993fae00874d89 100644
Binary files a/po/bg.gmo and b/po/bg.gmo differ
diff --git a/po/bg.po b/po/bg.po
index 34cc57a084f8c62048392a003e7111e7384e0c35..04ebe59a261321247ecfbe02de2df8f413aeb42a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,23 +1,19 @@
-# Bulgarian translation of GNU tar
-# Message catalog for coreutils
-# Copyright (C) 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as GNU tar.
-# Anton Zinoviev <zinoviev@debian.org>, 2000,2006.
+# Bulgarian translation of GNU tar po-file.
+# Copyright (C) 2006, 2018 Free Software Foundation, Inc.
+# This file is distributed under the same license as the tar package.
+# Anton Zinoviev <zinoviev@debian.org>, 2000, 2006.
+# Alexander Shopov <ash@kambanaria.org>, 2018.
#
# WARNING: Everywhere NUMBER is translated as N rather than as БРОЙ or ЧИСЛО
-#
-# This file should be sent to translation@iro.umontreal.ca with the
-# following subject line: TP-Robot tar-1.16.bg.po
-#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.16\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2006-11-23 22:40+0200\n"
-"Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-10-23 22:00+0200\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
+"Language-Team: Bulgarian <dict@ludost.net>\n"
"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,36 +24,36 @@ msgstr ""
#: gnu/argmatch.c:134
#, c-format
msgid "invalid argument %s for %s"
-msgstr "неправилен аргумент %s за %s"
+msgstr "аргументът „%s“ на опцията „%s“ е неправилен"
#: gnu/argmatch.c:135
#, c-format
msgid "ambiguous argument %s for %s"
-msgstr "двусмислен аргумент %s за %s"
+msgstr "аргументът „%s“ на опцията „%s“ не е еднозначен"
#: gnu/argmatch.c:154
msgid "Valid arguments are:"
-msgstr "Допустими аргументи са:"
+msgstr "Възможните аргументи са:"
#: gnu/argp-help.c:148
#, c-format
msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr "ARGP_HELP_FMT: стойността %s е по-малка или равна на %s"
+msgstr "„ARGP_HELP_FMT“: стойността %s е по-малка или равна на %s"
#: gnu/argp-help.c:224
#, c-format
msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr "%.*s: параметърът ARGP_HELP_FMT изисква стойност"
+msgstr "%.*s: параметърът „ARGP_HELP_FMT“ изисква стойност"
#: gnu/argp-help.c:234
#, c-format
msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr "%.*s: непознат параметър ARGP_HELP_FMT"
+msgstr "%.*s: непознат параметър „ARGP_HELP_FMT“"
#: gnu/argp-help.c:247
#, c-format
msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr "Боклук в ARGP_HELP_FMT: %s"
+msgstr "Грешки в „ARGP_HELP_FMT“: %s"
#: gnu/argp-help.c:1228
msgid ""
@@ -77,12 +73,12 @@ msgstr " или: "
#: gnu/argp-help.c:1631
msgid " [OPTION...]"
-msgstr " [ОПЦИЯ...]"
+msgstr " [ОПЦИЯ…]"
#: gnu/argp-help.c:1658
-#, fuzzy, c-format
+#, c-format
msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr "Използвайте „%s --help“ or „%s --usage“ за повече информация.\n"
+msgstr "За повече информация използвайте „%s --help“ или „%s --usage“.\n"
#: gnu/argp-help.c:1686
#, c-format
@@ -93,32 +89,32 @@ msgstr ""
#: gnu/argp-help.c:1887 gnu/error.c:195
msgid "Unknown system error"
-msgstr "Непозната системна грешка"
+msgstr "Неизвестна системна грешка"
#: gnu/argp-parse.c:81
msgid "give this help list"
-msgstr "показва тази справка"
+msgstr "извеждане на тази справка"
#: gnu/argp-parse.c:82
msgid "give a short usage message"
-msgstr "показва кратко съобщение за използването"
+msgstr "извеждане на кратко съобщение за използването"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "ИМЕ"
#: gnu/argp-parse.c:84
msgid "set the program name"
-msgstr "посочва името на програмата"
+msgstr "задаване на името на програмата"
#: gnu/argp-parse.c:85
msgid "SECS"
-msgstr "СЕК"
+msgstr "СЕКУНДИ"
#: gnu/argp-parse.c:86
msgid "hang for SECS seconds (default 3600)"
-msgstr "спира за СЕК секунди (подразбира се 3600)"
+msgstr "спиране за толкова СЕКУНДИ (стандартно е 3600)"
#: gnu/argp-parse.c:143
msgid "print program version"
@@ -126,7 +122,7 @@ msgstr "показва версията на програмата"
#: gnu/argp-parse.c:160
msgid "(PROGRAM ERROR) No version known!?"
-msgstr "(ДЕФЕКТ В ПРОГРАМАТА) Не е известна версията!?"
+msgstr "(ДЕФЕКТ В ПРОГРАМАТА) Неизвестна версия!"
#: gnu/argp-parse.c:613
#, c-format
@@ -135,60 +131,60 @@ msgstr "%s: Твърде много аргументи\n"
#: gnu/argp-parse.c:759
msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr "(ДЕФЕКТ В ПРОГРАМАТА) Опцията би трябвало да е била разпозната!?"
+msgstr "(ДЕФЕКТ В ПРОГРАМАТА) Опцията би трябвало да е била разпозната!"
#: gnu/closeout.c:122
msgid "write error"
-msgstr ""
+msgstr "грешка при запис"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: опцията „%s“ е двусмислена\n"
+msgstr "%s: опцията „%s%s“ не е еднозначна\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: опцията „%s“ е двусмислена\n"
+msgstr "%s: опцията „%s%s“ не е еднозначна. Възможности:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: непозната опция „%c%s“\n"
+msgstr "%s: непозната опция „%s%s“\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: опцията „%c%s“ не допуска аргумент\n"
+msgstr "%s: опцията „%s%s“ се използва без аргументи\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: опцията „%s“ изисква аргумент\n"
+msgstr "%s: опцията „%s%s“ изисква аргумент\n"
#: gnu/getopt.c:621
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: неправилна опция -- %c\n"
+msgstr "%s: неправилна опция — „%c“\n"
#: gnu/getopt.c:636 gnu/getopt.c:682
-#, fuzzy, c-format
+#, c-format
msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: опцията изисква аргумент -- %c\n"
+msgstr "%s: опцията изисква аргумент — „%c“\n"
#: gnu/obstack.c:338 gnu/obstack.c:340 gnu/xalloc-die.c:34
msgid "memory exhausted"
msgstr "паметта е изчерпана"
#: gnu/openat-die.c:38
-#, fuzzy, c-format
+#, c-format
msgid "unable to record current working directory"
-msgstr "Не може да се смени работният каталог"
+msgstr "не може да се запише коя е текущата работна директория"
#: gnu/openat-die.c:57
-#, fuzzy, c-format
+#, c-format
msgid "failed to return to initial working directory"
-msgstr "Не може да се запази работният каталог"
+msgstr "не може да се върне към първоначалната работна директория"
#. TRANSLATORS:
#. Get translations for open and closing quotation marks.
@@ -227,7 +223,7 @@ msgstr "“"
#. locale -k LC_MESSAGES | grep '^yesexpr='
#: gnu/rpmatch.c:150
msgid "^[yY]"
-msgstr "^[дДoOyY]"
+msgstr "^[yYдДщЩ]"
#. TRANSLATORS: A regular expression testing for a negative answer
#. (english: "no"). Testing the first character may be sufficient.
@@ -237,26 +233,26 @@ msgstr "^[дДoOyY]"
#. locale -k LC_MESSAGES | grep '^noexpr='
#: gnu/rpmatch.c:163
msgid "^[nN]"
-msgstr "^[нНkKnN]"
+msgstr "^[nNнНхХ]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
-msgstr ""
+msgstr "Пакетирано от %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
-msgstr ""
+msgstr "Пакетирано от %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
-msgstr ""
+msgstr "©"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -265,24 +261,33 @@ msgid ""
"There is NO WARRANTY, to the extent permitted by law.\n"
"\n"
msgstr ""
+"\n"
+"Лиценз — Общ публичен лиценз на GNU (GNU GPL), както е публикуван от "
+"Фондацията\n"
+"за свободен софтуер — версия 3 на лиценза или (по ваше решение) по-късна "
+"версия.\n"
+"<https://gnu.org/licenses/gpl.html>\n"
+"Тази програма е свободен софтуер. Можете да я разпространявате и/или "
+"променяте.\n"
+"Тя се разпространява БЕЗ НИКАКВИ ГАРАНЦИИ доколкото е позволено от закона.\n"
#. TRANSLATORS: %s denotes an author name.
#: gnu/version-etc.c:102
#, c-format
msgid "Written by %s.\n"
-msgstr ""
+msgstr "Създадено от %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#: gnu/version-etc.c:106
#, c-format
msgid "Written by %s and %s.\n"
-msgstr ""
+msgstr "Създадено от %s и %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#: gnu/version-etc.c:110
#, c-format
msgid "Written by %s, %s, and %s.\n"
-msgstr ""
+msgstr "Създадено от %s, %s и %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -293,6 +298,8 @@ msgid ""
"Written by %s, %s, %s,\n"
"and %s.\n"
msgstr ""
+"Създадено от %s, %s, %s\n"
+"и %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -303,6 +310,8 @@ msgid ""
"Written by %s, %s, %s,\n"
"%s, and %s.\n"
msgstr ""
+"Създадено от %s, %s, %s,\n"
+"%s и %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -313,6 +322,8 @@ msgid ""
"Written by %s, %s, %s,\n"
"%s, %s, and %s.\n"
msgstr ""
+"Създадено от %s, %s, %s,\n"
+"%s, %s и %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -323,6 +334,8 @@ msgid ""
"Written by %s, %s, %s,\n"
"%s, %s, %s, and %s.\n"
msgstr ""
+"Създадено от %s, %s, %s,\n"
+"%s, %s, %s и %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -334,6 +347,9 @@ msgid ""
"%s, %s, %s, %s,\n"
"and %s.\n"
msgstr ""
+"Създадено от %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"и %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -345,6 +361,9 @@ msgid ""
"%s, %s, %s, %s,\n"
"%s, and %s.\n"
msgstr ""
+"Създадено от %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s и %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -356,40 +375,42 @@ msgid ""
"%s, %s, %s, %s,\n"
"%s, %s, and others.\n"
msgstr ""
+"Създадено от %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s и др.\n"
#. TRANSLATORS: The placeholder indicates the bug-reporting address
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
#: gnu/version-etc.c:245
-#, fuzzy, c-format
+#, c-format
msgid ""
"\n"
"Report bugs to: %s\n"
msgstr ""
-"Съобщавайте за програмни грешки на %s.\n"
-"За грешки в българския превод на <dict@fsa-bg.org>.\n"
+"\n"
+"Докладвайте грешки в програмата на адрес: %s\n"
+"Докладвайте грешки в превода на адрес: <dict@ludost.net>\n"
#: gnu/version-etc.c:247
-#, fuzzy, c-format
+#, c-format
msgid "Report %s bugs to: %s\n"
-msgstr ""
-"Съобщавайте за програмни грешки на %s.\n"
-"За грешки в българския превод на <dict@fsa-bg.org>.\n"
+msgstr "Докладвайте грешки в „%s“ на адрес: %s\n"
#: gnu/version-etc.c:251
#, c-format
msgid "%s home page: <%s>\n"
-msgstr ""
+msgstr "Уеб страница на „%s“: <%s>\n"
#: gnu/version-etc.c:253
#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr ""
+msgstr "Уеб страница на „%s“: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgstr "Обща помощ за програмите на GNU: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -398,7 +419,7 @@ msgstr ""
#: lib/paxerror.c:60 lib/paxerror.c:73
#, c-format
msgid "%s: Cannot %s"
-msgstr "%s: Функцията %s не успя"
+msgstr "%s: неуспешно изпълнение на функцията „%s“"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -407,83 +428,83 @@ msgstr "%s: Функцията %s не успя"
#: lib/paxerror.c:86
#, c-format
msgid "%s: Warning: Cannot %s"
-msgstr "%s: Внимание: Функцията %s не успя"
+msgstr "%s: ВНИМАНИЕ: неуспешно изпълнение на функцията „%s“"
#: lib/paxerror.c:95
#, c-format
msgid "%s: Cannot change mode to %s"
-msgstr "%s: Режимът за достъп не може да се смени на %s"
+msgstr "%s: неуспешна смяна на режима за достъп на %s"
#: lib/paxerror.c:103
#, c-format
msgid "%s: Cannot change ownership to uid %lu, gid %lu"
-msgstr "%s: Собствеността не може да се смени на потребител %lu, група %lu"
+msgstr "%s: неуспешна смяна на собствеността на потребител %lu, група %lu"
#: lib/paxerror.c:129
#, c-format
msgid "%s: Cannot hard link to %s"
-msgstr "%s: Не може да се направи твърда връзка с %s"
+msgstr "%s: неуспешно създаване на твърда връзка към „%s“"
#: lib/paxerror.c:181 lib/paxerror.c:213
#, c-format
msgid "%s: Read error at byte %s, while reading %lu byte"
msgid_plural "%s: Read error at byte %s, while reading %lu bytes"
-msgstr[0] "%s: Грешка при четене при байт %s, при четенето на %lu байт"
-msgstr[1] "%s: Грешка при четене при байт %s, при четенето на %lu байта"
+msgstr[0] "%s: грешка при четене при байт %s, при четенето на %lu байт"
+msgstr[1] "%s: грешка при четене при байт %s, при четенето на %lu байта"
#: lib/paxerror.c:194
#, c-format
msgid "%s: Warning: Read error at byte %s, while reading %lu byte"
msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes"
msgstr[0] ""
-"%s: Внимание: Грешка при четене при байт %s, при четенето на %lu байт"
+"%s: ВНИМАНИЕ: грешка при четене при байт %s, при четенето на %lu байт"
msgstr[1] ""
-"%s: Внимание: Грешка при четене при байт %s, при четенето на %lu байта"
+"%s: ВНИМАНИЕ: грешка при четене при байт %s, при четенето на %lu байта"
#: lib/paxerror.c:261
#, c-format
msgid "%s: Cannot seek to %s"
-msgstr "%s: Не може да се отиде на отместване %s във файла"
+msgstr "%s: неуспешно позициониране към отместване %s във файла"
#: lib/paxerror.c:277
#, c-format
msgid "%s: Warning: Cannot seek to %s"
-msgstr "%s: Внимание: Не може да се отиде на отместване %s във файла"
+msgstr "%s: ВНИМАНИЕ: неуспешно позициониране към отместване %s във файла"
#: lib/paxerror.c:286
#, c-format
msgid "%s: Cannot create symlink to %s"
-msgstr "%s: Не може да се направи символна връзка към %s"
+msgstr "%s: неуспешно създаване на символна връзка към %s"
#: lib/paxerror.c:351
#, c-format
msgid "%s: Wrote only %lu of %lu byte"
msgid_plural "%s: Wrote only %lu of %lu bytes"
-msgstr[0] "%s: Записани са само %lu от %lu байт"
-msgstr[1] "%s: Записани са само %lu от %lu байта"
+msgstr[0] "%s: записани са само %lu от %lu байт"
+msgstr[1] "%s: записани са само %lu от %lu байта"
#: lib/paxnames.c:140
#, c-format
msgid "Removing leading `%s' from member names"
-msgstr "Премахва се началното „%s“ от имената на членове"
+msgstr "Премахване на началния префикс „%s“ от имената на членовете"
#: lib/paxnames.c:141
#, c-format
msgid "Removing leading `%s' from hard link targets"
-msgstr "Премахва се началното „%s“ от целите на твърдите връзки"
+msgstr "Премахване на началния префикс „%s“ от целите на твърдите връзки"
#: lib/paxnames.c:154
msgid "Substituting `.' for empty member name"
-msgstr "Полага се „.“ вместо празно име на член"
+msgstr "Използване на „.“ вместо празно име на член"
#: lib/paxnames.c:155
msgid "Substituting `.' for empty hard link target"
-msgstr "Полага се „.“ вместо празна цел на твърда връзка"
+msgstr "Използване на „.“ вместо празна цел на твърда връзка"
#: lib/rtapelib.c:299
#, c-format
msgid "exec/tcp: Service not available"
-msgstr "exec/tcp: Услугата не е достъпна"
+msgstr "exec/tcp: услугата не е достъпна"
#: lib/rtapelib.c:303
#, c-format
@@ -498,578 +519,573 @@ msgstr "стандартен изход"
#: lib/rtapelib.c:429
#, c-format
msgid "Cannot connect to %s: resolve failed"
-msgstr ""
+msgstr "Неуспешно свързване към „%s“: адресът не може да се открие"
#: lib/rtapelib.c:502
-#, fuzzy, c-format
+#, c-format
msgid "Cannot redirect files for remote shell"
-msgstr "Не може да се стартира отдалечена командна обвивка"
+msgstr "Неуспешно пренасочване на файлове за отдалечена командна обвивка"
#: lib/rtapelib.c:516
#, c-format
msgid "Cannot execute remote shell"
-msgstr "Не може да се стартира отдалечена командна обвивка"
+msgstr "Неуспешно стартиране на отдалечена командна обвивка"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
-msgstr "Посоката за отместване е недопустима"
+msgstr "Посоката за отместване е извън допустимия диапазон"
-#: rmt/rmt.c:438
-#, fuzzy
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
-msgstr "На опция е подаден неправилен режим"
+msgstr "Неправилна посока за търсене"
-#: rmt/rmt.c:446
-#, fuzzy
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
-msgstr "Неправилен размер: %s"
+msgstr "Неправилно отместване при търсене"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Мястото за позициониране е извън допустимия диапазон"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
-#, fuzzy
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
-msgstr "Неправилна дължина на лента"
+msgstr "Неправилен брой байтове"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
-#, fuzzy
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
-msgstr "Мястото за позициониране е извън допустимия диапазон"
+msgstr "Броят байтове е извън допустимия диапазон"
-#: rmt/rmt.c:558
-#, fuzzy
+#: rmt/rmt.c:562
msgid "Premature eof"
-msgstr "rmtd: Преждевременен край (eof)\n"
+msgstr "Преждевременен край (EOF)"
-#: rmt/rmt.c:601
-#, fuzzy
+#: rmt/rmt.c:605
msgid "Invalid operation code"
-msgstr "Вид основно действие:"
+msgstr "Неправилен код на действие"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
-msgstr ""
+msgstr "Действието не се поддържа"
-#: rmt/rmt.c:664
-#, fuzzy
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
-msgstr "Неочакван EOF"
+msgstr "Неочаквани аргументи"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
+"Управление на устройство за магнитна лента, като се приемат команди от "
+"отдалечен процес"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "N"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
-msgstr ""
+msgstr "ниво за изчистване на грешки"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "ФАЙЛ"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
-msgstr ""
+msgstr "задаване на файл за изхода за изчистване на грешки"
-#: rmt/rmt.c:715 rmt/rmt.c:783
-#, fuzzy, c-format
+#: rmt/rmt.c:719 rmt/rmt.c:787
+#, c-format
msgid "cannot open %s"
-msgstr "Не може да се отвори „%s“"
+msgstr "„%s“ не може да се отвори"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
-msgstr "твърде много аргументи"
+msgstr "прекалено много аргументи"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Непозната команда"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
-msgstr "Това не прилича на tar-архив"
+msgstr "Това не прилича на архив на „tar“"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Общо прочетени байтове"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Общо записани байтове"
-#: src/buffer.c:593
-#, fuzzy
+#: src/buffer.c:595
msgid "Total bytes deleted"
-msgstr "Общо изтрити байтове: %s\n"
+msgstr "Общо изтрити байтове"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(канал)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
+"Отказ за изчитане на съдържанието на архива от терминала (дали не сте "
+"пропуснали опцията „-f“?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
+"Отказ за записването на съдържанието на архива от терминала (дали не сте "
+"пропуснали опцията „-f“?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
-msgstr "Неправилна стойност на record_size"
+msgstr "Неправилна стойност на „record_size“"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Не е посочено име на архив"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Не може да се проверяват архиви на стандартните вход/изход"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Архивът е компресиран. Използвайте опцията %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Не може да се актуализират компресирани архиви"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
-msgstr "В началото на лентата, край на изпълнението"
+msgstr "В началото на лентата. Край на изпълнението"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
-msgstr "Твърде много грешки, край на изпълнението"
+msgstr "Твърде много грешки. Край на изпълнението"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Размер на записа = %lu блок"
msgstr[1] "Размер на записа = %lu блока"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Неподравнен блок (%lu байт) в архива"
msgstr[1] "Неподравнен блок (%lu байта) в архива"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
-"Невъзможно е връщане назад в архивния файл; той може да е нечитаем без опция "
-"-i"
+"Невъзможно е връщане назад в архивния файл — той може и да не се чете без "
+"опция „-i“"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
-msgstr "rmtlseek не завърши при граница на запис"
+msgstr "„rmtlseek“ не завърши при граница на запис"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: съдържа неправилен номер на том"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Препълване на номера на том"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
-msgstr "Подгответе том №%d за %s и натиснете return: "
+msgstr "Подгответе том №%d за %s и натиснете „Return“: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
-msgstr "EOF, когато се очакваше отговор от потребителя"
+msgstr "EOF, а се очакваше отговор от потребителя"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "ВНИМАНИЕ: Архивът е незавършен"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
" q Abort tar\n"
" y or newline Continue operation\n"
msgstr ""
-" n име Посочва ново файлово име за следващия том и томовете след "
-"него\n"
-" q Прекратява tar\n"
-" y или return Продължава изпълнението\n"
+" n ИМЕ Задаване на ново име на файл име за следващите томове\n"
+" q Прекратяване на изпълнението на „tar“\n"
+" y/Return Продължаване на изпълнението\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
-msgstr " ! Поражда вторична командна обвивка\n"
+msgstr " ! Стартиране на вторична командна обвивка\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
-msgstr " ? Извежда този списък\n"
+msgstr " ? Извеждане на този списък\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
-msgstr "Няма повече томове; изход.\n"
+msgstr "Няма повече томове — изход.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Не е посочено име на файл. Опитайте отново.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
-msgstr "Неправилна команда. Използвайте ? за справка.\n"
+msgstr "Неправилна команда. Използвайте „?“ за справка.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
-msgstr "командата %s не успя"
+msgstr "неуспешно изпълнение на командата „%s“"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
-msgstr "%s не продължава с този том"
+msgstr "„%s“ не продължава с този том"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
-"%s вероятно продължава в този том: заглавният запис съдържа отрязано име"
+"„%s“ вероятно продължава в този том: заглавният запис съдържа отрязано име"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s е грешен размер (%s != %s + %s)"
-#: src/buffer.c:1574
-#, fuzzy, c-format
+#: src/buffer.c:1576
+#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
-msgstr "Този том е извън поредицата"
+msgstr "Този том е извън поредицата (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
-msgstr "Архивът не е етикетиран да отговаря на %s"
+msgstr "Архивът не е етикетиран да отговаря на „%s“"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
-msgstr "Томът %s не съответства на %s"
+msgstr "Томът „%s“ не съответства на „%s“"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
"%s: името на файла е твърде дълго, за да се побере в заглавен запис на "
-"многотомен ГНУ-архив и бе съкратено"
+"многотомен архив на ГНУ и бе съкратено"
-#: src/buffer.c:1965
-#, fuzzy
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
-msgstr "EOF на архив %s не е на границата на блок"
+msgstr "записът не завърши на границата на блок"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
-msgstr[0] "Само %lu от %lu байт можаха да се прочетат"
-msgstr[1] "Само %lu от %lu байта можаха да се прочетат"
+msgstr[0] "Само %lu от %lu байт би прочетен"
+msgstr[1] "Само %lu от %lu байта бяха прочетени"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
-msgstr "Съдържанието се различава"
+msgstr "Различно съдържание"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Неочакван знак за край (EOF) в архива"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
-msgstr "Файловите типове се различават"
+msgstr "Различни видове файлове"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
-msgstr "Режимите за достъп се различават"
+msgstr "Различни режими на достъп"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
-msgstr "Собствениците се различават"
+msgstr "Различни идентификатори на собственици"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
-msgstr "Групите се различават"
+msgstr "Различни идентификатори на групи"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
-msgstr "Времената на промяна се различават"
+msgstr "Различни времена на промяна"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
-msgstr "Размерите се различават"
+msgstr "Различни размери"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
-msgstr "Не е свързан с %s"
+msgstr "Не е свързан с „%s“"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
-msgstr "Символните връзки се различават"
+msgstr "Различни символни връзки"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
-msgstr "Номерата на устройство се различават"
+msgstr "Различни номера на устройства"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Проверка"
-#: src/compare.c:480
-#, fuzzy, c-format
+#: src/compare.c:479
+#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
-msgstr "%s: Непознат файлов тип „%c“, сравнява се като обикновен файл"
+msgstr "%s: Непознат вид файл „%c“, сравнява се като обикновен файл"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
-msgstr "Архивът съдържа файлови имена, с отстранени префикси."
+msgstr "Архивът съдържа файлови имена с отстранени префикси."
-#: src/compare.c:541
-#, fuzzy
+#: src/compare.c:540
msgid "Archive contains transformed file names."
-msgstr "Архивът съдържа архаични заглавни записи по модул 64 (6 битови)"
+msgstr "Архивът съдържа преобразувани имена на файлове."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Проверката може и да не открие оригиналните файлове."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
-msgstr[0] "НЕУСПЕШНА ПРОВЕРКА: открита е %d неправилен заглавен запис"
+msgstr[0] "НЕУСПЕШНА ПРОВЕРКА: открит е %d неправилен заглавен запис"
msgstr[1] "НЕУСПЕШНА ПРОВЕРКА: открити са %d неправилни заглавни записа"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Изолиран блок от нули при %s"
-#: src/create.c:74
-#, fuzzy, c-format
+#: src/create.c:73
+#, c-format
msgid "%s: contains a cache directory tag %s; %s"
-msgstr "%s: каталогът е обозначен като кеш; не се архивира"
+msgstr "%s: директорията съдържа етикет, че е кешираща — „%s“: %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
-msgstr ""
-"стойността на %s е извън границите %s на диапазона %s..%s; замества се с %s"
+msgstr "стойността %s е извън диапазона на „%s“: [%s; %s], замества се с „%s“"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
-msgstr "стойността %s е извън границите %s на диапазона %s..%s"
+msgstr "стойността %s е извън диапазона на „%s“: [%s; %s]"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Генерират се отрицателни осмични заглавни записи"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
-msgstr "%s: файловото име е твърде дълго (максимум %d); не е архивирано"
+msgstr ""
+"%s: името на файл е твърде дълго (максимум %d), затова той не се архивира"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
-"%s: файловото име е твърде дълго (не може да се раздели); не е архивирано"
+"%s: името на файл е твърде дълго (не може да се раздели), затова той не се "
+"архивира"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
-msgstr "%s: името на символната връзка е твърде дълго; не е архивирано"
+msgstr "%s: името на символна връзка е твърде дълго, затова тя не се архивира"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
-msgstr[0] "%s: Файлът намаля с %s байт; допълва се с нула"
-msgstr[1] "%s: Файлът намаля с %s байта; допълва се с нули"
+msgstr[0] "%s: файлът намаля̀ с %s байт, допълва се с нула"
+msgstr[1] "%s: файлът намаля̀ с %s байта, допълва се с нули"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
-msgstr "%s: файлът е в друга файлова система; не се архивира"
+msgstr "%s: файлът е в друга файлова система, затова той не се архивира"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
-msgstr ""
+msgstr "съдържанието не се архивира"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
-msgstr "%s: Непознат файлов тип; файлът се пренебрегва"
+msgstr "%s: непознат вид файл, файлът се прескача"
-#: src/create.c:1576
-#, fuzzy, c-format
+#: src/create.c:1575
+#, c-format
msgid "Missing links to %s."
-msgstr "Неархивирани връзки с %s.\n"
+msgstr "Липсват връзки към „%s“."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
-msgstr "%s: файлът не е променен; не се архивира"
+msgstr "%s: файлът не е променен, затова той не се архивира"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
-msgstr "%s: файлът е архив; не се архивира"
+msgstr "%s: файлът е архив, затова той не се архивира"
-#: src/create.c:1774 src/incremen.c:603
-#, fuzzy
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
-msgstr "%s: каталогът е обозначен като кеш; не се архивира"
+msgstr "директорията не се архивира"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: файлът бе изменен по време на четене"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
-msgstr "%s: гнездото се пренебрегва"
+msgstr "%s: гнездото се прескача"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
-msgstr "%s: пренебрегва се специалният файл тип door"
+msgstr "%s: специалният файл тип „door“ се прескача"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
-msgstr "Пропуска се до следващия заглавен запис"
+msgstr "Прескачане до следващия заглавен запис"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
-msgstr "Изтрива се незаглавен запис от архива"
+msgstr "Изтриване на незаглавен запис от архива"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: записано е невероятно старо време %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: записано е време %s, което е %s сек. в бъдещето"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
-msgstr "%s: Неочаквана несъгласуваност при създаване на каталог"
+msgstr "%s: неочаквана несъгласуваност при създаване на директория"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
-msgstr ""
+msgstr "„%s“: пропускане на съществуващ файл"
#: src/extract.c:901
#, c-format
msgid "%s: Directory renamed before its status could be extracted"
msgstr ""
-"%s: каталогът бе преименуван преди да може да се извлече състоянието му"
+"%s: директорията бе преименувана, преди да може да се извлече състоянието ѝ"
#: src/extract.c:1086
msgid "Extracting contiguous files as regular files"
-msgstr "Продължаващи файлове се извличат като обикновени файлове"
+msgstr ""
+"Последователно непрекъснатите файлове се извличат като обикновени файлове"
#: src/extract.c:1433
msgid "Attempting extraction of symbolic links as hard links"
-msgstr "Опитва се извличането на символни връзки като твърди"
+msgstr "Опит за извличането на символни връзки като твърди"
#: src/extract.c:1596
#, c-format
msgid "%s: Cannot extract -- file is continued from another volume"
-msgstr "%s: Не може да се извлича -- файлът продължава с друг том"
+msgstr "%s: невъзможно извличане — файлът продължава с друг том"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Неочаквано дълъг заглавен запис"
#: src/extract.c:1610
-#, fuzzy, c-format
+#, c-format
msgid "%s: Unknown file type '%c', extracted as normal file"
-msgstr "%s: Непознат файлов тип „%c“, извлича се като обикновен файл"
+msgstr "%s: непознат вид файл „%c“, извлича се като обикновен файл"
#: src/extract.c:1636
#, c-format
msgid "Current %s is newer or same age"
-msgstr "Текущият %s е по-нов или със същата възраст"
+msgstr "Текущият файл „%s“ е по-нов или със същата възраст"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "„%s“: името на някой от елементите съдържа „..“"
#: src/extract.c:1696
#, c-format
msgid "%s: Was unable to backup this file"
-msgstr "%s: Не можа да се направи резервно копие на този файл"
+msgstr "%s: неуспешно създаване на резервно копие на този файл"
#: src/extract.c:1845
#, c-format
msgid "Cannot rename %s to %s"
-msgstr "Бе невъзможно %s да се преименува на %s"
+msgstr "Неуспешно преименуване на „%s“ към „%s“"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
-msgstr "%s: Каталогът бе преименуват от %s"
+msgstr "%s: директорията бе преименувана от „%s“"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
-msgstr "%s: Каталогът е нов"
+msgstr "%s: директорията е нова"
-#: src/incremen.c:566
-#, fuzzy, c-format
+#: src/incremen.c:565
+#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
-msgstr "%s: файлът е в друга файлова система; не се архивира"
+msgstr "%s: директорията е в друга файлова система и не се архивира"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
-msgstr "%s: Каталогът бе преименуван"
+msgstr "%s: директорията бе преименувана"
#: src/incremen.c:1003 src/incremen.c:1018
msgid "Invalid time stamp"
msgstr "Записано е неправилно време"
#: src/incremen.c:1047
-#, fuzzy
msgid "Invalid modification time"
-msgstr "Неправилно време на промяна (секунди)"
+msgstr "Неправилно време на промяна"
#: src/incremen.c:1057
msgid "Invalid modification time (nanoseconds)"
@@ -1086,16 +1102,16 @@ msgstr "Неправилен номер на i-възел"
#: src/incremen.c:1137
#, c-format
msgid "%s: byte %s: %s %.*s... too long"
-msgstr ""
+msgstr "%s: байт %s: %s %.*s… твърде голяма дължина"
#: src/incremen.c:1153 src/incremen.c:1211 src/incremen.c:1273
msgid "Unexpected EOF in snapshot file"
-msgstr "Неочакван край на snapshot-файл"
+msgstr "Неочакван край на файла за състоянието (snapshot)"
#: src/incremen.c:1161
#, c-format
msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x"
-msgstr ""
+msgstr "%s: байт %s: %s %s следван от неправилен байт 0x%02x"
#: src/incremen.c:1174
#, c-format
@@ -1103,16 +1119,18 @@ msgid ""
"%s: byte %s: (valid range %s..%s)\n"
"\t%s %s"
msgstr ""
+"%s: байт %s: (допустим диапазон: [%s; %s]\n"
+" %s %s"
#: src/incremen.c:1181
#, c-format
msgid "%s: byte %s: %s %s"
-msgstr ""
+msgstr "%s: байт %s: %s %s"
#: src/incremen.c:1262
#, c-format
msgid "%s: byte %s: %s"
-msgstr ""
+msgstr "%s: байт %s: %s"
#: src/incremen.c:1265
msgid "Missing record terminator"
@@ -1130,455 +1148,468 @@ msgstr "Неподдържана версия на инкрементален ф
#: src/incremen.c:1549
#, c-format
msgid "Malformed dumpdir: expected '%c' but found %#3o"
-msgstr "Лошо формиран dumpdir: очаква се „%c“, а вместо това има %#3o"
+msgstr ""
+"Неправилна секция за директориите (dumpdir): очаква се „%c“, а вместо това "
+"бе получен %#3o"
#: src/incremen.c:1559
msgid "Malformed dumpdir: 'X' duplicated"
-msgstr "Лошо формиран dumpdir: „X“ е дублиран"
+msgstr "Неправилна секция за директориите (dumpdir): „X“ се повтаря"
#: src/incremen.c:1572
msgid "Malformed dumpdir: empty name in 'R'"
-msgstr "Лошо формиран dumpdir: празно име в „R“"
+msgstr "Неправилна секция за директориите (dumpdir): празно име в „R“"
#: src/incremen.c:1585
-#, fuzzy
msgid "Malformed dumpdir: 'T' not preceded by 'R'"
-msgstr "Лошо формиран dumpdir: „T“ не се предхожда от „R“"
+msgstr ""
+"Неправилна секция за директориите (dumpdir): „T“ не се предхожда от „R“"
#: src/incremen.c:1591
msgid "Malformed dumpdir: empty name in 'T'"
-msgstr "Лошо формиран dumpdir: празно име в „T“"
+msgstr "Неправилна секция за директориите (dumpdir): празно име в „T“"
#: src/incremen.c:1611
#, c-format
msgid "Malformed dumpdir: expected '%c' but found end of data"
-msgstr "Лошо формиран dumpdir: очаква се „%c“, вместо това данните свършват"
+msgstr ""
+"Неправилна секция за директориите (dumpdir): очаква се „%c“, вместо това "
+"данните свършват"
#: src/incremen.c:1618
msgid "Malformed dumpdir: 'X' never used"
-msgstr "Лошо формиран dumpdir: „X“ никога не се използва"
+msgstr "Неправилна секция за директориите (dumpdir): „X“ никога не се използва"
#: src/incremen.c:1662
#, c-format
msgid "Cannot create temporary directory using template %s"
-msgstr "Не може да се създаде временен каталог, използвайки шаблона %s"
+msgstr "Не може да се създаде временна директория по шаблона %s"
#: src/incremen.c:1723
#, c-format
msgid "%s: Not purging directory: unable to stat"
-msgstr "%s: Каталогът не се изчиства: не може да се достъпи"
+msgstr "%s: директорията няма да бъде изчистена, защото няма достъп до нея"
#: src/incremen.c:1736
#, c-format
msgid "%s: directory is on a different device: not purging"
-msgstr "%s: каталогът е на друго устройство: не се изчиства"
+msgstr "%s: директорията няма да бъде изчистена, защото е на друго устройство"
#: src/incremen.c:1744
#, c-format
msgid "%s: Deleting %s\n"
-msgstr "%s: Изтрива се %s\n"
+msgstr "%s: изтрива се %s\n"
#: src/incremen.c:1749
#, c-format
msgid "%s: Cannot remove"
-msgstr "%s: Не може да се изтрие"
+msgstr "%s: не може да се изтрие"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
-msgstr "%s: Пропуска се"
+msgstr "%s: пропуска се"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
-msgstr "блок %s: ** Блок от знаци NUL **\n"
+msgstr "блок %s: •• Блок от знаци NUL ••\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
-msgstr "блок %s: ** Край на файла **\n"
+msgstr "блок %s: •• Край на файла ••\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "блок %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
-msgstr "Интервали в заглавен запис вместо числова стойност на %s"
+msgstr "Интервали в заглавен запис вместо числова стойност за %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
-"Осмичната стойност %.*s в архива е извън диапазона за %s; предполага се, че "
-"е допълнение до две"
+"Осмичната стойност %.*s в архива е извън диапазона за %s. Приема се, че е "
+"допълнение до две"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Осмичната стойност %.*s в архива е извън диапазона за %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
-msgstr "Архивът съдържа архаични заглавни записи по модул 64 (6 битови)"
+msgstr "Архивът съдържа архаични заглавни записи по модул 64 (base-64)"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr ""
-"Архивът е подписан с низ по модул 64 %s, който е е извън диапазона за %s"
+"Архивът е подписан с низ по модул 64 %s (base-64), който е е извън диапазона "
+"за %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
-msgstr "Стойността по модул 256 в архива е извън диапазона %s"
+msgstr "Стойността по модул 256 (base-256) в архива е извън диапазона %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
-msgstr "Архивът съдържа %.*s, вместо това се очаква числова стойност на %s"
+msgstr "Архивът съдържа %.*s, вместо това се очаква числова стойност за %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
-msgstr "Стойността %s в архива е извън допустимия диапазон за %s (%s..%s)"
+msgstr "Стойността %s в архива е извън допустимия диапазон за %s: [%s; %s]"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
-msgstr " връзка към %s\n"
+msgstr " връзка към „%s“\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
-msgstr " непознат файлов тип %s\n"
+msgstr " непознат вид файл %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
-msgstr "--Дълга връзка--\n"
+msgstr "——Дълга връзка——\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
-msgstr "--Дълго име--\n"
+msgstr "——Дълго име——\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
-msgstr "--Заглавен запис на тома--\n"
+msgstr "——Заглавен запис на тома——\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
-msgstr "--Продължава при байт %s--\n"
+msgstr "——Продължава при байт %s——\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
-msgstr "Създава се каталог:"
+msgstr "Създава се директория:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
-msgstr "Преименува се %s на %s\n"
+msgstr "„%s“ се преименува на „%s“\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
-msgstr "%s: Не може да се преименува на %s"
+msgstr "%s: не може да се преименува на „%s“"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
-msgstr "Преименува се %s обратно на %s\n"
+msgstr "„%s“ се преименува обратно на „%s“\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
-msgstr "%s: Файлът бе изтрит преди да бъде прочетен"
+msgstr "%s: Файлът бе изтрит, преди да бъде прочетен"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "породен процес"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "междупроцесен канал"
-#: src/names.c:69
-#, fuzzy
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Избор на локален файл:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
-"добавя посочения ФАЙЛ към архива (полезно е, ако името му започва с минус)"
+"добавяне на посочения ФАЙЛ към архива (полезно е, ако името му започва с „-“)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
-msgstr "КАТ"
+msgstr "ДИРЕКТОРИЯ"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
-msgstr "работи в каталога КАТ"
+msgstr "преминаване към ДИРЕКТОРИЯта"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
-msgstr "взема имената за извличане или създаване от ФАЙЛ"
+msgstr "вземане на имената за извличане или създаване от ФАЙЛ"
-#: src/names.c:78
-#, fuzzy
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
-msgstr "-T чете имена, завършващи с нулев байт"
+msgstr ""
+"„-T“ изчита имена на файлове, завършващи с нулев байт. Това задейства "
+"опцията „--verbatim-files-from“"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
-msgstr ""
+msgstr "изключване на ефекта от предходна опция „--null“"
-#: src/names.c:83
-#, fuzzy
+#: src/names.c:82
msgid "unquote input file or member names (default)"
-msgstr "декодира „\\“ във файловите имена на -T (подразб.)"
+msgstr ""
+"декодиране на „\\“ на входния файл или имената на членовете (стандартно)"
-#: src/names.c:85
-#, fuzzy
+#: src/names.c:84
msgid "do not unquote input file or member names"
-msgstr "не декодира „\\“ във файловите имена на -T"
+msgstr "без декодиране на „\\“ на входния файл или имената на членовете"
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
+"„-T“ изчита имената на файловете дословно, без екраниране или други обработки"
-#: src/names.c:89
-#, fuzzy
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
-msgstr "декодира „\\“ във файловите имена на -T (подразб.)"
+msgstr ""
+"„-T“ зачита имена на файлове, започващи с тирета, като опции (стандартно)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
-msgstr "ОБРАЗЕЦ"
+msgstr "ШАБЛОН"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
-msgstr "без файловете, отговарящи на ОБРАЗЕЦ"
+msgstr "без файловете, отговарящи на ШАБЛОНа"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
-msgstr "пропуска файловете, отговарящи на образци в ФАЙЛ"
+msgstr "пропускане на файловете, отговарящи на шаблоните във ФАЙЛа"
-#: src/names.c:96
-#, fuzzy
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
-msgstr "без каталози, обозначени като кеширащи"
+msgstr ""
+"без директории, които съдържат етикет за кешираща директория („CACHEDIR."
+"TAG“), с изключение на самия него"
-#: src/names.c:99
-#, fuzzy
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
-msgstr "без каталози, обозначени като кеширащи"
+msgstr ""
+"без всичко под директориите, които съдържат етикет за кешираща директория "
+"(„CACHEDIR.TAG“)"
-#: src/names.c:102
-#, fuzzy
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
-msgstr "без каталози, обозначени като кеширащи"
+msgstr ""
+"без директории, които съдържат етикет за кешираща директория („CACHEDIR.TAG“)"
-#: src/names.c:104
-#, fuzzy
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
-msgstr "без каталози, обозначени като кеширащи"
+msgstr "без директории, които съдържат такъв ФАЙЛ, с изключение на самия ФАЙЛ"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
+"изчитане на шаблоните за прескачане за всяка директория от зададения ФАЙЛ, "
+"ако той съществува"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
+"изчитане на шаблоните за прескачане за всяка директория и поддиректориите ѝ "
+"от зададения ФАЙЛ, ако той съществува"
-#: src/names.c:113
-#, fuzzy
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
-msgstr "без каталози, обозначени като кеширащи"
+msgstr "без всичко под директориите, които съдържат такъв ФАЙЛ"
-#: src/names.c:115
-#, fuzzy
+#: src/names.c:114
msgid "exclude directories containing FILE"
-msgstr "без каталози, обозначени като кеширащи"
+msgstr "без директории, които съдържат такъв ФАЙЛ"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
-msgstr ""
+msgstr "прескачане на служебните директории за следене на версиите"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
+"изчитане на шаблоните за прескачане от файла с пренебрегваните файлове от "
+"системата за следене на версиите"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
-msgstr ""
+msgstr "без заключващи файлове и резервни копия"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
-msgstr "влиза рекурсивно в подкаталозите (подразбира се)"
+msgstr "рекурсивно обхождане на поддиректориите (стандартно)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
-msgstr "без автоматично влизане в подкаталозите"
+msgstr "без рекурсивно обхождане на поддиректориите"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
-"Съпоставяне с файлови имена (влияе и на включващи, и на изключващи образци):"
+"Съпоставяне с файлови имена (влияе и на включващи, и на изключващи шаблони):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
-msgstr "съпоставянето с образците започва от началото на файловото име"
+msgstr "съпоставянето с шаблоните започва от началото на файловото име"
-#: src/names.c:135
-#, fuzzy
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
-msgstr "съпоставянето започва след кой да е „/“ (подразбира се при изключване)"
+msgstr ""
+"напасването се зачита след произволен знак „/“ (стандартно при изключване)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
-msgstr "пренебрегва разликата между големи/малки букви"
+msgstr "без разлика между главни и малки букви"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
-msgstr "отчита се разликата между малки и големи букви (подразбира се)"
+msgstr "с разлика между главни и малки букви (стандартно)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
-msgstr "ползва „*“ и „?“ (подразбира се за изключване)"
+msgstr "използване на „*“ и „?“ (стандартно при прескачане)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
-msgstr "дословно низово сравнение"
+msgstr "дословно сравнение на низове"
-#: src/names.c:145
-#, fuzzy
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
-msgstr "„/“ пасва с „*“ и „?“ (подразб. за изключване)"
+msgstr "„*“ и „?“ не напасват „/“ (стандартно при прескачане)"
-#: src/names.c:147
-#, fuzzy
+#: src/names.c:146
msgid "wildcards do not match '/'"
-msgstr "„/“ не пасва с „*“ и „?“"
+msgstr "„*“ и „?“ не напасват „/“"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Използвали сте следните опции след задължителен аргумент в режим на "
+"създаване или промяна на архив, но те са позиционни и се отнасят само за "
+"аргументите, които ги следват. Преподредете ги."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "„-C %s“ няма ефект"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "„--%s %s“ няма ефект"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "„--%s“ няма ефект"
-#: src/names.c:879
-#, fuzzy
+#: src/names.c:878
msgid "command line"
-msgstr "командата %s не успя"
+msgstr "команден ред"
-#: src/names.c:897
-#, fuzzy, c-format
+#: src/names.c:896
+#, c-format
msgid "%s: file list requested from %s already read from %s"
-msgstr "%s: файловият списък вече е прочетен"
+msgstr "%s: файловият списък заявен от „%s“ вече е прочетен от „%s“"
-#: src/names.c:978 src/checkpoint.c:274
-#, fuzzy, c-format
+#: src/names.c:977 src/checkpoint.c:308
+#, c-format
msgid "cannot split string '%s': %s"
-msgstr "не може да се смени времето на „%s“"
+msgstr "низът „%s“ не може да се раздели: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
-msgstr "%s: файловото име съдържа нулев байт"
+msgstr "%s: името на файла съдържа нулев байт"
-#: src/names.c:1358
-#, fuzzy
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
-msgstr "Във файловите имена са използвани „*“ и „?“. Моля,"
+msgstr "В имената на файловете са използвани шаблонни знаци („*“ или „?“)"
-#: src/names.c:1360
-#, fuzzy
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
-msgstr "използвайте --wildcards, за да позволите съпоставяне с образци,"
+msgstr ""
+"За напасване по шаблони използвайте „--wildcards“, а за подтискането на това "
+"предупреждение — „--no--wildcards“"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
-msgstr "%s: Не е открит в архива"
+msgstr "%s: не е открит в архива"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
-msgstr "%s: Необходимо срещане не е открито в архива"
+msgstr "%s: необходимо срещане не е открито в архива"
-#: src/names.c:1413
-#, fuzzy, c-format
+#: src/names.c:1443
+#, c-format
msgid "Archive label mismatch"
-msgstr "Архивът не е етикетиран да отговаря на %s"
+msgstr "Разлика в етикет на архива"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
+"Опцията „-C“ в списък с файлове е несъвместима с опцията „--listed-"
+"incremental“"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
-msgstr ""
+msgstr "Опцията „--listed-incremental“ позволява само една опция „-C“"
-#: src/tar.c:88
-#, fuzzy, c-format
+#: src/tar.c:87
+#, c-format
msgid "Options '%s' and '%s' both want standard input"
-msgstr "И двете опции „-%s“ и „-%s“ изискват стандартен вход"
+msgstr "И двете опции — „%s“ и „%s“, изискват стандартен вход"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
-msgstr "%s: Неправилен архивен формат"
+msgstr "%s: Неправилен формат на архива"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
-msgstr "Поискани са ГНУ-възможности при несъвместим архивен формат"
+msgstr ""
+"Поискани са възможности поддържани от проекта ГНУ при несъвместим архивен "
+"формат"
-#: src/tar.c:265
-#, fuzzy, c-format
+#: src/tar.c:264
+#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
msgstr ""
-"Непознат начин за извеждане на спец. знаци „%s“. Използвайте „%s --quoting-"
-"style=help“, за да получите списък."
+"Непознат начин на екраниране: „%s“. Използвайте „%s --quoting-style=help“, "
+"за да получите списък."
#: src/tar.c:354
-#, fuzzy
msgid ""
"GNU 'tar' saves many files together into a single tape or disk archive, and "
"can restore individual files from the archive.\n"
@@ -1588,17 +1619,16 @@ msgid ""
" tar -tvf archive.tar # List all files in archive.tar verbosely.\n"
" tar -xf archive.tar # Extract all files from archive.tar.\n"
msgstr ""
-"„Tar“ на ГНУ запазва последователно много файлове в един лентов или дисков "
-"архив и може да възстановява в последствие отделни файлове от архива.\n"
+"Командата „tar“ на ГНУ запазва последователно много файлове в един лентов "
+"или дисков\n"
+"архив и може да възстановява впоследствие отделни файлове от архива.\n"
"\n"
"Примери:\n"
-" tar -cf архив.tar дрън брън # Създава архив.tar от файловете дрън и брън\n"
-" tar -tvf архив.tar # Изрежда подробно всички файлове в архив."
-"tar\n"
-" tar -xf архив.tar # Извлича от архив.tar всички файлове\n"
+" tar -cf архив.tar дрън мрън # Създаване на архив.tar от „дрън“ и „мрън“\n"
+" tar -tvf архив.tar # Подробно извеждане на всичко в архив.tar\n"
+" tar -xf архив.tar # Извличане на всички файлове от архив.tar\n"
#: src/tar.c:363
-#, fuzzy
msgid ""
"The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
"The version control may be set with --backup or VERSION_CONTROL, values "
@@ -1609,72 +1639,72 @@ msgid ""
" nil, existing numbered if numbered backups exist, simple otherwise\n"
" never, simple always make simple backups\n"
msgstr ""
-"Суфиксът за резервни копия е „~“, освен при промяна с --suffix или с\n"
-"променлива от обкръжението SIMPLE_BACKUP_SUFFIX. Методът за управление на\n"
-"версиите може да се посочва с --backup или с променливата VERSION_CONTROL.\n"
+"Суфиксът за резервни копия е „~“, освен при промяна със „--suffix“ или с\n"
+"променлива на средата „SIMPLE_BACKUP_SUFFIX“. Методът за управление на\n"
+"версиите може да се посочва с „--backup“ или с променливата "
+"„VERSION_CONTROL“.\n"
"Допустими стойности са:\n"
"\n"
" none, off никога да не се правят резервни копия\n"
" t, numbered да се правят номерирани резервни копия\n"
-" nil, existing номерирани, ако вече са правени номерирани, а прости "
-"иначе\n"
+" nil, existing номерирани, ако вече има номерирани, иначе — прости\n"
" never, simple винаги да се правят прости резервни копия\n"
#: src/tar.c:393
msgid "Main operation mode:"
-msgstr "Вид основно действие:"
+msgstr "Основно действие:"
#: src/tar.c:396
msgid "list the contents of an archive"
-msgstr "изрежда съдържанието на архив"
+msgstr "извеждане на съдържанието на архив"
#: src/tar.c:398
msgid "extract files from an archive"
-msgstr "извлича файлове от архива"
+msgstr "извличане на файлове от архива"
#: src/tar.c:401
msgid "create a new archive"
-msgstr "създава нов архив"
+msgstr "създаване на нов архив"
#: src/tar.c:403
msgid "find differences between archive and file system"
-msgstr "намира разликите между архива и файловата система"
+msgstr "откриване на разликите между архива и файловата система"
#: src/tar.c:406
msgid "append files to the end of an archive"
-msgstr "добавя файлове в края на архив"
+msgstr "добавяне на файлове в края на архив"
#: src/tar.c:408
msgid "only append files newer than copy in archive"
-msgstr "добавя само файлове, по-нови от копието в архива"
+msgstr "добавяне само на файлове, по-нови от копието в архива"
#: src/tar.c:410
msgid "append tar files to an archive"
-msgstr "прибавя tar-файлове към архива"
+msgstr "прибавяне на файлове във формат „tar“ към архива"
#: src/tar.c:413
msgid "delete from the archive (not on mag tapes!)"
-msgstr "трие файлове от архива (не при магнитни ленти!)"
+msgstr "триене на файлове от архива (невъзможно при магнитни ленти!)"
#: src/tar.c:415
msgid "test the archive volume label and exit"
-msgstr "проверява етикета на тома и завършва"
+msgstr "проверка на етикета на тома и изход"
#: src/tar.c:420
msgid "Operation modifiers:"
-msgstr "Модификатори на действието:"
+msgstr "Модификатори:"
#: src/tar.c:423
msgid "handle sparse files efficiently"
-msgstr "работи ефективно с разредени файлове"
+msgstr "ефективна работа с рехави файлове"
#: src/tar.c:424
msgid "TYPE"
-msgstr ""
+msgstr "ВИД"
#: src/tar.c:425
msgid "technique to detect holes"
-msgstr ""
+msgstr "начин за откриване на дупки"
#: src/tar.c:426
msgid "MAJOR[.MINOR]"
@@ -1682,23 +1712,23 @@ msgstr "ГОЛЯМ[.МАЛЪК]"
#: src/tar.c:427
msgid "set version of the sparse format to use (implies --sparse)"
-msgstr "определя версията на формата разредени файлове (влече --sparse)"
+msgstr "задаване на версията на форма̀та рехавите файлове (влече „--sparse“)"
#: src/tar.c:429
msgid "handle old GNU-format incremental backup"
-msgstr "със стар формат ГНУ за инкрементално архивиране"
+msgstr "със стария формат ГНУ за инкрементално архивиране"
#: src/tar.c:431
msgid "handle new GNU-format incremental backup"
-msgstr "с новия формат на ГНУ за инкрем. архивиране"
+msgstr "с новия формат на ГНУ за инкрементално архивиране"
#: src/tar.c:433
msgid "dump level for created listed-incremental archive"
-msgstr ""
+msgstr "ниво на архива за създадения с опцията „--listed-incremental“ архив"
#: src/tar.c:435
msgid "do not exit with nonzero on unreadable files"
-msgstr "при нечитаеми файлове не завършва с грешка"
+msgstr "без изход с грешка при нечетими файлове"
#: src/tar.c:437
msgid ""
@@ -1707,84 +1737,92 @@ msgid ""
"diff, --extract or --list and when a list of files is given either on the "
"command line or via the -T option; NUMBER defaults to 1"
msgstr ""
-"обработва само N-тото срещане на всеки файл в архива; тази опция е правилна "
-"само в съчетание с една от подкомандите --delete, --diff, --extract или --"
-"list и когато списъкът от файлове е зададен или на командния ред, или с "
-"опция -T. Ако не е посочен N, се подразбира 1."
+"обработка само на N-тото срещане на всеки файл в архива. Тази опция важи "
+"само в съчетание с една от подкомандите „--delete“, „--diff“, „--extract“ "
+"или „--list“ и когато списъкът от файлове е зададен или на командния ред, "
+"или с опция „-T“. Ако N не е посочен, се подразбира 1."
#: src/tar.c:443
msgid "archive is seekable"
msgstr "архивът е с произволен достъп"
#: src/tar.c:445
-#, fuzzy
msgid "archive is not seekable"
-msgstr "архивът е с произволен достъп"
+msgstr "архивът не е с произволен достъп"
#: src/tar.c:447
msgid "do not check device numbers when creating incremental archives"
msgstr ""
+"без проверка на номерата на устройствата при създаване на инкрементални "
+"архиви"
#: src/tar.c:450
msgid "check device numbers when creating incremental archives (default)"
msgstr ""
+"проверка на номерата на устройствата при създаване на инкрементални архиви "
+"(стандартно)"
#: src/tar.c:456
msgid "Overwrite control:"
-msgstr "Регулиране заместването на файлове:"
+msgstr "Управление на заместването на файлове:"
#: src/tar.c:459
msgid "attempt to verify the archive after writing it"
-msgstr "след записа опитва да провери архива"
+msgstr "проверка на архива след записа"
#: src/tar.c:461
msgid "remove files after adding them to the archive"
-msgstr "изтрива файловете след като ги добави в архива"
+msgstr "изтриване файловете след добавянето им в архива"
#: src/tar.c:463
-#, fuzzy
msgid "don't replace existing files when extracting, treat them as errors"
-msgstr "при извличане не замества съществуващи файлове"
+msgstr ""
+"без заместване на съществуващи файлове при извличането, това да се счита за "
+"грешка"
#: src/tar.c:466
-#, fuzzy
msgid "don't replace existing files when extracting, silently skip over them"
-msgstr "при извличане не замества съществуващи файлове"
+msgstr ""
+"без заместване на съществуващи файлове при извличането, те да се прескачат "
+"без съобщаване"
#: src/tar.c:469
msgid "don't replace existing files that are newer than their archive copies"
-msgstr ""
-"не замества съществуващи файлове, ако са по-нови от копията им в архива"
+msgstr "без заместване на съществуващи файлове при извличането, ако са по-нови"
#: src/tar.c:471
msgid "overwrite existing files when extracting"
-msgstr "при извличане замества съществуващи файлове"
+msgstr "заместване на съществуващи файлове при извличане"
#: src/tar.c:473
msgid "remove each file prior to extracting over it"
-msgstr "изтрива всеки файл преди да извлича върху него"
+msgstr "изтриване на всеки файл преди презаписване върху него"
#: src/tar.c:475
msgid "empty hierarchies prior to extracting directory"
-msgstr "изпразва йерархията преди извличане на каталог"
+msgstr "изчистване на йерархията преди извличане на директорията"
#: src/tar.c:477
msgid "preserve metadata of existing directories"
-msgstr "запазва метаданните на съществуващи каталози"
+msgstr "запазване на метаданните на съществуващите директории"
#: src/tar.c:479
msgid "overwrite metadata of existing directories when extracting (default)"
msgstr ""
-"при извличане замества метаданните на съществуващи каталози (подразбира се)"
+"заместване на метаданните на съществуващите директории при извличане "
+"(стандартно)"
#: src/tar.c:482
-#, fuzzy
msgid "preserve existing symlinks to directories when extracting"
-msgstr "при извличане замества съществуващи файлове"
+msgstr ""
+"запазване на съществуващите символни връзки към директории при извличането "
+"на файлове"
#: src/tar.c:485
msgid "create a subdirectory to avoid having loose files extracted"
msgstr ""
+"създаване на поддиректория, за да се избегне извличането на файлове в "
+"началната"
#: src/tar.c:491
msgid "Select output stream:"
@@ -1792,23 +1830,23 @@ msgstr "Избор на изходен поток:"
#: src/tar.c:494
msgid "extract files to standard output"
-msgstr "извлича файловете на стандартния изход"
+msgstr "извличане на файловете на стандартния изход"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "КОМАНДА"
#: src/tar.c:496
msgid "pipe extracted files to another program"
-msgstr "подава с канал всеки извлечен файл към КОМАНДА"
+msgstr "подаване на всеки извлечен файл към КОМАНДА през канал"
#: src/tar.c:498
msgid "ignore exit codes of children"
-msgstr "игнорира кода на завършване на породени процеси"
+msgstr "игнориране на изходния код на породени процеси"
#: src/tar.c:500
msgid "treat non-zero exit codes of children as error"
-msgstr "счита за грешка всеки ненулев код на завършване на породен процес"
+msgstr "всеки ненулев код на завършване на породен процес се счита за грешка"
#: src/tar.c:505
msgid "Handling of file attributes:"
@@ -1816,32 +1854,38 @@ msgstr "Подход спрямо файловите атрибути:"
#: src/tar.c:508
msgid "force NAME as owner for added files"
-msgstr "прави ИМЕ да е собственик на добавените файлове"
+msgstr "ИМЕ да е собственик на добавените файлове"
#: src/tar.c:510
msgid "force NAME as group for added files"
-msgstr "прави ИМЕ да бъде групата на добавените файлове"
+msgstr "ИМЕ да е групата на добавените файлове"
#: src/tar.c:512
msgid "use FILE to map file owner UIDs and names"
msgstr ""
+"използване на посочения ФАЙЛ за съответствието между идентификатор (UID) и "
+"име на потребител"
#: src/tar.c:514
msgid "use FILE to map file owner GIDs and names"
msgstr ""
+"използване на посочения ФАЙЛ за съответствието между идентификатор (GID) и "
+"име на група"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
-msgstr "ДАТА-ИЛИ-ФАЙЛ"
+msgstr "ДАТА_ИЛИ_ФАЙЛ"
#: src/tar.c:516
msgid "set mtime for added files from DATE-OR-FILE"
-msgstr "прави времето на промяна на добавяни файлове като ДАТА-ИЛИ-ФАЙЛ"
+msgstr "времето на промяна на добавените файлове да е като ДАТА_ИЛИ_ФАЙЛ"
#: src/tar.c:518
msgid ""
"only set time when the file is more recent than what was given with --mtime"
msgstr ""
+"задаване на време, само когато файлът е по-нов от времето посочено с опцията "
+"„--mtime“"
#: src/tar.c:519
msgid "CHANGES"
@@ -1849,7 +1893,7 @@ msgstr "ПРОМЕНИ"
#: src/tar.c:520
msgid "force (symbolic) mode CHANGES for added files"
-msgstr "модифицира режима за достъп на добавени файлове"
+msgstr "прилага ПРОМЕНИте към режима за достъп на добавените файлове"
#: src/tar.c:522
msgid "METHOD"
@@ -1861,113 +1905,114 @@ msgid ""
"reading (METHOD='replace'; default) or by not setting the times in the first "
"place (METHOD='system')"
msgstr ""
-"запазва времената на достъп на архивираните файлове като или възстановява "
-"времената след четене (при МЕТОД=„replace“, подразбира се), или не променя "
-"имената изобщо (МЕТОД=„system“)"
+"запазване на времената на достъп на архивираните файлове или чрез "
+"възстановяване на времената след четене (при МЕТОД=„replace“ — стандартно), "
+"или без изобщо да се променят (МЕТОД=„system“)"
#: src/tar.c:527
msgid "don't extract file modified time"
-msgstr "не извлича времето на промяна на файловете"
+msgstr "без извличане на времето на промяна на файловете"
#: src/tar.c:529
-#, fuzzy
msgid ""
"try extracting files with the same ownership as exists in the archive "
"(default for superuser)"
-msgstr "опитва да възстановява собствеността на файловете"
+msgstr ""
+"опит за възстановяване на файловете със собственик както е в архива "
+"(стандартно за суперпотребителите)"
#: src/tar.c:531
-#, fuzzy
msgid "extract files as yourself (default for ordinary users)"
-msgstr "извлича файловете от ваше име"
+msgstr ""
+"възстановяване на файловете, като собственик сте вие (стандартно за "
+"обикновените потребители)"
#: src/tar.c:533
msgid "always use numbers for user/group names"
-msgstr "използва числа вместо имена за потребител и група"
+msgstr "използване на числа вместо имена за потребител и група"
#: src/tar.c:535
msgid "extract information about file permissions (default for superuser)"
msgstr ""
-"възстановява точно (без umask) режима на достъп (подразбира се при "
-"привилегирован потребител)"
+"точно възстановяване на режима на достъп, без прилагане на "
+"„umask“ (стандартно при привилегирован потребител)"
#: src/tar.c:539
msgid ""
"apply the user's umask when extracting permissions from the archive (default "
"for ordinary users)"
msgstr ""
-"прилага umask на потребителя при извличане на файлове (подразбира се при "
+"прилагане на „umask“ на потребителя при извличане на файлове (стандартно при "
"обикновен потребител)"
#: src/tar.c:541
msgid ""
"member arguments are listed in the same order as the files in the archive"
-msgstr ""
+msgstr "аргументите-членове са изведени в същия ред както файловете в архива"
#: src/tar.c:545
msgid ""
"delay setting modification times and permissions of extracted directories "
"until the end of extraction"
msgstr ""
-"забавя настройката на времето на промяна и режима за достъп на извличаните "
-"каталози докато извличането завърши"
+"задаването на времето на промяна и режима за достъп на извлечените "
+"директории да се извърши след завършването на извличането"
#: src/tar.c:548
msgid "cancel the effect of --delay-directory-restore option"
-msgstr "отменя ефекта на --delay-directory-restore"
+msgstr "отмяна на ефекта на „--delay-directory-restore“"
#: src/tar.c:549
msgid "ORDER"
-msgstr ""
+msgstr "ПОДРЕДБА"
#: src/tar.c:551
msgid "directory sorting order: none (default), name or inode"
-msgstr ""
+msgstr "подредба на директориите: без (стандартно), по име или по i-възел"
#: src/tar.c:553
msgid "directory sorting order: none (default) or name"
-msgstr ""
+msgstr "подредба на директориите: без (стандартно) или по име"
#: src/tar.c:560
-#, fuzzy
msgid "Handling of extended file attributes:"
-msgstr "Подход спрямо файловите атрибути:"
+msgstr "Подход спрямо разширените файлови атрибути:"
#: src/tar.c:563
msgid "Enable extended attributes support"
-msgstr ""
+msgstr "С поддръжка на разширените файлови атрибути"
#: src/tar.c:565
msgid "Disable extended attributes support"
-msgstr ""
+msgstr "Без поддръжка на разширените файлови атрибути"
#: src/tar.c:566 src/tar.c:568
msgid "MASK"
-msgstr ""
+msgstr "МАСКА"
#: src/tar.c:567
msgid "specify the include pattern for xattr keys"
-msgstr ""
+msgstr "указване на шаблона за включените разширени файлови атрибути"
#: src/tar.c:569
msgid "specify the exclude pattern for xattr keys"
-msgstr ""
+msgstr "указване на шаблона за изключените разширени файлови атрибути"
#: src/tar.c:571
msgid "Enable the SELinux context support"
-msgstr ""
+msgstr "С поддръжка на контекстите на SELinux"
#: src/tar.c:573
msgid "Disable the SELinux context support"
-msgstr ""
+msgstr "Без поддръжка на контекстите на SELinux"
#: src/tar.c:575
msgid "Enable the POSIX ACLs support"
-msgstr ""
+msgstr "С поддръжка на списъците за контрол на достъпа (ACL) на POSIX"
#: src/tar.c:577
msgid "Disable the POSIX ACLs support"
-msgstr ""
+msgstr "Без поддръжка на списъците за контрол на достъпа (ACL) на POSIX"
#: src/tar.c:582
msgid "Device selection and switching:"
@@ -1979,43 +2024,43 @@ msgstr "АРХИВ"
#: src/tar.c:585
msgid "use archive file or device ARCHIVE"
-msgstr "използва архивния файл или устройство АРХИВ"
+msgstr "използване на този АРХИВен файл или устройство"
#: src/tar.c:587
msgid "archive file is local even if it has a colon"
-msgstr "архивният файл е локален дори при двуеточие"
+msgstr "архивният файл е локален дори името да съдържа „:“"
#: src/tar.c:589
msgid "use given rmt COMMAND instead of rmt"
-msgstr "използва посочената КОМАНДА вместо rmt"
+msgstr "ползване на посочената КОМАНДА вместо „rmt“"
#: src/tar.c:591
msgid "use remote COMMAND instead of rsh"
-msgstr "използва посочената КОМАНДА вместо rsh"
+msgstr "ползване на посочената КОМАНДА вместо „rsh“"
#: src/tar.c:595
msgid "specify drive and density"
-msgstr "посочва устройство и гъстота"
+msgstr "указване на устройство и гъстота"
#: src/tar.c:609
msgid "create/list/extract multi-volume archive"
-msgstr "създава/извежда/извлича многотомен архив"
+msgstr "работа с многотомен архив"
#: src/tar.c:611
msgid "change tape after writing NUMBER x 1024 bytes"
-msgstr "смяна на лентата след запис на 1024 x N байта"
+msgstr "смяна на лентата след запис на 1024 × N байта"
#: src/tar.c:613
msgid "run script at end of each tape (implies -M)"
-msgstr "изпълнява скрипт в края на всяка лента (влече -M)"
+msgstr "изпълнение на скрипт в края на всяка лента (включва и опцията „-M“)"
#: src/tar.c:616
msgid "use/update the volume number in FILE"
-msgstr "ползва от и обновява във ФАЙЛ номера на тома"
+msgstr "ползване и обновяване на номер на тома от ФАЙЛ"
#: src/tar.c:621
msgid "Device blocking:"
-msgstr "Блокуване на устройството:"
+msgstr "Блокове на устройството:"
#: src/tar.c:623
msgid "BLOCKS"
@@ -2023,31 +2068,31 @@ msgstr "БЛОКОВЕ"
#: src/tar.c:624
msgid "BLOCKS x 512 bytes per record"
-msgstr "БЛОКОВЕ x 512 байта в секунда"
+msgstr "БЛОКОВЕ × 512 байта в секунда"
#: src/tar.c:626
msgid "NUMBER of bytes per record, multiple of 512"
-msgstr "прави N-байтови записи, кратно на 512"
+msgstr "N-байтови записи, трябва да е кратно на 512"
#: src/tar.c:628
msgid "ignore zeroed blocks in archive (means EOF)"
-msgstr "пренебрегва блоковете от нули и продължава"
+msgstr "прескачане на блоковете от нули (означава EOF)"
#: src/tar.c:630
msgid "reblock as we read (for 4.2BSD pipes)"
-msgstr "преформира при четене блоковете (канали 4.2BSD)"
+msgstr "преразделяне по блокове при четене (при канали в 4.2BSD)"
#: src/tar.c:635
msgid "Archive format selection:"
-msgstr "Избор на архивен формат:"
+msgstr "Формат на архива:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "ФОРМАТ"
#: src/tar.c:638
msgid "create archive of the given format"
-msgstr "създава архив с посочения формат"
+msgstr "създаване на архив с посочения ФОРМАТ"
#: src/tar.c:640
msgid "FORMAT is one of the following:"
@@ -2055,652 +2100,646 @@ msgstr "ФОРМАТ е някой от следните:"
#: src/tar.c:641
msgid "old V7 tar format"
-msgstr "стар формат tar, V7"
+msgstr "стар формат „tar“, V7"
#: src/tar.c:644
msgid "GNU format as per tar <= 1.12"
-msgstr "формат на ГНУ при tar <= 1.12"
+msgstr "формат на ГНУ при „tar“ ≤ 1.12"
#: src/tar.c:646
msgid "GNU tar 1.13.x format"
-msgstr "формат на версия 1.13.x на tar на ГНУ"
+msgstr "формат на версия 1.13.x на „tar“ на ГНУ"
#: src/tar.c:648
msgid "POSIX 1003.1-1988 (ustar) format"
-msgstr "формат POSIX 1003.1-1988 (ustar)"
+msgstr "формат POSIX 1003.1-1988 („ustar“)"
#: src/tar.c:650
msgid "POSIX 1003.1-2001 (pax) format"
-msgstr "формат POSIX 1003.1-2001 (pax)"
+msgstr "формат POSIX 1003.1-2001 („pax“)"
#: src/tar.c:651
msgid "same as pax"
-msgstr "същото като pax"
+msgstr "същото като „pax“"
#: src/tar.c:654
msgid "same as --format=v7"
-msgstr "същото като --format=v7"
+msgstr "същото като „--format=v7“"
#: src/tar.c:657
msgid "same as --format=posix"
-msgstr "същото като --format=posix"
+msgstr "същото като „--format=posix“"
#: src/tar.c:658
msgid "keyword[[:]=value][,keyword[[:]=value]]..."
-msgstr "ключдума[[:]=стойност][,ключдума[[:]=стойност]]..."
+msgstr "КЛЮЧ[[:]=СТОЙНОСТ][,КЛЮЧ[[:]=СТОЙНОСТ]]…"
#: src/tar.c:659
msgid "control pax keywords"
-msgstr "управляващи ключови думи за pax"
+msgstr "управляващи КЛЮЧове за „pax“"
#: src/tar.c:660
msgid "TEXT"
-msgstr "ТЕКСТ"
+msgstr "ИМЕ_ИЛИ_ШАБЛОН"
#: src/tar.c:661
msgid ""
"create archive with volume name TEXT; at list/extract time, use TEXT as a "
"globbing pattern for volume name"
msgstr ""
-"създава архив с име на том ТЕКСТ; при извеждане или извличане сравнява името "
-"на тома с ТЕКСТ"
+"създаване на архив с такова ИМЕ, а при извеждане или извличане името на тома "
+"се сравнява с този ШАБЛОН"
#: src/tar.c:666
-#, fuzzy
msgid "Compression options:"
-msgstr "Противоречащи си опции за компресиране"
+msgstr "Опции за компресиране:"
#: src/tar.c:668
-#, fuzzy
msgid "use archive suffix to determine the compression program"
-msgstr "Не може да се пише към компресиращата програма"
+msgstr "определяне на компресиращата програма според суфикса на архива"
#: src/tar.c:670
-#, fuzzy
msgid "do not use archive suffix to determine the compression program"
-msgstr "Не може да се пише към компресиращата програма"
+msgstr "без определяне на компресиращата програма според суфикса на архива"
#: src/tar.c:672
msgid "PROG"
-msgstr "ПРОГ"
+msgstr "ПРОГРАМА"
#: src/tar.c:673
msgid "filter through PROG (must accept -d)"
-msgstr "прекарва архива през ПРОГ (трябва да приема -d)"
+msgstr "прекарва архива през ПРОГРАМАта (тя трябва да приема опция „-d“)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Избор на локален файл:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
-msgstr "работи в рамките на локалната файлова система"
+msgstr "работа в рамките на локалната файлова система"
-#: src/tar.c:693
-#, fuzzy
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
-msgstr "не маха „/“ в началото на файлови имена"
+msgstr "оставяне на „/“ в началото на имена на файлове"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
-msgstr "следва симв. връзки; архивира сочените файлове"
+msgstr "следване на символните връзки и архивиране на сочените файлове"
-#: src/tar.c:697
-#, fuzzy
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
-msgstr "следва симв. връзки; архивира сочените файлове"
+msgstr "следване на твърдите връзки и архивиране на сочените файлове"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
-msgstr "ЧЛЕН-ИМЕ"
+msgstr "ИМЕ_НА_ЧЛЕН"
-#: src/tar.c:699
-#, fuzzy
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
-msgstr "започва от файл с име ЧЛЕН-ИМЕ в архива"
+msgstr "започване от обекта с това ИМЕ_НА_ЧЛЕН при четене на архива"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
-msgstr "съхранява само файлове, по-нови от ДАТА-ИЛИ-ФАЙЛ"
+msgstr "съхраняване само на файлове по-нови от ДАТА_ИЛИ_ФАЙЛ"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "ДАТА"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
-msgstr "сравнява времето само ако данните са променени"
+msgstr "сравняване на времето, само ако данните са променени"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
-msgstr "МЕТОД"
+msgstr "НОМЕРИРАНЕ"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
-msgstr "резервно копира съществуващи файлове с МЕТОД"
+msgstr "резервно копие с това НОМЕРИРАНЕ преди изтриване"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "НИЗ"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
-"резервно копира преди да трие, използвайки НИЗ вместо обичайния суфикс („~“, "
-"освен ако не е бил сменен с променливата от обкръжението "
-"SIMPLE_BACKUP_SUFFIX)"
+"резервно копие пред изтриване, като се ползва този НИЗ вместо обичайния "
+"суфикс („~“, освен ако не е бил сменен с променливата от обкръжението "
+"„SIMPLE_BACKUP_SUFFIX“)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
-msgstr "Промени на файловите имена:"
+msgstr "Промѐни на файловите имена:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
-msgstr "при извличане маха N начални каталози от файловите пътеки"
+msgstr "махане на N на брой директории от началото на пътищата при извличане"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "ИЗРАЗ"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
-msgstr ""
-"преобразува файловите имена, използвайки посочения ИЗРАЗ за замяна на sed"
+msgstr "преобразуване на имената на файловете с този ИЗРАЗ за замяна на „sed“"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Извеждане на информация:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
-msgstr "подробно изрежда обработените файлове"
+msgstr "подробно изреждане на обработените файлове"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
-msgstr ""
+msgstr "КЛЮЧ"
-#: src/tar.c:729
-#, fuzzy
+#: src/tar.c:730
msgid "warning control"
-msgstr "Регулиране заместването на файлове:"
+msgstr "управление на предупрежденията"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
-msgstr "извежда напредъка след всеки N-ти запис (подразбира се 10)"
+msgstr "извеждане на напредъка след всеки N-ти запис (стандартно е 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
-msgstr ""
+msgstr "ДЕЙСТВИЕ"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
-msgstr ""
+msgstr "изпълнение на ДЕЙСТВИЕ при всяка контролна точка"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
-msgstr "съобщава, ако не всички твърди връзки са включени"
+msgstr "предупреждение, ако не всички твърди връзки са включени в архива"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "СИГНАЛ"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
"SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; the names without SIG prefix are also "
"accepted"
msgstr ""
-"извежда общия брой байтове след обработването на архива; с аргумент - "
-"извежда текущите байтове при получаване на СИГНАЛ. Допустими СИГНАЛи са "
-"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2; имената без SIG също са позволени"
+"отпечатване на общия брой байтове след обработването на архива, ако има "
+"аргумент, той се тълкува като име на сигнал, а извеждането на информацията "
+"става при получаването му. Допустими СИГНАЛи са „SIGHUP“, „SIGQUIT“, "
+"„SIGINT“, „SIGUSR1“ и „SIGUSR2“, имената без „SIG“ също са позволени"
-#: src/tar.c:744
-#, fuzzy
+#: src/tar.c:745
msgid "print file modification times in UTC"
-msgstr "извежда времената по Гринуич"
+msgstr "извеждане на времената в UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
-msgstr ""
+msgstr "извеждане на времената с пълна точност"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
-msgstr "изпраща подробния изход във ФАЙЛ"
+msgstr "изпращане на подробния изход във ФАЙЛ"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
-msgstr "показва номера на блок в архива с всяко съобщение"
+msgstr "показване на номера на блок в архива с всяко съобщение"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
-msgstr "изисква потвърждение за всяко действие"
+msgstr "изискване на потвърждение за всяко действие"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
-msgstr "показва подразбираното от tar"
+msgstr "извеждане на стандартните стойности на „tar“"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
+"извеждане на диапазоните за полетата на файла за състоянието (snapshot)"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
-"при извеждане или извличане изрежда всеки каталог, който се пропуска по "
-"някаква причина"
+"отпечатване на всяка директория, която се пропуска по някаква причина при "
+"извеждане или извличане"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
-msgstr "показва преобразуваните файлови имена в архива"
+msgstr "извеждане на преобразуваните файлови имена в архива"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "НАЧИН"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
-msgstr ""
-"начин за цитиране на специални знаци; вж. по-долу за стойностите на НАЧИН"
+msgstr "НАЧИН за цитиране на специални знаци, различните видове са по-долу"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
-msgstr "работи и със знаците от НИЗ като със специални"
+msgstr "работа със знаците и от НИЗа като специални"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
-msgstr "не работи със знаците от НИЗ като със специални"
+msgstr "работа със знаците от НИЗа като обикновени"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Опции за съвместимост:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
-"при създаване е същото като --old-archive; при извличане е същото като --no-"
-"same-owner"
+"при създаване е същото като „--old-archive“, а при извличане е същото като "
+"„--no-same-owner“"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Други опции:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
-msgstr "забранява някои потенциално опасни опции"
+msgstr "изключване на някои потенциално опасни опции"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
-#, fuzzy, c-format
+#: src/tar.c:846
+#, c-format
msgid "'%s' cannot be used with '%s'"
-msgstr "%s: Не може да се отиде на отместване %s във файла"
+msgstr "опциите „%s“ и „%s“ са несъвместими"
-#: src/tar.c:933
-#, fuzzy
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
-msgstr "Не може да се използва повече от една опция „-Acdtrux“"
+msgstr ""
+"Не може да се използва повече от една опция „-Acdtrux“, „--delete“ или „--"
+"test-label“"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Противоречащи си опции за компресиране"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
-msgstr "Непознато име на сигнал: %s"
+msgstr "Непознато име на сигнал: „%s“"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
-msgstr "Не е открит еталлонният файл за дата"
+msgstr "Не е открит еталонният файл за дата"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
-msgstr "Използва се %s вместо непознатия файлов формат за дата %s"
+msgstr "Използва се „%s“ вместо непознатия файлов формат за дата „%s„“"
-#: src/tar.c:1065
-#, fuzzy, c-format
+#: src/tar.c:1067
+#, c-format
msgid "Option %s: Treating date '%s' as %s"
-msgstr "Опция %s: Датата „%s“ се разглежда като %s"
+msgstr "Опция „%s“: датата „%s“ се тълкува като „%s“"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
-#, fuzzy, c-format
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
+#, c-format
msgid "filter the archive through %s"
-msgstr "прекарва архива през gzip"
+msgstr "прекарване на архива през „%s“"
-#: src/tar.c:1137
-#, fuzzy
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
-msgstr "Правилни аргументи за опциите --quoting-style са:"
+msgstr "Допустими аргументи за опцията „--quoting-style“ са:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
msgstr ""
"\n"
-"*Този* tar подразбира следното:\n"
+"•Този• tar подразбира следното:\n"
-#: src/tar.c:1253
-#, fuzzy
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
-msgstr "Неправилен собственик"
+msgstr "Неправилен идентификатор на собственик или група"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
-msgstr "Неправилен фактор за блокуване"
+msgstr "Неправилен коефициент за блоковете (от 512 байта) в запис"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Неправилна дължина на лента"
-#: src/tar.c:1481
-#, fuzzy
+#: src/tar.c:1486
msgid "Invalid incremental level value"
-msgstr "Грешен инкрементален файлов формат"
+msgstr "Неправилно ниво на инкрементален архив"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Повече от една ограничителна дата"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
-msgstr "Неправилна версия на формат разредени файлове"
+msgstr "Неправилна версия на форма̀та на рехавите файлове"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
-msgstr "--atime-preserve='system' не се поддържа на тази платформа"
+msgstr "„--atime-preserve='system'“ не се поддържа на тази платформа"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
-msgstr "стойността на --checkpoint не е цяло число"
+msgstr "стойността на „--checkpoint“ не е цяло число"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "На опция е подаден неправилен режим"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Неправилно число"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Неправилен размер на запис"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Размерът на запис трябва да е кратен на %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Неправилен брой елементи"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
-msgstr "Позволява се само една опция --to-command"
+msgstr "Позволена е само една опция „--to-command“"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
-msgstr "Лошо образуван аргумент за гъстота: %s"
+msgstr "Неправилен аргумент за гъстота: %s"
-#: src/tar.c:2049
-#, fuzzy, c-format
+#: src/tar.c:2058
+#, c-format
msgid "Unknown density: '%c'"
msgstr "Непозната гъстота: „%c“"
-#: src/tar.c:2066
-#, fuzzy, c-format
+#: src/tar.c:2075
+#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
-msgstr "Опциите „-[0-7][lmh]“ не се поддържат от *този* tar"
+msgstr "Опциите „-[0-7][lmh]“ не се поддържат от •този• tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
-msgstr ""
+msgstr "%s:%lu: местоположение на грешката"
-#: src/tar.c:2076
-#, fuzzy, c-format
+#: src/tar.c:2085
+#, c-format
msgid "error parsing %s"
-msgstr "Грешка при анализа на число до „%s“"
+msgstr "грешка при анализа на „%s“"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
-msgstr "[ФАЙЛ]..."
+msgstr "[ФАЙЛ]…"
-#: src/tar.c:2181
-#, fuzzy, c-format
+#: src/tar.c:2190
+#, c-format
msgid "non-option arguments in %s"
-msgstr "неправилен аргумент %s за %s"
+msgstr "аргументи, които не са опции, в „%s“"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
-msgstr ""
+msgstr "ОПЦИИТЕ_НА_TAR не може да се раздѐлят: %s"
-#: src/tar.c:2291
-#, fuzzy, c-format
+#: src/tar.c:2300
+#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Старата опция „%c“ изисква аргумент."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
-msgstr "без списък файлове опцията --occurrence е безсмислена"
+msgstr "опцията „--occurrence“ е безсмислена без списък с файлове"
-#: src/tar.c:2390
-#, fuzzy
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Използването на много архивни файлове изисква опция „-M“"
-#: src/tar.c:2407
-#, fuzzy
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
-msgstr "без списък файлове опцията --occurrence е безсмислена"
+msgstr "опцията „--level“ е е безсмислена без опцията „--listed-incremental“"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
-msgstr[0] "%s: Етикетът на тома е твърде дълъг (не повече от %lu байт)"
-msgstr[1] "%s: Етикетът на тома е твърде дълъг (не повече от %lu байта)"
+msgstr[0] "%s: етикетът на тома е твърде дълъг (не повече от %lu байт)"
+msgstr[1] "%s: етикетът на тома е твърде дълъг (не повече от %lu байта)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Не може да се проверяват многотомни архиви"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Не може да се проверяват компресирани архиви"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Не може да се използват многотомни компресирани архиви"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Не може да се съединяват компресирани архиви"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
-msgstr ""
+msgstr "опцията „--clamp-mtime“ изисква задаване на дата с „--mtime“"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr ""
-"опцията --pax-option може да се използва само при архиви във формат POSIX"
+"опцията „--pax-option“ може да се използва само при архиви във формат POSIX"
-#: src/tar.c:2481
-#, fuzzy
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
-msgstr ""
-"опцията --pax-option може да се използва само при архиви във формат POSIX"
+msgstr "опцията „--acls“ може да се използва само при архиви във формат POSIX"
-#: src/tar.c:2486
-#, fuzzy
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr ""
-"опцията --pax-option може да се използва само при архиви във формат POSIX"
+"опцията „--selinux“ може да се използва само при архиви във формат POSIX"
-#: src/tar.c:2491
-#, fuzzy
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr ""
-"опцията --pax-option може да се използва само при архиви във формат POSIX"
+"опцията „--xattrs“ може да се използва само при архиви във формат POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
+"Името на най-горната директория не може да бъде определено. Задайте го "
+"изрично с опцията „--one-top-level=ДИРЕКТОРИЯ“"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
-msgstr ""
+msgstr "Размерът на тома не може да по-малък от размера на записа"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
-msgstr "Страхлив отказ да се създава празен архив"
+msgstr "Отказ да се създаде празен архив"
-#: src/tar.c:2623
-#, fuzzy
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Опциите „-Aru“ са несъвместими с „-f -“"
-#: src/tar.c:2711
-#, fuzzy
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
-msgstr "Трябва да посочите поне една от опциите „-Acdtrux“"
+msgstr ""
+"Трябва да посочите поне една от опциите „-Acdtrux“, „--delete“ или „--test-"
+"label“"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
-msgstr ""
+msgstr "Изход със статус за грешка поради предходни проблеми"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
-msgstr[0] "%s: Файлът намаля с %s байт"
-msgstr[1] "%s: Файлът намаля с %s байта"
+msgstr[0] "%s: файлът намаля с %s байт"
+msgstr[1] "%s: файлът намаля с %s байта"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Ключовата дума %s е непозната или все още не е реализирана"
-#: src/xheader.c:174
-#, fuzzy
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Записано е време извън допустимия диапазон"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
-msgstr "Образецът %s не може да се използва"
+msgstr "Шаблонът „%s“ не може да се използва"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Ключовата дума %s не може да се отмени"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
-msgstr "Лошо формиран разширен заглавен запис: не е посочена дължина"
+msgstr "Неправилен разширен заглавен запис: не е посочена дължина"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Дължината %*s на разширен заглавен запис е извън допустимия диапазон"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
-msgstr "Лошо формиран разширен заглавен запис: липсва интервал след дължината"
+msgstr "Неправилен разширен заглавен запис: липсва интервал след дължината"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
-msgstr "Лошо формиран разширен заглавен запис: липсва знак за равенство"
+msgstr "Неправилен разширен заглавен запис: липсва знак за равенство"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
-msgstr "Лошо формиран разширен заглавен запис: липсва знак за нов ред"
+msgstr "Неправилен разширен заглавен запис: липсва знак за нов ред"
-#: src/xheader.c:741
-#, fuzzy, c-format
+#: src/xheader.c:759
+#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
-"Пренебрегва се непознатата ключова дума „%s“ за разширен заглавен запис"
+"Непознатата ключова дума „%s“ за разширен заглавен запис се пренебрегва"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
-"Генерираната двойка <ключова дума, стойност> е твърде дълга (ключова дума="
-"%s, дължина=%s)"
+"Генерираната двойка <ключ, стойност> е твърде дълга (ключ=%s, дължина=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
-msgstr "Разширеният заглавен запис %s=%s е извън диапазона %s..%s"
+msgstr "Разширеният заглавен запис „%s=%s“ е извън диапазона [%s; %s]"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
-msgstr "Неправилно формиран разширен заглавен запис: неправилен %s=%s"
+msgstr "Неправилен разширен заглавен запис: неправилен „%s=%s“"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
-msgstr "Неправилно формиран разширен заглавен запис: прекомерен %s=%s"
+msgstr "Неправилен разширен заглавен запис: прекомерен „%s=%s“"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
-"Лошо формиран разширен заглавен запис: неправилен %s; очаква се разделител %c"
+"Неправилен разширен заглавен запис: грешка при „%s“ — неочакван разделител "
+"„%c“"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
-"Лошо формиран разширен заглавен запис: неправилен %s; нечетен брой стойности"
+"Неправилен разширен заглавен запис: грешка при „%s“ — нечетен брой стойности"
-#: src/checkpoint.c:114
-#, fuzzy, c-format
+#: src/checkpoint.c:133
+#, c-format
msgid "%s: not a valid timeout"
-msgstr "%s: Неправилна група"
+msgstr "%s: неправилен краен срок"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
-msgstr ""
+msgstr "%s: непознато действие при контролна точка"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
-msgstr ""
+msgstr "запис"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
-msgstr ""
+msgstr "четене"
#. TRANSLATORS: This is a "checkpoint of write operation",
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Контролна точка при запис %u"
@@ -2709,252 +2748,255 @@ msgstr "Контролна точка при запис %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Контролна точка при четене %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr ""
-"genfile борави с файловете с данни за тестовия пакет GNU paxutils.\n"
-"ОПЦИИТЕ са:\n"
+"„genfile“ борави с файловете с данни за тестовия пакет GNU paxutils.\n"
+"ОПЦИите са:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Опции за създаването на файл:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "РАЗМЕР"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
-msgstr "Създава файл с посочения РАЗМЕР"
+msgstr "Създаване на файл с посочения РАЗМЕР"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
-msgstr "Запис във файл ИМЕ вместо на стандартния изход"
+msgstr "Запис във файл с това ИМЕ вместо на стандартния изход"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
-msgstr "Чете файловите имена от ФАЙЛ"
+msgstr "Четене на файловите имена от ФАЙЛ"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
-msgstr "-T чете имена, завършващи с нулев байт"
+msgstr "„-T“ — четене на имена, завършващи с нулев байт"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
-"Попълва файла с посочения ОБРАЗЕЦ. ОБРАЗЕЦ може да бъде „default“ или „zeros“"
+"Попълва файла с посочения ОБРАЗЕЦ, който е или „default“ (стандартно) или "
+"„zeros“ (нули)"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
-msgstr "Размер на блок за разреден файл"
+msgstr "Размер на блок за рехав файл"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
-"Генерира разреден файл. Останалата част от командния ред дава карта на файла."
+"Генериране на рехав файл. Останалата част от командния ред дава карта на "
+"файла."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
-msgstr ""
+msgstr "ОТМЕСТВАНЕ"
-#: tests/genfile.c:149
-#, fuzzy
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
-msgstr "след записа опитва да провери архива"
+msgstr "Позициониране при зададеното ОТМЕСТВАНЕ преди запис на данни"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
-msgstr ""
+msgstr "Без извеждане на диагностичните съобщения"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Опции за файлови статистики:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
-"Извежда съдържанието на структурата stat за всеки файл. По подразбиране "
-"ФОРМАТ е: "
+"Извеждане съдържанието на структурата „stat“ за всеки файл. По подразбиране "
+"ФОРМАТът е: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
-msgstr "Опции за синхронизирано изпълнение:"
+msgstr "Опции за синхронно изпълнение:"
-#: tests/genfile.c:168
-#, fuzzy
-msgid "OPTION"
-msgstr " [ОПЦИЯ...]"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
-"Изпълнява посочената КОМАНДА. Полезно с --checkpoint и някоя от --cut, --"
-"append, --touch"
+"Изпълняване на посочените АРГУМЕНТИ. Полезно с опцията „--checkpoint“ и "
+"някоя от „--cut“, „--append“, „--touch“"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
-"Изпълнява посоченото действие (вж. по-долу) до достигането на контролна "
+"Изпълняване на посоченото действие (вж. по-долу) до достигането на контролна "
"точка N"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
-msgstr "Посочва дата за следващата опция --touch"
+msgstr "Посочване на дата за следващата опция „--touch“"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
-msgstr "Извежда изпълнените контролни точки и кода на завършване на КОМАНДА"
+msgstr ""
+"Извеждане на изпълнените контролни точки и кода на завършване на КОМАНДА"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
-"Синхронизирано изпълнение на действията. Те се изпълняват когато се достигне "
-"контролната точка с номер, посочен с --checkpoint."
+"Синхронно изпълнение на действията. Те се изпълняват когато се достигне "
+"контролната точка с номер, посочен с „--checkpoint“."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
-"Отсича ФАЙЛ до размера, определен с предхождаща опция --length (подразбира "
-"се 0)"
+"Отсичане на ФАЙЛа до размера, определен с предходна опция „--"
+"length“ (стандартно е 0)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
-"Добавя РАЗМЕР байтове към ФАЙЛ. РАЗМЕРът се определя от предхождаща опция --"
-"length."
+"Добавяне на този РАЗМЕР байтове към ФАЙЛ. РАЗМЕРът се определя от предходна "
+"опция „--length“."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
-msgstr "Обновява времето на достъп и промяна на FILE"
+msgstr "Обновяване на времето на достъп и промяна на ФАЙЛа"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
-msgstr "Изпълнява КОМАНДА"
+msgstr "Изпълняване на КОМАНДА"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Изтриване на ФАЙЛ"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Неправилен размер: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Номер извън допустимия диапазон: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Отрицателен размер: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
-msgstr "не успя stat(%s)"
+msgstr "неуспешно изпълнение на stat(%s)"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
-msgstr ""
+msgstr "заявената дължина на файл е %lu, а действителната е %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
-msgstr ""
+msgstr "създаденият файл не е рехав"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Грешка при анализа на число до „%s“"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Непознат формат за дата"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
-msgstr "[АРГУМ...]"
+msgstr "[АРГУМЕНТ…]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
-msgstr "Не може да се отвори „%s“"
+msgstr "„%s“ не може да се отвори"
-#: tests/genfile.c:448
-#, fuzzy
+#: tests/genfile.c:439
msgid "cannot seek"
-msgstr "Не може да се изпълни %s"
+msgstr "не може да се търси"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "името на файла съдържа нулев байт"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-"не може да се създават разредени файлове на стандартния изход, използвайте "
-"опцията --file"
+"рехави файлове не може да се създават на стандартния изход, използвайте "
+"опцията „--file“"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "неправилна маска (до „%s“)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Непознато поле „%s“"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
-msgstr "не може да се смени времето на „%s“"
+msgstr "времето не може да се смени на „%s“"
-#: tests/genfile.c:765
-#, fuzzy, c-format
+#: tests/genfile.c:756
+#, c-format
msgid "cannot truncate `%s'"
-msgstr "Не може да се отвори „%s“"
+msgstr "„%s“ не може да се отсече с „truncate“"
-#: tests/genfile.c:774
-#, fuzzy, c-format
+#: tests/genfile.c:765
+#, c-format
msgid "command failed: %s"
-msgstr "командата %s не успя"
+msgstr "командата „%s“ не успя"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "не може да се смени времето на „%s“"
+msgstr "не може да се получи информация със „stat“ за „%s“"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "не може да се смени времето на „%s“"
+msgstr "директорията „%s“ не може да се изтрие"
-#: tests/genfile.c:788
-#, fuzzy, c-format
+#: tests/genfile.c:779
+#, c-format
msgid "cannot unlink `%s'"
-msgstr "Не може да се отвори „%s“"
+msgstr "„%s“ не може да се изтрие"
#: tests/genfile.c:918
#, c-format
@@ -2964,7 +3006,7 @@ msgstr "Командата завърши успешно\n"
#: tests/genfile.c:920
#, c-format
msgid "Command failed with status %d\n"
-msgstr "Командата завърши с код %d\n"
+msgstr "Командата завърши неуспешно с код %d\n"
#: tests/genfile.c:924
#, c-format
@@ -2979,7 +3021,7 @@ msgstr "Командата бе спряна със сигнал %d\n"
#: tests/genfile.c:929
#, c-format
msgid "Command dumped core\n"
-msgstr "Командата генерира core\n"
+msgstr "Командата генерира „core“\n"
#: tests/genfile.c:932
#, c-format
@@ -2989,235 +3031,7 @@ msgstr "Командата бе прекратена\n"
#: tests/genfile.c:964
#, c-format
msgid "--stat requires file names"
-msgstr "--stat изисква файлови имена"
-
-#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-#~ msgstr "%.*s: параметърът ARGP_HELP_FMT трябва да бъде положителен"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: опцията „--%s“ не допуска аргумент\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: непозната опция „--%s“\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: неправилна опция -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: опцията „-W %s“ е двусмислена\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: опцията „-W %s“ не допуска аргумент\n"
-
-#~ msgid "block size"
-#~ msgstr "блоковият размер"
-
-#~ msgid "%s: Read error at byte %s, reading %lu byte"
-#~ msgid_plural "%s: Read error at byte %s, reading %lu bytes"
-#~ msgstr[0] "%s: Грешка при четене при байт %s, чете се %lu байт"
-#~ msgstr[1] "%s: Грешка при четене при байт %s, четат се %lu байта"
-
-#~ msgid "Input string too long"
-#~ msgstr "Входният низ е твърде дълъг"
-
-#~ msgid "Number syntax error"
-#~ msgstr "Синтактична грешка в число"
-
-#~ msgid "rmtd: Cannot allocate buffer space\n"
-#~ msgstr "rmtd: Не може да се задели място за буфер\n"
-
-#~ msgid "Cannot allocate buffer space"
-#~ msgstr "Не може да се задели място за буфер"
-
-#~ msgid "Try `%s --help' for more information.\n"
-#~ msgstr "Използвайте „%s --help“ за повече информация.\n"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION]\n"
-#~ "Manipulate a tape drive, accepting commands from a remote process.\n"
-#~ "\n"
-#~ " --version Output version info.\n"
-#~ " --help Output this help.\n"
-#~ msgstr ""
-#~ "Използване: %s [ОПЦИЯ]\n"
-#~ "Управлява лентово устройство, приемайки команди от отделен процес.\n"
-#~ "\n"
-#~ " --version Извежда информация за версията.\n"
-#~ " --help Извежда тази справка.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to <%s>.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Съобщавайте за програмни грешки на <%s>.\n"
-
-#~ msgid "Seek offset error"
-#~ msgstr "Грешка при позициониране"
-
-#~ msgid "Premature end of file"
-#~ msgstr "Преждевременен край на файла"
-
-#~ msgid "Reading %s\n"
-#~ msgstr "Чете се %s\n"
-
-#~ msgid "Error is not recoverable: exiting now"
-#~ msgstr "Грешката е непоправима: край на изпълнението"
-
-#~ msgid "Field too long while reading snapshot file"
-#~ msgstr "Твърде дълго поле при четене на snapshot-файл"
-
-#~ msgid "Read error in snapshot file"
-#~ msgstr "Грешка при четене в snapshot-файл"
-
-#~ msgid "Unexpected field value in snapshot file"
-#~ msgstr "Неочаквана стойност на поле в snapshot-файл"
-
-#~ msgid "--Mangled file names--\n"
-#~ msgstr "--Съкратени имена на файлове--\n"
-
-#~ msgid "Unexpected EOF in mangled names"
-#~ msgstr "Неочакван край EOF в съкратени имена"
-
-#~ msgid "Renamed %s to %s"
-#~ msgstr "Преиманувано %s на %s"
-
-#~ msgid "%s: Cannot symlink to %s"
-#~ msgstr "%s: Невъзможна символна връзка към %s"
-
-#~ msgid "Symlinked %s to %s"
-#~ msgstr "Символна връзка %s към %s"
-
-#~ msgid "Unknown demangling command %s"
-#~ msgstr "Непозната команда за оправяне на съкратени имена %s"
-
-#~ msgid "suppress this warning."
-#~ msgstr "или --no-wildcards, за да не се извежда това предупреждение."
-
-#~ msgid "sort names to extract to match archive"
-#~ msgstr "файловете за извличане са сортирани според архива"
-
-#~ msgid "same as both -p and -s"
-#~ msgstr "същото като едновременно -p и -s"
-
-#~ msgid "filter the archive through bzip2"
-#~ msgstr "прекарва архива през bzip2"
-
-#~ msgid "filter the archive through compress"
-#~ msgstr "прекарва архива през compress"
-
-#~ msgid "[.]NUMBER"
-#~ msgstr "[.]N"
-
-#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?"
-#~ msgstr ""
-#~ "Внимание: опцията -I не се поддържа. Може би имате предвид -j или -T?"
-
-#~ msgid "--occurrence cannot be used in the requested operation mode"
-#~ msgstr "не може да се използва --occurrence при пожелания начин на работа"
-
-#~ msgid "Cannot combine --listed-incremental with --newer"
-#~ msgstr "Не може да се съчетават --listed-incremental с --newer"
-
-#~ msgid "Error exit delayed from previous errors"
-#~ msgstr "Изходът с грешка бе забавен поради предхождащи грешки"
-
-#~ msgid "Extended header length is out of allowed range"
-#~ msgstr "Дължината на разширен заглавен запис е извън допустимия диапазон"
-
-#~ msgid "Modification time (seconds) out of range"
-#~ msgstr "Времето на промяна (секунди) е извън допустимия диапазон"
-
-#~ msgid "Modification time (nanoseconds) out of range"
-#~ msgstr "Времето на промяна (наносекунди) е извън допустимия диапазон"
-
-#~ msgid "Device number out of range"
-#~ msgstr "Номерът на устройство е извън допустимия диапазон"
-
-#~ msgid "Error reading time stamp"
-#~ msgstr "Грешка при четене на записаното време"
-
-#~ msgid "same as -N"
-#~ msgstr "същото като -N"
-
-#~ msgid ""
-#~ "creating multi-volume archives in posix format requires using --tape-"
-#~ "length (-L) option"
-#~ msgstr ""
-#~ "създаването на многотомен архив във формат POSIX изисква опция --tape-"
-#~ "length (-L)"
-
-#~ msgid "Cannot close file #%d"
-#~ msgstr "Не може да се затвори файл #%d"
-
-#~ msgid "Cannot close descriptor %d"
-#~ msgstr "Не може да се затвори дескриптор %d"
-
-#~ msgid "Cannot properly duplicate %s"
-#~ msgstr "Не може да се клонира правилно %s"
-
-#~ msgid "Cannot use compressed or remote archives"
-#~ msgstr "Не може да се използват компресирани или отдалечени архиви"
-
-#~ msgid "Cannot open pipe"
-#~ msgstr "Не може да се отвори именован канал"
-
-#~ msgid "Cannot fork"
-#~ msgstr "Не може да се породи процес"
-
-#~ msgid "tar (child)"
-#~ msgstr "tar (потомък)"
-
-#~ msgid "(child) Pipe to stdin"
-#~ msgstr "(потомък) Именован канал към стандартен изход"
-
-#~ msgid "Cannot open archive %s"
-#~ msgstr "Не може да се отвори архив %s"
-
-#~ msgid "Archive to stdout"
-#~ msgstr "Архив на стандартния изход"
-
-#~ msgid "Child cannot fork"
-#~ msgstr "Потомъкът не може да породи процес"
-
-#~ msgid "((child)) Pipe to stdout"
-#~ msgstr "((потомък)) Именован канал към стандартния изход"
-
-#~ msgid "tar (grandchild)"
-#~ msgstr "tar (подпотомък)"
-
-#~ msgid "(grandchild) Pipe to stdin"
-#~ msgstr "(подпотомък) Именован канал към стандартния изход"
-
-#~ msgid "Cannot read from compression program"
-#~ msgstr "Не може да се чете от компресиращата програма"
-
-#~ msgid "(child) Pipe to stdout"
-#~ msgstr "(потомък) Именован канал към стандартния изход"
-
-#~ msgid "((child)) Pipe to stdin"
-#~ msgstr "((потомък)) Именован канал към стандартния изход"
-
-#~ msgid "(grandchild) Pipe to stdout"
-#~ msgstr "(подпотомък) Именован канал към стандартния изход"
-
-#~ msgid "Write to compression program short %d bytes"
-#~ msgstr "Записът към компресиращата програма е по-къс с %d байта"
-
-#~ msgid "WARNING: No volume header"
-#~ msgstr "ВНИМАНИЕ: Томът е без заглавна част"
-
-#~ msgid "Only read %d bytes from archive %s"
-#~ msgstr "Прочетени са само %d байта от архив %s"
-
-#~ msgid "WARNING: Cannot close %s (%d, %d)"
-#~ msgstr "ВНИМАНИЕ: Не може да се затвори %s (%d, %d)"
-
-#~ msgid "Child died with signal %d%s"
-#~ msgstr "Потомъкът е прекратен чрез сигнал %d%s"
-
-#~ msgid "Cannot fork!"
-#~ msgstr "Не може да се породи процес!"
+msgstr "„--stat“ изисква файлови имена"
-#~ msgid "Cannot exec a shell %s"
-#~ msgstr "Не може да се изпълни командната обвивка %s"
+#~ msgid "OPTION"
+#~ msgstr "ОПЦИЯ"
diff --git a/po/ca.gmo b/po/ca.gmo
index 7614f19eb94c3f312d71400a15da29da027a7d98..82ad155657aef4c23149eace43990d31bbec1b41 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index be1d7fccf95e5659f2486ecf079abc08738622af..e3a3133b62f49ab17437ba383ba668a819beec02 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the tar package.
# Àngel Mompó <mecatxis@gmail.com>, 2010, 2011.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar-1.29\n"
+"Project-Id-Version: tar-1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-10-23 18:26+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-22 11:37+0100\n"
"Last-Translator: Angel Mompo <mecatxis@mecatxis.cat>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
"Language: ca\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 2.0.4\n"
#: gnu/argmatch.c:134
#, c-format
@@ -97,7 +97,7 @@ msgid "give a short usage message"
msgstr "dóna un missatge curt sobre utilització"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NOM"
@@ -135,29 +135,29 @@ msgid "write error"
msgstr "error d'escriptura"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: l'opció «%s» és ambigua\n"
+msgstr "%s: l'opció «%s%s» és ambigua\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: l'opció «%s» és ambigua. Possibilitats:"
+msgstr "%s: l'opció «%s%s» és ambigua. Possibilitats:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: opció no reconeguda «%c%s»\n"
+msgstr "%s: opció no reconeguda «%s%s»\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: l'opció «%c%s» no permet cap paràmetre\n"
+msgstr "%s: l'opció «%s%s» no permet cap paràmetre\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: l'opció «--%s» necessita un paràmetre\n"
+msgstr "%s: l'opció «%s%s» necessita un paràmetre\n"
#: gnu/getopt.c:621
#, c-format
@@ -232,12 +232,12 @@ msgstr "^[sS]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Empaquetat per %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Empaquetat per %s\n"
@@ -245,12 +245,11 @@ msgstr "Empaquetat per %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -260,7 +259,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Llicència GPLV3+: GNU GPL versió 3 o posterior <http://gnu.org/licenses/gpl."
+"Llicència GPLV3+: GNU GPL versió 3 o posterior <https://gnu.org/licenses/gpl."
"html>\n"
"Això és programari lliure: podeu modificar-lo i redistribuir-lo si voleu.\n"
"No hi ha CAP GARANTIA, en la mesura que ho permeti la llei.\n"
@@ -397,15 +396,14 @@ msgid "%s home page: <%s>\n"
msgstr "%s pàgina inicial <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "%s pàgina inicial: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s pàgina d'inici: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Ajuda general per quan es fa servir programari de GNU: <http://www.gnu.org/"
+"Ajuda general per quan es fa servir programari de GNU: <https://www.gnu.org/"
"gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
@@ -526,192 +524,192 @@ msgstr "No es poden redirigir els fitxers a un interpret d'ordres remot"
msgid "Cannot execute remote shell"
msgstr "No es pot executar un interpret d'ordres remot"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "La direcció de cerca està fora de rang"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "La direcció de cerca no és vàlida"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "L'òfset de cerca no és vàlid"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "L'òfset de cerca està fora de rang"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "La mida en bytes no és vàlida"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "La mida en bytes està fora de rang"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Final del fitxer prematur"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "El codi de l'operació no és vàlid"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "L'operació no és compatible"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Arguments inesperats"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Manipula una unitat de cinta, acceptant comandes d'un procés remot"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NÚMERO"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "estableix el nivell de depuració"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FITXER"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "estableix el nom del fitxer de sortida de la depuració"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "no es pot obrir %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "massa arguments"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Ordre escombraria"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "No sembla un arxiu tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Bytes totals llegits"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Bytes totals escrits"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Bytes totals esborrats"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(conducte)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"No es poden llegir continguts de l'arxiu des del terminal (falta l'opció -f?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"No es poden escriure continguts de l'arxiu al terminal (falta l'opció -f?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "El valor de record_size no és vàlid"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "No s'ha donat el nom de l'arxiu"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "No es pot verificar l'arxiu stdin/stdout"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "L'arxiu està comprimit. Feu servir l'opció %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "No es poden actualitzar els arxius comprimits"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Al principi de la cinta, se surt"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Massa errors, se surt"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Mida del registre = %lu bloc"
msgstr[1] "Mida del registre = %lu blocs"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Bloc desalineat(byte %lu) a l'arxiu"
msgstr[1] "Bloc desalineat(bytes %lu) a l'arxiu"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"No es pot tornar enrere al fitxer d'arxiu; potser no es pot llegir sense -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek no s'ha aturat als límits d'un registre "
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: conté un número de volum invàlid"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Desbordament del número de volum"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Prepareu el volum #%d per %s i premeu retorn: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Final del fitxer on s'esperava una resposta de l'usuari"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "AVÍS: L'arxiu és incomplet"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -723,66 +721,66 @@ msgstr ""
" q Interromp tar\n"
" y Continua l'operació\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Engendra un interpret d'ordres\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Mostra aquesta ajuda\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "No hi ha cap volum nou; se surt.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "No s'ha especificat cap nom de fitxer. Torneu-ho a provar.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Entrada invàlida. Tecleja ? per mostrar l'ajuda.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "L'ordre %s ha fallat"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s no continua a aquest volum"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s possiblement continua en aquest volum: la capçalera conté un nom truncat"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s té una mida equivocada (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Aquest volum és fora de la seqüència (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "L'arxiu no està etiquetat per coincidir amb %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "El Volum %s no coincideix amb %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -790,212 +788,212 @@ msgstr ""
"%s: El nom del fitxer és massa llarg per ser desat en una capçalera "
"multivolum GNU. S'ha truncat"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "l'escriptura no ha acabat al límit d'un bloc"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Només es pot llegir %lu de %lu byte"
msgstr[1] "Només es poden llegir %lu de %lu bytes"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "El contingut no coincideix"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Final de l'arxiu inesperat"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "El tipus de fitxer no coincideix"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "El mode no coincideix"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "L'identificador d'usuari no coincideix"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "L'identificador de grup d'usuaris no coincideix"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "La data de modificació no coincideix"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "La mida no coincideix"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "No s'ha enllaçat amb %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "L'enllaç tou no coincideix"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "El número de dispositiu no coincideix"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verifiqueu "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
"%s: Tipus de fitxer «%c» desconegut. S'hi fa servir el diff com si es "
"tractés d'un fitxer normal"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "L'arxiu conté noms de fitxers amb els prefixes inicials esborrats."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "L'arxiu conté noms de fitxers transformats."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Pot ser que la verificació no pugui trobar els fitxers originals."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "HA FALLAT LA VERIFICACIÓ: %d s'ha detectat una capçalera invàlida"
msgstr[1] "HA FALLAT LA VERIFICACIÓ: %d s'han detectat capçaleres invàlides"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Un sol bloc zero a %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: conté una etiqueta de directori de memòria cau %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "el valor %s està fora del rang%s %s..%s; es substitueix per %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "el valor %s està fora del rang %s %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "S'estan generant les capçaleres octals negatives"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: el nom del fitxer és massa llarg (màx %d); no s'aboca"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: el nom del fitxer és massa llarg (no es pot dividir); no s'aboca"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: el nom de l'enllaç és massa llarg; no s'aboca"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: El fitxer s'encongeix %s byte; s'omple amb zero"
msgstr[1] "%s: El fitxer s'encongeix %s bytes; s'omple amb zeros"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: el fitxer es troba a un sistema de fitxers diferent; no s'aboca"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "els continguts no s'aboquen"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Tipus de fitxer desconegut; el fitxer s'ignora"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Falten els enllaços a %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: el fitxer no ha canviat; no s'aboca"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: el fitxer és l'arxiu; no s'aboca"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "el directori no s'aboca"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: el fitxer ha canviat mentre es llegia"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: sòcol ignorat"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: porta ignorada"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Se salta fins a la propera capçalera"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "S'esborra la no-capçalera de l'arxiu"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: marca horària inversemblantment antiga %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: la marca horària %s pertany %s s al futur"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Inconsistència inesperada en crear el directori"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: se salta el fitxer existent"
@@ -1019,7 +1017,7 @@ msgstr "Es prova d'extreure els enllaços simbòlics com enllaços durs"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: No espot extreure -- el fitxer continua des d'un altre volum"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Nom de la capçalera inesperadament llarg"
@@ -1036,7 +1034,7 @@ msgstr "L'actual %s és igual d'antic o més nou"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: el nom del membre conté «..»"
#: src/extract.c:1696
#, c-format
@@ -1048,23 +1046,23 @@ msgstr "%s: No es pot fer la còpia de seguretat d'aquest fitxer"
msgid "Cannot rename %s to %s"
msgstr "No es pot canviar el nom de %s a %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: El directori ha canviat de nom a partir de %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: El directori és nou"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr ""
"%s: el directori es troba en un sistema de fitxers diferent. No s'aboca"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: El directori ha canviat de nom"
@@ -1192,35 +1190,35 @@ msgstr "%s: S'elimina %s\n"
msgid "%s: Cannot remove"
msgstr "%s: No es pot esborrar"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: S'ometen"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "bloc %s: ** Bloc de NULs **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "bloc %s: ** Final del Fitxer **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "bloc %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Capçalera amb blancs on hi hauria d'haver un valor numèric %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1228,163 +1226,162 @@ msgstr ""
"complement a dos"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "El valor octal de l'arxiu %.*s està fora del rang %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "L'arxiu conté capçaleres amb base 64 que estan esdevenint obsoletes"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "La cadena de signatura %s amb base 64 de l'arxiu està fora del rang %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "El valor amb base 256 de l'arxiu està fora del rang %s "
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "L'arxiu conté %.*s on hi hauria d'haver un valor numèric de tipus %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "El valor %s de l'arxiu està fora del rang %s %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " enllaç cap a %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " tipus de fitxer desconegut %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Enllaç llarg--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Nom Llarg--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Capçalera del volum--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Continua al byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Es crea el directori:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Es canvia el nom %s per %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: No es pot canviar el nom a %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Es torna a canviar el nom %s a %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: El fitxer s'ha esborrat abans de poder-lo llegir"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "procés descendent"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "canal d'intercomunicació"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Selecció de fitxer local:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "afegeix el FITXER a l'arxiu (útil si el nom comença per un guió)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIRECTORI"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "Canvia al directori DIRECTORI"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "obté els noms que cal extreure u crear del FITXER"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T llegeix els noms acabats en nul; inclou -verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "deshabilita l'efecte de l'opció --null prèvia"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"treu les cometes dels noms dels membres o dels fitxers d'entrada (per "
"defecte)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
"no treguis les cometes dels noms dels dels membres o dels fitxers d'entrada "
"(per defecte)"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T llegeix noms de fitxer verbatim (no permet opcions)"
+msgstr "-T llegeix noms de fitxer verbatim (no permet opcions ni escapada)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T tracta els noms de fitxer que comencen per guió com a opcions (per "
"defecte)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "PATRÓ"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "exclou els fitxers que es donen com un PATRÓ"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "exclou els patrons que es llisten al FITXER"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1392,25 +1389,25 @@ msgstr ""
"exclou el contingut dels directoris que continguin CACHEDIR.TAG, excepte el "
"propi fitxer d'etiquetes"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "exclou tot el que estigui als directoris que continguin CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "exclou els directoris que continguin CACHEDIR.TAG "
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"exclou el contingut dels directoris que contenen el FITXER, excepte el "
"FITXER mateix"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "si existeix, llegeix els patrons exclosos de cada directori del FITXER"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1418,120 +1415,124 @@ msgstr ""
"si existeix, llegeix els patrons exclosos de cada directori i subdirectoris "
"del FITXER"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "exclou tot el que hi hagi al directori que contingui el FITXER"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "exclou els directoris que continguin el FITXER"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "exclou els directoris del sistema de control de versions"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "llegeix els patrons exclosos dels fitxers d'ignorat VCS"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "exclou els fitxers de còpia de seguretat i de blocat"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "incloure els subdirectoris (per defecte)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "no baixa automàticament als directoris"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"opcions de concordança de nom de fitxer (afecta tant als patrons de inclusió "
"com als d'exclusió):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "comprova els patrons del començament del nom del fitxer"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
"comprova els patrons després de qualsevol «/» (per defecte a les exclusions) "
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "ignora diferències majúscules/minúscules"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "comprova diferències majúscules/minúscules (per defecte)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "fa servir comodins (per defecte a les exclusions)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "concordància exacte a les cadenes"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "els comodins han de concordar amb «/» (per defecte a les exclusions)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "els comodins no concorden amb «/»"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"S'han fet servir les següents opcions després dels paràmetres no opcionals "
+"en la creació d'arxius o el mode d'actualització. Aquestes opcions són "
+"posicionals i només afecten als paràmetres que els segueixen. Ajusteu-les "
+"correctament."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s no té cap efecte"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s no té cap efecte"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s no té cap efecte"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "línia de comandes"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: la llista de fitxers demanada des de %s ja s'ha llegit des de %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "no es pot dividir la cadena «%s»:%s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: la lectura del nom del fitxer conté un caràcter nul"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
"Caràcters de patró de coincidència que es fan servir en noms de fitxers"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1539,48 +1540,48 @@ msgstr ""
"Feu servir --wildcards per habilitar els patrons de coincidència, o --no-"
"wildcars per eliminar aquest avís."
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: No s'ha trobat a l'arxiu"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: No s'ha trobat cap coincidència a l'arxiu"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "L'etiqueta de l'arxiu no coincideix"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"No podeu fer servir l'opció -C als llistats de fitxer amb --listed-"
"incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Només podeu fer servit una opció -C amb --listed-incemental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Ambdues opcions «-%s» i «-%s» volen l'entrada estàndard"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Format de fitxer invàlid"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr ""
"El format de l'arxiu és incompatible perquè requereix característiques de GNU"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1809,7 +1810,7 @@ msgstr "Selecciona la sortida del flux de dades:"
msgid "extract files to standard output"
msgstr "extreu els fitxers a la sortida estàndard"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "COMANDA"
@@ -1849,7 +1850,7 @@ msgid "use FILE to map file owner GIDs and names"
msgstr ""
"fa servir FITXER per mapar els noms i GIDs dels propietaris dels fitxers"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATA-O-FITXER"
@@ -2065,7 +2066,7 @@ msgstr "refés els blocs mentre els llegeixes (per conductes de 4.2BSD)"
msgid "Archive format selection:"
msgstr "Selecció del format de l'arxiu: "
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2150,62 +2151,62 @@ msgstr "PROGRAMA"
msgid "filter through PROG (must accept -d)"
msgstr "filtra mitjançant PROGRAMA (ha d'acceptar -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Selecció de fitxer local:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "queda't al sistema de fitxers local quan creïs l'arxiu"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "no treguis les «/» del començament dels noms dels fitxers"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"segueix els enllaços simbòlics; arxiva i aboca els fitxers als quals apunten"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"segueix els enllaços durs; arxiva i aboca els fitxers als quals es refereix"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "NOM-DEL-MEMBRE"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "comença al membre NOM-DEL MEMBRE quan llegeixis l'arxiu"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "desa només els fitxers més nous que DATA-O-FITXER"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATA"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "compara la data i l'hora només quan les dades hagin canviat"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "CONTROL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr ""
"fes una còpia de seguretat abans d'esborrar, tria el CONTROL de versions"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "CADENA"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2213,62 +2214,62 @@ msgstr ""
"fa una còpia de seguretat abans d'esborrar, substitueix el sufix usual («~» "
"si no s'ha definit la variable d'entorn SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Transformacions del nom del fitxer:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
"treu NÚMERO components de la capçalera dels noms dels fitxers quan extreu"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "EXPRESSIÓ"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
"fes servir l'EXPRESSIÓ de substitució sed per transformar els noms dels "
"fitxers"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Sortida informativa:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "llista els fitxers processats detalladament"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "PARAULA CLAU"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "control d'avisos"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "mostra els missatges de progres cada NÚMERO registres (per defecte 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "ACCIÓ"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "executa ACCIÓ a cada punt de comprovació"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "mostra un missatge si no s'aboquen tots els enllaços"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SENYAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2280,35 +2281,35 @@ msgstr ""
"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2. També s'accepta els noms sense "
"el prefix SIG"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "mostra l'hora de modificació del fitxer en UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "Mostra l'hora del fitxer amb alta precisió"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "envia la sortida detallada al FITXER"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "mostra el número de bloc de dins l'arxiu a cada missatge"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "demana la confirmació per cada acció"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "mostra els valors per defecte de tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "mostra els intervals vàlids pels camps del fitxer instantània"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2316,33 +2317,33 @@ msgstr ""
"quan es llisti o s'extregui, llista tots els directoris que no es "
"corresponguin amb el criteri de cerca"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "mostra el nom del fitxer o de l'arxiu després de la transformació"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "ESTIL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"estableix el nom de l'estil de citació; vegeu més avall una llista de valors "
"vàlids per ESTIL"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "més caràcters de cometes des de CADENA"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "deshabilita els caràcters de cometa de la CADENA"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Opcions de compatibilitat:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2350,62 +2351,62 @@ msgstr ""
"quan es crea, el mateix que --old-archive; quan s'extreu, el mateix que --no-"
"same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Altres opcions:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "desactiva l'ús de certes opcions potencialment perjudicials"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» no es pot fer servir amb «%s»"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr ""
"No podeu especificar més d'una opció «-Acdtrux», «--delete» o «--test-label»"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Opcions de compressió conflictives"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Nom del senyal desconegut: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "No s'ha trobat el fitxer de mostra de la data"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "S'està substituint %s pel format de data desconegut %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Opció %s: S'està tractant la data «%s» com a %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtra l'arxiu a mitjançant %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Les opcions vàlides per l'opció --quoting-style són:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2413,163 +2414,163 @@ msgstr ""
"\n"
"*Aquest* tar va per defecte en:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "L'ID del grup o del propietari no és vàlid"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Factor de blocs invàlid"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Longitud de la cinta invàlida"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "valor invàlid del nivell d'increment"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Més d'una data del llindar"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "valor de la versió de l'opció de dispersió invalid"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "No es permet l'ús de --atime-preserve=«system» en aquesta plataforma"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "El valor --checkpoint no és un enter"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Mode invàlid donat a les opcions"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Número invàlid"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Mida del registre invàlida"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "La mida del registre ha de ser múltiple de %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Nombre d'elements invàlid"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Només es permet una opció --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Argument de densitat mal format: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Densitat desconeguda: «%c»"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Les opcions «-[0-7][lmh]» no són compatibles amb *aquest* tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: ubicació de l'error"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "error en analitzar %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FITXER]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "arguments sense opcions a %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "no es pot dividir TAR_OPCIONS:%s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "L'opció antiga «%c» necessita un argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence no té sentit sense una llista de fitxers"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Per a múltiples arxius de fitxers es necessita l'opció «-M»"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level no té sentit sense --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: l'etiqueta del volum és massa llarga (el limit és %lu byte)"
msgstr[1] "%s: l'etiqueta del volum és massa llarga (el limit és %lu bytes)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "No es poden verificar els arxius multi-volum"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "No es poden verificar els arxius comprimits"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "No es poden utilitzar arxius comprimits multi-volum"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "No es poden concatenar arxius comprimits"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime necessita una data que s'especifica emprant --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option només es pot utilitzar en arxius POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls només es pot fer servir en arxius POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux només es pot utilitzar en arxius POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs només es pot utilitzar en arxius POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2577,81 +2578,90 @@ msgstr ""
"No es pot deduir el nom del directori de dalt de tot. Establiu-lo "
"explícitament amb l'opció --one-top-level=DIR"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "La llargada del volum no pot ser inferior que la mida del registre"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "S'està refusant covardament crear un arxiu buit"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Les opcions «-Aru» no són compatibles amb «-f -»"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Heu d'especificar una opció «-Acdtrux», «--delete» o «--test-label»"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Se surt amb estat de fallida degut a errors prèvis"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: El fitxer s'encongeix %s byte"
msgstr[1] "%s: El fitxer s'encongeix %s bytes"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "La paraula clau %s és desconeguda o encara no s'ha implementat"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "La marca horària està fora del rang permés"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "No s'ha pogut utilitzar el patró %s "
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "No s'ha pogut sobreescriure la paraula clau %s"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Capçalera estesa mal formada: falta la longitud"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "La longitud de la capçalera estesa %*s està fora de rang"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Capçalera estesa mal formada: falta l'espai després de la longitud"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Capçalera estesa mal formada: falta el signe igual"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Capçalera estesa mal formada: falta el salt de línia"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "S'ignora la paraula clau desconeguda de la capçalera estesa «%s»"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2660,46 +2670,46 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "La capçalera estesa %s=%s està fora del rang %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Capçalera estesa mal formada: %s=%s invàlid"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Capçalera estesa mal formada: excedeix %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Capçalera estesa mal formada: %s invàlid, delimitador %c inesperat"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Capçalera estesa mal formada: %s invàlid: nombre de valors incorrecte"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: no és un temps d'espera vàlid"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: acció del punt de comprovació desconegut"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "escriu"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "llegeix"
@@ -2707,7 +2717,7 @@ msgstr "llegeix"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Punt de comprovació d'escriptura %u"
@@ -2716,12 +2726,12 @@ msgstr "Punt de comprovació d'escriptura %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Punt de comprovació de lectura %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2730,99 +2740,103 @@ msgstr ""
"paxutils.\n"
"Les OPCIONS són:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Opcions de creació de fitxers:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "MIDA"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Crea un fitxer de la MIDA indicada"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Escriu al fitxer amb NOM, en comptes de la sortida estàndard"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Llegeix els noms dels fitxers del FITXER"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T llegeix els noms acabats en nul"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Omple el fitxer amb el PATRÓ indicat. El PATRÓ és «per defecte» o «zeros»"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Mida d'un bloc per fitxer dispers"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Genera un fitxer dispers. La resta de la línia de comandes indica el mapa "
"del fitxer"
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "ÒFSET"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Cerca l'òfset donat abans d'escriure les dades"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "S'han eliminat els missatges de diagnosi que no eren fatals"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Opcions de les estadístiques dels fitxers:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Mostra el contingut de l'estructura stat per cadascun dels fitxers indicats. "
"El FORMAT per defecte és:"
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Opcions d'execució sincrónica:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPCIÓ"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Executa ARGS. Útil amb --checkpoint i i una entre --cut, --append, --touch, "
"--unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Realitzar les accions donades (mirar avall) quan s'arrivi al punt de "
"comprovació NÚMERO"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Defineix la data per a la següent opció --touch"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
"Mostra els punts de comprovació executats i l'estat de sortida de la COMANDA"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2830,7 +2844,7 @@ msgstr ""
"Accions d'execució sincrónica. Aquestes son executades quan s'arriba al "
"númerode punts de comprovació donat per --checkpoint"
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2838,126 +2852,126 @@ msgstr ""
"Talla el FITXER a la mida especificada amb l'opció --length prèvia (o 0, si "
"no s'ha especificat)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Afegeix MIDA bytes al FITXER. MIDA s'ha especificat amb l'opció --length "
"prèvia."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Actualitza les hores d'accés i modificació del FITXER"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Executa COMANDA"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Esborra FITXER"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Mida invàlida: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Número fora de l'abast permés: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Mida negativa: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "Ha fallat la petició d'stat(%s)"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "mida del fitxer sol·licitada %lu, actual %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "el fitxer creat no és dispers"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Error en analitzar el número prop de «%s»"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Format de data desconegut"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGS...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "no es pot obrir «%s»"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "no es pot cercar"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "el nom del fitxer conté un caràcter nul"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"no es poden generar fitxers dispersos a la sortida estàndard, empreu l'opció "
"--file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "màscara incorrecta (prop de «%s»)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Camp desconegut «%s»"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "no es pot definir el temps de «%s»"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "no es pot truncar «%s»"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "ha fallat la comanda: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "no es pot truncar «%s»"
+msgstr "no es pot fer estadístiques de «%s»"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "no es pot definir el temps de «%s»"
+msgstr "no es pot esborrar el directori «%s»"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "no es pot desfer l'enllaç «%s»"
@@ -2997,6 +3011,9 @@ msgstr "Comanda finalitzada\n"
msgid "--stat requires file names"
msgstr "--stat requereix noms de fitxers"
+#~ msgid "OPTION"
+#~ msgstr "OPCIÓ"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: El paràmetre ARGP_HELP_FMT ha de ser positiu"
diff --git a/po/cs.gmo b/po/cs.gmo
index 61ab3410458b403e9fb7b20b00bf8de00db3a3c0..125828d3f2676af18dfeec83e169f7771d39a65b 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 3d5cd4d09d252131c7ee20941346a07755244395..5bf9df41c6efa8de8f72b509029aa6df0b233e93 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@
# Copyright (C) 1997 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
# Vladimir Michl <Vladimir.Michl@seznam.cz>, 1997.
-# Petr Pisar <petr.pisar@atlas.cz>, 2009, 2010, 2011, 2013, 2014, 2016.
+# Petr Pisar <petr.pisar@atlas.cz>, 2009, 2010, 2011, 2013, 2014, 2016, 2017.
#
# Pozor: program sám zalamuje dlouhé řádky, ale místo (širokých) znaků počítá
# bajty. Proto je nutné dodržovat nezlomitelné mezery, které program rovněž
@@ -13,13 +13,13 @@
# tape → páska (rod ženský, vzor žena; ne pásek)
# seek offset → pozice posunu (pásky)
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-16 22:38+02:00\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-18 21:48+01:00\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
"Language: cs\n"
@@ -109,7 +109,7 @@ msgstr "vypíše stručný návod na použití"
# JMÉNO jako v příslušné položce nápovědy
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "JMÉNO"
@@ -147,29 +147,29 @@ msgid "write error"
msgstr "chyba zápisu"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: přepínač „%s“ není jednoznačný\n"
+msgstr "%s: přepínač „%s%s“ není jednoznačný\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: přepínač „%s“ není jednoznačný; možnosti:"
+msgstr "%s: přepínač „%s%s“ není jednoznačný; možnosti:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: nerozpoznaný přepínač „%c%s“\n"
+msgstr "%s: nerozpoznaný přepínač „%s%s“\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: přepínač „%c%s“ musí být zadán bez argumentu\n"
+msgstr "%s: přepínač „%s%s“ musí být zadán bez argumentu\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: přepínač „--%s“ vyžaduje argument\n"
+msgstr "%s: přepínač „%s%s“ vyžaduje argument\n"
#: gnu/getopt.c:621
#, c-format
@@ -244,12 +244,12 @@ msgstr "^[aAyY].*"
msgid "^[nN]"
msgstr "^[nN].*"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Zabaleno kým: %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Zabaleno kým: %s\n"
@@ -257,12 +257,11 @@ msgstr "Zabaleno kým: %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -272,10 +271,11 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Licence GPLv3+: GNU GPL verze 3 nebo novější <http://gnu.org/licenses/gpl."
-"html>.\n"
-"Toto je svobodné programové vybavení: máte právo měnit jej a dále šířit.\n"
-"Není poskytována ŽÁDNÁ ZÁRUKA, jak jen zákon dovoluje.\n"
+"Licence GPLv3+: GNU GPL verze 3 nebo novější\n"
+"<https://gnu.org/licenses/gpl.html>. Toto je svobodné programové vybavení:\n"
+"máte právo jej měnit a dále šířit. Není poskytována ŽÁDNÁ ZÁRUKA, jak jen\n"
+"zákon dovoluje.\n"
+"\n"
#. TRANSLATORS: %s denotes an author name.
#: gnu/version-etc.c:102
@@ -416,15 +416,14 @@ msgid "%s home page: <%s>\n"
msgstr "Domovská stránka %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Domovská stránka programu %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "Domovská stránka programu %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Obecná pomoc při používání softwaru GNU: <http://www.gnu.org/gethelp/>\n"
+"Obecná pomoc při používání softwaru GNU: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -548,145 +547,145 @@ msgstr "Soubory nelze přesměrovat ke vzdálenému shellu"
msgid "Cannot execute remote shell"
msgstr "Vzdálený shell není možné spustit"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Směr posunu je mimo rozsah"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Chybný směr posunu"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Neplatná pozice posunu"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Pozice posunu je je mimo rozsah"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Neplatný počet bajtů"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Počet bajtů je mimo rozsah"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Předčasný konec souboru"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Neplatní kód operace"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operace není podporována"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Neočekávané argumenty"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Ovládá páskovou jednotku přijímaje příkazy ze vzdáleného procesu"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "ČÍSLO"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "nastaví úroveň ladění"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "SOUBOR"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "nastaví název souboru pro výstup ladění"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "„%s“ nelze otevřít"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "příliš mnoho argumentů"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Neznámý příkaz"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Toto pravděpodobně není tar archiv"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Celkem přečteno bajtů"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Celkem zapsáno bajtů"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Celkem smazáno bajtů"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(roura)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Čtení obsahu archivu z terminálu se zamítá (nechybí přepínač -f?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Zápis obsahu archivu do terminálu se zamítá (nechybí přepínač -f?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Chybná hodnota pro velikost záznamu"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Název archivu nebyl zadán"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Stdin/Stdout archiv nelze ověřit"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Archiv je komprimován. Použijte přepínač %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Komprimovaný archiv nelze aktualizovat"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Páska na začátku, končím"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Příliš mnoho chyb, končím"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
@@ -694,7 +693,7 @@ msgstr[0] "Velikost záznamu = %'lu blok"
msgstr[1] "Velikost záznamu = %'lu bloky"
msgstr[2] "Velikost záznamu = %'lu bloků"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
@@ -702,37 +701,37 @@ msgstr[0] "Nezarovnaný blok (%'lu bajt) v archivu"
msgstr[1] "Nezarovnaný blok (%'lu bajty) v archivu"
msgstr[2] "Nezarovnaný blok (%'lu bajtů) v archivu"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "V archivu se nelze vrátit, bez -i může být nečitelný"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek se nezastavil na hranici záznamu"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: obsahuje neplatné číslo svazku"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "U čísla svazku nastalo přetečení"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Připravte svazek #%d pro archiv %s a stiskněte return:"
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Místo uživatelské odpovědi byl zadán konec souboru"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "VAROVÁNÍ: Archiv je nekompletní"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -743,65 +742,65 @@ msgstr ""
" q Ukončit program tar\n"
" y nebo odřádkování Pokračovat v operaci\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Vytvořit podshell\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Vypsat tuto nápovědu\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Není nový svazek; končím.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Název souboru nebyl zadán. Zkuste to znovu.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Neplatný vstup. Nápovědu obdržíte napsáním „?“ (otazníku).\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "příkaz %s selhal"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s nepokračuje na tomto svazku"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s možná pokračuje na tomto svazku: hlavička obsahuje zkrácený název"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s je špatné délky (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Tento svazek není je mimo pořadí (%s − %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Pro vyhodnocení vzorku %s musí být archiv pojmenován"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Svazek %s neodpovídá vzorku %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -809,11 +808,11 @@ msgstr ""
"%s: název souboru je příliš dlouhý, aby byl uložen do vícesvazkové hlavičky "
"GNU, bude zkrácen"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "zápis neskončil na konci hranice bloku"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
@@ -821,75 +820,75 @@ msgstr[0] "Bylo možné načíst pouze %'lu z %'lu bajtu"
msgstr[1] "Bylo možné načíst pouze %'lu z %'lu bajtů"
msgstr[2] "Bylo možné načíst pouze %'lu z %'lu bajtů"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Obsahy se liší"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Neočekávaný konec archivu"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Typ souboru se liší"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Práva se liší"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "UID se liší"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "GID se liší"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Čas poslední modifikace se liší"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Velikost se liší"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Není odkazem na %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symbolický odkaz se liší"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Číslo zařízení se liší"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Ověřuji "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Neznámý typ souboru „%c“, porovnáván jako normální soubor"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Archiv obsahuje názvy souborů, kterým byly odstraněny předpony."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Archiv obsahuje transformované názvy souborů."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Při kontrole může selhat nalezení původních souborů."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
@@ -897,46 +896,46 @@ msgstr[0] "SELHÁNÍ KONTROLY: zjištěna %d chybná hlavička"
msgstr[1] "SELHÁNÍ KONTROLY: zjištěny %d chybné hlavičky"
msgstr[2] "SELHÁNÍ KONTROLY: zjištěno %d chybných hlaviček"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Osiřelý nulový blok na pozici %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: obsahuje značku keše adresáře %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "hodnota %s typu %s je mimo rozsah %s..%s; nahrazuji za %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "hodnota %s typu %s je mimo rozsah %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Generuji záporné osmičkové hlavičky"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: název souboru je příliš dlouhý (max. %d); nezpracován"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: název souboru je příliš dlouhý (nelze jej rozdělit); nezpracován"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: název odkazu je příliš dlouhý; nezpracován"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
@@ -944,78 +943,78 @@ msgstr[0] "%s: Soubor je kratší o %s bajt; Doplňuji nulami."
msgstr[1] "%s: Soubor je kratší o %s bajty; Doplňuji nulami."
msgstr[2] "%s: Soubor je kratší o %s bajtů; Doplňuji nulami."
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: soubor je na jiném souborovém systému; nearchivován"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "obsah nezpracován"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Neznámý typ souboru; soubor ignorován"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Chybí odkazy na %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: soubor není změněn; neaktualizován"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: soubor je archiv; nearchivován"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "adresář nezpracován"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: soubor byl během čtení změněn"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: soket ignorován"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: dveře ignorovány"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Přeskakuji na další hlavičku"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Z archivu je mazáno to, co není hlavička"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: nemožně stará časová značka %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: časová značka %s je %s s v budoucnosti"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Neočekávaná inkonzistence, při vytváření adresáře"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: existující soubor se přeskakuje"
@@ -1038,7 +1037,7 @@ msgstr "Zkouším rozbalit symbolické odkazy jako pevné odkazy"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Nelze rozbalit – soubor je pokračováním jiného svazku"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Neočekávaná hlavička dlouhého názvu"
@@ -1053,7 +1052,7 @@ msgid "Current %s is newer or same age"
msgstr "Současný soubor %s je novější nebo stejně starý"
#: src/extract.c:1664
-#, fuzzy, c-format
+#, c-format
msgid "%s: Member name contains '..'"
msgstr "%s: Název souboru obsahuje „..“"
@@ -1067,22 +1066,22 @@ msgstr "%s: Tento soubor nebylo možné zálohovat"
msgid "Cannot rename %s to %s"
msgstr "%s nelze přejmenovat na %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Adresář byl přejmenován z %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Adresář je nový"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: adresář je na jiném souborovém systému; nearchivován"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Adresář byl přejmenován"
@@ -1208,194 +1207,195 @@ msgstr "%s: Mažu %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Nelze smazat"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Vynechávám"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** Blok NUL **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok %s: ** Konec souboru **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Mezery v hlavičce na místě, kde je očekávána číselná hodnota typu %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
"Osmičková hodnota %.*s typu %s je mimo rozsah; přiřazuji dvojkový complement"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Osmičková hodnota %.*s typu %s je mimo rozsah"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Archiv obsahuje zastaralé base-64 hlavičky"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Base-64 řetězec %s je mimo rozsah typu %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Hodnota base-256 je mimo rozsah typu %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Archiv obsahuje %.*s tam, kde je očekávána číselná hodnota typu %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Hodnota %s typu %s je mimo rozsah %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " odkaz na %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " neznámý souborový typ %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Dlouhý odkaz--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Dlouhý název--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Hlavička svazku--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Pokračováno od %s bajtu--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Vytvářím adresář:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Přejmenovávám %s na %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: nelze přejmenovat na %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Přejmenovávám %s zpět na %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Soubor smazán dříve než mohl být přečten"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "potomek"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "meziprocesový kanál"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Výběr názvu místního souboru:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"zadaný SOUBOR přidá do archivu (užitečné, začíná-li jeho název spojovníkem)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "ADRESÁŘ"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "změní adresář na ADRESÁŘ"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "seznam jmen souborů na rozbalení nebo zabalení získá ze SOUBORU"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T čte názvy zakončené nulovým znakem, zapne --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "zruší účinek předchozího přepínače --null"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"odčiní citování (escapování) názvů vstupních souborů nebo prvků (implicitní)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "neodčiní citování (escapování) názvů vstupních souborů nebo prvků"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T čte názvy souborů doslovně (přepínače se nezpracovávají)"
+msgstr ""
+"-T čte názvy souborů doslovně (přepínače ani escape sekvence se "
+"nezpracovávají)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "-T považuje názvy souborů začínající pomlčkou za přepínače (výchozí)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "VZOR"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "vynechá soubory, které odpovídají VZORU"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "vynechá vzorky vyjmenované v SOUBORU"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1403,23 +1403,23 @@ msgstr ""
"vynechá obsah adresářů obsahujících CACHEADR.ZNAČKA, kromě souboru značky "
"samotného"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "vynechá vše pod adresáři obsahujícími CACHEADR.ZNAČKA"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "vynechá adresáře obsahující CACHEADR.ZNAČKA"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "vynechá obsah adresářů obsahujících SOUBOR, vyjma SOUBORU samotného"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "čte vzorky na vynechání pro každý adresář ze SOUBORU, pokud existuje"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1427,118 +1427,122 @@ msgstr ""
"čte vzorky na vynechání pro každý adresář a jeho podadresáře ze SOUBORU, "
"pokud existuje"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "vynechá vše pod adresáři obsahujícími SOUBOR"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "vynechá adresáře obsahující SOUBOR"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "vynechá adresáře systému správy verzí"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "čte vzorky na vynechání ze souboru ignorací verzovacího systému"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "vynechá soubory záloh a zámků"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "sestupuje rekurzivně do adresářů (implicitní)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "zabrání automatickému sestupu do adresářů"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Přepínače řídicí výběr souborů podle názvu (ovlivňuje vzory jak pro "
"vyloučení, tak pro zahrnutí)"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "vzory se testují název souboru od začátku"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "vzory se testují po každém „/“ (implicitní u vyloučení)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "ignoruje velikost písmen"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "testování je citlivé na velikost (implicitní)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "použije žolíkové znaky (implicitní u vyloučení)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "testuje se přesný řetězec"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "žolíkové znaky zahrnují „/“ (implicitní u vyloučení)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "žolíkové znaky nezahrnují „/“"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Následující přepínače byly použity po nepřepínačových argumentech při "
+"vytváření archivu nebo jeho aktualizaci. Tyto přepínače jsou poziční a "
+"ovlivňují pouze argumenty, které je následují. Prosím, řádně je "
+"přeuspořádejte."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s nemá žádný vliv"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s nemá žádný vliv"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s nemá žádný vliv"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "příkazový řádek"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: seznam souborů požadovaný z %s již načten z %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "řetězec „%s“ nelze rozdělit: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: načtený název souboru obsahuje nulový znak"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "V názvech souborů se nachází žolíkové znaky"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1546,47 +1550,47 @@ msgstr ""
"Porovnávání proti žolíkových znaků zapněte pomocí --wildcards, nebo varování "
"potlačte prostřednictvím --no-wildcards"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: V archivu nenalezen"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Požadovaný výskyt nebyl v archivu nalezen"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Název archivu se neodpovídá"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Použití přepínače -C uvnitř seznamu souborů není spolu s --listed-"
"incremental dovoleno"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "S --listed-incremental je dovolen pouze jediný přepínač -C"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Oba dva přepínače „%s“ a „%s“ chtějí standardní vstup"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Neplatný formát archivu"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU rozšíření požadovány na nekompatibilním formátu archivu"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1805,7 +1809,7 @@ msgstr "Výběr výstupního proudu:"
msgid "extract files to standard output"
msgstr "soubory vybaluje na standardní výstup"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "PŘÍKAZ"
@@ -1841,7 +1845,7 @@ msgstr "použije SOUBOR k převodu UID a jmen vlastníků souborů"
msgid "use FILE to map file owner GIDs and names"
msgstr "použije SOUBOR k převodu GID a jmen vlastníků souborů"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATUM_NEBO_SOUBOR"
@@ -2053,7 +2057,7 @@ msgstr "předělat bloky v průběhu čtení (pro roury na BSD 4.2)"
msgid "Archive format selection:"
msgstr "Výběr formátu archivu:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMÁT"
@@ -2137,63 +2141,63 @@ msgstr "PROGRAM"
msgid "filter through PROG (must accept -d)"
msgstr "archiv protáhne PROGRAMEM (musí znát -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Výběr místního souboru:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "při tvorbě archivu se zdrží v místním systému souborů"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "neodstraní z názvů souborů úvodní „/“"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"následuje symbolické odkazy; archivuje a vybaluje soubory, na které je "
"odkazováno"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"následuje pevné odkazy; archivuje a vybaluje soubory, na které je odkazováno"
# část cesty (adresář)
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "SLOŽKA_NÁZVU"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "čtení archivu začne na složce SLOŽKA_NÁZVU"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "ukládá jen soubory novější než DATUM_NEBO_SOUBOR"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATUM"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "při změně dat porovná datum i čas"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "STRATEGIE"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "před odstraněním vytvoří záložní kopii za použití STRATEGIE"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "ŘETĚZEC"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2201,59 +2205,59 @@ msgstr ""
"před odstraněním vytvoří záložní kopii, potlačí obvyklou příponu („~“, není-"
"li uvedeno jinak v proměnné prostředí SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Transformace názvů souborů:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "při rozbalování odřízne ČÍSLO úvodních složek z názvů souborů"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "VÝRAZ"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "názvy souborů transformuje pomocí nahrazovacího VÝRAZU sedu"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informativní výstup:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "vypisuje zpracovávané soubory"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "KLÍČOVÉ_SLOVO"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "řídí varování"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "zobrazuje zprávy o postupu každých ČÍSLO. záznam (implicitně 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "AKCE"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "v každém kontrolním bodu vykoná AKCI"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "hlásí, že nebyly zpracovány všechny odkazy"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNÁL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2264,35 +2268,35 @@ msgstr ""
"hlášení, až bude doručen SIGNÁL; Povolené signály jsou SIGHUP, SIGQUIT, "
"SIGINT, SIGUSR1 a SIGUSR2; názvy bez předpony SIG jsou rovněž přípustné"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "časy změn obsahu souborů vypisuje v UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "časy souborů vypisuje v plném znění"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "informativní výstup pošle do SOUBORU"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "každou zprávu opatří číslem bloku uvnitř archivu"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "na každou akcí žádá potvrzení"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "zobrazí implicitní argumenty taru"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "zobrazí platné rozsahy pro položky souborů snímků"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2300,31 +2304,31 @@ msgstr ""
"při vypisování nebo rozbalování zobrazí každý adresář, který neodpovídá "
"vyhledávacím podmínkám"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "zobrazuje názvy souborů a archivů po transformaci"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STYL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "nastaví styl citování názvů; platné hodnoty STYLŮ nalezte níže"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "cituje navíc znaky z ŘETĚZCE"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "zakáže citování znaků z ŘETĚZCE"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Přepínače pro kompatibilitu"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2332,22 +2336,22 @@ msgstr ""
"při vytváření archivu má stejný význam jako --old-archive, při rozbalování "
"jako --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Další přepínače:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "zakáže použití některých potenciálně nebezpečných přepínačů"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "Přepínač „%s“ nelze použít s „%s“"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2355,40 +2359,40 @@ msgstr ""
"Nemůže být zadán více jak jeden přepínač z „-Acdtrux“, „--delete“ nebo „--"
"test-label“"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Odporující si kompresní přepínače"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Neznámý název signálu: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Soubor, ze kterého se má vzít datum a čas, nebyl nalezen"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Datum neznámého formátu %2$s nahrazuji %1$s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Přepínač %s: S datem „%s“ bude zacházeno jako s %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "archiv protáhne skrze filtr %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Pro přepínač --quoting-style jsou platné argumenty:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2396,120 +2400,120 @@ msgstr ""
"\n"
"Implicitní přepínače *tohoto* taru:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Neplatné ID vlastníka nebo skupiny"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Neplatný počet bajtů na záznam"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Neplatná délka pásky"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Chybná hodnota úrovně přírůstku"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Více než jedeno počáteční datum"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Neplatná hodnota verze řídkého formátu"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' není na této platformě podporován"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "hodnota --checkpoint není celé číslo"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Zadána chybná práva"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Neplatné číslo"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Chybná velikost záznamu"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Velikost záznamu musí být násobek %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Neplatný počet prvků"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Povolen je jen jeden přepínač --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Neplatný argument hustoty: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Neznámá hustota: „%c“"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Přepínače „-[0-7][lmh]“ nejsou *tímto* tarem podporovány"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: umístění chyby"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "Chyba při rozebírání %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[SOUBOR]…"
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "nepřepínačový argument v %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "TAR_OPTIONS nelze rozdělit: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Starý přepínač „%c“ vyžaduje argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "bez seznamu souborů nemá --occurrence smysl"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Více archivačních souborů vyžaduje přepínač „-M“"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level bez --listed-incremental postrádá smysl"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
@@ -2517,43 +2521,43 @@ msgstr[0] "%s: Název svazku je příliš dlouhý (limit je %'lu bajt)"
msgstr[1] "%s: Název svazku je příliš dlouhý (limit je %'lu bajty)"
msgstr[2] "%s: Název svazku je příliš dlouhý (limit je %'lu bajtů)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Vícesvazkový archiv není možné ověřit"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Komprimovaný archiv nelze ověřit"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Vícesvazkový komprimovaný archiv nelze vytvořit"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Komprimované archivy nelze zřetězit"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime potřebuje datum určené pomocí --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "Přepínač --pax-option lze použít jen na posixových archivech"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "Přepínač --acls lze použít jen na posixových archivech"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "Přepínač --selinux lze použít jen na posixových archivech"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "Přepínač --xattrs lze použít jen na posixových archivech"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2561,30 +2565,30 @@ msgstr ""
"Název vrcholového adresáře nelze odvodit; prosím, zadejte jej explicitně "
"pomocí --one-top-level=ADRESÁŘ"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Délka svazku nemůže být kratší než délka záznamu"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Vytvoření prázdného archivu odmítnuto."
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Přepínače „-Aru“ jsou neslučitelné s přepínačem „-f -“"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Musíte zadat jeden z přepínačů „-Acdtrux“, „--delete“ nebo „--test-label“"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Končí se chybovým kódem, protože byly zaznamenány chyby"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
@@ -2592,52 +2596,61 @@ msgstr[0] "%s: Soubor zkrácen o %s bajt"
msgstr[1] "%s: Soubor zkrácen o %s bajty"
msgstr[2] "%s: Soubor zkrácen o %s bajtů"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Klíčové slovo %s není známo nebo ještě nebylo implementováno"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Časový údaj je mimo povolený rozsah"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Vzor %s nelze použít"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Klíčové slovo %s nelze přebít"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Chybná rozšířená hlavička: chybí délka"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Délka rozšířené hlavičky %*s je mimo rozsah"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Chybná rozšířená hlavička: po délce chybí bílé místo"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Chybná rozšířená hlavička: chybí znak rovná se"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Chybná rozšířená hlavička: chybí odřádkování"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ignoruje se neznámé klíčové slovo „%s“ rozšířené hlavičky"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2646,46 +2659,46 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "%s=%s v rozšířené hlavičce je mimo rozsah %s–%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Chybná rozšířená hlavička: %s=%s není platné"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Chybná rozšířená hlavička: nadbytečná %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Chybná rozšířená hlavička: neplatný %s: neočekávaný oddělovač %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Chybná rozšířená hlavička: neplatný %s: lichý počet hodnot"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: neplatný časový limit"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: neznámá akce kontrolního bodu"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "zápis"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "čtení"
@@ -2693,7 +2706,7 @@ msgstr "čtení"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Kontrolní bod zápisu %u"
@@ -2702,12 +2715,12 @@ msgstr "Kontrolní bod zápisu %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Kontrolní bod čtení %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2715,93 +2728,97 @@ msgstr ""
"genfile pracuje s datovými soubory testovacího balíku GNU paxutils.\n"
"PŘEPÍNAČE jsou:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Přepínače tvorby souboru:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "VELIKOST"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Vytvoří soubor zadané VELIKOSTI"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Místo na standardní výstup píše do souboru JMÉNO"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Názvy souborů čte ze SOUBORU"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T čte názvy zakončené nulovými znaky"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Vyplní soubor zadaným VZOREM. VZOR je „default“ (výchozí) nebo „zeros“ (nuly)"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Velikost bloku pro řídké soubory"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Vytvoří řídký soubor. Zbytek příkazové řádku definuje mapu souboru."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "POZICE"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Před zápisem dat se přesune na zadanou POZICI"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Potlačí diagnostické hlášky, které nevedou k přerušení programu"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Přepínače statistiky souboru:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"U každého zadaného souboru vypíše obsah struktury stat. Implicitní FORMÁT je:"
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Přepínače synchronního vykonávání:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "PŘEPÍNAČ"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Provede ARGUMENTY. Užitečné s --checkpoint a jedním z --cut, --append, --"
"touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Provede zadanou akci (vizte níže) při dosažení kontrolního bodu ČÍSLO"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Nastaví datum pro následující přepínač --touch"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Zobrazuje prováděné kontrolní body a návratové kódy PŘÍKAZU"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2809,7 +2826,7 @@ msgstr ""
"Synchronní vykonávání akcí. Tyto budou provedeny, když bude dosaženo číslo "
"kontrolního bodu zadaného přepínačem --checkpoint."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2817,125 +2834,125 @@ msgstr ""
"Zkrátí SOUBOR na velikost zadanou předchozím přepínačem --length (nebo na 0, "
"není-li uveden)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"K SOUBORU připojí VELIKOST bajtů. VELIKOST se zadává předcházejícím "
"přepínačem --length."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Aktualizuje časy přístupu a změny obsahu SOUBORU"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Vykoná PŘÍKAZ"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Smaže SOUBOR"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Neplatná velikost: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Číslo je mimo povolený rozsah: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Záporná velikost: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) selhalo"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "požadovaná délka souboru %'lu, aktuální %'lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "vytvořený soubor není řídký"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Chyba při rozebírání čísla poblíž „%s“"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENT…]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "„%s“ nelze otevřít"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "v souboru se nelze pohybovat"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "název souboru obsahuje nulový znak"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"na standardní výstup nelze generovat řídké soubory, použijte přepínač --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "nesprávná maska (poblíž „%s“)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Neznámá položka „%s“"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "Souboru „%s“ nelze nastavit čas"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "„%s“ nelze zkrátit"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "příkaz selhal: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "„%s“ nelze zkrátit"
+msgstr "nelze získat údaje o „%s“"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "Souboru „%s“ nelze nastavit čas"
+msgstr "adresář „%s“ nelze odstranit"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "„%s“ nelze odstranit (unlink)"
@@ -2975,6 +2992,9 @@ msgstr "Příkaz ukončen\n"
msgid "--stat requires file names"
msgstr "--stat potřebuje název souboru"
+#~ msgid "OPTION"
+#~ msgstr "PŘEPÍNAČ"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: parametr ARGP_HELP_FMT musí být kladný"
diff --git a/po/da.gmo b/po/da.gmo
index 054ec688ab1f012274b91c22647630d90658a507..38c15de5fa4954488624b73a06eab02579911bc0 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 0b6d3189f5505843b3dba4b7bd285216f78fe64b..390e70a01254d647a96bdfc2cfe0c221370d09ef 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,14 +4,14 @@
#
# Claus Hindsgaul <claus_h@image.dk>, 2001.
# Keld J�rn Simonsen <keld@keldix.com>, 2000-2001,2009,2010.
-# Keld Simonsen <keld@keldix.com>, 2010-2011, 2015.
-#: src/create.c:1599
+# Keld Simonsen <keld@keldix.com>, 2010-2011, 2015, 2017.
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: GNU tar 1.28\n"
+"Project-Id-Version: GNU tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2015-04-26 10:18+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-20 17:18+0100\n"
"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"Language: da\n"
@@ -99,7 +99,7 @@ msgid "give a short usage message"
msgstr "vis en kort hj�lpemeddelelse"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NAVN"
@@ -137,29 +137,29 @@ msgid "write error"
msgstr "skrivefejl"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: flag '-W %s' er flertydigt\n"
+msgstr "%s: flag '%s%s' er flertydigt\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: flag '%s' er flertydigt; muligheder:"
+msgstr "%s: flag '%s%s' er flertydigt; muligheder:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: ukendt flag '%c%s'\n"
+msgstr "%s: ukendt flag '%s%s'\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: flag '%c%s' tillader ikke et argument\n"
+msgstr "%s: flag '%s%s' tillader ikke et argument\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: flag '--%s' kr�ver et argument\n"
+msgstr "%s: flag '%s%s' kr�ver et argument\n"
#: gnu/getopt.c:621
#, c-format
@@ -234,12 +234,12 @@ msgstr "^[jJyY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Pakket af %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Pakket af %s\n"
@@ -247,12 +247,11 @@ msgstr "Pakket af %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "�"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -264,7 +263,7 @@ msgstr ""
"\n"
"Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/gpl."
"html>.\n"
-"Dette program er frit programmel. Du kan �ndre og distribuere det.\n"
+"Dette program er frit programmel. Du m� �ndre og distribuere det.\n"
"Der er ikke NOGEN SOM HELST GARANTI, i det omfang som lov tillader.\n"
#. TRANSLATORS: %s denotes an author name.
@@ -399,15 +398,14 @@ msgid "%s home page: <%s>\n"
msgstr "%s hjemmeside: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "%s hjemmeside: <http://www.gnu.org/software/%s/>.\n"
+msgstr "%s hjemmeside: <http://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Generel brugerhj�lp for GNU-programmel: <http://www.gnu.org/gethelp/>.\n"
+"Generel brugerhj�lp for GNU-programmel: <http://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -526,189 +524,189 @@ msgstr "Kan ikke omdirigere filer for fjern sk
msgid "Cannot execute remote shell"
msgstr "Kan ikke eksekvere fjern sk�l"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "S�geretning udenfor interval"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Ugyldig s�geretning"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Ugyldig positioneringsv�rdi"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "S�geposition udenfor interval"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Ugyldigt byteantal"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Byteantal udenfor interval"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "For tidlig filafslutning"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Ugyldig operationskode"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operation underst�ttes ikke"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Uventede argumenter"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Styr en b�ndstation via accept af kommandoer fra en fjernproces"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NUMMER"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "s�t fejls�gningsniveau"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FIL"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "s�t fejls�gningsfilnavn"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "kan ikke �bne %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "for mange argumenter"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Ugyldig kommando"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Dette ligner ikke et tar-arkiv"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Totalt antal byte l�st"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Totalt antal byte skrevet"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Totalt antal byte slettet"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(datakanal)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "N�gter at l�se arkivindhold fra terminal (manglende -f-flag?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "N�gter at skrive arkivindhold til terminal (manglende -f-flag?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Ugyldig v�rdi for record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Arkivnavn er ikke opgivet"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Kan ikke verificere standard-ind/standard-ud arkiver"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Arkivet er komprimeret. Brug flaget %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Kan ikke opdatere komprimerede arkiver"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Ved begyndelsen af b�ndet, afslutter nu"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "For mange fejl, afslutter"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Postst�rrelse = %lu blok"
msgstr[1] "Postst�rrelse = %lu blokke"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Ikke-justeret blok (%lu byte) i arkiv"
msgstr[1] "Ikke-justerede blokke (%lu byte) i arkiv"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Kunne ikke g� tilbage i arkivfilen. Den kan v�re ul�selig uden -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek stoppede ikke p� en postgr�nse"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: indeholder ugyldigt delarkivs-nummer"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Overl�b p� delarkiv-nummer"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Klarg�r delarkiv nummer %d for %s og tryk retur: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Filafslutning hvor svar fra bruger var forventet"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "ADVARSEL: Arkivet er ufuldst�ndigt"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -720,66 +718,66 @@ msgstr ""
" q Afbryd tar\n"
" y eller ny linje Forts�t handling\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Start en ny sk�l\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Udskriv denne liste\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Intet nyt delarkiv; afslutter.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Filnavn ikke angivet, pr�v igen.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Ugyldigt inddata. Skriv ? for at f� hj�lp.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "'%s'-kommando mislykkedes"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s forts�tter ikke i dette delarkiv"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s forts�ttes muligvis i dette delarkiv: hoved indeholder afkortet navn"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s har forkert st�rrelse (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Dette delarkiv er ude af r�kkef�lge (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arkivet er ikke navngivet til at passe med %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Delarkivet '%s' stemmer ikke overens med %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -787,210 +785,210 @@ msgstr ""
"%s: filnavnet er for langt til at gemmes i hovedet p� et GNU-flerdelarkiv, "
"afkortes"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "skrivning stoppede ikke p� en blokgr�nse"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Kunne kun l�se %lu af %lu byte"
msgstr[1] "Kunne kun l�se %lu af %lu byte"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Indhold er forskelligt"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Uventet filslutning i arkivet"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Filtype er forskellig"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Modus er forskellig"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Bruger-ID er forskellig"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gruppe-ID er forskellig"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Modificeringstid er forskellig"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "St�rrelse er forskellig"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Ikke l�nket til %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symbolsk l�nke er forskellig"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Enhedsnummer er forskellig"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verific�r "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Ukendt filtype '%c', diff'et som en almindelig fil"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Arkivet indeholder filnavne med indledende prefixer borttaget."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Arkiv indeholder transformerede filnavne."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Verificering kan mislykkes med at finde originalfiler."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "VERIFICERINGSFEJL: %d ukendt hoved fundet"
msgstr[1] "VERIFICERINGSFEJL: %d ukendte hoveder fundet"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "En enkeltst�ende nulblok ved %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: indeholder et cachekatalog-m�rke %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "v�rdi %s ud af %s interval %s..%s; erstatter %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "v�rdi %s ud af %s interval %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Genererer negative oktale hoveder"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: filnavnet er for langt (max %d); ikke arkiveret"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: filnavnet er for langt (kan ikke opdeles); ikke arkiveret"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: l�nkenavn er for langt; ikke arkiveret"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Filen formindsket med %s byte, fylder ud med nul"
msgstr[1] "%s: Filen formindsket med %s byte, fylder ud med nuller"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: fil er p� et andet filesystem; ikke arkiveret"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "indholdet ikke arkiveret"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Ukendt filtype; filen blev ignoreret"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Mangler l�nke til %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: fil er u�ndret; ikke arkiveret"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: fil er det samme som arkivet; ikke arkiveret"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "katalog ikke arkiveret"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: Fil �ndredes mens vi l�ste den"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: sokkel ignoreret"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: d�r ignoreret"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Hopper til n�ste hoved"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Sletter ikke-hoved fra arkivet"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: usandsynligt gammelt tidsstempel %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: tidsstempel %s er %s sekunder ud i fremtiden"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Uventet uoverensstemmelse ved oprettelse af katalog"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: skipper eksisterende fil"
@@ -1013,7 +1011,7 @@ msgstr "Fors
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Kan ikke udpakke -- filen er fortsat fra et andet delarkiv"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Uventet langt filnavnshoved"
@@ -1030,7 +1028,7 @@ msgstr "Nuv
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: Medlemsnavn indeholder '..'"
#: src/extract.c:1696
#, c-format
@@ -1042,22 +1040,22 @@ msgstr "%s: Kunne ikke sikkerhedskopiere denne fil"
msgid "Cannot rename %s to %s"
msgstr "Kan ikke omd�be %s til %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Kataloget er blevet omd�bt fra %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Kataloget er nyt"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: katalog er p� et andet filesystem; ikke arkiveret"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Kataloget er blevet omd�bt"
@@ -1144,9 +1142,8 @@ msgid "Malformed dumpdir: empty name in 'R'"
msgstr "Fejlagtigt dumpkatalog: tomt navn i \"R\""
#: src/incremen.c:1585
-#, fuzzy
msgid "Malformed dumpdir: 'T' not preceded by 'R'"
-msgstr "Fejlagtigt dumpkatalog: \"T\" foreg�s ikke af \"R\""
+msgstr "Fejlagtigt dumpkatalog: 'T' foreg�s ikke af 'R'"
#: src/incremen.c:1591
msgid "Malformed dumpdir: empty name in 'T'"
@@ -1186,192 +1183,191 @@ msgstr "%s: Sletter %s\n"
msgid "%s: Cannot remove"
msgstr "Kan ikke slette %s"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Udelader"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** Blok med NULler **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok %s: ** Slut p� fil **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Blank-tegn i hovedet hvor numerisk %s v�rdi var forventet"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr "Oktal v�rdi %.*s i arkiv er udenfor %s interval; antager to-komplement"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Oktal v�rdi %.*s i arkiv er udenfor %s interval"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arkiv indeholder for�ldede base-64 hoveder"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Base-64 streng med fortegn %s i arkiv er udenfor %s interval"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Base-256 v�rdi i arkiv er udenfor %s interval"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arkiv indeholder %.*s hvor numerisk %s-v�rdi var forventet"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Arkiv v�rdi %s er udenfor %s interval %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " l�nke til %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " ukendt filtype %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Lang l�nke--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Langt navn--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Delarkivhoved--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Fortsat ved byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Opretter katalog:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Omd�ber %s til %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Kan ikke omd�be til %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Omd�ber %s tilbage til %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Fil fjernet f�r vi l�ste den"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "underproces"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "mellemproces-kanal"
-#: src/names.c:69
-#, fuzzy
+#: src/names.c:68
msgid "Local file name selection:"
-msgstr "Lokalt filvalg:"
+msgstr "Lokalt valg af filnavn:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "tilf�j angivet FIL til arkivet (brugbart hvis FIL begynder med \"-\")"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "KATALOG"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "g� til arbejdskatalog KATALOG"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "hent navne at udpakke eller oprette fra FIL"
-#: src/names.c:78
-#, fuzzy
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
-msgstr "-T l�ser navne adskilt med nultegn, deaktiv�r -C"
+msgstr "-T l�ser navne adskilt med nultegn; indeb�rer --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "fjern effekten af foreg�ende --null-flag"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "afcit�r inddata fil eller medlemsnavne (standardv�rdi)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "afcit�r ikke inddata fil eller medlemsnavne"
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
+"-T l�ser filnavne bogstaveligt (ingen beskyttelsestegn eller flagbehandling)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
-msgstr ""
+msgstr "-T behandler filnavne der begynder med '-' som flag (standard)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "M�NSTER"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "udelad filer som matcher M�NSTER"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "udelad filer som matcher m�nster listet i FIL"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1379,24 +1375,24 @@ msgstr ""
"udelad indholdet i kataloger som indeholder CACHEDIR.TAG, undtagen "
"m�rkefilen CACHEDIR.TAG selv"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "udelad alt i kataloger som indeholder CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "udelad kataloger som indeholder CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "udelad indholdet i kataloger som indeholder FIL, undtagen FIL selv"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
"indl�s ekskluderingsm�nstre for hvert katalog fra FIL, hvis den eksisterer"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1404,118 +1400,121 @@ msgstr ""
"indl�s ekskluderingsm�nstre for hvert katalog og dets underkataloger fra "
"FIL, hvis den eksisterer"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "udelad alting i kataloger som indeholder FIL"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "udelad kataloger som indeholder FIL"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "udelad kataloger fra versionsh�ndteringssystemer"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "indl�s ekskluderingsm�nstre fra VCS ignoreingsfiler"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "udelad sikkerhedskopier og l�sefiler"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "g� rekursivt ned i kataloger (standardv�rdi)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "g� ikke ned i kataloger automatisk"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Flag for match af filnavne (p�virker b�de ekskluderings- og "
"inkluderingsm�nstre):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "m�nstre skal matche med begyndelsen p� filnavne"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "m�nstre matches efter alle '/'-er (standardv�rdi ved ekskludering)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "ingen forskel p� store og sm� bogstaver"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "match store og sm� bogstaver forskelligt (standardv�rdi)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "brug jokertegn (standardv�rdi for ekskludering)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "ordret strengsammenligning"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "jokertegn matcher '/' (standardv�rdi for ekskludering)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "jokertegn matcher ikke '/'"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"De f�lgende flag blev brugt efter nogen valgfri argumenter i oprettelses- "
+"eller opdaterings-tilstand for arkiv. Disse flag er positionelle og p�virker "
+"kun argumenter som f�lger efter dem. Omarrang�r dem venligst korrekt."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s har ingen virkning"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s har ingen virkning"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s har ingen virkning"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "kommandolinje"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: filliste forespurgt fra %s allerede l�st fra %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "kan ikke opsplitte streng '%s': %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: filnavnet som l�stes indeholder nultegn"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "M�nstermatchningstegn bruges i filnavne"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1523,46 +1522,46 @@ msgstr ""
"Brug --wildcards for at aktivere m�nstermatchning, eller --no-wildcards for "
"at undertrykke denne advarsel"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Ikke fundet i arkivet"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Kr�vet forekomst blev ikke fundet i arkivet"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Arkivetiket stemmer ikke overrens"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"At bruge -C-flaget i en filliste er ikke tilladt med --listed-incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Kun �t -C-flag er tilladt med --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Flagene '%s' and '%s' vil begge have standard inddata"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: ugyldigt arkivformat"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU-funktioner fors�gt p� inkompatibelt arkiv-format"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1661,11 +1660,11 @@ msgstr "h
#: src/tar.c:424
msgid "TYPE"
-msgstr ""
+msgstr "TYPE"
#: src/tar.c:425
msgid "technique to detect holes"
-msgstr ""
+msgstr "teknik til at finde huller"
#: src/tar.c:426
msgid "MAJOR[.MINOR]"
@@ -1785,7 +1784,7 @@ msgstr "V
msgid "extract files to standard output"
msgstr "udpak filer til standard-ud"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "KOMMANDO"
@@ -1815,13 +1814,13 @@ msgstr "s
#: src/tar.c:512
msgid "use FILE to map file owner UIDs and names"
-msgstr ""
+msgstr "brug FIL til at associere filejer UID'er og navne"
#: src/tar.c:514
msgid "use FILE to map file owner GIDs and names"
-msgstr ""
+msgstr "brug FIL til at associere filejer GID'er og navne"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATO-ELLER-FIL"
@@ -1832,7 +1831,7 @@ msgstr "s
#: src/tar.c:518
msgid ""
"only set time when the file is more recent than what was given with --mtime"
-msgstr ""
+msgstr "s�t kun tid n�r filen er nyere end hvad der er givet med --mtime"
#: src/tar.c:519
msgid "CHANGES"
@@ -2030,7 +2029,7 @@ msgstr "lav nye blokke ved l
msgid "Archive format selection:"
msgstr "Valg af arkivformat:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2114,59 +2113,59 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "filtr�r med PROG (skal acceptere -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Lokalt filvalg:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "skift ikke filsystem n�r arkivet oprettes"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "fjern ikke indledende '/'-er fra filnavne"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "f�lg symbolske l�nker, arkiv�r filerne de peger p�"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "f�lg h�rde l�nker, arkiv�r filerne de peger p�"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "MEDLEMSNAVN"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "begynd med medlem MEDLEMSNAVN ved l�sning af arkivet"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "arkiv�r kun filer nyere end DATO-ELLER-FIL"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATO"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "sammenlign kun dato og tid for data�ndringer"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "KONTROL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "lav sikkerhedskopier f�r fjernelse, v�lg type af versionsh�ndtering"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "STRENG"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2174,60 +2173,60 @@ msgstr ""
"lav sikkerhedskopier f�r fjernelse, erstat den normale sikkerhedskopiendelse "
"(\"~\" hvis ikke �ndret med milj�variablen SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Filnavnstransformationer:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "fjern ANTAL indledende komponenter fra filnavne ved udpakning"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "UDTRYK"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "brug sed's erstatnings-UDTRYK for at transformere filnavne"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informativ udskrift:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "v�s navne p� alle filer som bliver behandlet"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "N�GLEORD"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "advarselskontrol"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"vis forl�bsmeddelelser efter hver gruppe af ANTAL poster (standardv�rdi 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "HANDLING"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "udf�r HANDLING ved hvert kontrolpunkt"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "vis en meddelelse hvis ikke alle l�nker bliver arkiveret"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2239,35 +2238,35 @@ msgstr ""
"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 coh SIGUSR2. Navne uden SIG-pr�fix "
"accepteres ogs�."
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "vis filers modificeringstid i UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "vis fuld opl�sning p� filtider"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "send informative meddelelser til FIL"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "vis bloknummer i arkivet for hver meddelelse"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "bed om bekr�ftelse for hver handling"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "vis standardv�rdier for \"tar\""
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "vis gyldige omr�der for felter i snapshot-filer"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2275,31 +2274,31 @@ msgstr ""
"ved visning eller udpakning vises hvert katalog som ikke matcher "
"s�gekriterium"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "vis fil- eller arkivnavne efter transformering"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "ST�L"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "s�t citatst�l for navne. Se nedenfor for gyldige v�rdier p� ST�L."
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "cit�r ogs� tegn i STRENG"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "cit�r ikke tegn fra STRENG"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Kompatibilitetsflag:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2307,22 +2306,22 @@ msgstr ""
"ved oprettelse det samme som --old-archive; ved udpakning det samme som --no-"
"same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Andre flag:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "begr�ns brugen af potentielt farlige flag"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s: kan ikke bruges med '%s'"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2330,40 +2329,40 @@ msgstr ""
"Du kan ikke angive mere end �t af '-Acdtrux', --delete eller `--test-label' "
"flagene"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Konflikt i komprimeringsflag"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Ukendt signalnavn: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Tidsfil blev ikke fundet"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Erstatter %s for ukendt dato-format %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Flag %s: Behandler tidsangivelse '%s' som %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtr�r arkivet igennem %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Gyldige argumenter til flaget --quoting-style er:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2371,164 +2370,164 @@ msgstr ""
"\n"
"*Denne* tar har standardv�rdierne:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Ugyldig ejer eller gruppe-ID"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Ugyldig blokfaktor"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Ugyldig b�ndl�ngde"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Fejlagtig v�rdi for inkrementelt niveau"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Mere end �n gr�nse-dato"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Ugyldig version for filer med huller"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve=\"system\" underst�ttes ikke p� denne platform"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint-v�rdien er ikke et heltal"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Ugyldig modus angivet i flag"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Ugyldigt nummer"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Ugyldig postst�rrelse"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Postst�rrelse skal v�re deleligt med %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Ugyldigt antal elementer"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Kun �t --to-command flag tilladt"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Ugyldig densitetsangivelse: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Ukendt densitet: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr ""
"Flagene '-[0-7][lmh]' underst�ttes ikke af *denne* implementering af tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
-msgstr ""
+msgstr "%s:%lu: sted for fejlen"
-#: src/tar.c:2076
-#, fuzzy, c-format
+#: src/tar.c:2085
+#, c-format
msgid "error parsing %s"
-msgstr "Fejl ved fortolkning af tal n�r \"%s\""
+msgstr "Fejl ved fortolkning af %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FIL]..."
-#: src/tar.c:2181
-#, fuzzy, c-format
+#: src/tar.c:2190
+#, c-format
msgid "non-option arguments in %s"
-msgstr "ugyldigt argument %s for %s"
+msgstr "argumenter uden flag i %s"
-#: src/tar.c:2196
-#, fuzzy, c-format
+#: src/tar.c:2205
+#, c-format
msgid "cannot split TAR_OPTIONS: %s"
-msgstr "kan ikke opsplitte streng '%s': %s"
+msgstr "kan ikke opsplitte TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Gammelt flag '%c' beh�ver et argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence er meningsl�s uden en filliste"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Ved flere arkivfiler kr�ves '-M'-flaget"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level er meningsl�s uden --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: etiket p� delarkiv er for lang (gr�nse er %lu byte)"
msgstr[1] "%s: etiket p� delarkiv er for lang (gr�nse er %lu byte)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Kan ikke verificere arkiv som g�r over flere delarkiver"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Kan ikke verificere komprimerede arkiver"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Kan ikke bruge komprimerede arkiver som g�r over flere delarkiver"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Kan ikke sammenl�gge (konkatenere) komprimerede arkiver"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
-msgstr ""
+msgstr "--clamp-mtime beh�ver en dato angivet med --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option kan kun bruges p� POSIX-arkiver"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls kan kun bruges p� POSIX-arkiver"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux kan kun bruges p� POSIX-arkiver"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs kan kun bruges p� POSIX-arkiver"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2536,128 +2535,137 @@ msgstr ""
"Kan ikke udlede topniveau-katalognav; s�t det eksplicit med --one-top-"
"level=KAT"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Delarkivl�ngden kan ikke v�re mindre end postst�rrelsen"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "N�gter st�digt at oprette et tomt arkiv"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Flagene '-Aru' er inkompatible med '-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Du skal angive et af '-Acdtrux', '--delete' eller '--test-label' flagene"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Afslutter med fejlstatus p� grund af tidligere fejl"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Filen formindskedes med %s byte"
msgstr[1] "%s: Filen formindskedes med %s byte"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "N�gleordet %s er ukendt eller ikke implementeret endnu"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Tidsstempel udenfor tilladt interval"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "M�nster %s kan ikke bruges"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "N�gleord %s kan ikke erstattes"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Fejlagtigt udvidet hoved: l�ngden mangles"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "L�ngde %*s p� udvidet hoved er udenfor gyldigt interval"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Fejlagtigt udvidet hoved: blanktegn efter l�ngdangivelse mangles"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Fejlagtigt udvidet hoved: ligmedtegn mangles"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Fejlagtigt udvidet hoved: nylinje mangles"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ignorerer n�gleord '%s' i udvidet hoved"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Genereret n�gle/v�rdi-par er for langt (n�gle=%s, l�ngde=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Udvidet hoved %s=%s er udenfor intervallet %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Fejlagtigt udvidet hoved: ugyldig %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Fejlagtigt udvidet hoved: for mange %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Fejlagtigt udvidet hoved: ugyldigt %s: uventet skilletegn %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Fejlagtigt udvidet hoved: ugyldigt %s: ulige antal v�rdier"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: ugyldig tidsudl�b"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: ukendt kontrolpunktshandling"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "skrive"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "l�se"
@@ -2665,7 +2673,7 @@ msgstr "l
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Skrivekontrolpunkt %u"
@@ -2674,12 +2682,12 @@ msgstr "Skrivekontrolpunkt %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "L�sekontrolpunkt %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2687,93 +2695,97 @@ msgstr ""
"genfile bearbejder datafiler i testsuiten for GNU paxutils.\n"
"FLAG er:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Flag for filoprettelse:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "ST�RRELSE"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Opret en fil med angivet ST�RRELSE"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Skriv til filen NAVN i stedet for til standard-ud"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "L�s filnavne fra FIL"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T l�ser navne adskilte med nultegn"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "Fyld filen med det angivne M�NSTER. M�NSTER er 'default' eller 'zeros'"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "St�rrelse af en blok for filer med huller"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Gener�r fil med huller. Resten af kommandolinjen giver filmapningen."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "POSITION"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Flyt til given position inden data skrives"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
-msgstr ""
+msgstr "Undertryk ikke-fataler diagnosebeskeder"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Flag for filstatistik:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"V�s indholdet i \"struct stat\" for hver given fil. Standardv�rdi p� FORMAT "
"er:"
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Flag for synkron udf�relse:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "FLAG"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Udf�r ARGUMENTER. Nyttigt ved --checkpoint og en af --cut, --append, --"
"touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Udf�r angivet handling (se nedenfor) n�r kontrolpunkt NUMMER n�s"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "S�t dato for n�ste --touch flag"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "V�s udf�rte kontrolpunkter og slutstatus p� KOMMANDO"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2781,7 +2793,7 @@ msgstr ""
"Synkront udf�rte handlinger. Disse udf�res n�r kontrolpunktnummeret givet "
"med flaget --checkpoint n�s."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2789,127 +2801,127 @@ msgstr ""
"Afkort FIL til st�rrelsen givet med det foreg�ende --length flag (eller 0 "
"hvis det ikke er angivet)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Tilf�j ST�RRELSE antal byte til FIL. ST�RRELSE er givet med foreg�ende --"
"length flag."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Opdat�r acces- og modifikationstider for FIL"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Udf�r KOMMANDO"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Slet FIL"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Ugyldig st�rrelse %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Nummer udenfor tilladt interval: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negativ st�rrelse: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "status (stat) kunne ikke tages p� %s"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "�nsket fill�ngde %lu, virkelig %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "oprettet fil har ikke huller"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Fejl ved fortolkning af tal n�r \"%s\""
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENTER...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "kan ikke �bne '%s'"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "Kan ikke s�ge"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "filnavnet indeholder nultegn"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr "kan ikke oprette filer med huller til standard-ud, brug flaget --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "fejlagtig maske (n�r \"%s\")"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Ukendt felt '%s'"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "kan ikke s�tte tid p� \"%s\""
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "kan ikke trunkere '%s'"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "kommando mislykkedes: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "kan ikke trunkere '%s'"
+msgstr "kan ikke tage status via stat() p� '%s'"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "kan ikke s�tte tid p� \"%s\""
+msgstr "kan ikke fjerne katalog '%s'"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
-msgstr "kan ikke fjerne (unlink) \"%s\""
+msgstr "kan ikke fjerne (unlink) '%s'"
#: tests/genfile.c:918
#, c-format
@@ -2946,6 +2958,9 @@ msgstr "Kommandoen afsluttedes\n"
msgid "--stat requires file names"
msgstr "--stat kr�ver filnavne"
+#~ msgid "OPTION"
+#~ msgstr "FLAG"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: Parameter fra ARGP_HELP_FMT skal v�re positiv."
diff --git a/po/de.gmo b/po/de.gmo
index 84214d9cb815f0521da939e53d30b7d8706e299f..86f3b0fd3467b01623bc0ac9d7dbf7d160b2be8d 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index be2430a77cfa003282ea3db5f1ddc0ae3cff4f6e..60e50fa1dba7ac850108565f0b833c3c4b9d284a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,15 +4,15 @@
# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995?
# Karl Eichwalder <ke@ke.central.de>, 1996
# Christian Kirsch <ck@held.mind.de>, 1996, 2001
-# Michael Piefel <piefel@informatik.hu-berlin.de>, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2016
+# Michael Piefel <piefel@informatik.hu-berlin.de>, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2016, 2018
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-17 20:20+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-02-11 14:45+0200\n"
"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n"
@@ -99,7 +99,7 @@ msgid "give a short usage message"
msgstr "eine kurze Benutzungsübersicht ausgeben"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NAME"
@@ -137,29 +137,29 @@ msgid "write error"
msgstr "Schreibfehler"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: Option „%s“ ist mehrdeutig\n"
+msgstr "%s: Option „%s%s“ ist mehrdeutig\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: Option „%s“ ist mehrdeutig; Möglichkeiten:"
+msgstr "%s: Option „%s%s“ ist mehrdeutig; Möglichkeiten:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: Unbekannte Option „%c%s“\n"
+msgstr "%s: Unbekannte Option „%s%s“\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: Option „%c%s“ erlaubt keinen Parameter\n"
+msgstr "%s: Option „%s%s“ erlaubt kein Argument\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: Option „--%s“ benötigt einen Parameter\n"
+msgstr "%s: Option „%s%s“ benötigt ein Argument\n"
#: gnu/getopt.c:621
#, c-format
@@ -169,7 +169,7 @@ msgstr "%s: Ungültige Option -- „%c“\n"
#: gnu/getopt.c:636 gnu/getopt.c:682
#, c-format
msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: Option benötigt einen Parameter -- „%c“.\n"
+msgstr "%s: Option benötigt ein Argument -- „%c“.\n"
#: gnu/obstack.c:338 gnu/obstack.c:340 gnu/xalloc-die.c:34
msgid "memory exhausted"
@@ -234,12 +234,12 @@ msgstr "^[yYjJ]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Paketiert von %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Paketiert von %s\n"
@@ -247,12 +247,11 @@ msgstr "Paketiert von %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -262,7 +261,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"License GPLv3+: GNU GPL Version 3 oder später <http://gnu.org/licenses/gpl."
+"License GPLv3+: GNU GPL Version 3 oder später <https://gnu.org/licenses/gpl."
"html>\n"
"Dies ist freie Software: Sie dürfen sie ändern und weiter verbreiten.\n"
"Es gibt KEINERLEI GARANTIE, so weit das Gesetz es erlaubt.\n"
@@ -400,14 +399,13 @@ msgid "%s home page: <%s>\n"
msgstr "Homepage von %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Homepage von %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "Homepage von %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
-msgstr "Allgemeine Hilfe zu GNU-Software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Allgemeine Hilfe zu GNU-Software: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -526,190 +524,190 @@ msgstr "Kann Dateien für Remote-Shell nicht umleiten."
msgid "Cannot execute remote shell"
msgstr "Kann Remote-Shell nicht ausführen."
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Richtung für Positionierung nicht zulässig."
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Ungültige Richtung für Positionierung"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Ungültiger Betrag für Positionierung"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Positionierungsangabe außerhalb des zulässigen Bereichs."
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Ungültige Bytezahl"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Bytezahl außerhalb des zulässigen Bereichs"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Vorzeitiges Dateiende"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Ungültiger Arbeitsmodus"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operation nicht gestattet"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Unerwartete Argumente"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
"Ein Bandlaufwerk bearbeiten, dabei Befehle von entferntem Prozess annehmen"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "ZAHL"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "Debug-Level setzen"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "DATEI"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "Dateinamen für Debug-Ausschriften setzen"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "kann „%s“ nicht öffnen"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "zu viele Argumente"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Ungültiger Befehl"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Das sieht nicht wie ein „tar“-Archiv aus."
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Gesamtzahl gelesener Bytes"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Gesamtzahl geschriebener Bytes"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Gesamtzahl gelöschter Bytes"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(pipe)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Verweigere, Archivinhalt vom Terminal zu lesen (fehlt Option -f?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Verweigere, Archivinhalt aufs Terminal zu schreiben (fehlt Option -f?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Ungültiger Wert für „record_size“."
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Kein Archivname angegeben"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Kann Archive auf Standard-Ein-/Ausgabe nicht prüfen."
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Archiv ist komprimiert. Benutzen Sie die Option %s."
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Kann komprimierte Archive nicht aktualisieren"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Am Anfang des Mediums, beende jetzt."
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Zu viele Fehler, beende."
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Recordgröße = %lu Block"
msgstr[1] "Recordgröße = %lu Blöcke"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Falsch ausgerichteter Block (ein Byte) im Archiv."
msgstr[1] "Falsch ausgerichteter Block (%lu Bytes) im Archiv."
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Kann Archiv-Datei nicht zurücksetzen; könnte ohne „-i“ unlesbar sein."
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "„rmtlseek“ nicht an Recordgrenze angehalten"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: enthält ungültige Teil-Nummer."
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Teil-Nummer zu groß."
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Medium #%d für %s einlegen und Eingabetaste drücken: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Dateiende gefunden, Benutzereingabe erwartet"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "WARNUNG: Archiv unvollständig"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -721,67 +719,67 @@ msgstr ""
" q „tar“ abbrechen\n"
" j oder Enter fortfahren\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Shell in einem Unterprozess starten\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? diese Liste ausgeben\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Kein neues Medium; halte an.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Dateiname nicht angegeben. Versuchen Sie es noch einmal.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Ungültige Eingabe. Geben Sie „?“ für Hilfe ein.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "„%s“-Befehl gescheitert."
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "Dieser Teil ist keine Fortsetzung von %s."
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s wird möglicherweise auf diesem Teil fortgesetzt: Kopf enthält "
"abgeschnittenen Namen."
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s hat die falsche Größe (%s != %s + %s)."
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Dieser Teil ist nicht an der Reihe (%s - %s != %s)."
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Kennzeichnung des Archivs passt nicht zu „%s“."
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Teil „%s“ passt nicht zu „%s“."
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -789,211 +787,211 @@ msgstr ""
"%s: Dateiname zu lang, um in einem GNU-Mehrteil-Kopf abgelegt werden zu "
"können, abgeschnitten"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "Schreiben endete nicht an Blockgrenze"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Konnte nur %lu von %lu Byte lesen"
msgstr[1] "Konnte nur %lu von %lu Bytes lesen"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Unterschiedliche Inhalte"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Unerwartetes Dateiende im Archiv."
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Unterschiedliche Dateitypen "
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Modus ist unterschiedlich"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Benutzerkennung ist unterschiedlich"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gruppenkennung ist unterschiedlich"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Änderungszeit ist unterschiedlich"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Größe ist unterschiedlich"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Nicht mit „%s“ verknüpft"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symbolische Verknüpfung ist unterschiedlich"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Unterschiedliche Gerätenummern"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Prüfe "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Unbekannter Dateityp „%c“, Differenz wie für eine normale Datei."
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Archiv enthält Dateinamen, deren Präfixe entfernt wurden."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Archiv enthält transformierte Dateinamen."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Die Überprüfung findet möglicherweise die Originaldateien nicht."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "FEHLER BEI PRÜFUNG: %d ungültiger Kopfteil erkannt."
msgstr[1] "FEHLER BEI PRÜFUNG: %d ungültige Kopfteile erkannt."
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Ein einzelner Nullblock bei %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: enthält eine „Cache-Verzeichnis“-Markierung %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "Wert %s außerhalb des %s-Bereich %s..%s; ersetze durch %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "Wert %s außerhalb des %s-Bereichs %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Erzeuge negative oktale Kopfteile"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: Dateiname ist zu lang (max. %d); nicht gesichert."
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
"%s: Dateiname ist zu lang (kann nicht aufgeteilt werden); nicht gesichert."
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: Verknüpfungsname ist zu lang; nicht gesichert."
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "Datei %s ist um ein Byte geschrumpft, fülle mit Null auf."
msgstr[1] "Datei %s ist um %s Bytes geschrumpft, fülle mit Nullen auf."
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "Datei %s liegt auf einem anderen Dateisystem; nicht gesichert."
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "Inhalt nicht gesichert"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Unbekannter Dateityp; Datei ignoriert."
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Fehlende Verknüpfungen zu %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "Datei %s ist unverändert; nicht gesichert."
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s ist das Archiv; nicht gesichert."
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "Verzeichnis nicht gesichert"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: Datei hat sich beim Lesen geändert."
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: Socket ignoriert"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: Klappe ignoriert"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Springe zum nächsten Kopfteil."
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Lösche nicht-Kopfteil aus dem Archiv"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: unplausibel alter Zeitstempel %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: Zeitstempel %s liegt %s Sekunden in der Zukunft."
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Unerwarteter Inkonsitenz beim Erstellen des Verzeichnisses."
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: überspringe existierende Datei"
@@ -1018,7 +1016,7 @@ msgid "%s: Cannot extract -- file is continued from another volume"
msgstr ""
"Kann „%s“ nicht herausholen – Datei ist Fortsetzung eines anderen Teils."
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Unerwarteter Kopfteil mit langem Namen"
@@ -1035,7 +1033,7 @@ msgstr "Aktuelles %s ist neuer oder hat dasselbe Alter."
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: Elementname enthält „..“"
#: src/extract.c:1696
#, c-format
@@ -1047,22 +1045,22 @@ msgstr "%s: Konnte keine Sicherheitskopie von dieser Datei erstellen"
msgid "Cannot rename %s to %s"
msgstr "Kann %s nicht in %s umbenennen."
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Verzeichnis wurde von „%s“ umbenannt."
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "Verzeichnis „%s“ ist neu."
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "Verzeichnis %s liegt auf einem anderen Dateisystem; nicht gesichert."
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Verzeichnis wurde umbenannt."
@@ -1190,87 +1188,87 @@ msgstr "%s: Lösche %s.\n"
msgid "%s: Cannot remove"
msgstr "%s: Kann nicht entfernen."
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Ausgelassen"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "Block %s: ** Block aus NULlen **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "Block %s: ** Ende der Datei **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "Block %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Leerzeichen im Kopfteil, wo numerische %s-Werte stehen sollten."
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
-msgstr "Oktalzahl %.*s außerhalb des %s-Bereichs, nehme Zweierkomplement an?"
+msgstr "Oktalzahl %.*s außerhalb des %s-Bereichs, nehme Zweierkomplement an"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Oktalzahl %.*s außerhalb des %s-Bereichs"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Archiv enthält veraltete Base64-Kopfteile"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
-msgstr "Base64-Text %s außerhalb des %s-Bereichs."
+msgstr "Base64-Text %s außerhalb des %s-Bereichs"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
-msgstr "Base-256-Wert ist außerhalb des %s-Bereichs."
+msgstr "Base-256-Wert ist außerhalb des %s-Bereichs"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
-msgstr "Archiv enthält „%.*s“ wo numerische %s-Werte stehen sollten."
+msgstr "Archiv enthält „%.*s“ wo numerische %s-Werte stehen sollten"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
-msgstr "Wert %s außerhalb des %s-Bereichs %s..%s."
+msgstr "Wert %s außerhalb des %s-Bereichs %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " Verknüpfung zu %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " unbekannter Dateityp %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "––Lange Verknüpfung––\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "––Langer Name––\n"
@@ -1278,112 +1276,112 @@ msgstr "––Langer Name––\n"
# Alte Üs: Band Kopfteil. Kann diese Meldung auch bei Disketten
# ausgegeben werden? Dann kann man ja nicht "Band" sagen; am besten
# einfach "Volume" lassen. ke.
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "––Vorspann des Teils––\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "––Fortgesetzt bei Byte %s––\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Erzeuge Verzeichnis:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
-msgstr "Benenne „%s“ in „%s“ um.\n"
+msgstr "Benenne „%s“ in „%s“ um\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Kann nicht in %s umbenennen"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
-msgstr "Benenne „%s“ zurück in „%s“.\n"
+msgstr "Benenne „%s“ zurück in „%s“\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
-msgstr "%s: Datei gelöscht, bevor sie gelesen wurde."
+msgstr "%s: Datei gelöscht, bevor sie gelesen wurde"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "Kindprozess"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "Interprocess-Kanal"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Auswahl der lokalen Dateinamen:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"angegebene Datei zum Archiv hinzufügen (nützlich, wenn Datei mit einem "
"Strich beginnt)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "VERZEICHNIS"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "zu VERZEICHNIS wechseln"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "Namen der zu bearbeitenden Dateien aus DATEI lesen"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T liest null-terminierte Namen; impliziert --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "die Wirkung der vorangehenden Option --null aufheben"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"Namen von Eingabedateien oder Bestandteilen von Zitat befreien "
"(Voreinstellung)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "Namen von Eingabedateien oder Bestandteilen nicht von Zitat befreien"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T liest Dateinamen wortwörtlich (keine Erkennung von Optionen)"
+msgstr ""
+"-T liest Dateinamen wortwörtlich (keine Behandlung von Escapes oder Optionen)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T behandelt Dateinamen, die mit Strich beginnen, als Optionen "
"(Voreinstellung)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "MUSTER"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "Dateien auslassen, auf die MUSTER passt"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "Dateien auslassen, auf die in DATEI angegebene Muster passen"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1391,26 +1389,26 @@ msgstr ""
"Inhalt von Verzeichnissen auslassen, die CACHEDIR.TAG enthalten, außer der "
"Markierungsdatei selbst"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr ""
"alles unterhalb von Verzeichnissen auslassen, die CACHEDIR.TAG enthalten"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "Verzeichnisse auslassen, die CACHEDIR.TAG enthalten"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"Inhalt von Verzeichnissen auslassen, die DATEI enthalten, außer DATEI selbst"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
"Ausschlussmuster für jedes Verzeichnis aus DATEI lesen, wenn sie existiert"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1418,118 +1416,122 @@ msgstr ""
"Ausschlussmuster für jedes Verzeichnis und seine Unterverzeichnisse aus "
"DATEI lesen, wenn sie existiert"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "alles unterhalb von Verzeichnissen auslassen, die DATEI enthalten"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "Verzeichnisse auslassen, die DATEI enthalten"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "Verzeichnisse von Versionskontrollsystemen auslassen"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "Ausschlussmuster aus der VCS-Ignorierdatei lesen"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "Backup- und Lock-Dateien ausschließen"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "in Verzeichnisse absteigen (Voreinstellung)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "automatischen Abstieg in Vezeichnisse vermeiden"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Dateinamenauswahloptionen (sowohl für ein- als auch ausschließende Muster):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "Muster am Dateinamensanfang ausrichten"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "Muster passen nach jedem „/“ (Voreinstellung beim Ausschluss)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "Groß-/Kleinschreibung ignorieren"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "Groß-/Kleinschreibung beachten (Voreinstellung)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "Muster benutzen (Voreinstellung für Ausschluss)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "Zeichenketten sind buchstabengetreu"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "Jokerzeichen passen auf „/“ (Voreinstellung für Ausschluss)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "Jokerzeichen passen nicht auf „/“"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Die folgenden Optionen wurden im Modus zum Erzeugen oder Aktualisieren von "
+"Archiven hinter nicht optionalen Argumenten angegeben. Diese Optionen sind "
+"positionsabhängig und haben nur auf Argumente Einfluss, die hinter ihnen "
+"stehen. Bitte ordnen Sie sie entsprechend an."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s hat keinen Einfluss"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s hat keinen Einfluss"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s hat keinen Einfluss"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "Kommandozeile"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr ""
"%s: Dateiliste, die von %s angefordert wurde, wurde schon von %s gelesen"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "kann Zeichenkette „%s“ nicht zerteilen: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: gelesener Dateiname enthält ein NULL-Zeichen"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Zeichen für Musterüberdeckung im Dateinamen benutzt"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1537,45 +1539,45 @@ msgstr ""
"Benutzen Sie --wildcards, um Musterüberdeckung zu ermöglichen oder\n"
"--no-wildcards, um diese Warnung zu unterdrücken."
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Nicht im Archiv gefunden."
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Erforderliches Auftreten nicht im Archiv gefunden."
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Kennzeichnung des Archivs passt nicht"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr "Option -C in Dateiliste ist nicht erlaubt mit --listed-incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "In --listed-incremental ist nur eine Option -C erlaubt"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Sowohl Option „%s“ als auch „%s“ verlangen Standard-Eingabe."
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Ungültiges Archivformat"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU-Erweiterungen bei einem inkompatiblen Archiv-Format verlangt."
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1806,7 +1808,7 @@ msgstr "Wahl des Ausgabestroms:"
msgid "extract files to standard output"
msgstr "Dateien auf die Standardausgabe extrahieren"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "BEFEHL"
@@ -1842,7 +1844,7 @@ msgstr "DATEI benutzen, um UIDs und Namen der Besitzer abzubilden"
msgid "use FILE to map file owner GIDs and names"
msgstr "DATEI benutzen, um GIDs und Namen der Besitzer abzubilden"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATUM-ODER-DATEI"
@@ -2062,7 +2064,7 @@ msgstr "erneut Blocken beim Lesen (für 4.2BSD‐Pipes)"
msgid "Archive format selection:"
msgstr "Auswahl des Archiv-Formats:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2146,63 +2148,63 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "durch PROG filten (muss -d akzeptieren)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Auswahl der lokalen Dateien:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "beim Anlegen eines Archivs im lokalen Dateisystem bleiben"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "führende „/“-Zeichen in den Dateinamen erhalten"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"symbolischen Verknüpfungen folgen; die Dateien archivieren und abspeichern, "
"auf die sie zeigen"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"harten Verknüpfungen folgen; die Dateien archivieren und abspeichern, auf "
"die sie sich beziehen"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "ELEMENT-NAME"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "beim Lesen der Archivs mit ELEMENT-NAME beginnen"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "nur Dateien ablegen, die neuer als DATUM-ODER-DATEI sind"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATUM"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "Datum und Zeit nur überprüfen, wenn Daten geändert wurden"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "KONTROLLE"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "Sicherung vor dem Entfernen, wähle Versions-KONTROLLE"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "ZEICHENKETTE"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2210,61 +2212,61 @@ msgstr ""
"Sicherung vor dem Entfernen, übliches Suffix ersetzen („~“, wenn nicht durch "
"Umgebungsvariable SIMPLE_BACKUP_SUFFIX anders gesetzt)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Dateinamentransformationen:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "ZAHL führende Komponenten beim Extrahieren von Dateinamen entfernen"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "AUSDRUCK"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "den sed-AUSDRUCK zur Dateinamentransformation benutzen"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informationen:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "bearbeitete Dateien ausführlich listen"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "SCHLÜSSELWORT"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "Warnungssteuerung"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"Fortschrittsnachrichten bei jedem ZAHLten Record (Voreinstellung 10) anzeigen"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "AKTION"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "AKTION bei jedem Kontrollpunkt ausführen"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr ""
"eine Nachricht ausgeben, wenn nicht alle Verknüpfungen abgespeichert werden"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2276,35 +2278,35 @@ msgstr ""
"wird; erlaubte Signale sind: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 und SIGUSR2; "
"die Namen ohne das Präfix SIG sind auch erlaubt"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "Dateiänderungszeiten in UTC anzeigen"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "Dateizeit in voller Auflösung anzeigen"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "ausführliche Ausgabe in DATEI schreiben"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "bei jeder Nachricht die Blocknummer innerhalb des Archivs mit anzeigen"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "für jede Aktion um Bestätigung bitten"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "Voreinstellungen von tar anzeigen"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "gültige Bereiche für die Felder von Snapshot-Dateien anzeigen"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2312,52 +2314,52 @@ msgstr ""
"beim Listen oder Extrahieren jedes Verzeichnis auflisten, dass nicht den "
"Suchkriterien entspricht"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "Datei- oder Archivnamen nach der Transformation anzeigen"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STIL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "Zitatstil setzen; siehe unten für gültige STIL-Werte"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "zusätzliche Zeichen aus ZEICHENKETTE zitieren"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "Zeichen aus ZEICHENKETTE nicht zitieren"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Kompatibilitätsoptionen:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr "beim Anlegen wie --old-archive; beim Extrahieren wie --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Weitere Optionen:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "möglicherweise schädliche Optionen deaktivieren"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "„%s“ kann nicht mit %s benutzt werden"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2365,40 +2367,40 @@ msgstr ""
"Von den Optionen „-Acdtrux“, „--delete“ oder „--test-label“ ist jeweils nur "
"eine erlaubt"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Kompressionsoptionen schließen sich gegenseitig aus."
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Unbekannter Signalname: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Datumsdatei nicht gefunden"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Ersetze %s für unbekanntes Datumsformat %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Option %s: Behandle Datum „%s“ als %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "Archiv durch %s filtern"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Gültige Argumente für die Option --quoting-style sind:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2406,163 +2408,163 @@ msgstr ""
"\n"
"*Dieses* „tar“ hat als Voreinstellung:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Ungültige Benutzer- oder Gruppen-ID"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Ungültige Blockgröße"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Ungültige Bandlänge"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "unzulässiger Wert für inkrementelles Niveau"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Mehr als ein Datum angegeben."
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Ungültiger Wert für Sparse-Version (für löchrige Dateien)"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' wird auf dieser Plattform nicht unterstützt"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "Wert für --checkpoint ist keine ganze Zahl"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Ungültige Zugriffsrechte angegeben."
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Ungültige Zahl"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Ungültiger Wert für Recordgröße."
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Die Recordgröße muss ein Vielfaches von %d sein."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Ungültige Elementanzahl"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Nur eine Option --to-command erlaubt"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Fehlgeformtes Dichteargument: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Unbekannte Dichte: „%c“"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Die Optionen „-[0-7][lmh]“ unterstützt *dieses* „tar“ nicht."
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: Stelle des Fehlers"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "Fehler beim Parser von %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[DATEI]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "Argumente, die keine Optionen sind, in %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "kann TAR_OPTIONS nicht zerteilen: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
-msgstr "Die alte Option „%c“ benötigt einen Parameter."
+msgstr "Die alte Option „%c“ benötigt ein Argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence ist ohne Dateiliste bedeutungslos"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Mehrere Archivdateien verlangen die Option „-M“."
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level ist ohne --listed-incremental bedeutungslos"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Band-Nummer ist zu lang (Maximum ist ein Byte)."
msgstr[1] "%s: Band-Nummer ist zu lang (Maximum ist %lu Bytes)."
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Kann mehrteilige Archive nicht prüfen."
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Kann komprimierte Archive nicht prüfen"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Kann keine mehrteiligen komprimierten Archive verwenden."
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Kann komprimierte Archive nicht aneinanderhängen"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime benötigt ein mit --mtime gesetztes Datum"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option kann nur mit POSIX-Archiven benutzt werden"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls kann nur mit POSIX-Archiven benutzt werden"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux kann nur mit POSIX-Archiven benutzt werden"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs kann nur mit POSIX-Archiven benutzt werden"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2570,82 +2572,91 @@ msgstr ""
"Kann Namen des obersten Verzeichnisses nicht ableiten; bitte explizit mit --"
"one-top-level=VERZ setzen"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Teillänge kann nicht unter der Recordgröße liegen"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Anlegen eines leeren Archivs wird feige verweigert."
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Die Optionen „-Aru“ sind nicht kompatibel mit „-f -“."
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Eine der Optionen „-Acdtrux“, „--delete“ oder „--test-label“ ist notwendig."
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Beende mit Fehlerstatus aufgrund vorheriger Fehler"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Datei ist um ein Byte geschrumpft."
msgstr[1] "%s: Datei ist um %s Bytes geschrumpft."
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Schlüsselwort %s ist unbekannt oder noch nicht implementiert"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Zeitstempel außerhalb des zulässigen Bereichs"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Muster %s kann nicht benutzt werden"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Schlüsselwort %s kann nicht überschrieben werden"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Fehlgeformter erweiterter Kopfteil: fehlende Länge"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Länge %*s des erweiterten Kopfteils ist außerhalb des Bereichs"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Fehlgeformter erweiterter Kopfteil: fehlender Leerraum nach der Länge"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Fehlgeformter erweiterter Kopfteil: fehlendes Gleichheitszeichen"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Fehlgeformter erweiterter Kopfteil: fehlender Zeilenvorschub"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ignoriere unbekanntes Schlüsselwort „%s“ für erweiterten Kopfteil"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2653,50 +2664,50 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Erweiterter Kopfteil %s=%s ist außerhalb des Bereichs %s..%s."
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Fehlgeformter erweiterter Kopfteil: ungültiges %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Fehlgeformter erweiterter Kopfteil: überzähliges %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
"Fehlgeformter erweiterter Kopfteil: ungültiges %s: unerwarteter Trenner %c"
# Ist „odd“ hier ungerade oder merkwürdig?
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
"Fehlgeformter erweiterter Kopfteil: ungültiges %s: ungewöhnliche Anzahl von "
"Werten"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: kein gültiger Zeitüberschreitungswert"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: unbekannte Kontrollpunkt-Aktion"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "lesen"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "schreiben"
@@ -2704,7 +2715,7 @@ msgstr "schreiben"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Schreib-Kontrollpunkt %u"
@@ -2713,12 +2724,12 @@ msgstr "Schreib-Kontrollpunkt %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Lese-Kontrollpunkt %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2726,99 +2737,103 @@ msgstr ""
"genfile manipuliert Datendateien für die Testsuite der GNU paxutils.\n"
"OPTIONEN sind:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Optionen beim Anlegen von Dateien:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "GRÖßE"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Datei der gegebenen GRÖßE anlegen"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "in Datei NAME anstelle der Standardausgabe schreiben"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Dateinamenlist aus DATEI lesen"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T liest null-terminierte Namen"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Die Datei mit dem gegebenen MUSTER füllen. MUSTER ist „default“ oder „zeros“."
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Größe eines Blocks für löchrige Dateien"
# „map“: Karte, Abbildung?
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
-"Löchrige („sparse“) Datei erzeugen. Der Rest der Kommandozeile gibt die die "
+"Löchrige („sparse“) Datei erzeugen. Der Rest der Kommandozeile gibt die "
"Dateibildungsvorschrift an."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "POSITION"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "vor dem Schreiben zur gegebenen Position springen"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Diagnosemeldungen, die nicht schwerwiegend sind, unterdrücken"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Dateistatistikoptionen:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Inhalt des „struct stat“ für jede gegebene Datei ausgeben. Standard-FORMAT "
"ist:"
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Optionen für synchrone Ausführung:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPTION"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"ARGUMENTE ausführen. Nützlich mit --checkpoint und einem aus --cut, --"
"append, --touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"gegebene Aktion (siehe unten) beim Erreichen des Kontrollpunkts ZAHL "
"ausführen"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Datum für nächste „--touch“-Operation setzen"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "ausgeführte Kontrollpunkte und Beendigungsstatus von BEFEHL anzeigen"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2826,7 +2841,7 @@ msgstr ""
"Aktionen für synchrone Ausführung. Diese werden beim Erreichen des "
"Kontrollpunkts, der mit der Option --checkpoint gesetzt wurde, ausgeführt."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2834,126 +2849,126 @@ msgstr ""
"DATEI kürzen auf die Länge, die mit einer vorhergehenden Option --length "
"(oder 0 bei Abwesenheit) gesetzt wurde"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"GRÖßE Bytes an DATEI anfügen. GRÖßE wird mit einer vorhergehenden Option --"
"length gesetzt."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Zugriffs- und Änderungszeiten der DATEI neu setzen"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "BEFEHL ausführen"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "DATEI löschen"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Ungültige Größe: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Zahl außerhalb des zulässigen Bereichs: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negative Größe: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) fehlgeschlagen"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "Dateilänge %lu verlangt, tatsächlich %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "erzeugte Datei ist nicht löchrig"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Fehler beim Parser der Zahl in der Nähe von „%s“"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENTE...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "kann „%s“ nicht öffnen"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "kann nicht positionieren"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "Dateiname enthält Null-Zeichen"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"kann auf der Standardausgabe keine löchrige Datei erstellen, benutzen Sie "
"die Option --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "inkorrekte Maske (nahe „%s“)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "unbekannte Feld „%s“"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "kann an „%s“ keine Zeit setzen"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "kann „%s“ nicht abschneiden"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "Befehl fehlgeschlagen: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "kann „%s“ nicht abschneiden"
+msgstr "kann nicht auf „%s“ zugreifen"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "kann an „%s“ keine Zeit setzen"
+msgstr "kann Verzeichnis „%s“ nicht entfernen"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "kann „%s“ nicht entfernen (unlink)"
@@ -2993,11 +3008,11 @@ msgstr "Befehl beendet\n"
msgid "--stat requires file names"
msgstr "--stat erfordert Dateinamen"
-#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-#~ msgstr "%.*s: ARGP_HELP_FMT-Parameter muss positiv sein"
+#~ msgid "OPTION"
+#~ msgstr "OPTION"
#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: Option „--%s“ erlaubt keinen Parameter\n"
+#~ msgstr "%s: Option „--%s“ erlaubt kein Argument\n"
#~ msgid "%s: unrecognized option '--%s'\n"
#~ msgstr "%s: Unbekannte Option „--%s“\n"
@@ -3006,10 +3021,10 @@ msgstr "--stat erfordert Dateinamen"
#~ msgstr "%s: Option „-W %s“ ist mehrdeutig\n"
#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: Option „-W %s“ erlaubt keinen Parameter\n"
+#~ msgstr "%s: Option „-W %s“ erlaubt kein Argument\n"
#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: Option „-W %s“ benötigt einen Parameter\n"
+#~ msgstr "%s: Option „-W %s“ benötigt ein Argument\n"
#~ msgid "Unlink FILE"
#~ msgstr "FILE entfernen (unlink)"
@@ -3017,13 +3032,6 @@ msgstr "--stat erfordert Dateinamen"
#~ msgid "same as both -p and -s"
#~ msgstr "wie -p und -s zusammen"
-#~ msgid ""
-#~ "The --preserve option is deprecated, use --preserve-permissions --"
-#~ "preserve-order instead"
-#~ msgstr ""
-#~ "Die Option --preserve ist veraltet, benutzen Sie stattdessen --preserve-"
-#~ "permissions --preserve-order"
-
#~ msgid "--occurrence cannot be used with %s"
#~ msgstr "--occurrence kann mit %s nicht benutzt werden"
@@ -3067,13 +3075,6 @@ msgstr "--stat erfordert Dateinamen"
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: Unzulässige Option -- %c\n"
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to <%s>.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an <%s>.\n"
-
#~ msgid "Input string too long"
#~ msgstr "Eingabezeichenkette zu lang"
@@ -3089,20 +3090,6 @@ msgstr "--stat erfordert Dateinamen"
#~ msgid "Try `%s --help' for more information.\n"
#~ msgstr "„%s --help“ zeigt weitere Informationen.\n"
-#~ msgid ""
-#~ "Usage: %s [OPTION]\n"
-#~ "Manipulate a tape drive, accepting commands from a remote process.\n"
-#~ "\n"
-#~ " --version Output version info.\n"
-#~ " --help Output this help.\n"
-#~ msgstr ""
-#~ "Aufruf: %s [OPTION]\n"
-#~ "Arbeiten mit einem Bandlaufwerk, Befehle können von einem anderen Prozess "
-#~ "stammen.\n"
-#~ "\n"
-#~ " --version Versionsinformation ausgeben\n"
-#~ " --help diesen Hilfetext ausgeben\n"
-
#~ msgid "Seek offset error"
#~ msgstr "Fehler bei der Positionierungsangabe."
diff --git a/po/el.gmo b/po/el.gmo
index b36b784b6fca5ed07093796fd729c547cc2696a5..a3e4a0430dbe2ed55674cfc0b15c295061ff542e 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index e30a4ac5c9ec544b182bdaa8e9e006851d51cfea..b5d998b1b95c3032d6485f7d9f3bb21320bb286e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,12 +3,12 @@
# Μπαλάσκας Ευάγγελος (Balaskas Euaggelos) <ebalaskas@cs.teiath.gr>, 2004.
# Simos Xenitellis <simos74@gmx.net>, 2004.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar 1.13.25 \n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2004-03-08 14:44+0200\n"
"Last-Translator: Μπαλάσκας Ευάγγελος (Balaskas Euaggelos) <ebalaskas@cs."
"teiath.gr>\n"
@@ -100,7 +100,7 @@ msgid "give a short usage message"
msgstr ""
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr ""
@@ -235,12 +235,12 @@ msgstr ""
msgid "^[nN]"
msgstr ""
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr ""
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr ""
@@ -248,11 +248,11 @@ msgstr ""
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr ""
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -511,54 +511,54 @@ msgstr "Δεν είναι δυνατή η εκτέλεση απομακρυσμ
msgid "Cannot execute remote shell"
msgstr "Δεν είναι δυνατή η εκτέλεση απομακρυσμένου κελύφους (φλοιού)"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Η κατεύθυνση αναζήτησης είναι εκτός εύρους"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
#, fuzzy
msgid "Invalid seek direction"
msgstr "Άκυρη κατάσταση δόθηκε σε επιλογή"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
#, fuzzy
msgid "Invalid seek offset"
msgstr "Άκυρη ένδειξη χρόνου"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Η μετατόπιση αναζήτησης είναι εκτός εύρους"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
#, fuzzy
msgid "Invalid byte count"
msgstr "Άκυρο μέγεθος ταινίας"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
#, fuzzy
msgid "Byte count out of range"
msgstr "Η μετατόπιση αναζήτησης είναι εκτός εύρους"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
#, fuzzy
msgid "Premature eof"
msgstr "rmtd: Πρόωρο eof (τέλος αρχείου)\n"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
#, fuzzy
msgid "Invalid operation code"
msgstr "%s: άκυρη επιλογή -- %c\n"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr ""
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
#, fuzzy
msgid "Unexpected arguments"
msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στα κατακερματισμένα ονόματα"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
#, fuzzy
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
@@ -569,147 +569,147 @@ msgstr ""
" --version Εμφάνιση πληροφοριών έκδοσης.\n"
" --help Εμφάνιση αυτής της βοήθειας.\n"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr ""
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr ""
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr ""
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr ""
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, fuzzy, c-format
msgid "cannot open %s"
msgstr "Δεν είναι δυνατό το κλείσιμο"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr ""
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Εντολή απορριμμάτων"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Αυτό δεν φαίνεται ως αρχειοθήκη tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr ""
-#: src/buffer.c:592
+#: src/buffer.c:594
#, fuzzy
msgid "Total bytes written"
msgstr "Συνολικά byte που γράφτηκαν: %s (%sB, %sB/s)\n"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr ""
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(σωλήνωση)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Άκυρη τιμή για record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Δεν δόθηκε όνομα αρχειοθήκης"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr ""
"Δεν είναι δυνατή η επαλήθευση των κανονικών εισόδων/εξόδων της αρχειοθήκης"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr ""
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Δεν είναι δυνατή η ανανέωση των συμπιεσμένων αρχειοθηκών"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Στην αρχή της ταινίας, τερματισμός τώρα"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Πάρα πολλά σφάλματα, τερματισμός"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, fuzzy, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Μέγεθος εγγραφής = %lu block"
msgstr[1] "Μέγεθος εγγραφής = %lu block"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, fuzzy, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Μη ευθυγραμμισμένο μπλοκ (%lu byte) στην αρχειοθήκη"
msgstr[1] "Μη ευθυγραμμισμένο μπλοκ (%lu byte) στην αρχειοθήκη"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr ""
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: περιέχει άκυρο αριθμό τόμου"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Υπερχήλιση αριθμού τόμου"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Προετοίμασε τον τόμο #%d για %s και πάτα το πλήκτρο επιστροφής γραμμής"
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "EOF (Τέλος Αρχείου) ενώ η απάντηση του χρήστη αναμενότανε"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "ΠΡΟΕΙΔΟΠΟΊΗΣΗ: Η αρχειοθήκη είναι ημιτελής"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, fuzzy, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -721,275 +721,275 @@ msgstr ""
" ! Παραγωγή νέου υπό-φλοιού\n"
" ? Εκτύπωση αυτής της λίστας\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr ""
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr ""
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Κανένας νέος τόμος; έξοδος\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr ""
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr ""
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, fuzzy, c-format
msgid "%s command failed"
msgstr "`%s' η εντολή απέτυχε"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s δεν συνεχίζεται σε αυτόν τον τόμο"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, fuzzy, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s δεν συνεχίζεται σε αυτόν τον τόμο"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s είναι το εσφαλμένο μέγεθος (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, fuzzy, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Αυτός ο τόμος είναι εκτός συνέχειας"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Η αρχειοθήκη δεν έχει ετικέτα για ταίριασμα %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Ο τόμος %s δεν ταιριάζει %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr ""
-#: src/compare.c:98
+#: src/compare.c:97
#, fuzzy, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Δυνατή μόνο η ανάγνωση %lu από %lu byte"
msgstr[1] "Δυνατή μόνο η ανάγνωση %lu από %lu byte"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Τα περιεχόμενα διαφέρουν"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στην αρχειοθήκη"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Οι τύποι αρχείων διαφέρουν"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Οι καταστάσεις διαφέρουν"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Ταυτότητες χρήστη διαφέρουν"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Ταυτότητες ομάδας διαφέρουν"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Ώρες τροποποίησης διαφέρουν"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Τα μεγέθη διαφέρουν"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Δεν είναι συνδεδεμένο με %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Οι σύνδεσμοι διαφέρουν"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Οι αριθμοί των συσκευών διαφέρουν"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Επαλήθευση "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Άγνωστος τύπος αρχείου '%c', εκτέλεση της diff ως κανονικό αρχείο"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr ""
-#: src/compare.c:541
+#: src/compare.c:540
#, fuzzy
msgid "Archive contains transformed file names."
msgstr "Η αρχειοθήκη περιέχει απαρχαιωμένες επικεφαλίδες κωδικοποίησης base64"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr ""
-#: src/compare.c:620
+#: src/compare.c:619
#, fuzzy, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "Η ΕΠΑΛΎΘΕΥΣΗ ΑΠΈΤΥΧΕ: ανιχνεύτηκαν %d άκυρη(ες) επικεφαλίδα(δες)"
msgstr[1] "Η ΕΠΑΛΎΘΕΥΣΗ ΑΠΈΤΥΧΕ: ανιχνεύτηκαν %d άκυρη(ες) επικεφαλίδα(δες)"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr ""
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr ""
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "η τιμή %s είναι εκτός του %s εύρος %s..%s; αντικαταστήθηκε από %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "η τιμή %s είναι εκτός του %s εύρους %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Παράχθηκαν αρνητικές οκταδικές επικεφαλίδες"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, fuzzy, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: δεν μπορεί να τροποποιηθεί το αρχείο; δεν αποθηκεύτηκε"
-#: src/create.c:616
+#: src/create.c:615
#, fuzzy, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: δεν μπορεί να τροποποιηθεί το αρχείο; δεν αποθηκεύτηκε"
-#: src/create.c:643
+#: src/create.c:642
#, fuzzy, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: δεν μπορεί να τροποποιηθεί το αρχείο; δεν αποθηκεύτηκε"
-#: src/create.c:1106
+#: src/create.c:1105
#, fuzzy, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Το αρχείο συρρικνώθηκε σε %s bytes; συμπλήρωση με μηδενικά"
msgstr[1] "%s: Το αρχείο συρρικνώθηκε σε %s bytes; συμπλήρωση με μηδενικά"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: το αρχείο είναι σε διαφορετικό σύστημα αρχείων; δεν αποθηκεύτηκε"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr ""
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Άγνωστος τύπος αρχείου; το αρχείο αγνοήθηκε"
-#: src/create.c:1576
+#: src/create.c:1575
#, fuzzy, c-format
msgid "Missing links to %s."
msgstr " σύνδεσμος σε %s\n"
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: δεν μπορεί να τροποποιηθεί το αρχείο; δεν αποθηκεύτηκε"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr ""
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: αρχείο τροποποιήθηκε κατά την ανάγνωση"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: η υποδοχή αγνοήθηκε"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: η πόρτα αγνοήθηκε"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Παραλείποντας στην επόμενη επικεφαλίδα"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Διαγραφή μη-επικεφαλίδων από την αρχειοθήκη"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr ""
-#: src/extract.c:320
+#: src/extract.c:319
#, fuzzy, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: η ένδειξη χρόνου %s είναι %lu s στο μέλλον"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Μη αναμενόμενη ανακολουθία κατά την δημιουργία του καταλόγου"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr ""
@@ -1012,7 +1012,7 @@ msgstr "Προσπάθεια εξαγωγής των συμβολικών συν
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Δεν είναι δυνατή η εξαγωγή -- το αρχείο συνεχίζεται σε άλλο τόμο"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
#, fuzzy
msgid "Unexpected long name header"
msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στα κατακερματισμένα ονόματα"
@@ -1042,22 +1042,22 @@ msgstr "%s: Δεν είναι δυνατή η αποθήκευση αυτού τ
msgid "Cannot rename %s to %s"
msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, fuzzy, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Ο κατάλογος έχει μετονομαστεί"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Ο κατάλογος είναι καινούριος"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, fuzzy, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: το αρχείο είναι σε διαφορετικό σύστημα αρχείων; δεν αποθηκεύτηκε"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Ο κατάλογος έχει μετονομαστεί"
@@ -1183,35 +1183,35 @@ msgstr "%s: Διαγραφή %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Δεν είναι δυνατή η απομάκρυνση"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Παράλειψη"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "μπλοκ %s: ** Μπλοκ με χαρακτήρες NUL **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "μπλοκ %s: ** Τέλος Αρχείου **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "μπλοκ %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Κενά στην επικεφαλίδα ενώ αναμενόταν αριθμητική τιμή %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1219,342 +1219,342 @@ msgstr ""
"συμπληρώματα"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Αρχειοθήκη οκταδικής τιμής %.*s είναι εκτός του %s εύρους"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Η αρχειοθήκη περιέχει απαρχαιωμένες επικεφαλίδες κωδικοποίησης base64"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr ""
"Η αρχειοθήκη είναι υπογεγραμμένη με αλφαριθμητικά base-64 %s είναι εκτός του "
"%s εύρους"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Η αρχειοθήκη με base-256 τιμές είναι εκτός του %s εύρους"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Η αρχειοθήκη περιέχει %.*s όπου αριθμητικές %s τιμές αναμένονται"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Η τιμή της αρχειοθήκης %s είναι εκτός του %s εύρους %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " σύνδεσμος σε %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " άγνωστος τύπος αρχείου %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr ""
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr ""
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Επικεφαλίδα Τόμου--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Συνέχιση στο byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Δημιουργία καταλόγου:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Μετονομασία %s σε %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Μετονομασία %s πίσω στο %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Το αρχείο απομακρύνθηκε πριν το διαβάσουμε"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "θυγατρική διεργασία"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "κανάλι μεταξύ διεργασιών"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr ""
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr ""
-#: src/names.c:74
+#: src/names.c:73
#, fuzzy
msgid "change to directory DIR"
msgstr "Δεν είναι δυνατή η τροποποίηση του τρέχοντος καταλόγου"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr ""
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr ""
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr ""
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr ""
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr ""
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr ""
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr ""
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr ""
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr ""
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr ""
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr ""
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr ""
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr ""
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr ""
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr ""
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr ""
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr ""
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr ""
-#: src/names.c:147
+#: src/names.c:146
#, fuzzy
msgid "wildcards do not match '/'"
msgstr "Ο τόμος %s δεν ταιριάζει %s"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
#, fuzzy
msgid "command line"
msgstr "`%s' η εντολή απέτυχε"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr ""
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr ""
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr ""
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr ""
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Δεν βρέθηκε στην αρχειοθήκη"
-#: src/names.c:1379
+#: src/names.c:1409
#, fuzzy, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Δεν βρέθηκε στην αρχειοθήκη"
-#: src/names.c:1413
+#: src/names.c:1443
#, fuzzy, c-format
msgid "Archive label mismatch"
msgstr "Η αρχειοθήκη δεν έχει ετικέτα για ταίριασμα %s"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
-#: src/tar.c:88
+#: src/tar.c:87
#, fuzzy, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Οι επιλογές `-%s' και `-%s' απαιτούν κανονική είσοδο"
-#: src/tar.c:165
+#: src/tar.c:164
#, fuzzy, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Άκυρη ομάδα"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Τα χαρακτηριστικά GNU απαιτούν μη συμβατή διαμόρφωση αρχειοθήκης"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1770,7 +1770,7 @@ msgstr ""
msgid "extract files to standard output"
msgstr "Σφάλμα κατά την εγγραφή στην κανονική έξοδο"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr ""
@@ -1806,7 +1806,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr ""
@@ -2007,7 +2007,7 @@ msgstr ""
msgid "Archive format selection:"
msgstr "Συγκρουόμενες επιλογές διαμόρφωσης αρχειοθήκης"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr ""
@@ -2090,118 +2090,118 @@ msgstr ""
msgid "filter through PROG (must accept -d)"
msgstr ""
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr ""
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr ""
-#: src/tar.c:693
+#: src/tar.c:694
#, fuzzy
msgid "don't strip leading '/'s from file names"
msgstr "Απομακρύνονται τα αρχικά `%.*s' από τα ονόματα των μελών"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr ""
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr ""
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr ""
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr ""
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr ""
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr ""
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr ""
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr ""
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr ""
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr ""
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr ""
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr ""
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr ""
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr ""
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr ""
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr ""
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr ""
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr ""
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2209,426 +2209,435 @@ msgid ""
"accepted"
msgstr ""
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr ""
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr ""
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr ""
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr ""
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr ""
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr ""
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr ""
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr ""
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr ""
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr ""
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr ""
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr ""
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr ""
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, fuzzy, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s"
-#: src/tar.c:933
+#: src/tar.c:934
#, fuzzy
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "Ίσως δεν καθορίσατε παραπάνω από μία επιλογή `-Acdtrux'"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Συγκρουόμενες επιλογές συμπίεσης"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, fuzzy, c-format
msgid "Unknown signal name: %s"
msgstr " άγνωστος τύπος αρχείου %s\n"
-#: src/tar.c:1028
+#: src/tar.c:1030
#, fuzzy
msgid "Date sample file not found"
msgstr "Το αρχείο ημερομηνίας δεν βρέθηκε"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Αντικατάσταση %s για άγνωστη διαμόρφωση ημερομηνίας %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr ""
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr ""
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr ""
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
msgstr ""
-#: src/tar.c:1253
+#: src/tar.c:1259
#, fuzzy
msgid "Invalid owner or group ID"
msgstr "Άκυρος ιδιοκτήτης"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Άκυρος συντελεστής ομαδοποίησης"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Άκυρο μέγεθος ταινίας"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr ""
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Παραπάνω από ένα όριο ημερομηνίας"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr ""
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr ""
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr ""
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Άκυρη κατάσταση δόθηκε σε επιλογή"
-#: src/tar.c:1797
+#: src/tar.c:1806
#, fuzzy
msgid "Invalid number"
msgstr "Άκυρος αριθμός i-κόμβου"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Άκυρο μέγεθος εγγραφής"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Το μέγεθος της εγγραφής πρέπει να είναι πολλαπλάσιο του %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
#, fuzzy
msgid "Invalid number of elements"
msgstr "Άκυρο μέγεθος ταινίας"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr ""
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr ""
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr ""
-#: src/tar.c:2066
+#: src/tar.c:2075
#, fuzzy, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr ""
"Οι επιλογές `-[0-7][lmh]' δεν υποστηρίζονται από *αυτήν* την εντολή tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr ""
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr ""
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "άκυρο όρισμα %s για %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr ""
-#: src/tar.c:2291
+#: src/tar.c:2300
#, fuzzy, c-format
msgid "Old option '%c' requires an argument."
msgstr "Παλιά επιλογή `%c' απαιτεί όρισμα."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr ""
-#: src/tar.c:2390
+#: src/tar.c:2399
#, fuzzy
msgid "Multiple archive files require '-M' option"
msgstr "Πολλαπλά αρχεία αρχειοθηκών απαιτούν την επιλογή `-M'"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr ""
-#: src/tar.c:2424
+#: src/tar.c:2433
#, fuzzy, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Η ετικέτα του τόμου είναι πολύ μεγάλη (το όριο είναι %lu byte)"
msgstr[1] "%s: Η ετικέτα του τόμου είναι πολύ μεγάλη (το όριο είναι %lu byte)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Δεν είναι δυνατή η επαλήθευση πολλαπλών αρχειοθηκών"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Δεν είναι δυνατή η επαλήθευση των συμπιεσμένων αρχειοθηκών"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Δεν είναι δυνατή η χρήση πολλαπλών συμπιεσμένων αρχειοθηκών"
-#: src/tar.c:2457
+#: src/tar.c:2466
#, fuzzy
msgid "Cannot concatenate compressed archives"
msgstr "Δεν είναι δυνατή η ανανέωση των συμπιεσμένων αρχειοθηκών"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Αρνούμαι δειλά στη δημιουργία μίας κενής αρχειοθήκης"
-#: src/tar.c:2623
+#: src/tar.c:2632
#, fuzzy
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Οι επιλογές `-Aru' δεν είναι συμβατές με `-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
#, fuzzy
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Πρέπει να καθορίσεις μία από τις επιλογές `-Acdtrux'"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr ""
-#: src/update.c:87
+#: src/update.c:86
#, fuzzy, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Το αρχείο συρρικνώθηκε κάτα %s byte"
msgstr[1] "%s: Το αρχείο συρρικνώθηκε κάτα %s byte"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr ""
-#: src/xheader.c:174
+#: src/xheader.c:173
#, fuzzy
msgid "Time stamp is out of allowed range"
msgstr "Η ένδειξη χρόνου είναι εκτός εύρους"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr ""
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr ""
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr ""
-#: src/xheader.c:677
+#: src/xheader.c:695
#, fuzzy, c-format
msgid "Extended header length %*s is out of range"
msgstr ""
"Η αρχειοθήκη είναι υπογεγραμμένη με αλφαριθμητικά base-64 %s είναι εκτός του "
"%s εύρους"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr ""
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr ""
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr ""
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, fuzzy, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Η τιμή της αρχειοθήκης %s είναι εκτός του %s εύρους %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr ""
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr ""
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, fuzzy, c-format
msgid "%s: not a valid timeout"
msgstr "%s: Άκυρη ομάδα"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr ""
@@ -2636,7 +2645,7 @@ msgstr ""
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, fuzzy, c-format
msgid "Write checkpoint %u"
msgstr "Εγγραφή σημείου ελέγχου %d"
@@ -2645,231 +2654,231 @@ msgstr "Εγγραφή σημείου ελέγχου %d"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, fuzzy, c-format
msgid "Read checkpoint %u"
msgstr "Ανάγνωση σημείου ελέγχου %d"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
#, fuzzy
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr "Παράγει αρχεία δεδομένων για δοκιμαστική πλατφόρμα GNU tar.\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
#, fuzzy
msgid "File creation options:"
msgstr "Συγκρουόμενες επιλογές συμπίεσης"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr ""
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr ""
-#: tests/genfile.c:135
+#: tests/genfile.c:130
#, fuzzy
msgid "Write to file NAME, instead of standard output"
msgstr "Σφάλμα κατά την εγγραφή στην κανονική έξοδο"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr ""
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr ""
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr ""
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr ""
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr ""
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr ""
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr ""
-#: tests/genfile.c:168
-msgid "OPTION"
+#: tests/genfile.c:163
+msgid "N"
msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr ""
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr ""
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr ""
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, fuzzy, c-format
msgid "Invalid size: %s"
msgstr "Άκυρη ένδειξη χρόνου"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, fuzzy, c-format
msgid "Number out of allowed range: %s"
msgstr "Ο αριθμός του i-κόμβου είναι εκτός εύρους"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr ""
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr ""
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr ""
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr ""
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr ""
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, fuzzy, c-format
msgid "Unknown date format"
msgstr "Άγνωστο σφάλμα συστήματος"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr ""
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr ""
-#: tests/genfile.c:448
+#: tests/genfile.c:439
#, fuzzy
msgid "cannot seek"
msgstr "Δεν είναι δυνατό το κλείσιμο"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr ""
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr ""
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, fuzzy, c-format
msgid "Unknown field `%s'"
msgstr " άγνωστος τύπος αρχείου %s\n"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, fuzzy, c-format
msgid "cannot set time on `%s'"
msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, fuzzy, c-format
msgid "cannot truncate `%s'"
msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, fuzzy, c-format
msgid "command failed: %s"
msgstr "`%s' η εντολή απέτυχε"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, c-format
msgid "cannot stat `%s'"
msgstr ""
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "Δεν είναι δυνατή η αποθήκευση του τρέχοντος καταλόγου"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, fuzzy, c-format
msgid "cannot unlink `%s'"
msgstr "%s: Δεν είναι δυνατή η συμβολική σύνδεση στο %s"
diff --git a/po/eo.gmo b/po/eo.gmo
index 2f9e433cc09dc22b69879814a08b330a4fd7bbe3..06cda0c6dd74f20b1886d24da23a34ef7688ace1 100644
Binary files a/po/eo.gmo and b/po/eo.gmo differ
diff --git a/po/eo.po b/po/eo.po
index 06c47b7534360ce789d13b91a1ac16f53495ef78..d3690a47a1641483a8cf7c9f0269b14b41b79914 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,15 +1,15 @@
# Esperanto translation.
-# Copyright (C) 2013, 2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2013, 2014, 2016, 2018 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
-# Felipe Castro <fefcas@gmail.com>, 2013, 2014, 2016.
+# Felipe Castro <fefcas@gmail.com>, 2013, 2014, 2016, 2018.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-10-15 21:16-0300\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-06-05 23:06-0300\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
"Language: eo\n"
@@ -97,7 +97,7 @@ msgid "give a short usage message"
msgstr "montri mallongan mesaĝon pri la uzmaniero"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NOMO"
@@ -135,29 +135,29 @@ msgid "write error"
msgstr "skrib-eraro"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: modifilo '%s' estas plursenca\n"
+msgstr "%s: modifilo '%s%s' estas plursenca\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: modifilo '%s' estas plursenca; ebloj:"
+msgstr "%s: modifilo '%s%s' estas plursenca; ebloj:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: nerekonata modifilo '%c%s'\n"
+msgstr "%s: nerekonata modifilo '%s%s'\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: modifilo '%c%s' ne permesas argumenton\n"
+msgstr "%s: modifilo '%s%s' ne permesas argumenton\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: modifilo '--%s' postulas argumenton\n"
+msgstr "%s: modifilo '%s%s' postulas argumenton\n"
#: gnu/getopt.c:621
#, c-format
@@ -232,12 +232,12 @@ msgstr "^[jJyY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Pakigita de %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Pakigita de %s\n"
@@ -245,12 +245,11 @@ msgstr "Pakigita de %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -260,7 +259,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Permeso GPLv3+: GNU GPL versio 3 aŭ posta <http://gnu.org/licenses/gpl."
+"Permeso GPLv3+: GNU GPL versio 3 aŭ posta <https://gnu.org/licenses/gpl."
"html>.\n"
"Tio ĉi estas libera programaro: vi estas libera por ŝanĝi kaj redisdoni "
"ĝin.\n"
@@ -400,15 +399,15 @@ msgid "%s home page: <%s>\n"
msgstr "%s hejm-paĝo: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "%s hejm-paĝo: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s hejm-paĝo: <https://www.gnu.org/software/%s/>\n"
+#
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Ĝenerala helpo por uzi programaron GNU: <http://www.gnu.org/gethelp/>\n"
+"Ĝenerala helpo por uzi programaron GNU: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -527,189 +526,189 @@ msgstr "Ne eblas redirektigi dosierojn por fora ŝelo"
msgid "Cannot execute remote shell"
msgstr "Ne eblas lanĉi foran ŝelon"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Serĉ-direkto estas for de intervalo"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Malvalida serĉ-direkto"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Malvalida serĉ-deŝovo"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Serĉ-deŝovo estas for de intervalo"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Malvalida bajt-nombro"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Bajt-nombro estas for de intervalo"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Trofrua EOF"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Malvalida operacia kodo"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operacio ne estas subtenata"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Neatenditaj argumentoj"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Manipuli bendolegilon, akceptante komandojn el fora procezo"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NUMERO"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "difini rafinigan nivelon"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "DOSIERO"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "difini rafinigan eliran dosiernomon"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "ne eblas malfermi %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "tro da argumentoj"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Ruba komando"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Tio ĉi ne ŝajnas esti arĥivo tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Bajtoj entute legitaj"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Bajtoj entute skribitaj"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Tuto da bajtoj forigitaj"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(dukto)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Ni rifuzas legi arĥiv-enhavon el terminalo (ĉu mankas modifilon -f?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Ni rifuzas skribi arĥiv-enhavon al terminalo (ĉu mankas modifilon -f?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Malvalida valoro por 'record_size'"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Neniu arĥiv-nomo estas indikita"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Ne eblas kontroli arĥivon de ĉefa en/eligujo"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Arĥivo estas densigita. Uzu modifilon %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Ne eblas ĝisdatigi densigitajn arĥivojn"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Ĉe komenco de bendo, ni ĉesas nun"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Tro multaj eraroj, ni ĉesas"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Rikord-grando = %lu bloko"
msgstr[1] "Rikord-grando = %lu blokoj"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Malrektigita bloko (%lu bajto) en arĥivo"
msgstr[1] "Malrektigita bloko (%lu bajtoj) en arĥivo"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Ne eblas retropaŝi arĥivan dosieron; ĝi eble ne legeblos sen -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "'rmtlseek' ne haltis ĉe rikord-limo"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: enhavas malvalidan volum-numeron"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Datumvolum-numero troigas"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Preparu datumvolumon #%d por %s kaj premu enig-klavon: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "EOF kie respondo de uzanto estis atendata"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "AVERTO: arĥivo estas malkompleta"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -720,67 +719,67 @@ msgstr ""
" q Ĉesigi tar\n"
" y aŭ novlinio Daŭrigi operacion\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Generi subŝelon\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Montri tiun ĉi liston\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Neniu nova datumvolumo: ni eliras.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Dosiernomo ne estis indikata. Reprovu.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Malvalida enigo. Tajpu ? por helpo.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "La komando %s fiaskis"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s ne estas daŭrigata en tiu ĉi datumvolumo"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s eble estas daŭrigata en tiu ĉi datumvolumo: la kapo enhavas tranĉitan "
"nomon"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s estas malkorekta grando (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Tiu ĉi datumvolumo estas for de sekvo (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "La arĥivo ne estas markita por kongrui al %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "La datumvolumo %s ne kongruas al %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -788,210 +787,210 @@ msgstr ""
"%s: dosiernomo tro longas por esti konservata en GNU-plurvoluma kapo, ni "
"tranĉis"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "skribo ne finiĝis ĉe bloko-limo"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Eblis legi %lu el %lu bajto"
msgstr[1] "Eblis legi %lu el %lu bajtoj"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Enhavo malsamas"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Neatendita EOF en arĥivo"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Dosiertipo malsamas"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Reĝimo malsamas"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "UID malsamas"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "GID malsamas"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Modif-tempo malsamas"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Grando malsamas"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Ne ligita al %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Simbol-ligo malsamas"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Aparatnumero malsamas"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Kontroli "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: nekonata dosiertipo '%c', ni komparas kiel normalan dosieron"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Arĥivo enhavas dosiernomojn kun forigitaj antaŭiraj prefiksoj."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Arĥivo enhavas transformitajn dosiernomojn."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Kontrolo povas malsukcesi lokigi originalajn dosierojn."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "KONTROLA MALSUKCESO: %d malvalida kapo detektita"
msgstr[1] "KONTROLA MALSUKCESO: %d malvalidaj kapoj detektitaj"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Izolita nul-bloko ĉe %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: enhavas kaŝmemoran dosierujan markon %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "valoro %s estas for de intervalo %s %s..%s; ni anstataŭigas %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "valoro %s estas for de intervalo %s %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Generado de negativaj okumaj kapoj"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s dosiernomo tro longas (maks %d); ne ŝutita"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s dosiernomo tro longas (ne povas esti apartigita); ne ŝutita"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: lignomo tro longas; ne ŝutita"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: dosiero malpligrandiĝis je %s bajto; ni ŝtopas per nulo"
msgstr[1] "%s: dosiero malpligrandiĝis je %s bajtoj; ni ŝtopas per nuloj"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: dosiero estas en malsama dosiersistemo; ne ŝutita"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "enhavo ne estas ŝutita"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: nekonata dosiertipo; dosiero estas preteratentita"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Mankas ligoj al %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: dosiero estas nemodifita; ne ŝutita"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: dosiero estas la arĥivo; ne ŝutita"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "dosierujo ne estas ŝutita"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: dosiero ŝanĝis dum ni legas ĝin"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: konektilo estis preteratentata"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: pordo estis preteratentata"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Ni saltas al sekva kapo"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Ni forigas ne-kapon el arĥivo"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: malprobable malnova temp-indiko %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: temp-indiko %s estas %s s estontece"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: neatendita malkohero dum kreo de dosierujo"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: ni preterpasas ekzistantan dosieron"
@@ -1014,7 +1013,7 @@ msgstr "Ni provas elpreni simbolajn ligojn kiel rektajn ligojn"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: ne eblas eltiri -- dosiero daŭriĝas el alia datumvolumo"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Neatendita long-noma kapo"
@@ -1031,7 +1030,7 @@ msgstr "Nuna %s estas pli nova aŭ sam-aĝa"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: nomo de ano enhavas '..'"
#: src/extract.c:1696
#, c-format
@@ -1043,22 +1042,22 @@ msgstr "%s: ne eblis savkopii tiun ĉi dosieron"
msgid "Cannot rename %s to %s"
msgstr "Ne eblas renomigi %s al %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: dosierujo estas renomigita el %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: dosierujo estas nova"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: dosierujo estas en malsama dosiersistemo; ne ŝutita"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: dosierujo estas renomigita"
@@ -1184,35 +1183,35 @@ msgstr "%s: forigo de %s\n"
msgid "%s: Cannot remove"
msgstr "%s: ne eblas forigi"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: ni malinkluzivigas"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "bloko %s: ** Bloko de NULOj **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "bloko %s: ** Fino de dosiero **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "bloko %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Vakoj en kapo kie numera valoro %s estas atendata"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1220,160 +1219,159 @@ msgstr ""
"komplementon de du"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Arĥiva okuma valoro %.*s estas for de intervalo %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arĥivo enhavas malaktualajn kapojn 'base-64'"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Signita ĉeno 'base-64' de arĥivo (%s) estas for de intervalo %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Valoro 'base-256' de arĥivo estas for de intervalo %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arĥivo enhavas %.*s kie estas atendata numera valoro %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Arĥiva valoro %s estas for de intervalo %s: %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " kunligo al %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " nekonata dosiertipo %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Longa ligo--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Longa nomo--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Voluma kapo--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Daŭrigita ĉe bajto %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Kreado de dosierujo:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Alinomigo de %s al %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: ne eblas renomigi al %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Renomigo de %s reen al %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: dosiero estis forigata antaŭ ol ni legis ĝin"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "ida procezo"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "interproceza kanalo"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Loka dosiernoma elekto:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"aldoni la indikitan DOSIEROn al la arĥivo (utilas se ĝia nomo komencas per "
"streketo)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "UJO"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "ŝanĝi al la dosierujo UJO"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "havigi nomojn por eltiri aŭ krei el DOSIERO"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T legas nul-finigitajn nomojn; implicas --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "malebligi la efikon de la antaŭa modifilo --null"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "malcitigi enigdosierojn aŭ membro-nomojn (aprioras)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "ne malcitigi enigdosierojn aŭ membro-nomojn"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T legas dosier-nomojn senpere (neniu subteno al modifiloj)"
+msgstr "-T legas dosier-nomojn senpere (neniu subteno al modifiloj aŭ eskapoj)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T traktas dosier-nomojn komencantajn per streketo kiel modifiloj (apriore)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "ŜABLONO"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "malinkluzivi dosierojn, indikitaj kiel ŜABLONO"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "malinkkluzivi ŝablonojn listigitajn en DOSIERO"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1381,24 +1379,24 @@ msgstr ""
"malinkluzivi enhavojn de dosierujoj enhavantaj CACHEDIR.TAG, krom por la "
"markdosiero mem"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "malinkluzivi ĉion sub dosierujoj enhavantaj CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "malinkluzivi dosierujojn enhavantajn CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"malinkluzivi enhavojn de dosierujoj enhavantaj DOSIEROn, krom por DOSIERO mem"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "legi forig-ŝablonojn por ĉiu dosierujo el DOSIERO, se ĝi ekzistas"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1406,118 +1404,121 @@ msgstr ""
"legi forig-ŝablonojn por ĉiu dosierujo kaj ĝiaj subdosierujoj el DOSIERO, se "
"ĝi ekzistas"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "malinkluzivi ĉion sub dosierujoj enhavantaj DOSIERO"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "malinkluzivi dosierujojn enhavantajn DOSIEROn"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "malinkluzivi versikontrol-sistemajn dosierujojn"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "legi forig-ŝablonojn el la dosieroj por preteratenti VCS"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "malinkluzivi savkopiajn kaj ŝlosajn dosierojn"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "rekursigi en dosierujojn (aprioras)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "eviti malsupreniri aŭtomate en dosierujoj"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Dosiernom-kongruaj modifiloj (influas kaj ekskluzivajn kaj inkluzivajn "
"ŝablonojn):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "ŝablonoj kongruas al komenco de dosiernomo"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "ŝablonoj kongruas post iu ajn '/' (aprioras por malinkluzivo)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "preteratenti usklecon"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "uskleca kongruo (aprioras)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "uzi ĵokerojn (aprioras por malinkluzivo)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "laŭvorta ĉena kongruo"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "ĵokeroj kongruas kun '/' (aprioras por malinkluzivo)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "ĵokeroj ne kongruas kun '/'"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"La jenaj modifiloj estis uzataj post iu malnepra argumento en reĝimo de "
+"kreado aŭ ĝisdatigo de arĥivo. Tiuj modifiloj estas poziciaj kaj nur efikas "
+"en argumentoj, kiuj sekvas ilin. Bonvole rearanĝu ilin taŭge."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s efikas neniel"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s efikas neniel"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s efikas neniel"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "komandlinio"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: dosierlisto petita el %s jam estas legita el %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "ne eblas apartigi ĉenon '%s': %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: lego de dosiernomo enhavas nul-signon"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Ŝablon-kongruaj signoj uzataj en dosiernomoj"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1525,47 +1526,47 @@ msgstr ""
"Uzu --wildcards por ebligi ŝablon-kongruon, aŭ --no-wildcards por eviti tiun "
"ĉi averton"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: ne trovita en arĥivo"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: postulata apero ne estis trovata en arĥivo"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Miskongruo de arĥiva etikedo"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Uzo de la modifilo -C ene de dosierlisto ne estas permesata kun --listed-"
"incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Nur unu modifilo -C estas permesata kun --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Ambaŭ modifiloj '%s' kaj '%s' postulas ĉefenigujon"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: malvalida arĥiv-formo"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU-trajtoj estas dezirataj en neakordigebla arĥiv-formo"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1785,7 +1786,7 @@ msgstr "Elekti eligfluon:"
msgid "extract files to standard output"
msgstr "eltiri dosierojn al ĉefeligujo"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "KOMANDO"
@@ -1821,7 +1822,7 @@ msgstr "uzi DOSIERO por mapigi dosier-posedantajn nomojn kaj UID-ojn"
msgid "use FILE to map file owner GIDs and names"
msgstr "uzi DOSIERO por mapigi dosier-posedantajn nomojn kaj GID-ojn"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATO-AŬ-DOSIERO"
@@ -2030,7 +2031,7 @@ msgstr "reblokigi dum ni legas (por duktoj 4.2BSD)"
msgid "Archive format selection:"
msgstr "Elekto de arĥiv-formo:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMO"
@@ -2114,60 +2115,60 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "filtri tra PROG (devas akcepti -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Loka dosier-elekto:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "resti en loka dosiersistemo dum kreo de arĥivo"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "ne demeti antaŭirajn '/'-ojn el dosiernomoj"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "sekvi simbol-ligojn; arĥivi kaj ŝuti la dosierojn, kiujn ili indikas"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"sekvi rekt-ligojn; arĥivi kaj ŝuti la dosierojn, kiujn ili referencigas"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "MEMBRO-NOMO"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "komenci per la membro MEMBRO-NOMO dum lego de la arĥivo"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "nur konservi dosierojn pli novajn ol DATO-AŬ-DOSIERO"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATO"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "kompari daton kaj horon nur kiam datumaro ŝanĝis"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "KONTROLO"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "savkopii antaŭ ol forigi, elekti versi-KONTROLOn"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "ĈENO"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2175,59 +2176,59 @@ msgstr ""
"savkopii antaŭ ol forigi, anstataŭigi ordinaran sufikson ('~' krom se "
"anstataŭigita de medi-variablo SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Dosiernomaj transformigoj:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "demeti NUMERO antaŭirajn komponantojn el dosiernomoj dum eltiro"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "ESPRIMO"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "uzi sed-anstataŭigan ESPRIMOn por transformigi dosiernomojn"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informa eligo:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "detale listigi procezitajn dosierojn"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "ŜLOSILVORTO"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "avert-kontrolo"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "montri progres-mesaĝojn je ĉiu NUMERa rikordo (aprioras 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "AGO"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "plenumigi AGOn je ĉiu kontrolpunkto"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "montri mesaĝon se ne ĉiuj ligoj estos ŝutitaj"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNALO"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2239,35 +2240,35 @@ msgstr ""
"estas: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 kaj SIGUSR2; la nomoj sen prefikso "
"SIG ankaŭ akcepteblas"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "montri dosierajn modif-horojn laŭ UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "montri dosieran horon per ĝia tuta distingivo"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "sendi detalan eligon al DOSIERO"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "montri bloknumeron ene de arĥivo je ĉiu mesaĝo"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "peti konfirmon por ĉiu ago"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "montri apriorojn de tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "montri validajn intervalojn por kampoj de statkopi-dosiero"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2275,52 +2276,52 @@ msgstr ""
"dum listigo aŭ eltiro, listigi ĉiun dosierujon kiu ne kongruas al serĉ-"
"kriterio"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "montri dosieron aŭ arĥivajn nomojn post transformigo"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STILO"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "difini nom-citigan stilon; vidu sube por validaj valoroj de STILO"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "krome citigi signojn el ĈENO"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "malebligi citigon por signoj el ĈENO"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Akordigeblaj modifiloj:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr "dum kreo, same ol --old-archive; dum eltiro, same ol --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Aliaj modifiloj:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "malebligi uzon de kelkaj eble damaĝaj modifiloj"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne uzeblas kun '%s'"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2328,40 +2329,40 @@ msgstr ""
"Vi ne devas indiki pli ol unu el la modifiloj '-Acdtrux', '--delete' aŭ '--"
"test-label'"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Konfliktantaj densigaj modifiloj"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Nekonata signal-nomo: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Data specimen-dosiero ne estis trovata"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Ni anstataŭigas %s por la nekonata dato-formo %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Modifilo %s: ni traktas daton '%s' kiel %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtri la arĥivon tra %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Validaj argumentoj por la modifilo --quoting-style estas:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2369,163 +2370,163 @@ msgstr ""
"\n"
"*Tiu ĉi* tar apriorigas tion:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Malvalida posedanto aŭ grupo-ID"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Malvalida blok-faktoro"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Malvalida benda longo"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Malvalida aldon-nivela valoro"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Pli ol unu lim-dato"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Malvalida disa versi-valoro"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' ne estas subtenata en tiu ĉi platformo"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "valoro de --checkpoint ne estas entjero"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Malvalida reĝimo indikita en modifilo"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Malvalida numero"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Malvalida rikord-grando"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Rikord-grando devas esti oblo de %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Malvalida nombro da elementoj"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Nur unu modifilo --to-command estas permesata"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Fuŝa densiga argumento: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Nekonata densigo: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Modifiloj '-[0-7][lmh]' ne estas subtenata de *tiu ĉi* tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: loko de la eraro"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "Eraro dum analizo de %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[DOSIERO]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "ne-modifilaj argumentoj en %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "ne eblas apartigi TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "La malnova modifilo '%c' postulas argumenton."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "Sen dosierlisto, --occurrence estas sensignifa"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Multoblaj arĥiv-dosieroj postulas modifilon '-M'"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "Sen --listed-incremental, --level estas sensignifa"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: volum-etikedo tro longas (limo estas %lu bajto)"
msgstr[1] "%s: volum-etikedo tro longas (limo estas %lu bajtoj)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Ne eblas kontroli plur-volumajn arĥivojn"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Ne eblas kontroli densigitajn arĥivojn"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Ne eblas uzi plur-volumajn densigitajn arĥivojn"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Ne eblas kunmeti densigitajn arĥivojn"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime bezonas daton indikitan per --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option nur uzeblas en arĥivoj POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls nur uzeblas en arĥivoj POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux nur uzeblas en arĥivoj POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs nur uzeblas en arĥivoj POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2533,128 +2534,137 @@ msgstr ""
"Ne eblas konjekti supro-nivela dosieruja nomo; bonvolu indiki ĝin klare per "
"--one-top-level=UJO"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Datum-voluma longo ne povas esti malpli ol rikord-grando"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Malkuraĝe ni rifuzas krei malplenan arĥivon"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Modifiloj '-Aru' ne akordigeblas kun '-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Vi devas indiki unu el la modifiloj '-Acdtrux', --delete' aŭ '--test-label'"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Ni eliras kun malsukcesa stato pro antaŭaj eraroj"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: dosiero malkreskiĝis per %s bajto"
msgstr[1] "%s: dosiero malkreskiĝis per %s bajtoj"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Ŝlosilo %s estas nekonata aŭ ankoraŭ ne realigita"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Temp-indiko estas for de permesata intervalo"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Ŝablono %s ne povas esti uzata"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Ŝablono %s ne povas esti anstataŭigata"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Fuŝa etendita kapo: mankas longo"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Longo de etendita kapo %*s estas for de intervalo"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Fuŝa etendita kapo: mankas blankspaco post longo"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Fuŝa etendita kapo: mankas egal-signo"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Fuŝa etendita kapo: mankas nov-linio"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ni preteratentas nekonatan etenditan kapan ŝlosilon '%s'"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Generita paro ŝlosilo/valoro tro longas (ŝlosilo=%s, longo=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "La etendita kapo %s=%s estas for de la intervalo %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Fuŝa etendita kapo: malvalida %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Fuŝa etendita kapo: troiga %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Fuŝa etendita kapo: malvalida %s: neatendita apartigilo %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Fuŝa etendita kapo: malvalida %s: malpara nombro da valoroj"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: ne estas valida templimo"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: nekonata kontrolpunkta ago"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "skribi"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "legi"
@@ -2662,7 +2672,7 @@ msgstr "legi"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Skriba kontrol-punkto %u"
@@ -2671,12 +2681,12 @@ msgstr "Skriba kontrol-punkto %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Lega kontrol-punkto %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2685,96 +2695,100 @@ msgstr ""
"de GNU.\n"
"MODIFILOJ estas:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Dosier-kreaj modifiloj:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "GRANDO"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Krei dosieron el indikita GRANDO"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Skribi al dosiero NOMO, anstataŭ al ĉefeligujo"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Legi dosiernomojn el DOSIERO"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T legas nul-finigitajn nomojn"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Kompletigi la dosieron per la indikita ŜABLONO. ŜABLONO estas 'default' aŭ "
"'zeros'"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Grando de bloko por disa dosiero"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Generi disan dosieron. Cetero de la komandlinio indikas la dosiermapon."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "DEŜOVO"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Moviĝi al la indikita deŝovo antaŭ ol skribi datumaron"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Forĵeti ne-fatalajn diagnozajn mesaĝojn"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Dosier-statistikaj modifiloj:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Montri enhavon de 'struct stat' por ĉiu indikita dosiero. Apriora FORMO "
"estas: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Sinkronaj plenumaj modifiloj:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "MODIFILO"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Plenumi ARGj. Utilas kun --checkpoint kaj unu el --cut, --append, --touch, --"
"unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Plenumi indikitan agon (vidu sube), kiam atingi kontrolpunkton NUMERO"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Difini daton por la modifilo --touch kiu sekvas"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Montri plenumitajn kontrolpunktojn kaj elir-staton de KOMANDO"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2782,7 +2796,7 @@ msgstr ""
"Sinkronaj plenumaj agoj. Tiuj ĉi estas plenumataj kiam oni atingas "
"kontrolpunktan numeron indikitan de modifilo --checkpoint."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2790,125 +2804,125 @@ msgstr ""
"Tranĉi DOSIEROn al la grando indikita de antaŭa modifilo --length (aŭ 0, se "
"ne indikita)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Postmeti GRANDO bajtojn al DOSIERO. GRANDO estas indikita de antaŭa modifilo "
"--length."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Ĝisdatigi la alirajn kaj modifajn horojn de DOSIERO"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Lanĉi KOMANDOn"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Forviŝi DOSIEROn"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Malvalida grando: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Numero estas for de permesata intervalo: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negativa grando: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) fiaskis"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "petita dosier-longo: %lu, fakta: %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "kreita dosiero ne estas disa"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Eraro dum analizo de numero proksime de '%s'"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Nekonata dat-formo"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGj...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "ne eblas malfermi '%s'"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "ne eblas apliki 'seek'"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "dosiernomo enhavas nul-signon"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"ne eblas generi disajn dosierojn por la ĉefeligujo, uzu la modifilon --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "malĝusta masko (proksime de '%s')"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Nekonata kampo '%s'"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "ne eblas difini horon por '%s'"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "ne eblas tranĉi '%s'"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "komando fiaskis: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "ne eblas tranĉi '%s'"
+msgstr "ne eblas apliki 'stat' al '%s'"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "ne eblas difini horon por '%s'"
+msgstr "ne eblas forviŝi dosierujon '%s'"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "ne eblas apliki 'unlink' al '%s'"
@@ -2948,6 +2962,9 @@ msgstr "Komando estas ĉesigita\n"
msgid "--stat requires file names"
msgstr "--stat postulas dosiernomojn"
+#~ msgid "OPTION"
+#~ msgstr "MODIFILO"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: parametro en ARGP_HELP_FMT devas esti pozitiva"
diff --git a/po/es.gmo b/po/es.gmo
index 889f80c1ca5f35deabce16de17b4a0ffb8780300..098ada786201f93227bf8ce3250d06b369789178 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 7779cd56f3fcc554e74bfb2338ad7de45b3399ba..f08215cd1a4f8b999293da2a70bb4f51b7942731 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,18 +1,18 @@
# Mensajes en español para GNU tar.
-# Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2017 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
# Federico Rivas <frivas@arrakis.es>, 1997.
# Enrique Melero <melero@iprolink.ch>, 1997.
# Santiago Vila Doncel <sanvila@unex.es>, 1998, 1999, 2000, 2001, 2002, 2004, 2014.
-# Antonio Ceballos <aceballos@gmail.com>, 2015, 2016
+# Antonio Ceballos <aceballos@gmail.com>, 2015, 2016, 2017
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: GNU tar 1.29\n"
+"Project-Id-Version: GNU tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-06-26 13:57+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-30 10:29+0100\n"
"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
"Language-Team: Spanish <es@tp.org.es>\n"
"Language: es\n"
@@ -106,7 +106,7 @@ msgid "give a short usage message"
msgstr "da un mensaje de uso corto"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NOMBRE"
@@ -144,29 +144,29 @@ msgid "write error"
msgstr "error de escritura"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: la opción '%s' es ambigua\n"
+msgstr "%s: la opción '%s%s' es ambigua\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: la opción '%s' es ambigua; posibilidades:"
+msgstr "%s: la opción '%s%s' es ambigua; posibilidades:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: opción no reconocida '%c%s'\n"
+msgstr "%s: opción no reconocida '%s%s'\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: la opción '%c%s' no admite ningún argumento\n"
+msgstr "%s: la opción '%s%s' no admite ningún argumento\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: la opción '--%s' requiere un argumento\n"
+msgstr "%s: la opción '%s%s' requiere un argumento\n"
#: gnu/getopt.c:621
#, c-format
@@ -241,12 +241,12 @@ msgstr "^[sSyY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Empaquetado por %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Empaquetado por %s\n"
@@ -254,12 +254,11 @@ msgstr "Empaquetado por %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -269,7 +268,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"License GPLv3+: GPL de GNU versión 3 o posterior <http://gnu.org/licenses/"
+"License GPLv3+: GPL de GNU versión 3 o posterior <https://gnu.org/licenses/"
"gpl.html>\n"
"Esto es software libre: usted es libre de cambiarlo y redistribuirlo.\n"
"No hay NINGUNA GARANTÍA, hasta donde permite la ley.\n"
@@ -407,15 +406,14 @@ msgid "%s home page: <%s>\n"
msgstr "Página de %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Página de %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "Página de %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Ayuda general sobre el uso de software de GNU: <http://www.gnu.org/gethelp/"
+"Ayuda general sobre el uso de software de GNU: <https://www.gnu.org/gethelp/"
">\n"
# FIXME: Intraducible.
@@ -541,95 +539,95 @@ msgstr "No se pueden redireccionar los ficheros para un shell remoto"
msgid "Cannot execute remote shell"
msgstr "No se puede ejecutar un shell remoto"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Dirección de desplazamiento fuera de rango"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Orden de desplazamiento inválida"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Desplazamiento inválido"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Desplazamiento fuera de rango"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Número de bytes inválido"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Número de bytes fuera de rango"
# FIXME. Este es el único eof en minúsculas.
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Fin de fichero prematuro"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Código de operación inválido"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operación no soportada"
# ¿No se referirá al autor a "mangled filenames"?... jmg
# FIXME. Preguntárselo.
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Argumentos inesperados"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Maneja una unidad de cinta, aceptando órdenes de un proceso remoto"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NÚMERO"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "establece el nivel de depuración"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FICHERO"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "establece el nombre del fichero para la salida de depuración"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "No se puede abrir %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Orden ininteligible"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Esto no parece un archivo tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Bytes leídos en total"
@@ -638,7 +636,7 @@ msgstr "Bytes leídos en total"
# "bytes escritos en total" suena demasiado complejo... Nicolás Lichtmaier.
# Suena algo extraño eso de "total de bytes". "en total" me suena
# mucho más natural. sv
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Bytes escritos en total"
@@ -647,7 +645,7 @@ msgstr "Bytes escritos en total"
# "bytes escritos en total" suena demasiado complejo... Nicolás Lichtmaier.
# Suena algo extraño eso de "total de bytes". "en total" me suena
# mucho más natural. sv
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Bytes borrados en total"
@@ -665,27 +663,27 @@ msgstr "Bytes borrados en total"
# aparecer *varias* veces, y entonces sí que es una paliza.
# Ejemplo de paliza: "tubería rota" en libc. Sale muchísimo y no es
# cuestión de ver (pipe) cuarenta veces al día...
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(tubería)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Declinando leer contenido de archivo desde terminal (¿falta la opción -f)?"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"Declinando escribir contenido de archivo a terminal (¿falta la opción -f)?"
# ¿No queda más bonita la 1ª comilla abierta así: `record_size'?
# Sí. FIXME. Comunicar al autor. sv
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "El valor de `record_size' no es válido"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "No se ha especificado ningún nombre de archivo"
@@ -704,69 +702,69 @@ msgstr "No se ha especificado ningún nombre de archivo"
# o algo así. Quizá "No se puede verificar un archivo tomado de la entrada
# estándar o escrito hacia la salida estándar", pero es un poco largo.. =)
#
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "No se puede verificar la entrada/salida estándar"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "El archivo está comprimido. Utilice la opción %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "No se pueden actualizar archivos comprimidos"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Al principio de la cinta, se terminará ahora"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Demasiados errores, abandono"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Tamaño del registro = %lu bloque"
msgstr[1] "Tamaño del registro = %lu bloques"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Bloque no alineado (%lu byte) dentro del archivo"
msgstr[1] "Bloque no alineado (%lu bytes) dentro del archivo"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "No se puede ir hacia atrás en el archivo; puede ser ilegible sin -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek no paró en los límites de un registro"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: contiene un número de volumen inválido"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Desbordamiento en el número de volumen"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Prepare el volumen #%d para %s y pulse intro: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr ""
"Se encontró un final de fichero mientras se esperaba respuesta del usuario"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "ATENCIÓN: El archivo está incompleto"
@@ -798,7 +796,7 @@ msgstr "ATENCIÓN: El archivo está incompleto"
# A mí aquí me da igual lista que ayuda, de las dos formas se entiende. Manda
# el traductor original. gerardo
# ¿A alguien más le parece mal que ponga ayuda en vez de lista? sv
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -810,12 +808,12 @@ msgstr ""
" q Aborta tar\n"
" y o Intro Sigue\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Lanza un subshell\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Muestra esta lista\n"
@@ -826,37 +824,37 @@ msgstr " ? Muestra esta lista\n"
# Uno se sale del programa, y éste acaba. En realidad, también da igual, de
# cualquier forma se entiende, pero mejor acabar o terminar que finalizar,
# total, son sinónimos. gerardo
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "No hay volumen nuevo; finalizando.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "No se ha especificado el nombre del fichero. Inténtelo de nuevo.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Entrada inválida. Teclee ? para obtener ayuda.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "La orden %s falló"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s no continúa en este volumen"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s posiblemente continúa en este volumen: la cabecera contiene un nombre "
"truncado"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s tiene un tamaño erróneo (%s != %s + %s)"
@@ -876,7 +874,7 @@ msgstr "%s tiene un tamaño erróneo (%s != %s + %s)"
# él solito.
# Todavía espero una solución mágica que sea mejor que las dos
# que tenemos hasta ahora.
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Este volumen está fuera de secuencia (%s - %s != %s)"
@@ -887,17 +885,17 @@ msgstr "Este volumen está fuera de secuencia (%s - %s != %s)"
# Si no se sabe eso, se podría dejar de forma más neutra como
# "Archivo no etiquetado para concordancia con `%s'" - gerardo (gag)
# FIXME: Preguntar.
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "El archivo no está etiquetado para que coincida con %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "El volumen %s no coincide con %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -909,27 +907,27 @@ msgstr ""
# Según gag y jmg, hay que decir: "no está en un límite de bloque", pues
# no estamos hablando de un bloque concreto (el bloque) sino de uno cualquiera.
# FIXME: Entonces tal vez el original debería decir "on a block boundary". sv
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "la escritura no terminó en un límite de bloque"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Sólo se pudieron leer %lu de %lu byte"
msgstr[1] "Sólo se pudieron leer %lu de %lu bytes"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "El contenido es distinto"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Fin de fichero inesperado en el archivo"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "El tipo de fichero es distinto"
@@ -939,46 +937,46 @@ msgstr "El tipo de fichero es distinto"
# corresponder siempre una frase corta española, el resultado sonará a indio
# completamente (me refiero a los indios esos de las películas del oeste,
# que solamente hablan con sustantivos, verbos y adjetivos). sv
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "El modo es distinto"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "El uid es distinto"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "El gid es distinto"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "La fecha de modificación es distinta"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "El tamaño es distinto"
# Creo que este enlace se efectúa al descomprimir un archivo tar.
# No es que nos diga si está enlazado o no lo está, sino si él hace
# el enlace o no lo hace. sv
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "No se enlaza a %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "El enlace simbólico es distinto"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "El número de dispositivo es distinto"
# "Verifica ". Supongo que depende de si se concatena en algún
# mensaje. jmg
# FUZZY. Es verdad, habrá que verlo.
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verificar "
@@ -989,70 +987,70 @@ msgstr "Verificar "
# # cambiaría "se toma" por "se ha tomado". gag
# Es norma habitual convertir un pasado en un presente en estos casos.
# Realmente, dice lo que hace y no lo que ha hecho. sv
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
"%s: Tipo de fichero '%c' desconocido, se toma la diferencia\n"
"como fichero normal"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr ""
"El archivo contiene nombres de fichero con los prefijos iniciales eliminados."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "El archivo contiene nombres de fichero transformados."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Puede que la verificación no encuentre los ficheros originales."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "FALLO DE VERIFICACIÓN: %d cabecera inválida detectada"
msgstr[1] "FALLO DE VERIFICACIÓN: %d cabeceras inválidas detectadas"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Un bloque de ceros aislado en %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: contiene una marca de directorio caché %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "valor %s fuera del rango %s %s..%s; se sustituye %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "valor %s fuera del rango %s %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Generando cabeceras octales negativas"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: el nombre del fichero es demasiado largo (máx %d); no se vuelca"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
"%s: el nombre del fichero es demasiado largo (no se puede dividir); no se "
"vuelca"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: el nombre del enlace es demasiado largo; no se vuelca"
@@ -1065,7 +1063,7 @@ msgstr "%s: el nombre del enlace es demasiado largo; no se vuelca"
# Que sí, reconozco que la traducción es un poco libre.
# Pero mi intención es que el programa diga lo que va haciendo, no lo que ya
# ha hecho. Ni siquiera el original es consistente en los modos verbales. sv
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
@@ -1074,13 +1072,13 @@ msgstr[0] ""
msgstr[1] ""
"%s: El tamaño del fichero ha disminuido en %s bytes, se rellena con ceros"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: el fichero está en un sistema de ficheros distinto; no se vuelca"
# Se vuelca la *memoria* del proceso en un fichero llamado `core'.
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "no se vuelca el contenido"
@@ -1100,70 +1098,70 @@ msgstr "no se vuelca el contenido"
# Seguiremos en la ortodoxia, pero aún así, no puedo creerme que venga
# en el DRAE. ¿Estás seguro? sv
# No, no me compré el DRAE. Pregúntalo a spanglish (si te atreves ;-) gerardo
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Tipo de fichero desconocido; no se tendrá en cuenta"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Faltan enlaces a %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: el fichero no ha cambiado; no se vuelca"
# FIXME: Decir al autor que ponga el "itself". sv
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: el fichero es el propio archivo; no se vuelca"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "no se vuelca el directorio"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: el fichero cambió mientras se estaba leyendo"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: el `socket' no se tendrá en cuenta"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: no se tendrá en cuenta la puerta"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Saltando a la siguiente cabecera"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Borrando no-cabecera del archivo"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: marca de fecha sospechosamente antigua %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: la marca de tiempo %s está %s s en el futuro"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Inconsistencia inesperada al crear el directorio"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: se salta un fichero que existe"
@@ -1198,7 +1196,7 @@ msgstr "%s: No se puede extraer -- el fichero es continuación de otro volumen"
# ¿No se referirá al autor a "mangled filenames"?... jmg
# FIXME. Preguntárselo.
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Cabecera de nombres largos inesperada"
@@ -1215,7 +1213,7 @@ msgstr "El %s actual es más reciente o de la misma fecha"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: El nombre del miembro contiene '..'"
#: src/extract.c:1696
#, c-format
@@ -1227,23 +1225,23 @@ msgstr "%s: No se pudo hacer copia de seguridad de este fichero"
msgid "Cannot rename %s to %s"
msgstr "No se puede renombrar %s a %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: El directorio ha sido renombrado desde %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: El directorio es nuevo"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr ""
"%s: el directorio está en un sistema de ficheros distinto; no se vuelca"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: El directorio ha sido renombrado"
@@ -1370,35 +1368,35 @@ msgstr "%s: Borrando %s\n"
msgid "%s: Cannot remove"
msgstr "%s: No se puede borrar"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Se omite"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "bloque %s: ** Bloque de NULos **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "bloque %s: ** Fin de Fichero **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "bloque %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Hay blancos en la cabecera cuando se esperaba el valor numérico %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1406,145 +1404,145 @@ msgstr ""
"se supone complemento a dos"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "El valor octal %.*s del archivo está fuera del rango %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "El archivo contiene cabeceras base 64 obsoletas"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "La cadena firmada en base 64 %s del archivo está fuera del rango %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "El valor en base 256 del archivo está fuera del rango %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "El archivo contiene %.*s donde se esperaba el valor numérico %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "El valor del archivo %s está fuera del rango de %s %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " enlace a %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " tipo de fichero desconocido %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Enlace largo--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Nombre largo--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Cabecera de Volumen--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Continúa en el byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Creando el directorio:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Se renombra %s como %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: No se puede renombrar a %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Se vuelve a renombrar %s como %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: El fichero fue borrado antes de leerlo"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "proceso hijo"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "canal de interproceso"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Selección del fichero local:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"añade el FICHERO dado al archivo (útil si su nombre comienza con un guion)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "cambia al directorio DIR"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "obtiene los nombres que se van a extraer o crear de FICHERO"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T lee nombres terminados en nulo; implica --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "desactiva el efecto de la opción --null anterior"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"quita las comillas de los nombres de ficheros de entrada o de miembros "
"(predeterminado)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
"no quita las comillas de los nombres de ficheros de entrada o de miembros"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T lee nombres de fichero literalmente (sin manejo de opciones)"
+msgstr ""
+"-T lee nombres de fichero literalmente (sin manejo de escape ni de opciones)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T trata los nombres de fichero que comienzan con guión como opciones "
@@ -1555,19 +1553,19 @@ msgstr ""
# de expansión de nombres de ficheros, como * y ?, mientras que
# el segundo se refiere a expresiones regulares como las de grep,
# es decir, ^, $, ., *, etc.
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "PATRÓN"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "excluye ficheros, dados como un PATRÓN"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "excluye los patrones listados en FICHERO"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1575,26 +1573,26 @@ msgstr ""
"excluye el contenido de los directorios que contienen CACHEDIR.TAG, excepto "
"por el propio fichero CACHEDIR.TAG"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "excluye todo bajo los directorios que contienen CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "excluye los directorios que contienen CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"excluye el contenido de los directorios que contengan FICHERO, excepto el "
"propio FICHERO"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
"leer en FICHERO, si existe, los patrones de exclusión oara cada directorio"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1602,121 +1600,125 @@ msgstr ""
"leer en FICHERO, si existe, los patrones de exclusión oara cada directorio "
"sus subdirectorios"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "exclute todo bajo los directorios que contengan FICHERO"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "excluye los directorios que contengan FICHERO"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "excluye los directorios de sistemas de control de versiones"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "lee los patrones de exclusión de los ficheros de descarte de VCS"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "excluye los ficheros de respaldo y de bloqueo"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "opera recursivamente sobre los directorios (por omisión)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "evita descender automáticamente en los directorios"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"opciones de coincidencia para nombres de fichero (afectan a los patrones de "
"exclusión y de inclusión):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "los patrones encajan con el comienzo del nombre del fichero"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
"los patrones encajan después de cualquier `/' (por omisión para exclusión)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "no distingue mayúsculas de minúsculas"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "distingue mayúsculas de minúsculas (por omisión)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "utiliza comodines (predeterminado para exclusión)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "coincidencia de cadenas verbatim"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "los comodines encajan con `/' (por omisión para exclusión)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "los comodines no encajan con `/'"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Las siguientes opciones se han utilizado después de cualesquier argumentos "
+"no opcionales en modo de crear o actualizar fichero. Estas opciones son "
+"posicionales y afectan solamente a los argumentos que vayan tras ellas. Hay "
+"que recolocarlas adecuadamente."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s carece de efecto"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s carece de efecto"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s carece de efecto"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "línea de órdenes"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: la lista de ficheros solicitada en %s ya se ha leído de %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "no se puede dividir la cadena '%s': %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: el nombre de fichero leído contiene el carácter nul"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
"Se han utilizado caracteres de expresiones regulares en los nombres de los "
"ficheros"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1724,12 +1726,12 @@ msgstr ""
"Utilice --wildcards para activar el encaje de patrones, o --no-wildcards "
"para suprimir este aviso"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: No se encuentra en el archivo"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: El elemento solicitado no se encuentra en el archivo"
@@ -1740,37 +1742,37 @@ msgstr "%s: El elemento solicitado no se encuentra en el archivo"
# Si no se sabe eso, se podría dejar de forma más neutra como
# "Archivo no etiquetado para concordancia con `%s'" - gerardo (gag)
# FIXME: Preguntar.
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Discordancia en la etiqueta del archivo"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Usar la opción -C dentro de una lista de ficheros no está permitido con --"
"listed-incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Solamente se permite una opción -C con --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Las opciones '%s' y '%s' requieren entrada estándar"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Formato de archivo inválido"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Se requieren características de GNU en formato de archivo incompatible"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -2038,7 +2040,7 @@ msgstr "Selección del flujo de salida:"
msgid "extract files to standard output"
msgstr "extrae los ficheros a la salida estándar"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "ORDEN"
@@ -2077,7 +2079,7 @@ msgid "use FILE to map file owner GIDs and names"
msgstr ""
"utiliza FICHERO para asociar GIDs de propietarios y nombres de ficheros"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "FECHA-O-FICHERO"
@@ -2321,7 +2323,7 @@ msgstr "rehace los bloques conforme se lee (para tuberías de 4.2BSD)"
msgid "Archive format selection:"
msgstr "Selección del formato de archivo:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMATO"
@@ -2407,61 +2409,61 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "filtra a través de PROG (debe aceptar -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Selección del fichero local:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "permanece en el sistema de ficheros locales al crear el archivo"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "no elimina las '/'s iniciales de los nombres de ficheros"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"sigue los enlaces simbólicos; archiva y vuelca los ficheros a los que apuntan"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"sigue los enlaces duros; archiva y vuelca los ficheros a los que se refieren"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "NOMBRE-DE-MIEMBRO"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "comienza por el miembro NOMBRE-DE-MIEMBRO al leer el archivo"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "almacena solamente ficheros más recientes que FECHA-O-FICHERO"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "FECHA"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "compara la fecha y hora solamente cuando cambian los datos"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "CONTROL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "se hace un respaldo antes de borrar, escoja el CONTROL de versión"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "CADENA"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2470,63 +2472,63 @@ msgstr ""
"que se\n"
"cambie con la variable de entorno SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Transformaciones de los nombres de ficheros:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
"elimina NÚMERO componentes iniciales de los nombres de ficheros al extraer"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "EXPRESIÓN"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
"utiliza la EXPRESIÓN de reemplazo sed para transformar los nombres de "
"ficheros"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Salida informativa:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "lista los ficheros procesados detalladamente"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "PALABRACLAVE"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "control de advertencia"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"muestra mensajes de progreso cada NÚMERO-ésimo registro (por omisión 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "ACCIÓN"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "ejecuta ACCIÓN en cada punto de comprobación"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "muestra un mensaje si no se vuelcan todos los enlaces"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SEÑAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2538,35 +2540,35 @@ msgstr ""
"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 y SIGUSR2; también se aceptan los nombres "
"sin el prefijo SIG"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "muestra las fechas/horas de modificación de los ficheros en UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "muestra la fecha del fichero con la máxima resolución"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "envía la salida detallada a FICHERO"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "muestra el número de bloque dentro del archivo con cada mensaje"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "pide confirmación para cada acción"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "muestra los valores predeterminados de tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "muestra los rangos válidos para los campos de fichero de instantánea"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2574,35 +2576,35 @@ msgstr ""
"cuando se lista o extrae, lista cada directorio que no coincida con el "
"criterio de búsqueda"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr ""
"muestra los nombres de los ficheros o los archivos después de la "
"transformación"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "ESTILO"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"establece el estilo de cita de los nombres; véanse más abajo los valores "
"ESTILO válidos"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "también entrecomilla los caracteres de CADENA"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "no entrecomilla los caracteres de CADENA"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Opciones de compatibilidad:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2610,22 +2612,22 @@ msgstr ""
"al crear, lo mismo que --old-archive; al extraer, lo mismo que --no-same-"
"owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Otras opciones:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "desactivo el uso de algunas opciones potencialmente peligrosas"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "la opción '%s' no se puede usar con '%s'"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2633,40 +2635,40 @@ msgstr ""
"No se puede especificar más de una opción `-Acdtrux', '--delete' o '--test-"
"label'"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Opciones de compresión en conflicto"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Nombre de señal desconocido: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "No se encontró el fichero de fechas de muestra"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Sustituyendo %s por el formato de fecha desconocido %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Opción %s: Se trata la fecha '%s' como %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtra el archivo a través de %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Los argumentos válidos para la opción --quoting-style son:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2674,19 +2676,19 @@ msgstr ""
"\n"
"Las opciones predeterminadas de *esta* versión de tar son:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "ID de propietario o de grupo inválido"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Factor de bloqueo inválido"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Longitud de cinta inválida"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Valor de nivel incremental inválido"
@@ -2696,105 +2698,105 @@ msgstr "Valor de nivel incremental inválido"
# Es "umbral", pero no sé qué c$%&# es la fecha umbral. :-( gag
# A ver si te vale así. sv
# ¿Qué tal os suena "fecha límite"?. jmg
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Se ha especificado más de una fecha tope"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Valor de versión dispersa inválido"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' no se admite en esta plataforma"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "El valor de --checkpoint no es un número entero"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Se ha especificado un modo no válido en la opción"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Número inválido"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "El tamaño del registro es inválido"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "El tamaño del registro debe ser múltiplo de %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Número inválido de elementos"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Solamente se permite una opción --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Argumento de densidad mal formado: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Densidad desconocida: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "*Esta* versión de tar no admite las opciones '-[0-7][lmh]'"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: localización del error"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "error al analizar %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FICHERO]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "argumentos que no son opciones en %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "no se puede dividir TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "La opción antigua '%c' requiere un argumento"
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence no tiene sentido sin una lista de ficheros"
# requieren -> necesitan. gerardo
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Los archivos múltiples requieren la opción '-M'"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level no tiene sentido sin --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
@@ -2803,43 +2805,43 @@ msgstr[0] ""
msgstr[1] ""
"%s: La etiqueta de volumen es demasiado larga (el límite es %lu bytes)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "No se pueden verificar archivos multivolumen"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "No se pueden verificar archivos comprimidos"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "No se pueden utilizar archivos multivolumen comprimidos"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "No se pueden concatenar archivos comprimidos"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime necesita una fecha especificada mediante --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option solamente se puede usar en archivos POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls solamente se puede usar en archivos POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux solamente se puede usar en archivos POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs solamente se puede usar en archivos POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2847,26 +2849,26 @@ msgstr ""
"No se puede deducir el nombre del directorio del nivel superior; indíquelo "
"explícitamente con --one-top-level=DIR"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "La longitud del volumen no puede ser menor que el tamaño de registro"
# Me gusta más al verrés: cobarde rechazo [de la pradera] a... gerardo
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Rechazo cobarde a crear un archivo vacío"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Las opciones '-Aru' son incompatibles con '-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Debe especificar una de las opciones `-Acdtrux', '--delete' o '--test-label'"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Se sale con estado de fallo debido a errores anteriores"
@@ -2885,60 +2887,69 @@ msgstr "Se sale con estado de fallo debido a errores anteriores"
# y cursis, para que no se enfade nadie? Aunque para cursis: `cáspita',
# `caracoles', `cónchales'; no diréis que no os doy opciones.) Por cierto,
# creo que la coma sobra (incluso en el original). gerardo
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: El tamaño del fichero ha disminuido en %s byte"
msgstr[1] "%s: El tamaño del fichero ha disminuido en %s bytes"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "La palabra clave %s es desconocida o no está implementada todavía"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "La marca de tiempo está fuera del rango permitido"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "No se puede usar el patrón %s"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "La palabra clave %s no se puede sustituir"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Cabecera extendida errónea: falta la longitud"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "La longitud de cabecera extendida %*s está fuera de rango"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Cabecera extendida errónea: falta espacio después de la longitud"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Cabecera extendida errónea: falta un signo igual"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Cabecera extendida errónea: falta una nueva línea"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
"Se desestima la palabra clave de la cabecera extendida desconocida '%s'"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2947,46 +2958,46 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "La cabecera extendida %s=%s está fuera del rango %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Cabecera extendida errónea: %s=%s inválido"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Cabecera extendida errónea: sobra %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Cabecera extendida errónea: %s inválido: delimitador %c inesperado"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Cabecera extendida errónea: %s inválido: número impar de valores"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: no es un tiempo de expiración válido"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: acción de punto de comprobación desconocida"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "escritura"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "lectura"
@@ -2994,7 +3005,7 @@ msgstr "lectura"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Punto de comprobación de escritura %u"
@@ -3003,7 +3014,7 @@ msgstr "Punto de comprobación de escritura %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Punto de comprobación de lectura %u"
@@ -3011,7 +3022,7 @@ msgstr "Punto de comprobación de lectura %u"
# Acepto sugerencias para el `test suite'. sv
# "test suite"="paquete/conjunto de pruebas/análisis", en cualquier
# combinación. jmg
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -3019,99 +3030,103 @@ msgstr ""
"genfile manipula ficheros de datos para la «suite» de pruebas GNU paxutils.\n"
"OPCIONES:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Opciones de creación de ficheros:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "TAMAÑO"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Crea un fichero del TAMAÑO dado"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Escribe al fichero NOMBRE; en lugar de a la salida estándar"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Lee los nombres de los ficheros de FICHERO"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T lee nombres terminados en nulo"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "Rellena el fichero con el PATRÓN dado, PATRÓN es 'default' o 'zeros'"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Tamaño de un bloque para un fichero disperso"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Genera un fichero disperso. El resto de la línea de órdenes da el mapa del "
"fichero."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "DESPLAZAMIENTO"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Busca en el desplazamiento indicado antes de escribir los datos"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Suprime mensajes de diagnóstico no fatales"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Opciones de estadísticas de ficheros:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Imprime los contenidos de la estructura de estadísticas para cada fichero "
"indicado. FORMATO predeterminado: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Opciones de ejecución síncrona:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPCIÓN"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Ejecuta ARGS. Es útil con --checkpoint y una de entre --cut, --append, --"
"touch y --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Realiza la acción indicada (véase más abajo) al llegar al punto de "
"comprobación NÚMERO"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Establece la fecha para la siguiente opción --touch"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
"Muestra los puntos de comprobación ejecutados y el estado de la salida de "
"ORDEN"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -3119,7 +3134,7 @@ msgstr ""
"Acciones de ejecución síncrona. Se ejecutan cuando se llega al punto de "
"comprobación indicado por la opción --checkpoint"
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -3127,96 +3142,96 @@ msgstr ""
"Trunca FICHERO al tamaño especificado previamente en una opción --length (o "
"0, si no se ha indicado esta)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Añade TAMAÑO btyes a FICHERO. TAMAÑO es el indicado previamente en una "
"opción --length"
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Actualiza las fechas de acceso y modificación de FICHERO"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Ejecuta ORDEN"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Borra FICHERO"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Tamaño inválido: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Número fuera del rango permitido: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Tamaño negativo: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) ha fallado"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "longitud de fichero solicitada %lu, efectiva %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "el fichero creado no es disperso"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Error al analizar número cerca de `%s'"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENTOS...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "No se puede abrir `%s'"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "no se puede efectuar `seek'"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "el nombre del fichero contiene el carácter nulo"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"no se pueden generar ficheros dispersos en la salida estándar; utilice la "
"opción --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "máscara incorrecta (cerca de `%s')"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Campo desconocido `%s'"
@@ -3227,25 +3242,25 @@ msgstr "Campo desconocido `%s'"
# ser: "No se puede hacer stat() del fichero %s", o "stat() ha fallado..."
# Aunque tal como está es más descriptivo para el neófito, desde
# luego. gag
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "no se puede establecer la fecha sobre `%s'"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "no se puede truncar `%s'"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "la orden falló: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "no se puede truncar `%s'"
+msgstr "no se pueden sacar estadísticas de `%s'"
# Uff, a lo mejor se asusta el usuario si ponemos 'no se pudo leer con stat()
# el estado del fichero em+
@@ -3253,12 +3268,12 @@ msgstr "no se puede truncar `%s'"
# ser: "No se puede hacer stat() del fichero %s", o "stat() ha fallado..."
# Aunque tal como está es más descriptivo para el neófito, desde
# luego. gag
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "no se puede establecer la fecha sobre `%s'"
+msgstr "no se puede borrar el directorio `%s'"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "no se puede desenlazar `%s'"
@@ -3298,6 +3313,9 @@ msgstr "La orden terminó\n"
msgid "--stat requires file names"
msgstr "--stat necesita nombres de ficheros"
+#~ msgid "OPTION"
+#~ msgstr "OPCIÓN"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: El parámetro ARGP_HELP_FMT debe ser positivo"
diff --git a/po/et.gmo b/po/et.gmo
index 10b0a17c0b4b5529ff671fee5a75fd94f38673bc..d44c134ae43e3f8404b272259407c9ce9d4f40aa 100644
Binary files a/po/et.gmo and b/po/et.gmo differ
diff --git a/po/et.po b/po/et.po
index 73f0092210ceaa41c4b9f36769fa52715fefb29c..7f541d708cef8708d53e35d12e5ae18752161aaf 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3,12 +3,12 @@
# Copyright (C) 2001 Free Software Foundation, Inc.
# Toomas Soome <tsoome@me.com>, 2016.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: GNU tar 1.29\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2016-05-16 22:43+0300\n"
"Last-Translator: Toomas Soome <tsoome@me.com>\n"
"Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -96,7 +96,7 @@ msgid "give a short usage message"
msgstr "näita lühikest kasutamise õpetust"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NIMI"
@@ -231,12 +231,12 @@ msgstr "^[jJ]"
msgid "^[nN]"
msgstr "^[eE]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Paketi looja %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Paketi looja %s\n"
@@ -244,11 +244,11 @@ msgstr "Paketi looja %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
#, fuzzy
msgid ""
"\n"
@@ -524,191 +524,191 @@ msgstr "Teise serveri käsuinterpretaatorile ei saa faile ümber suunata"
msgid "Cannot execute remote shell"
msgstr "Ei saa käivitada kaug käsuinterpretaatorit"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Otsimise suund on piiridest väljas"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Vigane seek suund"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Vigane seek indeks"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Otsimise indeks on piiridest väljas"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Vigane baitide arv"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Baitide arv on piiridest väljas"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Ootamatu faili lõpp"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Vigane operatsiooni kood"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operatsioon ei ole toetatud"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Ootamatud argumendid"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Opereeri lindiseadet, aktsepteerib käske mittelokaalselt protsessilt"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "N"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "määra silumise tase"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FAIL"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "sea silumisteadete faili nimi"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "%s ei saa avada"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "liiga palju argumente"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Rämpskäsk"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Hmm.... see ei tundu olema tar arhiiv"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Baite loetud kokku"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Baite kirjutatud kokku"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Kustutatud baite kokku"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(toru)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Ei loe arhiivi sisu terminalist (puudub -f võti?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Ei kirjuta arhiivi sisu terminali (puudub -f võti?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Kirje suuruse väärtus on vigane"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Arhiivi nime pole"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Ei saa kontrollida sisend/väljund arhiive"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Arhiiv on tihendatud. Kasutage võtit %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Ei saa uuendada pakitud arhiive"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Lindi alguses, lõpetan töö"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Liig palju vigu, jätan töö pooleli"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Kirje suurus = %lu blokki"
msgstr[1] "Kirje suurus = %lu blokki"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Joondamata blokk (%lu baiti) arhiivis"
msgstr[1] "Joondamata blokk (%lu baiti) arhiivis"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Arhiivi ei õnnestu tagasi kerida; lugemiseks võib olla vajalik kasutada "
"võtit -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek ei peatunud kirje piiril"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: sisaldab vigast volüümi numbrit"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Volüümi number on liiga suur"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Otsi volüüm #%d %s'le ja vajuta return klahvi: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "EOF kasutaja vastuse asemel"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "HOIATUS: Arhiiv pole täielik"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -719,65 +719,65 @@ msgstr ""
" q Katkesta tar\n"
" y või reavahetus Jätka\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Loo alamshell\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Väljasta see info\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Pole uus volüüm; lõpetan töö.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Puudub faili nimi. Proovige uuesti.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Vigane sisend. ? annab abiinfot.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s käsklus sai vea"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s ei jätku sellel volüümil"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "võimalik et %s jätkub sellel volüümil: päises on lühendatud nimi"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s on vale suurusega (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "See volüüm on väljaspoolt järjekorda (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arhiivi märgend ei sobi %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Volüüm %s ei sobi volüümiga %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -785,210 +785,210 @@ msgstr ""
"%s: faili nimi on GNU mitmevolüümi päisesse salvestamiseks liiga pikk, "
"lühendan"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "kirjutamine ei peatunud bloki piiril"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Sain lugeda ainult %lu baiti (sooviti %lu)"
msgstr[1] "Sain lugeda ainult %lu baiti (sooviti %lu)"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Sisu on erinev"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Ootamatu arhiivi lõpp"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Failitüübid on erinevad"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Moodid erinevad"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "UID on erinevad"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "GID on erinevad"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Muutmise ajad erinevad"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Suurused erinevad"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "ei viita %s-le"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Nimeviited erinevad"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Seadme numbrid on erinevad"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Kontroll "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Tundmatu failitüüp '%c', võrdlen tavalise failina"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Arhiiv sisaldab eemaldatud prefiksitega failinimesid."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Arhiiv sisaldab teisendatud faili nimesid."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Kontrollimine ei pruugi leida algseid faile."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "VIGA KONTROLLIMISEL: leiti %d vigast päist"
msgstr[1] "VIGA KONTROLLIMISEL: leiti %d vigast päist"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Üksik null blokk kohal %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: sisaldab vahemälu kataloogi lipikut %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "väärtus %s on %s piiridest %s..%s väljas; asendan %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "väärtus %s on %s piiridest %s..%s väljas"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Genereerin negatiivsed kaheksand päised"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: faili nimi on liiga pikk (maks. %d); ei salvesta"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: faili nimi on liiga pikk (ei saa poolitada); ei salvesta"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: viite nimi on liiga pikk; ei salvesta"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Fail lühenes %s baiti; täidan nullidega"
msgstr[1] "%s: Fail lühenes %s baiti; täidan nullidega"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: fail on teises failisüsteemis; ei salvesta"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "sisu ei salestata"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Tundmatu failitüüp; ignoreerin seda faili"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "%s-le puudub viiteid."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: pole muutunud; ei salvesta"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s on arhiiv; ei salvesta"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "kataloogi ei salvestatud"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: fail muutus lugemisel"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: ignoreerin pesa"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: ignoreerin ust"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Hüppan järgmise päiseni"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Kustutan arhiivist mitte-päise"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: ebatõenäoliselt vana ajatempel %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: ajatempel %s on %s sekundit tulevikus"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Ootamatu kooskõlalisuse probleem kataloogi loomisel"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: jätan olemasoleva faili vahele"
@@ -1011,7 +1011,7 @@ msgstr "Üritan taastada nimeviiteid viidetena"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Ei saa taastada -- fail jätkub teisel volüümil"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Ootamatu pika nime päis"
@@ -1040,22 +1040,22 @@ msgstr "%s: Selle faili varundamine ebaõnnestus"
msgid "Cannot rename %s to %s"
msgstr "%s ei õnnestu ümber nimetada %s-ks"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Kataloog %s on ümber nimetatud"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Kataloog on uus"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: kataloog on teises failisüsteemis; ei salvesta"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Kataloog on ümber nimetatud"
@@ -1181,193 +1181,193 @@ msgstr "%s: Kustutan %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Ei saa eemaldada"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Jätan vahele"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blokk %s: ** NULlide blokk **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blokk %s: ** Faili lõpp **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blokk %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Tühjad väljad päises kohtadel, kus eeldati numbrit %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
"Arhiivi kaheksandväärtus %.*s on %s piiridest väljas; eeldan kahe täiendit"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Arhiivi kaheksandväärtus %.*s on %s piiridest väljas"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arhiiv sisaldab aegunuid base-64 päiseid"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Arhiivi märgiga base-64 sõne %s on %s piiridest väljas"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Arhiivi base-256 väärtus on %s piiridest väljas"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arhiiv sisaldab %.*s, eeldati numbrit %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Arhiivi väärtus %s on %s piiridest %s..%s väljas"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " viide %s-le\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " tundmatu failitüüp %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Pikk viide--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Pikk nimi--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Volüümi päis--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Jätkub baidilt %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Loon kataloogi:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Annan %s uueks nimeks %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: ei õnnestu ümber nimetada %s-ks"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Nimetan `%s' tagasi `%s'\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Fail kustutati enne lugemist"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "alamprotsess"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "protsessidevaheline kanal"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Lokaalse faili nime valik:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "lisa antud FAIL arhiivi (kasulik, kui faili nimi algab kriipsuga)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "KAT"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "mine kataloogi KAT"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "loe taastatavate või varundatavate failide nimed failist NIMI"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T loeb nullidega lõpetatud nimesid; eeldab --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "blokeeri eelmise --null võtme mõju"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"eemalda sisendfaili või liikmete nimedest kvootimissümbolid (vaikimisi)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "ära eemalda nimedest kvootimissümboleid"
-#: src/names.c:87
+#: src/names.c:86
#, fuzzy
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr "-T loeb faili nimesid otse (ei käsitle võtmeid)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "-T käsitleb kriipsuga algavaid failide nimesid võtmetena (vaikimisi)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "MUSTER"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "MUSTRI järgi välistatud failid"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "välistavad mustrid on FAILIS"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1375,24 +1375,24 @@ msgstr ""
"välista kataloogide, mis sisaldavad CACHEDIR.TAG, sisu, välja arvatud "
"märgendi fail ise"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "välista kõik kataloogis, mis sisaldab CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "välista kataloogid, mis sisaldavad CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"välista kataloogide, mis sisaldavad faili FAIL, sisu, välja arvatud FAIL ise"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "loe kataloogide välistamise mustrid failist, kui see on olemas"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1400,116 +1400,116 @@ msgstr ""
"loe kataloogide ja alamkataloogide välistamise mustrid failist, kui see on "
"olemas"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "välista kataloogid, mis sisaldavad faili FAIL"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "välista kataloogid, mis sisaldavad faili FAIL"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "välista versiooni kontrolli süsteemi kataloogid"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "loe välistamise mustrid VCS ignoreerimise failidest"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "välista varukoopiad ja lukufailid"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "sisene kataloogidesse (vaikimisi)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "ära sisene kataloogidesse"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr "Failinimede otsimine (mõjutab nii kaasamist, kui välistamist):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "mustrid alustavad faili nime algusest"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "mustrid toimivad iga '/' järel (välistamise korral vaikimisi)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "tõstutundetu"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "tõstutundlik otsimine (vaikimisi)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "kasuta jokkersümboleid (välistamise korral vaikimisi)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "täht-täheline sõne otsimine"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "jokkersümbolid leiavad '/' (välistamise korral vaikimisi)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "jokkerid ei leia '/'"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "käsurida"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: %s loetud failide nimekiri on juba loetud failist %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "sõne '%s' ei saa tükeldada: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: loetud faili nimi sisaldab sümbolit nul"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Failide nimedes on jokkersümbolid"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1517,45 +1517,45 @@ msgstr ""
"Jokkerite lubamiseks kasutage --wildcars või --no-wildcards selle teate "
"blokeerimiseks"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Puudub arhiivis"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Nõutud eksemplar puudub arhiivis"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Arhiivi märgend ei sobi"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr "--listed-incremental ei luba faili loendis võtit -C kasutada"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Võti --listed-incremental lubab ainult ühte -C kasutamist"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Mõlemad võtmed, '%s' ja '%s', eeldavad standard sisendit"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Vigane arhiivi vorming"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Arhiivi formaat ei toeta GNU laiendusi"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1771,7 +1771,7 @@ msgstr "Vali väljundvoog:"
msgid "extract files to standard output"
msgstr "taasta failid standardväljundisse"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "KÄSK"
@@ -1807,7 +1807,7 @@ msgstr "kasuta FAILi omaniku UID ja nime seadmisel"
msgid "use FILE to map file owner GIDs and names"
msgstr "kasuta FAILi omaniku GID ja nime seadmisel"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "KUUP-VÕI-FAIL"
@@ -2013,7 +2013,7 @@ msgstr "bloki lugemisel uuesti (4.2BSD torude jaoks)"
msgid "Archive format selection:"
msgstr "Arhiivi vormingu valikud:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "VORMING"
@@ -2097,59 +2097,59 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "filtreeri läbi programmi (peab lubama võtit -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Lokaalse faili valik:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "püsi arhiivi loomise ajal kohalikus failisüsteemis"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "ära eemalda faili nimedelt prefiksit '/'"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "järgi nimeviiteid; arhiveeri ja taasta viidatavad failid"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "järgi viiteid; arhiveeri ja taasta viidatavad failid"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "KOMPONENT"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "alusta arhiivi lugemisel liikmest KOMPONENT"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "salvesta ainult failid mis on uuemad kui KUUP-VÕI-FAIL"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "KUUPÄEV"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "võrdle kuupäevi ainult kui andmed on muutunud"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "KONTROLL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "loo enne eemaldamist varukoopia, vali versioonikontroll"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "SÕNE"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2157,59 +2157,59 @@ msgstr ""
"varunda enne kustutamist, kasuta uut lõppu (vaikimisi '~', kui pole üle "
"määratud keskkonnamuutujaga SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Failide nimede muutmine:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "eemalda taastamisel failide nimede algusest NUMBER komponenti"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "AVALDIS"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "kasuta failide nimede muutmiseks sed asendus avaldist"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informatsioon:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "väljasta töödeldavate failide kohta infot"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "VÕTMESÕNA"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "hoiatuste juhtimine"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "anna töö kohta infot iga NUMBER kirje järel (vaikimisi 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "TEGEVUS"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "käivita tegevus igas kontrollpunktis"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "väljasta teade, kui kõike viiteid pole salvestatud"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2220,35 +2220,35 @@ msgstr ""
"väljasta see info, kui saadetakse antud signaal. Lubatud signaalid on: "
"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 ja SIGUSR2; SIG prefiksi võib ära jätta"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "väljasta failide muutmise ajad UTC esituses"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "väljasta faili aeg täielikult"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "salvesta täiendav info FAILi"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "näita iga teatega ka arhiivi bloki numbrit"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "küsi iga tegevuse kohta kinnitust"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "näita tar vaikeseadeid"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "näita snapshot-faili väljade lubatud vahemikud"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2256,92 +2256,92 @@ msgstr ""
"listingu või taastamise ajal, näita igat kataloogi mis ei vasta "
"otsingutingimustele"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "peale teisendamist näita faili või arhiivi nime"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STIIL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "määra nimede kvootimise stiil; lubatud väärtused on toodud allpool"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "lisaks kvoodi sõnes näidatud sümbolid"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "keela sõnes toodud sümbolite kvootimine"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Ühilduvuse võtmed:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr "loomisel sama kui --old-archive. Taastamisel sama kui --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Muud võtmed:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "blokeeri potentsiaalselt ohtlikud võtmed"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "võtit '%s' ei saa võtmega '%s' kasutada"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr ""
"Korraga võib kasutada ainult ühte võtmetest '-Acdtrux' või '--test-label'"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Konfliktsed pakkimisvõtmed"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Tundmatu signaali nimi: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Kuupäeva fail puudub"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Kasutan %s tundmatu ajaformaadi %s asemel"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Võti %s: Käsitlen aega '%s' kui %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtreeri arhiiv läbi %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Võtmega --quoting-style on lubatud järgnevad argumendid:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2349,290 +2349,299 @@ msgstr ""
"\n"
"*See* tar kasutab vaikimisi:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Vigane omanik või grupi ID"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Vigane blokkimisfaktor"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Vigane lindi pikkus"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Inkrementaalse varunduse taseme väärtus on vigane"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Rohkem kui üks etteantud aeg"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Vigane aukudega faili versiooni väärtus"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' ei ole sellel platvormil toetatud"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint väärtus ei ole täisarv"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Võtmega anti vigane mood"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Vigane number"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Vigane kirje suurus"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Kirje suurus peab olema %d kordne."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Vigane elementide arv"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Lubatud on ainult üks --to-command võti"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Vigane tiheduse argument: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Tundmatu tihedus: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "*See* tar ei toeta võtmeid '-[0-7][lmh]'"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: vea asukoht"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "viga %s parsimisel"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FAIL]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "%s sisaldab vigast argumenti"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "TAR_OPTIONS ei saa tükeldada: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Vana võti '%c' nõuab argumenti."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence ei oma failide nimekirjata mõtet"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Mitme arhiivifaili kasutamine nõuab võtit '-M'"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level ei oma võtmeta --listed-incremental mõtet"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Volüümi märgend on liiga pikk (piirang on %lu baiti)"
msgstr[1] "%s: Volüümi märgend on liiga pikk (piirang on %lu baiti)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Ei suuda kontrollida mitme volüümilisi arhiive"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Ei saa kontrollida pakitud arhiive"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Ei saa kasutada mitme volüümilisi pakitud arhiive"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Tihendatud arhiive ei saa ühendada"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime vajab võtmega --mtime märgitud aega"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option saab kasutada ainult POSIX arhiividega"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls saab kasutada ainult POSIX arhiividega"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux saab kasutada ainult POSIX arhiividega"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs saab kasutada ainult POSIX arhiividega"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
"Ülemise kataloogi nime ei saa tuletada; palun kasutage --one-top-level=KAT"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Volüümi suurus ei saa olla väiksem kirje suurusest"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Ega ikka ei tee küll tühja arhiivi"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Võtmeid '-Aru' ei saa kasutada võtmega '-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Peab kasutama üht võtmetest '-Acdtrux', '--delete' või '--test-label'"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Kuna eelnevalt oli vigu, siis lõpetan veakoodiga"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Fail on %s baiti lühem"
msgstr[1] "%s: Fail on %s baiti lühem"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Võtmesõna %s on tundmatu või pole veel realiseeritud"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Ajatempel on piiridest väljas"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Mustrit %s ei saa kasutada"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Võtmesõna %s ei saa ümber määrata"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Vigane laiendatud päis: puudub pikkus"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Laiendatud päise pikkus %*s on piiridest väljas"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Vigane laiendatud päis: pikkuse järel puudub tühik"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Vigane laiendatud päis: puudub võrdusmärk"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Vigane laiendatud päis: puudub reavahetus"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ignoreerin tundmatut laiendatud päise võtmesõna '%s'"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Genereeritud võti/väärtus paar on liiga pikk (võti=%s, pikkus=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Laiendatud päis %s=%s on piiridest %s..%s väljas"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Vigane laiendatud päis: %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Vigane laiendatud päis: liigne %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Vigane laiendatud päis: vigane %s: ootamatu eraldaja %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Vigane laiendatud päis: vigane %s: veider arv väärtuseid"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: ei ole korrektne taimout"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: tundmatu kontrollpunkti tegevus"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "kirjutamine"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "lugemine"
@@ -2640,7 +2649,7 @@ msgstr "lugemine"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Kirjutamise kontrollpunkt %u"
@@ -2649,12 +2658,12 @@ msgstr "Kirjutamise kontrollpunkt %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Lugemise kontrollpunkt %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2662,91 +2671,95 @@ msgstr ""
"genfile manipuleerib GNU paxutils testipaketi andmefailidega.\n"
"VÕTMED on:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Faili loomise võtmed:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "SUURUS"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Loo määratud suurusega fail"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Kirjuta standardväljundi asemel faili NIMI"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Loe failide nimed failist FAIL"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T loeb nullidega lõpetatud nimesid"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "Täida fail antud mustriga. Muster on 'default' või 'zeros'"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Bloki suurus aukudega faili korral"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Loo aukudega fail. Järgnev käsurida kirjeldab faili."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "INDEKS"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Enne kirjutamist liigu antud indeksile"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Blokeeri mitte-fataalsed diagnostika teated"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Statistika faili kohta:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr "Väljasta iga faili kohta stat struktuuri sisu. Vaikimisi VORMING on: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Sünkroonse täitmise võtmed:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "VÕTI"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Täida antud KÄSKLUS. Kasulik võtmetega --checkpoint ja --cut, --append, --"
"touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Jõudes kontrollpunkti NUMBER, täida antud tegevus (vt. allpool)"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Määra järgmise --touch võtme ajatempel"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Esita täidetud kontrollpunktid ja käsu lõpetamise olek"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2754,129 +2767,129 @@ msgstr ""
"Sünkroonse täitmise tegevused. Neid täidetakse, kui saabub --checkpoint "
"võtmega määratud kontrollpunkt."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
"Sea faili suuruseks --length võtmega näidatu (või 0, kui suurust ei antud)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr "Lisa faili lõppu --length parameetriga näidatud arv baite."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Uuenda faili kasutamise ja muutmise ajatempleid"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Käivita KÄSK"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Vigane suurus: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Number on piiridest väljas: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negatiivne suurus: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) ebaõnnestus"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "küsitud faili pikkus %lu, tegelik %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "loodud fail pole aukudega"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Viga `%s' juures numbri parsimisel"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Tundmatu kuupäeva vorming"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENDID...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "`%s' ei saa avada"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "seek ebaõnnestus"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "faili nimi sisaldab null sümbolit"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr "standard väljundis ei saa aukudega faili luua, kasutage võtit --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "vigane mask (`%s' lähedal)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Tundmatu väli `%s'"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "ei õnnestu seada `%s' aega"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "'%s' ei saa lühendada"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "käsklus sai vea: %s"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "'%s' ei saa lühendada"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "ei õnnestu seada `%s' aega"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "`%s' ei saa kustutada"
@@ -2916,6 +2929,9 @@ msgstr "Käsk katkestas\n"
msgid "--stat requires file names"
msgstr "--stat nõuab failinimesid"
+#~ msgid "OPTION"
+#~ msgstr "VÕTI"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT parameeter peab olema positiivne"
diff --git a/po/eu.gmo b/po/eu.gmo
index 70043581ac0e0c8b26065add2f3bd8e80c3eece1..f1c03a88946b7e48b093ae881573fb192da2141d 100644
Binary files a/po/eu.gmo and b/po/eu.gmo differ
diff --git a/po/eu.po b/po/eu.po
index cdf627dc94dfbd30c9d617d684c53c645c233a71..80860e20580243a340f5dd53aebaf018ec897433 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,12 +5,12 @@
# This file is distributed under the same license as the tar package.
#
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar-1.15.91-eu\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2006-12-13 19:52+0100\n"
"Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
"Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -98,7 +98,7 @@ msgid "give a short usage message"
msgstr "erabilera mezu labur bat eman"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "IZENA"
@@ -233,12 +233,12 @@ msgstr "^[bB]"
msgid "^[nN]"
msgstr "^[eE]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr ""
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr ""
@@ -246,11 +246,11 @@ msgstr ""
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr ""
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -498,197 +498,197 @@ msgstr "Ezin da urruneko shell-a abiarazi"
msgid "Cannot execute remote shell"
msgstr "Ezin da urruneko shell-a abiarazi"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Seek norabidea eremuz kanpo"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
#, fuzzy
msgid "Invalid seek direction"
msgstr "Modu baliogabea eman da aukeran"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
#, fuzzy
msgid "Invalid seek offset"
msgstr "Tamaina baliogabea: %s"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Seek offset-a eremuz kanpo"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
#, fuzzy
msgid "Invalid byte count"
msgstr "Zinta luzera baliogabea"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
#, fuzzy
msgid "Byte count out of range"
msgstr "Seek offset-a eremuz kanpo"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
#, fuzzy
msgid "Premature eof"
msgstr "rmtd: Fitxategi amaiera azkarregia\n"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
#, fuzzy
msgid "Invalid operation code"
msgstr "Ekintza nagusi modua:"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr ""
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
#, fuzzy
msgid "Unexpected arguments"
msgstr "Fitxategi Amaiera Esperogabea"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "ZENBAKIA"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr ""
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FITXATEGIA"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr ""
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, fuzzy, c-format
msgid "cannot open %s"
msgstr "Ezin da `%s' ireki"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "argumentu gehiegi"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Zabor komandoa"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Honek ez dirudi tar pakete bat"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Irakurritako byte-ak guztira"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Idatziriko byte-ak guztira"
-#: src/buffer.c:593
+#: src/buffer.c:595
#, fuzzy
msgid "Total bytes deleted"
msgstr "Ezabaturiko byte-ak guztira: %s\n"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(tutua)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "balio baliogabea record_size-rentzat"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Ez da fitxategi izenik eman"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Ezin da sarrera/irteera estandar fitxategia egiaztatu"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Fitxategia konprimiturik dago. %s aukera erabili"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Ezin dira konprimituriko fitxategiak eguneratu"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Zintaren hasieran, uzten"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Errore gehiegi, uzten"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Grabazio tamaina = bloke %lu"
msgstr[1] "Grabazio tamaina = %lu bloke"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Alineatu gabeko blokea (byte %lu) paketean"
msgstr[1] "Alineatu gabeko blokea (%lu byte) paketean"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr ""
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: bolumen zenbaki baliogabea du"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Bolumen zenbaki gainezkatzea"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "#%d bolumena %s -rako prestatu eta enter sakatu: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Fitxategi amaiera erabiltzaile erantzuna espero zenean"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "Oharra: Paketea ez dago osaturik"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -699,277 +699,277 @@ msgstr ""
" q tar utzi\n"
" y edo intro Ekintza jarraitu\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Azpishell bat sortu\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Zerrenda hau inprimatu\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Ez dago bolumen berririk; uzten.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Ez da fitxategi izenik ezarri. Berriz saiatu.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "SArrera baliogabea. ? idatzi laguntzarako.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s komandoak huts egin du"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s ez da bolumen honen jarraipena"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s posibleki bolumen honen jarraipena da: buruak mozturiko izena du"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s okerreko tamaina da (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, fuzzy, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Bolumen hau sekuentziatik kanpo dago"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr ""
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "%s bolumena ez da %s-ren pareko"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
"%s: fitxategi izen luzeegia GNU bolumen anitzeko buruan gordetzeko, mozturik"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr ""
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "%lu byte bakarrik irakurri daiteke %lu byte-tatik"
msgstr[1] "%lu byte bakarrik irakurri daiteke %lu byte-tatik"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Eduki ezberdintasunak"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Esperogabeko Fitxategi amaiaera paketean"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Fixtategi mota ezberdinak"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Modu ezberdinak"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid ezberdinak"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid ezberdinak"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Eraldaketa data ezberdinak"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Tamaina ezberdinak"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Ez dago %s-ra loturik"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Lotura sinboliko ezberdinak"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Gailu zenbaki ezberdinak"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Egiaztatu "
-#: src/compare.c:480
+#: src/compare.c:479
#, fuzzy, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: `%c' fitxategi mota ezezaguna, fitxategi arrunt batez ezberdina"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr ""
-#: src/compare.c:541
+#: src/compare.c:540
#, fuzzy
msgid "Archive contains transformed file names."
msgstr "Paketeak zaharkituriko base-64 buruak ditu"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Egiaztapenak huts egin dezake jatorrizko fitxategiak kokatzerakoan."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "EGIAZTAPEN AKATSA: buru baliogabe %d aurkitu da"
msgstr[1] "EGIAZTAPEN AKATSA: %d buru baliogabe aurkitu dira"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr ""
-#: src/create.c:74
+#: src/create.c:73
#, fuzzy, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: katxe direktorioa marka bat du; ez da irauliko"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "%s eremua %s eremutik %s..%s kanpo: %s aldatzen"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "%s balioa %s eremutik %s..%s kanpo dago"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Zortzitar buru negatiboak sortzen"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: fitxategi izena luzeegia da (gehi. %d); ez da irauliko"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: fitxategi izena luzeegia da (ezin da moztu); ez da irauliko"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: lotura izena luzeegia da; ez da irauliko"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] ""
msgstr[1] ""
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: fitxategia fitxategi sistema ezberdin batetan dago, ez da irauliko"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr ""
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Fitxategi mota ezezaguna; fitxategia alde batetara utziko da"
-#: src/create.c:1576
+#: src/create.c:1575
#, fuzzy, c-format
msgid "Missing links to %s."
msgstr "%s-ra lotura falta da.\n"
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: fitxategia ez da aldatu, ez da irauliko"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: fitxategia paketea da, ez da irauliko"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
#, fuzzy
msgid "directory not dumped"
msgstr "%s: katxe direktorioa marka bat du; ez da irauliko"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: fitxategia aldatu egin da irakurtzen ari zenean"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: socket-a alde batetara utzi da"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: atea alde batetara utzia"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Hurrengoa burura salto egiten"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "paketetik burugabea ezabatzen"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: Sinesgarri izateko zaharregia den denbora marka %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: %s denbora marka %s etorkizunean da"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Esperogabeko inkonsistentziak direktorioa sortzerakoan"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr ""
@@ -992,7 +992,7 @@ msgstr "Lotura sinbolikoak lotura gogor bezala ateratzen saiatzen"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Ezin da atera -- paketea beste bolumen baten jarraipena da"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Buru izen luzera esperogabea"
@@ -1022,22 +1022,22 @@ msgstr "%s: Ez da gai fitxategi honen babeskopia egiteko"
msgid "Cannot rename %s to %s"
msgstr "Ezin da %s %s-ra berrizendatu"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Direktorioa %s-tik berrizendatua izan da"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Direktorioa berria da"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, fuzzy, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: fitxategia fitxategi sistema ezberdin batetan dago, ez da irauliko"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Direktorioa berrizendatua izan da"
@@ -1167,35 +1167,35 @@ msgstr "%s: %s ezabatzen\n"
msgid "%s: Cannot remove"
msgstr "%s: Ezin da ezabatu"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Alde batetara uzten"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr ""
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "%s blokea: ** Fitxategi Amaiera **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "%s blokea: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Zuriunea buruan zenbakizko %s balioa espero zenean"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1203,348 +1203,348 @@ msgstr ""
"direla pentsatuko da"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Paketearen zortzitar %.*s balioa %s eremutik kanpo dago"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Paketeak zaharkituriko base-64 buruak ditu"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr ""
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr ""
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Paketeak %.*s du zenbakizko %s balioa espero zenean "
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Pakete %s balioa %s eremutik kanpo dago %s.. %s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " %s-ra lotu\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " %s fitxategi mota ezezaguna\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Lotura Luzea--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Izen Luzea--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Bolumen Burua--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--%s byte-an jarraitzen du--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Direktorioa sortzen:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "%s %s-ra berrizendatzen\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Ezin da %s-ra berrizendatu"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "%s %s-ra atzera berrizendatzen\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Fitxategia irakurri baino lehen ezabaturik"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "ume prozesua"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "prozesu arteko kanala"
-#: src/names.c:69
+#: src/names.c:68
#, fuzzy
msgid "Local file name selection:"
msgstr "Fixtategi lokal hautapena:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"Emandako FITXATEGIA paketera gehitu /Erabilgarri izena asaterisko batez "
"asten bada)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "DIR direktoriora aldatu"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "ateratzeko edo sortzeko izenak FITXATEGIA-tik eskuratu"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr ""
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "PATROIA"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "fixtategiak utzi, PATROIA bezala emandakoak"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "FITXATEGIAN zerrendaturiko patroiak alde batetara utzi"
-#: src/names.c:96
+#: src/names.c:95
#, fuzzy
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr "katxe marka duten direktorioak alde batetara utzi"
-#: src/names.c:99
+#: src/names.c:98
#, fuzzy
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "katxe marka duten direktorioak alde batetara utzi"
-#: src/names.c:102
+#: src/names.c:101
#, fuzzy
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "katxe marka duten direktorioak alde batetara utzi"
-#: src/names.c:104
+#: src/names.c:103
#, fuzzy
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "katxe marka duten direktorioak alde batetara utzi"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-#: src/names.c:113
+#: src/names.c:112
#, fuzzy
msgid "exclude everything under directories containing FILE"
msgstr "katxe marka duten direktorioak alde batetara utzi"
-#: src/names.c:115
+#: src/names.c:114
#, fuzzy
msgid "exclude directories containing FILE"
msgstr "katxe marka duten direktorioak alde batetara utzi"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr ""
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr ""
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "direktorioetan barrena (lehenetsia)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "sahiestu automatikoki direktorioetan zehar jeistea"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr ""
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "kasua alde batetara utzi"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr ""
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr ""
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "verbatim kate parekatzea"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr ""
-#: src/names.c:147
+#: src/names.c:146
#, fuzzy
msgid "wildcards do not match '/'"
msgstr "%s bolumena ez da %s-ren pareko"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
#, fuzzy
msgid "command line"
msgstr "%s komandoak huts egin du"
-#: src/names.c:897
+#: src/names.c:896
#, fuzzy, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: fitxategi zerrenda irakurria dagoeneko"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, fuzzy, c-format
msgid "cannot split string '%s': %s"
msgstr "ezin da `%s'-ren denbora ezarri"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr ""
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr ""
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Ez da paketean aurkitu"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr ""
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr ""
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
-#: src/tar.c:88
+#: src/tar.c:87
#, fuzzy, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "`-%s' eta `-%s' aukerek sarrera estandarra behar dute"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Pakete formatu baliogabea"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU ezaugarriak behar dira pakete formatu bateraezinean"
-#: src/tar.c:265
+#: src/tar.c:264
#, fuzzy, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1787,7 +1787,7 @@ msgstr "Irteera korrontea hautatu:"
msgid "extract files to standard output"
msgstr "fitxategiak irteera estandarrera atera"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "KOMANDOA"
@@ -1823,7 +1823,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATA-EDO-FITXATEGIA"
@@ -2030,7 +2030,7 @@ msgstr "irakurri ahala berriz bloke egin (4.2BSD tutuentzat)"
msgid "Archive format selection:"
msgstr "Pakete formatu hautapena:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMATUA"
@@ -2113,127 +2113,127 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "PROG bidez iragazi (-d onartu behar du)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Fixtategi lokal hautapena:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "fitxategi sistema lokalean egon paketea sortzerakoan"
-#: src/tar.c:693
+#: src/tar.c:694
#, fuzzy
msgid "don't strip leading '/'s from file names"
msgstr "Ez kendu hasierako `/' fitxategi izenetatik"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"lotura sinbolikoak jarraitu; lotzen dituzten fitxategiak irauli eta paketean "
"sartu"
-#: src/tar.c:697
+#: src/tar.c:698
#, fuzzy
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"lotura sinbolikoak jarraitu; lotzen dituzten fitxategiak irauli eta paketean "
"sartu"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "PARTAIDE IZEN"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr ""
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr ""
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATA"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "data eta ordua parekatu data bakarrik aldatzen denean"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "KONTROL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "babeskopia egin ezabatu aurretik, KONTROL bertsioa hautatu"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "KATEA"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Fitxategi izen eraldaketak:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "ESPRESIOA"
-#: src/tar.c:718
+#: src/tar.c:719
#, fuzzy
msgid "use sed replace EXPRESSION to transform file names"
msgstr "Sed-en ordezko EXPRESIOA erabili fitxategi izenak eraldatzeko"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "irteera informatiboa:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr ""
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr ""
-#: src/tar.c:729
+#: src/tar.c:730
#, fuzzy
msgid "warning control"
msgstr "Gainidazketa kontrola:\n"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"Aurrerapen mezuak bistarazi grabaketa ZENBAKI bakiotzagatik (lehenetsia 10 "
"da)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr ""
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr ""
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "mezu bat inprimatu lotura guztiak ez badira iraultzen"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SEINALEA"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2241,426 +2241,435 @@ msgid ""
"accepted"
msgstr ""
-#: src/tar.c:744
+#: src/tar.c:745
#, fuzzy
msgid "print file modification times in UTC"
msgstr "eraldaketa datak UTC orduan bistarazi"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr ""
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "irteera luzea FITXATEGIRA bidali"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "Bloke zenbakia bistarazu pakete bakoitzeko mezu bakoitzagatik"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "berrespena eskatu ekintza bakoitzean"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "tar lehenespenak bistarazi"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "fixtategi edo pakete izenak bistarazi eraldaketaren aurretik"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "ESTILOA"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "Gako karaktere gehigarriak KATE-tik"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "gakoak kendu karaktereentzat KATE-tik"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Bateragarritasun aukerak:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Beste aukerak:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "ezgaitu arriskutsu izan daitezken zenbait aukera"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, fuzzy, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s: Ezin da %s-ra seek egin"
-#: src/tar.c:933
+#: src/tar.c:934
#, fuzzy
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "Ezin duzu `-Acdtrux' aukera bat baino gehiago ezarri"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Elkarjotzen duten konpresio aukerak"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Seinale izen ezezaguna: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Data adibide fitxategia ez da aurkitu"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "%s %s data formatu ezezagunagatik aldatzen"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr ""
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, fuzzy, c-format
msgid "filter the archive through %s"
msgstr "fitxategia gzip bidez iragazi"
-#: src/tar.c:1137
+#: src/tar.c:1143
#, fuzzy
msgid "Valid arguments for the --quoting-style option are:"
msgstr "--quoting-style-entzat balio erabilgarriak:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
msgstr ""
-#: src/tar.c:1253
+#: src/tar.c:1259
#, fuzzy
msgid "Invalid owner or group ID"
msgstr "Jabe baliogabea"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Blokeo faktore baliogabea"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Zinta luzera baliogabea"
-#: src/tar.c:1481
+#: src/tar.c:1486
#, fuzzy
msgid "Invalid incremental level value"
msgstr "Fitxategi inkremental formatu okerra"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Atari data bat baino gehiago"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr ""
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' ez da onartzen plataforma honetan"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint balioa ez da zenbaki oso bat"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Modu baliogabea eman da aukeran"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Zenbaki baliogabea"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Grabazio tamaina baliogabea"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Grabaszio tamaina %d-ren multiplo bat izan behar da."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Elementu kopuru baliogabea"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "--to-command aukera bat bakarrik onartzen da"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Gaizki eratutako dentsitate argumentua: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, fuzzy, c-format
msgid "Unknown density: '%c'"
msgstr "Dentsitate Ezezaguna: `%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, fuzzy, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr " `-[0-7][lmh]' aukerak ez dira onartzen tar *honetan*"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, fuzzy, c-format
msgid "error parsing %s"
msgstr "Errorea zenbakia analizatzean hemendi gertu: `%s'"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FITXATEGIA]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "%s argumentu baliogabea %s-rentzat"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr ""
-#: src/tar.c:2291
+#: src/tar.c:2300
#, fuzzy, c-format
msgid "Old option '%c' requires an argument."
msgstr "`%c' zaharkituriko aukerak argumentu bat behar du"
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr ""
-#: src/tar.c:2390
+#: src/tar.c:2399
#, fuzzy
msgid "Multiple archive files require '-M' option"
msgstr "Pakete fitxategi anitzentzat `-M' aukera erabili behar da"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr ""
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Bolumen etiketa luzeegia da (muga %lu byte da)"
msgstr[1] "%s: Bolumen etiketa luzeegia da (muga %lu byte da)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Ezin dira bolumen-anitzeko paketeak egiaztatu"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Ezin dira konprimituriko fitxategiak egiaztatu"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Ezin dira bolumen anitzeko konprimituriko paketeak erabaili"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Ezin dira konprimituriko paketeak kateatu"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke"
-#: src/tar.c:2481
+#: src/tar.c:2490
#, fuzzy
msgid "--acls can be used only on POSIX archives"
msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke"
-#: src/tar.c:2486
+#: src/tar.c:2495
#, fuzzy
msgid "--selinux can be used only on POSIX archives"
msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke"
-#: src/tar.c:2491
+#: src/tar.c:2500
#, fuzzy
msgid "--xattrs can be used only on POSIX archives"
msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr ""
-#: src/tar.c:2623
+#: src/tar.c:2632
#, fuzzy
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr " `-Aru' aukerak bateraezinak dira `-f -' rekin"
-#: src/tar.c:2711
+#: src/tar.c:2743
#, fuzzy
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Behintzat `-Acdtrux' aukeretako bat ezarri behar duzu"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr ""
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] ""
msgstr[1] ""
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "%s gakoa ezezaguna da edo ez dago inplementaturik oraindik"
-#: src/xheader.c:174
+#: src/xheader.c:173
#, fuzzy
msgid "Time stamp is out of allowed range"
msgstr "Denbora marka eremuz kanpo dago"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "%s patroia ezin da erabili"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "%s gakoa ezin da gainidatzi"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Gaizki eratutako buru luzapena: luzera falta da"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr " %*s buru luzapen luzera eremuz kanpo dago"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Gaizki eratutako buru luzapena: luzera ondoren hutsunea falta da"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Gaizki eratutako buru luzapena: berdin ikurra falta da"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Gaizki eratutako buru luzapena: lerro berria falta da"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, fuzzy, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "alde batetara utzi gako buru luzapen ezezaguna `%s'"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "buru luzapena %s=%s eremuz kanpo dago %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Gaizki eratutako buru luzapena: baliogabea %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Gaizki eratutako buru luzapena: gehiegizkoa %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
"Gaizki eratutako buru luzapena: %s baliogabea: %c mugatzaile esperodageba"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Gaizki eratutako buru luzapena: %s baliogabea: balio kopuru bitxia"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, fuzzy, c-format
msgid "%s: not a valid timeout"
msgstr "%s: Talde baliogabea"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr ""
@@ -2668,7 +2677,7 @@ msgstr ""
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Idazketa %u egiaztapen puntua"
@@ -2677,238 +2686,237 @@ msgstr "Idazketa %u egiaztapen puntua"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Irakurketa %u egiaztapen puntua"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr ""
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Pakete sortze aukerak:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "TAMAINA"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Emandako TAMAINAko paketea sortu"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Fitxategi IZENEAN idatzi irteera estandarren ordez"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Fitxategi izenak PAKETEtik irakurri"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr ""
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Bloke tamaina fitxategi sakabanatuentzat"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Fitxategi sakabanatuak sortu. Komanod lerroaren besteak fitxategi mapa dakar."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr ""
-#: tests/genfile.c:149
+#: tests/genfile.c:144
#, fuzzy
msgid "Seek to the given offset before writing data"
msgstr "fitxategia egiaztatzen saiatu idatzi aurretik"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Fixtategi estatistika aukerak:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Eduki eta egitura estatusa inprimatu emandako fitxategi bakoiztarentzat. "
"Lehenetsiriko FORMATUA: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Sinkronizatutako exekuzio aukerak:"
-#: tests/genfile.c:168
-#, fuzzy
-msgid "OPTION"
-msgstr " [AUKERA...]"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
#, fuzzy
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Emandako KOMANDOA exekutatu. Erabilgarri --checkpoint eta hauetako batekin; "
"--cut, --append, --touch"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Ezarri data hurrengo --touch aukerarentzat"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "FITXATEGIAREN irakurketa eta eraldaketa denborak aldatu"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "KOMANDOA exekutatu"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Tamaina baliogabea: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, fuzzy, c-format
msgid "Number out of allowed range: %s"
msgstr "Inodo zenbakia eremuz kanpo dago"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, fuzzy, c-format
msgid "Negative size: %s"
msgstr "Tamaina baliogabea: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) -ek huts egin du"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr ""
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr ""
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Errorea zenbakia analizatzean hemendi gertu: `%s'"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Data formatu ezezaguna"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARG...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "Ezin da `%s' ireki"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
#, fuzzy
msgid "cannot seek"
msgstr "%s: Ezin da %s-ra seek egin"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "fitxategia izenak karaktere baliogabea du"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"ezin dira sakabanaturiko fitxategiaksortu irteera estandarrean. --file "
"erabili"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "maskara baliogabea (`%s'-etik gertu)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "`%s' eremu ezezaguna"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "ezin da `%s'-ren denbora ezarri"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, fuzzy, c-format
msgid "cannot truncate `%s'"
msgstr "Ezin da `%s' ireki"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, fuzzy, c-format
msgid "command failed: %s"
msgstr "%s komandoak huts egin du"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "ezin da `%s'-ren denbora ezarri"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "ezin da `%s'-ren denbora ezarri"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, fuzzy, c-format
msgid "cannot unlink `%s'"
msgstr "Ezin da `%s' ireki"
@@ -2948,6 +2956,10 @@ msgstr "Komandoa amaitua\n"
msgid "--stat requires file names"
msgstr "--stat -ek fitxategi izenak behar ditu"
+#, fuzzy
+#~ msgid "OPTION"
+#~ msgstr " [AUKERA...]"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT parametroa positibo izan behar da"
diff --git a/po/fi.gmo b/po/fi.gmo
index 1e20845f01293cc059f8302a79a91c443ff84b88..778f74cb04cef22ef973cf3f50c68b231da9b33a 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 6ca826c46b9537b0297aba23752ababad7a1305d..6697bc3eade96cde38a6424e8c290016f735d4fb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,12 +3,12 @@
# This file is distributed under the same license as the tar package.
# Lauri Nurmi <lanurmi@iki.fi>, 2002-2006, 2014.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar 1.29\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2016-05-26 20:48+0300\n"
"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -97,7 +97,7 @@ msgid "give a short usage message"
msgstr "näytä lyhyt käyttöohje"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NIMI"
@@ -232,12 +232,12 @@ msgstr "^[kKyY]"
msgid "^[nN]"
msgstr "^[eEnN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Paketoinut %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Paketoinut %s\n"
@@ -245,11 +245,11 @@ msgstr "Paketoinut %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
#, fuzzy
msgid ""
"\n"
@@ -525,191 +525,191 @@ msgstr "Tiedostoja ei voida uudelleenohjata etäkuorelle"
msgid "Cannot execute remote shell"
msgstr "Etäkuorta ei voi käynnistää"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Siirtymän suunta sallitun välin ulkopuolella"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Virheellinen siirtymän suunta"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Virheellinen siirtymän arvo"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Siirtymä sallitun välin ulkopuolella"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Virheellinen tavumäärä"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Tavumäärä sallitun välin ulkopuolella"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Ennenaikainen tiedoston loppu"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Virheellinen operaatiokoodi"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Toiminto ei ole tuettu"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Odottamattomat argumentit"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Ohjaa nauha-asemaa, hyväksyen komentoja etäprosessilta"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "MÄÄRÄ"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "aseta vianjäljityksen taso"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "TIED"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "aseta vianjäljityksen tulostetiedoston nimi"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "tiedostoa %s ei voi avata"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "liian monta argumenttia"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Roskakomento"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Tämä ei näytä tar-arkistolta"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Luettuja tavuja yhteensä"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Kirjoitettuja tavuja yhteensä"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Poistettuja tavuja yhteensä"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(putki)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Virheellinen arvo kentälle record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Arkiston nimeä ei ole annettu"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Vakiosyötteessä/tulosteessa olevaa arkistoa ei voi varmistaa"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Arkisto on tiivistetty. Käytä valitsinta %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Pakattuja arkistoja ei voi päivittää"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Nauhan alussa, lopetetaan"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Liian monta virhettä, lopetetaan"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Tietueen koko = %lu lohko"
msgstr[1] "Tietueen koko = %lu lohkoa"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Kohdistamaton lohko (%lu tavu) arkistossa"
msgstr[1] "Kohdistamaton lohko (%lu tavua) arkistossa"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Arkistossa ei voi siirtyä taaksepäin; sitä ei ehkä voi lukea ilman "
"valitsinta -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek ei pysähtynyt tietueen rajalle"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: sisältää virheellisen arkiston osan järjestysnumeron"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Arkisto-osan järjestysnumeron ylivuoto"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Valmistele osa #%d arkistolle %s ja paina return: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Tiedoston loppu odotetun käyttäjän syötteen sijaan"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "VAROITUS: Arkisto on epätäydellinen"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -721,67 +721,67 @@ msgstr ""
" q Keskeytä tar\n"
" y tai rivinv. Jatka suoritusta\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Käynnistä alikuori\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Näytä tämä lista\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Ei uutta arkiston osaa, poistutaan.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Tiedostonimeä ei annettu. Yritä uudelleen.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Virheellinen syöte. Kirjoita ? ohjeen näyttämiseksi.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "Komento %s epäonnistui"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s ei jatku tällä arkiston osalla"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s jatkuu mahdollisesti tällä arkiston osalla: otsake sisältää typistetyn "
"nimen"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s on väärän kokoinen (%s ≠ %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Tämä arkiston osa epäjärjestyksessä (%s - %s ≠ %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arkistoa ei ole nimetty täsmää nimiöön %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Arkiston osa %s ei täsmää nimiöön %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -789,211 +789,211 @@ msgstr ""
"%s: tiedostonimi on liian pitkä tallennettavaksi moniosaisen GNU-arkiston "
"otsakkeeseen; nimi typistetty"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "kirjoitus ei päättynyt lohkon rajalle"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Voitiin lukea vain %lu tavua %lu tavusta"
msgstr[1] "Voitiin lukea vain %lu tavua %lu tavusta"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Sisällöt eroavat"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Odottamaton tiedoston loppu arkistossa"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Tiedoston tyyppi eroaa"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Tila eroaa"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "UID eroaa"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "GID eroaa"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Muutosaika eroaa"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Koko eroaa"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Ei ole linkitetty tiedostoon %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symlinkki eroaa"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Laitenumero eroaa"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Tarkasta "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Tuntematon tiedostotyyppi ”%c”, vertailtu normaalina tiedostona"
# Mitäh?
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Arkisto sisältää tiedostonimiä, joiden etuliitteet on poistettu."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Arkisto sisältää muunnettuja tiedostonimiä."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Tarkastus ei ehkä löydä alkuperäisiä tiedostoja."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "TARKASTUSVIRHE: havaittu %d virheellinen otsake"
msgstr[1] "TARKASTUSVIRHE: havaittu %d virheellistä otsaketta"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Yksinäinen nollalohko kohdassa %s"
-#: src/create.c:74
+#: src/create.c:73
#, fuzzy, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "Välimuistihakemistoa %s ei voi avata\n"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "arvo %s on sallitun %s-välin %s..%s ulkopuolella, korvataan arvolla %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "arvo %s on sallitun %s-välin %s..%s ulkopuolella"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Luodaan otsakkeet negatiivisilla oktaaleilla"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: tiedostonimi on liian pitkä (maksimi %d), ei lisätä"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: tiedostonimi on liian pitkä (ei voida jakaa), ei lisätä"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: linkin nimi on liian pitkä, ei lisätä"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Tiedosto kutistui %s tavun verran, tasataan nollilla"
msgstr[1] "%s: Tiedosto kutistui %s tavun verran, tasataan nollilla"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: tiedosto ei ole samalla tiedostojärjestelmällä, ei lisätä"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "sisältöä ei lisätty"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Tuntematon tiedostotyyppi, tiedostoa ei huomioida"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Puuttuvia linkkejä tiedostoon %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: tiedosto on muuttumaton, ei lisätä"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: tiedosto on arkistossa, ei lisätä"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "hakemistoa ei lisätty"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: tiedosto muuttui lukemisen aikana"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: pistoketta ei huomioida"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: ovea ei huomioida"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Siirrytään seuraavaan otsakkeeseen"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Poistetaan epäotsake arkistosta"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: epätodennäköisen vanha aikaleima %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: aikaleima %s on %s sekuntia tulevaisuudessa"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Odottamaton ristiriita luotaessa hakemistoa"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: ohitetaan olemassa oleva tiedosto"
@@ -1016,7 +1016,7 @@ msgstr "Yritetään purkaa symboliset linkit koviksi linkeiksi"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Ei voi purkaa -- tiedosto on jatkoa toisesta arkiston osasta"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Odottamaton pitkä nimiotsake"
@@ -1045,22 +1045,22 @@ msgstr "%s: Tätä tiedostoa ei voitu varmuuskopioida"
msgid "Cannot rename %s to %s"
msgstr "%s: Uudelleennimeäminen nimelle %s ei onnistu"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Hakemisto %s on nimetty uudelleen"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Hakemisto on uusi"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: tiedosto ei ole samalla tiedostojärjestelmällä, ei lisätä"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Hakemisto on nimetty uudelleen"
@@ -1187,35 +1187,35 @@ msgstr "%s: Poistetaan %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Ei voi poistaa"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Jätetään pois"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "lohko %s: ** NUL-lohko **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "lohko %s: ** Tiedoston loppu **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "lohko %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Tyhjiä merkkejä otsakkeessa, odotettiin numeerista %s-arvoa"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1223,160 +1223,160 @@ msgstr ""
"kahden komplementiksi"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Arkiston oktaaliarvo %.*s on sallitun %s-välin ulkopuolella"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arkisto sisältää käytöstä poistuvia base-64-otsakkeita"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr ""
"Arkiston etumerkillinen base-64-merkkijono %s on sallitun %s-välin "
"ulkopuolella"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Arkiston base-256-arvo on sallitun %s-välin ulkopuolella"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arkisto sisältää merkkijonon %.*s, odotettiin numeerista %s-arvoa"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Arkiston arvo %s on sallitun %s-välin %s..%s ulkopuolella"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " linkki tiedostoon %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " tuntematon tiedostotyyppi %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Pitkä linkki--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Pitkä nimi--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Arkiston osan otsake--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Jatkuu tavusta %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Luodaan hakemisto:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Nimetään uudelleen %s -> %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Uudelleennimeäminen nimelle %s ei onnistu"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Nimetään %s takaisin nimelle %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Tiedosto oli poistettu ennen sen lukemista"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "lapsiprosessi"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "prosessienvälinen kanava"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Paikallisten tiedostonimien valinta:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"lisää annettu TIEDosto arkistoon (hyödyllinen, jos nimi alkaa viivalla)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "HAK"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "siirry hakemistoon HAK"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "hae purettavat/luotavat nimet TIEDOSTOsta"
-#: src/names.c:78
+#: src/names.c:77
#, fuzzy
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T lukee nollaan päättyviä nimiä, poistaa käytöstä -C:n"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "kumoa edellisen --null-valitsimen vaikutus"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "HAHMO"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "jätä pois HAHMOn mukaiset tiedostot"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "jätä pois TIEDOSTOssa listatut hahmot"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1384,142 +1384,142 @@ msgstr ""
"jätä pois CACHEDIR.TAGin sisältävät hakemistot, lukuunottamatta tag-"
"tiedostoa itseään"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "jätä pois kaikki hakemistojen alta, jotka sisältävät CACHEDIR.TAGin"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "jätä pois CACHEDIR.TAGin sisältävät hakemistot"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"jätä pois TIEDOSTOn sisältävien hakemistojen sisältö, lukuun ottamatta "
"TIEDOSTOa itseään"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "jätä pois kaikki hakemistojen alta, jotka sisältävät TIEDOSTOn"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "jätä pois TIEDOSTOn sisältävät hakemistot"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "jätä pois versionhallintajärjestelmän hakemistot"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "lue poisjättöhahmot versionhallinnan ignore-tiedostoista"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "jätä pois varmuuskopio- ja lukkotiedostot"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "etene alihakemistoihin (oletus)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "estä automaattinen eteneminen alihakemistoihin"
-#: src/names.c:130
+#: src/names.c:129
#, fuzzy
msgid "File name matching options (affect both exclude and include patterns):"
msgstr "Tiedostonimien täsmäysvalinnat (vaikuttava sekä "
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "hahmot täsmäävät tiedostonimen alkuun"
-#: src/names.c:135
+#: src/names.c:134
#, fuzzy
msgid "patterns match after any '/' (default for exclusion)"
msgstr "poisjättöhahmoja verrataan jokaisen ”/”:n jälkeen"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "älä huomioi kirjainkokoa"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "kirjainkoon huomioiva täsmäys (oletus)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "käytä jokerimerkkejä (oletus poisjätölle)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "sanatarkka merkkijonojen täsmäys"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "jokerimerkit täsmäävät merkkiin ”/” (oletus poisjätölle)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "jokerimerkit eivät täsmää merkkiin ”/”"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "komentorivi"
-#: src/names.c:897
+#: src/names.c:896
#, fuzzy, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: tiedosto on arkistossa, ei lisätä"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "merkkijonoa ”%s” ei voi jakaa osiin: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: tiedostonimi sisältää nul-merkin"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Tiedostonimissä on käytetty jokerimerkkejä"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1527,47 +1527,47 @@ msgstr ""
"Käytä valitsinta --wildcards täsmäyksen käyttöön ottamiseksi, tai --no-"
"wildcards tämän varoituksen hiljentämiseksi"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Ei löytynyt arkistosta"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Vaadittua esiintymää ei löytynyt arkistosta"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Arkiston nimiö ei täsmää"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
"Vain yksi -C-valitsin on sallittu valitsimen --listed-incremental kanssa"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Kumpikin valitsimista ”%s” ja ”%s” käyttää vakiosyötettä"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Virheellinen arkistomuoto"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr ""
"Haluttiin käyttää GNU-ominaisuuksia yhteensopimattoman arkistomuodon kanssa"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1789,7 +1789,7 @@ msgstr "Tulostevirran valinta:"
msgid "extract files to standard output"
msgstr "pura tiedostot vakiotulosteeseen"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "KOMENTO"
@@ -1825,7 +1825,7 @@ msgstr "yhdistä tiedostojen UID:t ja nimet TIEDOSTOn avulla"
msgid "use FILE to map file owner GIDs and names"
msgstr "yhdistä tiedostojen GID:t ja nimet TIEDOSTOn avulla"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "PÄIVÄYS-TAI-TIED"
@@ -2028,7 +2028,7 @@ msgstr "suorita lohkominen uudelleen luettaessa (4.2BSD-putkia varten)"
msgid "Archive format selection:"
msgstr "Arkistomuodon valinta:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "MUOTO"
@@ -2113,60 +2113,60 @@ msgstr "OHJ"
msgid "filter through PROG (must accept -d)"
msgstr "ohjaa OHJelman läpi (on hyväksyttävä -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Paikallisten tiedostojen valinta:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "pysy nykyisessä tiedostojärjestelmässä arkistoa luotaessa"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "älä poista ”/”-merkkiä tiedostonimien alusta"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "seuraa symlinkkejä; arkistoi ja lisää niiden osoittamat tiedostot"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "seuraa kovia linkkejä; arkistoi ja lisää niiden osoittamat tiedostot"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "TIED-NIMI"
-#: src/tar.c:699
+#: src/tar.c:700
#, fuzzy
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "aloita arkiston tiedostosta TIED-NIMI"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "tallenna vain PÄIVÄYS-TAI-TIEDostoa uudemmat tiedostot"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "PÄIVÄYS"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "vertaa vain tiedoston muutosaikaa"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "HALLINTA"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "varmuuskopiointi ennen poistoa, valitse versionHALLINTA"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "MERKKIJONO"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2174,59 +2174,59 @@ msgstr ""
"varmuuskopiointi ennen poistoa, älä käytä tavanomaista jälkiliitettä (joka "
"on ”~”, ellei muuttujaa SIMPLE_BACKUP_SUFFIX ole asetettu)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Tiedostonimien muunnokset:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "poista MÄÄRÄn verran osia tiedostonimien alusta purettaessa"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "LAUSEKE"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "käytä sedin korvausLAUSEKEtta tiedostonimien muuntamiseen"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Tietoja antava tuloste:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "listaa käsiteltävät tiedostot"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "AVAINSANA"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "varoitusten hallinta"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "näytä edistymisviesti MÄÄRÄn tietueen välein (oletus 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "TOIMINTO"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "suorita TOIMINTO jokaisen tarkistuspisteen kohdalla"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "näytä viesti, ellei kaikkia linkkejä lisätty"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAALI"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2238,88 +2238,88 @@ msgstr ""
"signaalit ovat: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 ja SIGUSR2; myös nimet "
"ilman SIG-etuliitettä kelpaavat"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "näytä tiedostojen muutosajat UTC-aikoina"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "näytä tiedoston aikaleima täydellä tarkkuudella"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "ohjaa monisanainen tuloste TIEDostoon"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "näytä lohkonumero arkistossa viestien yhteydessä"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "kysy varmistusta jokaiselle toiminnolle"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "näytä tarin oletukset"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
"luettele hakuehtoihin täsmäämättömät hakemistot luetellessa tai purettaessa"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "näytä tiedosto- tai arkistonimet muunnoksen jälkeen"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "TYYLI"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr ""
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr ""
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Yhteensopivuusvalitsimet:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
"luotaessa sama kuin --old-archive; purettaessa sama kuin --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Muut valitsimet:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "poista käytöstä joitakin potentiaalisesti vahingollisia valitsimia"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, fuzzy, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "Valitsinta --occurrence ei voi käyttää yhdessä valitsimen %s kanssa"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2327,40 +2327,40 @@ msgstr ""
"Vain yhtä valitsimista ”-Acdtrux”, ”--delete” tai ”--test-label” voi käyttää "
"kerrallaan"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Ristiriitaiset pakkausvalitsimet"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Tuntematon signaalin nimi: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Päiväysnäytetiedostoa ei löytynyt"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Korvataan tuntematon päiväysmuoto %2$s arvolla %1$s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Valitsin %s: Käsittellään päiväys ”%s” arvona %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "ohjaa arkisto %s-ohjelman läpi"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Kelvolliset argumentit --quoting-style-valitsimelle ovat:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2368,164 +2368,164 @@ msgstr ""
"\n"
"*Tämä* tar käyttää oletuksena:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Virheellinen omistaja- tai ryhmä-ID"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Virheellinen lohkomiskerroin"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Virheellinen nauhan pituus"
-#: src/tar.c:1481
+#: src/tar.c:1486
#, fuzzy
msgid "Invalid incremental level value"
msgstr "--level on merkityksetön ilman valitsinta --listed-incremental"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Annettu useampi kuin yksi kynnyspäiväys"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Virheellinen hajanaisversion arvo"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' ei ole tuettu tällä alustalla"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint-arvo ei ole kokonaisluku"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Valitsimelle annettiin virheellinen tila"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Virheellinen määrä"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Virheellinen tietueen koko"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Tietueen koon on oltava %d:n monikerta."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Virheellinen osien määrä"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Vain yksi --to-command-valitsin on sallittu"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Kelvoton tiheysargumentti: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Tuntematon tiheys: ”%c”"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "*Tämä* tar ei tue valitsimia ”-[0-7][lmh]”"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: virheen sijainti"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, fuzzy, c-format
msgid "error parsing %s"
msgstr "Virhe lukuarvon jäsentämisessä lähellä kohtaa ”%s”"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[TIEDOSTO]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "argumentti %s on virheellinen %s:lle"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, fuzzy, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "merkkijonoa ”%s” ei voi jakaa osiin: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Vanha valitsin ”%c” vaatii argumentin."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "valitsin --occurence on merkityksetön ilman tiedostoluetteloa"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Usean arkistotiedoston käyttäminen vaatii valitsimen ”-M”"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level on merkityksetön ilman valitsinta --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Arkiston osan nimiö on liian pitkä (raja on %lu tavu)"
msgstr[1] "%s: Arkiston osan nimiö on liian pitkä (raja on %lu tavua)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Moniosaisia arkistoja ei voi tarkastaa"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Pakattuja arkistoja ei voi varmistaa"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Pakattuja moniosaisia arkistoja ei voi käyttää"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Pakattuja arkistoja ei voi liittää toisiinsa"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "Valitsinta --pax-option voi käyttää vain POSIX-arkistoille"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "Valitsinta --acls voi käyttää vain POSIX-arkistoille"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "Valitsinta --selinux voi käyttää vain POSIX-arkistoille"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "Valitsinta --xattrs voi käyttää vain POSIX-arkistoille"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2533,83 +2533,92 @@ msgstr ""
"Ylätason hakemiston nimeä ei voi päätellä; aseta se valitsimella --one-top-"
"level=HAK"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Arkiston osan pituus ei voi olla pienempi kuin tietueen koko"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Kieltäydytään pelkurimaisesti luomasta tyhjää arkistoa"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Valitsimet ”-Aru” eivät ole yhteensopivia valitsimen ”-f -” kanssa"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Vähintään yhtä valitsimista ”-Acdtrux”, ”--delete” tai ”--test-label” on "
"käytettävä"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Poistutaan virhepaluuarvolla aiempien virheiden vuoksi"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Tiedosto kutistui %s tavun verran"
msgstr[1] "%s: Tiedosto kutistui %s tavun verran"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Avainsana %s on tuntematon tai sillä ei vielä ole toteutusta"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Aikaleima on sallitun välin ulkopuolella"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Hahmoa %s ei voi käyttää"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Avainsanaa %s ei voi ohittaa"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Väärän muotoinen lisäotsake: pituus puuttuu"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Laajennettu otsake %*s on sallitun välin ulkopuolella"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Väärän muotoinen lisäotsake: tyhje puuttuu pituuden jälkeen"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Väärän muotoinen lisäotsake: yhtäsuuruusmerkki puuttuu"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Väärän muotoinen lisäotsake: rivinvaihto puuttuu"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Jätetään huomiotta tuntematon laajennetun otsakkeen avainsana ”%s”"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2617,46 +2626,46 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Laajennettu otsake %s=%s on sallitun välin %s..%s ulkopuolella"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Väärän muotoinen lisäotsake: virheellinen %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Väärän muotoinen lisäotsake: ylimääräinen %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Väärän muotoinen lisäotsake: virheellinen %s: odottamaton rajoitin %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Väärän muotoinen lisäotsake: virheellinen %s: pariton määrä arvoja"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s ei ole kelvollinen aikakatkaisuarvo"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: tuntematon tarkistuspistetoiminto"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "kirjoitus"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "luku"
@@ -2664,7 +2673,7 @@ msgstr "luku"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Kirjoituksen tarkistuspiste %u"
@@ -2673,104 +2682,104 @@ msgstr "Kirjoituksen tarkistuspiste %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Lukemisen tarkistuspiste %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
#, fuzzy
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr "Luo datatiedostot GNU tar:in testausta varten.\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Tiedoston luontivalinnat:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "KOKO"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Luo annetun KOKOinen tiedosto"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Kirjoita tuloste tiedostoon NIMI, ei vakiotulosteeseen"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Lue tiedostonimet TIEDOSTOsta"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T lukee nollatavuun päättyviä nimiä"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "Täytä tiedosto annetulla HAHMOlla. HAHMO on ”default” tai ”zeros”"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Hajanaisen tiedoston lohkokoko"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
#, fuzzy
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Luo hajanaisia tiedostoja. "
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "SIIRTYMÄ"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Siirry annettuun kohtaan ennen datan kirjoittamista"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Vaienna ei-vakavat diagnostiikkaviestit"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Tiedostojen tilastoinnin valinnat:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Tulosta struct statin sisältö jokaisesta annetusta tiedostosta. "
"OletusMUOTOILU on: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Synkronisen suorituksen valinnat:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "VALITSIN"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Aseta päiväys seuraavalle --touch-valitsimelle"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Näytä suoritetut tarkistuspisteet sekä KOMENNOn paluuarvo"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2778,7 +2787,7 @@ msgstr ""
"Synkronisen suorituksen toiminnot. Nämä suoritetaan, kun saavutetaan --"
"checkpoint-valitsimella annettua numeroa vastaava tarkistuspiste."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2786,127 +2795,127 @@ msgstr ""
"Typistä TIEDOSTO aiemmalla --length-valitsimella määrättyyn kokoon (tai "
"nollaan, ellei annettu)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
#, fuzzy
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Typistä TIEDOSTO aiemmalla --length-valitsimella määrättyyn kokoon (tai "
"nollaan, ellei annettu)"
-#: tests/genfile.c:193
+#: tests/genfile.c:188
#, fuzzy
msgid "Update the access and modification times of FILE"
msgstr "näytä tiedostojen muutosajat UTC-aikoina"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Suorita KOMENTO"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Virheellinen koko: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Lukuarvo sallitun välin ulkopuolella: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negatiivinen koko: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) epäonnistui"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "pyydetty tiedoston pituus %lu, todellinen %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "luotu tiedosto ei ole hajanainen"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Virhe lukuarvon jäsentämisessä lähellä kohtaa ”%s”"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Tuntematon päiväyksen muoto"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARG...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "tiedostoa ”%s” ei voi avata"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "ei voi siirtyä"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "tiedostonimi sisältää nollatavun"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"hajanaisia tiedostoja ei voi luoda vakiotulosteeseen, käytä valitsinta --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "virheellinen peite (lähellä kohtaa ”%s”)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Tuntematon kenttä ”%s”"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "tiedoston ”%s” aikaa ei voi asettaa"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "tiedostoa ”%s” ei voi typistää"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "komento epäonnistui: %s"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "tiedostoa ”%s” ei voi typistää"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "Työhakemistoa ei voi tallentaa"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "tiedoston ”%s” linkitystä ei voi poistaa"
@@ -2946,6 +2955,9 @@ msgstr "Komento keskeytyi\n"
msgid "--stat requires file names"
msgstr "--stat vaatii tiedostonimiä"
+#~ msgid "OPTION"
+#~ msgstr "VALITSIN"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT-parametrin on oltava positiivinen"
diff --git a/po/fr.gmo b/po/fr.gmo
index e3024c697f77750a4a70e8144c0f8cee12ede01d..c64b9c09aefbb67ad7d9fc135c6b1e4ec5ba9b4f 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 1a70f7b5c07672bbfe856d2466470df1edcbd175..51b9debfebf48d61f1e337590b9aad104e7bd8ae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,12 +6,12 @@
# Christophe Combelles <ccomb@free.fr>, 2007, 2008, 2009, 2010, 2011.
# Stéphane Aulery <lkppo@free.fr>, 2015, 2016.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar-1.29\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2016-05-17 00:52+0200\n"
"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -99,7 +99,7 @@ msgid "give a short usage message"
msgstr "Afficher un court mode d'emploi"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NOM"
@@ -234,12 +234,12 @@ msgstr "^[oO]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Packagé par %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Packagé par %s\n"
@@ -247,11 +247,11 @@ msgstr "Packagé par %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
#, fuzzy
msgid ""
"\n"
@@ -535,200 +535,200 @@ msgstr ""
msgid "Cannot execute remote shell"
msgstr "Impossible de lancer un interpréteur de commandes distant"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Direction de positionnement hors plage"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Direction de recherche non valable"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Décalage de recherche non valable"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Positionnement relatif hors plage"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Nombre d'octets non valable"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Nombre d'octets hors plage"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Fin de fichier prématurée"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Code d'opération non valable"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Opération non prise en charge"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Arguments inattendus"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
"Manipule un lecteur de cartouches en acceptant des commandes d'un processus "
"distant"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NOMBRE"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "définit le niveau de débogage"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FICHIER"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "définit le nom de fichier de sortie de débogage"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "trop d'arguments"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Commande rejetée"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Ceci ne ressemble pas à une archive de type « tar »"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Nombre total d'octets lus"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Nombre total d'octets écrits"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Nombre total d'octets effacés"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(tube)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Refus de lecture du contenu de l'archive depuis le terminal (option -f "
"manquante ?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"Refus d'écriture du contenu de l'archive depuis le terminal (option -f "
"manquante ?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Valeur incorrecte pour « record_size »"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Aucun nom d'archive donné"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr ""
"Une archive utilisant l'entrée/sortie standard ne peut pas être vérifiée"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "L'archive est compressée. Utilisez l'option %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Une archive compressée ne peut pas être mise à jour"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Début de la cartouche atteinte ; arrêt du programme."
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Trop d'erreurs, arrêt du programme."
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Taille de l'enregistrement = %lu bloc"
msgstr[1] "Taille de l'enregistrement = %lu blocs"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Bloc non aligné (%lu octet) dans l'archive"
msgstr[1] "Bloc non aligné (%lu octets) dans l'archive"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Impossible de reculer dans le fichier d'archive ; il se peut qu'il soit "
"illisible sans l'option « -i »"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek ne s'est pas arrêté à une limite d'enregistrement"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s : contient un numéro de volume non valable"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Débordement du numéro de volume"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Préparez le volume n°%d pour %s et appuyez sur Entrée : "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr ""
"Fin de fichier rencontrée alors qu'une réponse de l'utilisateur était "
"attendue"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "AVERTISSEMENT : l'archive est incomplète"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -739,67 +739,67 @@ msgstr ""
" q Arrêter tar\n"
" y ou newline Continuer le traitement\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Générer un sous-shell\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Afficher cette liste\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Pas de nouveau volume ; fin du traitement.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Nom de fichier non spécifié. Essaye encore :).\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Données non valables en entrée. Tapez « ? » pour obtenir de l'aide.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "Échec de la commande %s"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "La suite de %s n'est pas sur ce volume."
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"La suite de %s est probablement sur ce volume : l'en-tête contient un nom "
"tronqué."
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s a une taille incorrecte (%s != %s + %s)."
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Ce volume est hors séquence (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Archive non étiquetée pour correspondre à %s."
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Le volume %s ne correspond pas à %s."
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -807,217 +807,217 @@ msgstr ""
"%s : nom de fichier tronqué, car trop long pour être stocké dans un en-tête "
"GNU multi-volumes"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "l'écriture ne s'est pas arrêté sur une limite de bloc"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Seulement %lu octet sur %lu a pu être lu"
msgstr[1] "Seulement %lu octets sur %lu ont pu être lus"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Les contenus sont différents."
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Fin prématurée rencontrée dans l'archive."
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Le type de fichier est différent."
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Le mode est différent."
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "L'UID est différent."
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Le GID est différent."
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "La date de modification est différente."
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "La taille est différente."
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "N'est pas lié à %s."
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Le lien symbolique est différent."
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Le numéro de périphérique est différent."
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Vérification "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
"%s : type de fichier « %c » inconnu, recherche de différence comme pour un "
"fichier normal"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "L'archive contient des noms de fichiers dont le préfixe a été enlevé"
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "L'archive contient des noms de fichiers transformés"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr ""
"La vérification peut échouer lors de la localisation des fichier originaux."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "ÉCHEC DE VÉRIFICATION : %d en-tête non valable détecté."
msgstr[1] "ÉCHEC DE VÉRIFICATION : %d en-têtes non valables détectés."
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Bloc zéro solitaire repéré à %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s : contient une étiquette de répertoire cache %s ; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "Valeur %s en dehors de la plage de %s : %s..%s ; remplacement par %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "Valeur %s en dehors de la plage de %s : %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Génération d'en-têtes octaux négatifs"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s : le nom de fichier est trop long (%d max) ; fichier non archivé"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
"%s : le nom de fichier est trop long (ne peut être scindé) ; fichier non "
"archivé"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s : le nom du lien est trop long ; fichier non archivé"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s : fichier réduit de %s octet ; remplissage avec des zéros"
msgstr[1] "%s : fichier réduit de %s octets ; remplissage avec des zéros"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr ""
"%s : le fichier est sur un système de fichiers différent ; fichier non "
"archivé"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "contenu non archivé"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s : type de fichier inconnu ; fichier ignoré"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Liens manquants vers %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s : le fichier n'est pas modifié ; fichier non archivé"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s : le fichier est l'archive elle-même ; fichier non archivé"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "répertoire non archivé"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s : fichier modifié pendant sa lecture"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s : socket ignorée"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s : porte ignorée"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "On saute à l'en-tête suivant"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Suppression d'un « non en-tête » de l'archive"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s : l'horodatage %s est trop vieux pour être plausible"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s : l'horodatage %s est situé %s secondes dans le futur."
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s : incohérence inattendue lors de la création du répertoire"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s : fichier existant ignoré"
@@ -1040,7 +1040,7 @@ msgstr "Tentative d'extraction des liens symboliques comme des liens physiques"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s : extraction impossible (morceau de fichier issu d'un autre volume)"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "En-tête à nom long inattendu"
@@ -1069,24 +1069,24 @@ msgstr "%s : impossible d'archiver ce fichier."
msgid "Cannot rename %s to %s"
msgstr "Impossible de renommer %s en %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s : le répertoire a été renommé depuis %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s : le répertoire est nouveau."
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr ""
"%s : le répertoire est sur un système de fichiers différent ; fichier non "
"archivé"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s : le répertoire a été renommé."
@@ -1213,36 +1213,36 @@ msgstr "%s : suppression de %s\n"
msgid "%s: Cannot remove"
msgstr "%s : suppression impossible"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s : omis"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "bloc %s : ** Bloc de NULs **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "bloc %s : ** Fin de fichier **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "bloc %s : "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr ""
"Blancs dans l'en-tête alors qu'une valeur numérique de type %s était attendue"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1250,27 +1250,27 @@ msgstr ""
"complément à 2 supposé"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "La valeur octale de l'archive %.*s est en dehors de la plage de %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "L'archive contient des en-têtes obsolètes en base 64."
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Une chaîne en base 64 signée %s de l'archive est hors de la plage %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Une valeur en base 256 de l'archive est en dehors de la plage %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr ""
@@ -1278,140 +1278,140 @@ msgstr ""
"attendue."
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "La valeur de l'archive %s est hors des limites de %s : %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " lien vers %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " type de fichier inconnu %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Lien long--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Nom long--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--En-tête de volume--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Suite à l'octet %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Création du répertoire :"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "%s renommé en %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s : impossible de renommer en %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "%s finalement renommé en %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s : fichier supprimé avant d'avoir été lu"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "processus enfant"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "canal inter-processus"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Sélection des noms de fichiers locaux :"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"Ajouter le FICHIER donné à l'archive (utile si son nom commence par un tiret)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "RÉP"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "Utiliser RÉP comme répertoire de travail"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "Lire depuis le FICHIER la liste des noms à extraire ou à créer"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
"« -T » permet de lire les noms terminés par un NULL ; implique --verbatim-"
"files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "désactive l'effet de l'option --null précédente"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"Enlever la protection de caractères du fichier d'entrée ou des noms de "
"membres (par défaut)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
"Ne pas enlever la protection de caractères du fichier d'entrée ou des noms "
"de membres"
-#: src/names.c:87
+#: src/names.c:86
#, fuzzy
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr "-T lit les noms de fichiers verbatim (sans les options)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T traite les noms de fichiers commençants par un tiret comme des options "
"(par défaut)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "MOTIF"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "Exclure les fichiers correspondant au MOTIF"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "Exclure les motifs listés dans le FICHIER"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1419,26 +1419,26 @@ msgstr ""
"Exclure le contenu des répertoires contenant CACHEDIR.TAG, sauf le fichier "
"de tag lui-même"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "Tout exclure dans les répertoires contenant CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "Exclure les répertoires contenant CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"Exclure le contenu des répertoires contenant le FICHIER, sauf le FICHIER lui-"
"même"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
"lire le motif d'exclusion de chaque répertoire depuis FICHIER, s'il existe"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1446,126 +1446,126 @@ msgstr ""
"lire le motif d'exclusion de chaque répertoire et de ses sous-répertoire "
"depuis FICHIER, s'il existe"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "Tout exclure dans les répertoires contenant le FICHIER"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "Exclure les répertoires contenant le FICHIER"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "Exclure les répertoires des gestionnaires de version"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
"lire les motifs d'exclusion depuis les fichiers d'exclusion des "
"gestionnaires de version"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "exclure les fichiers de sauvegarde et de verrou"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "Parcourir les sous-répertoires de manière récursive (par défaut)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "Empêcher la descente automatique dans les sous-répertoires"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Options de correspondance de noms de fichiers (pour les motifs d'exclusion "
"et d'inclusion)"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "Les motifs doivent correspondre au début des noms de fichiers"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
"Les motifs peuvent correspondre après n'importe quel « / » (par défaut pour "
"l'exclusion)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "Ignorer la casse (majuscules/minuscules)"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "Correspondance sensible à la casse (comportement par défaut)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr ""
"Utiliser des caractères de correspondance (par défaut pour l'exclusion)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "Correspondance exacte de chaîne"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr ""
"« / » peut correspondre à un caractère de correspondance (par défaut pour "
"l'exclusion)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "« / » ne correspond à aucun caractère de correspondance"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "commande échouée"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s : la liste demandée depuis %s a déjà été lue depuis %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "Impossible de couper la chaîne de caractères « %s » : %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s : le nom de fichier lu contient un caractère nul"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
"Caractères de correspondance de motif utilisé dans les noms de fichiers."
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1573,49 +1573,49 @@ msgstr ""
"Utilisez « --wildcards » pour activer la correspondance de motif ou « --no-"
"wildcards » pour supprimer cet avertissement"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s : non trouvé dans l'archive"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s : occurence requise non trouvée dans l'archive"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Mauvaise correspondance d'étiquette d'archive"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"L'utilisation de l'option -C à l'intérieur de la liste de fichiers n'est pas "
"permise avec --listed-incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Une seule option -C est autorisée avec --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr ""
"Les options « -%s » et« -%s » nécessitent toutes les deux l'entrée standard."
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s : format d'archive non valable"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr ""
"Fonctionnalités de type GNU demandées pour un format d'archive incompatible."
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1853,7 +1853,7 @@ msgstr "Choix du flux de sortie :"
msgid "extract files to standard output"
msgstr "Extraire les fichiers vers la sortie standard"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "COMMANDE"
@@ -1892,7 +1892,7 @@ msgid "use FILE to map file owner GIDs and names"
msgstr ""
"utilise FICHIER pour la correspondance des noms et GIDs du propriétaire"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATE-OU-FICHIER"
@@ -2110,7 +2110,7 @@ msgstr "Refaire les blocs pendant la lecture (pour les tubes BSD 4.2)"
msgid "Archive format selection:"
msgstr "Sélection du format d'archive :"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2198,65 +2198,65 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "Filtrer à travers le PROG (doit accepter l'option « -d »)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Sélection des fichiers locaux :"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr ""
"Rester dans le système de fichiers local lors de la création de l'archive"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "Ne pas enlever le « / » au début des noms de fichiers"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"Suivre les liens symboliques ; archiver les fichiers vers lesquels ils "
"pointent"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"Suivre les liens physiques : archiver les fichiers vers lesquels ils pointent"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "NOM-DE-MEMBRE"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "Débuter au NOM-DE-MEMBRE durant la lecture de l'archive"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "Stocker seulement les fichiers plus récents que DATE-OU-FICHIER"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATE"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "Ne comparer que la date et l'heure de modification des données"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "CONTRÔLE"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr ""
"Faire une copie de sauvegarde avant suppression, choisir le CONTRÔLE de "
"version"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "CHAÎNE"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2265,65 +2265,65 @@ msgstr ""
"habituel (« ~ » sauf s'il est définit par la variable d'environnement "
"SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Transformation des noms de fichiers :"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
"Supprimer NOMBRE composants au début des noms de fichiers à l'extraction"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "EXPRESSION"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
"Utiliser l'EXPRESSION de remplacement « sed » pour transformer les noms de "
"fichiers"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Options d'affichage :"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "Afficher de manière détaillée les fichiers traités"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "MOTCLÉ"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "Contrôle d'avertissement"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"Afficher un message de progression tous les NOMBRE enregistrements (10 par "
"défaut)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "ACTION"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "exécuter l'ACTION à chaque point de contrôle"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr ""
"Afficher un message si tous les liens n'ont pas pu être suivis et archivés"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2335,35 +2335,35 @@ msgstr ""
"sont : SIGHUP, SIGQUIT, SIGINT, SIGUSR1 et SIGUSR2. Les noms sans préfixe « "
"SIG » sont aussi acceptés"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "Afficher les dates de modification de fichier en UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "afficher l'heure du fichier en pleine résolution"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "Envoyer la sortie détaillée vers le FICHIER"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "Afficher le numéro du bloc de l'archive avec chaque message"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "Demander confirmation pour chaque action"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "Afficher les paramètres par défaut de tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "afficher les intervalles valides des champs des fichiers d'instantané"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2371,33 +2371,33 @@ msgstr ""
"Lors du listage ou de l'extraction, lister chaque répertoire qui ne concorde "
"pas avec le critère de recherche"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "Afficher les noms des fichiers ou des archives après transformation"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STYLE"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"Définir le style de protection de caractères appliqués aux noms. Voir ci-"
"dessous pour les valeurs du STYLE"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "Protéger aussi les caractères faisant partie de la CHAÎNE"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "Enlever la protection des caractères faisant partie de la CHAÎNE"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Options de compatibilité :"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2405,22 +2405,22 @@ msgstr ""
"Lors de la création, identique à « --old-archive ». Lors de l'extraction, "
"identique à « --no-same-owner »"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Autres options :"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "Désactiver certaines options potentiellement néfastes"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "« %s » ne peut pas être utilisé avec « %s »"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2428,40 +2428,40 @@ msgstr ""
"Vous ne pouvez pas sélectionner plus d'une option parmi « -Acdtrux », « --"
"delete » ou « --test-label »"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Options de compression non compatibles entre elles"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Type de signal inconnu : %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Fichier d'échantillon de date non trouvé"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Remplacement par %s du format de date inconnu %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Option %s : date « %s » traitée comme %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "Filtrer l'archive à travers %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Les arguments valables pour l'option « --quoting-style » sont :"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2469,121 +2469,121 @@ msgstr ""
"\n"
"Les valeurs par défaut de *ce* tar sont :\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Identifiant du propriétaire ou du groupe non valable"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Facteur de bloc non valable"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Longueur de cartouche non valable"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Mauvaise valeur pour le niveau incrémental"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Plus d'une date seuil"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Version de la dispersion non valable"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr ""
"--atime-preserve='system' n'est pas pris en charge sur cette plateforme"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "la valeur de « --checkpoint » n'est pas un entier"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Mode non valable donné en option"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Nombre non valable"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Taille d'enregistrement non valable"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "La taille d'un enregistrement doit être un multiple de %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Nombre d'éléments incorrect"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Une seule option « --to-command » est permise"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Argument de densité incorrect : %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Densité inconnue : « %c »"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Les options « -[0-7][lmh] » ne sont pas prises en charge par *ce* tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: emplacement de l’erreur"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "erreur à la lecture de « %s »"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FICHIER]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "Arguments non-option dans %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "Impossible de couper TAR_OPTIONS : %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "L'ancienne option « %c » a besoin d'un argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence n'a pas de sens sans une liste de fichiers"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Les fichiers d'archives multiples ont besoin de l'option « -M »"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level n'a aucun sens sans --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
@@ -2592,43 +2592,43 @@ msgstr[0] ""
msgstr[1] ""
"%s: l'étiquette du volume est trop longue (la limite est %lu octets)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Impossible de vérifier des archives multi-volumes"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Impossible de vérifier des archives compressées"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Impossible d'utiliser des archives multi-volumes compressées"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Impossible de concaténer des archives compressées"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime nécessite une date spécifiée avec --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option peut être utilisée uniquement avec des archives POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls peut être utilisée uniquement avec des archives POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux peut être utilisée uniquement avec des archives POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs peut être utilisée uniquement avec des archives POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2636,85 +2636,94 @@ msgstr ""
"Impossible de déduire le nom du répertoire de plus haut niveau ; veuillez le "
"sélectionner explicitement avec --one-top-level=RÉP"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
"La longueur du volume ne peut pas être inférieure à la taille de "
"l'enregistrement"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Je refuse de créer un fichier d'archive vide (oui je suis lâche)"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Les options « -Aru » sont incompatibles avec « -f - »"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Vous devez choisir une option parmi « -Acdtrux », « --delete » ou « --test-"
"label »"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Arrêt avec code d'échec à cause des erreurs précédentes"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s : fichier réduit de %s octet"
msgstr[1] "%s: fichier réduit de %s octets"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Le mot clé %s est inconnu ou n'est pas encore implémenté"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "L'horodatage est en dehors de la plage permise"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Le motif %s ne peut être utilisé"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Le mot clé %s ne peut pas être surdéfini"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "En-tête étendu incorrect : longueur manquante"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "La longueur de l'en-tête étendu %*s est hors plage"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "En-tête étendu incorrect : espace blanche manquante après la longueur"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "En-tête étendu incorrect : signe d'égalité manquant"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "En-tête étendu incorrect : retour à la ligne manquant"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Le mot clé inconnu « %s » pour l'en-tête étendu a été ignoré"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2722,46 +2731,46 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "L'en-tête étendu %s=%s est hors plage %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "En-tête étendu incorrect : %s=%s non valable"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "En-tête étendu incorrect : %s=%s en trop"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "En-tête étendu incorrect : %s non valable : délimiteur %c non prévu"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "En-tête étendu incorrect : %s non valable : nombre impair de valeurs"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s : délai d'expiration non valable"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s : action de point de contrôle inconnue"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "écriture"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "lecture"
@@ -2769,7 +2778,7 @@ msgstr "lecture"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Point de contrôle d'écriture %u"
@@ -2778,12 +2787,12 @@ msgstr "Point de contrôle d'écriture %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Point de contrôle de lecture %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2792,100 +2801,104 @@ msgstr ""
"GNU paxutils.\n"
"Les options sont :\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Options de création de fichier :"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "TAILLE"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Créer le fichier à la TAILLE donnée"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Écrire dans le fichier NOM, plutôt que sur la sortie standard"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Lire les noms de fichier depuis le FICHIER"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T permet de lire les noms terminés par un NULL"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Remplir le fichier avec le MOTIF donné. MOTIF est « default » ou « zeros »"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Taille d'un bloc pour le fichier dispersé"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Générer un fichier dispersé (avec des trous). Le reste de la ligne de "
"commande définit la carte du fichier."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "DÉCALAGE"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Se déplacer du DÉCALAGE donné avant d'écrire des données"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Supprimer les messages de diagnostique non fatals"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Options des statistiques de fichiers :"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Afficher le contenu des structures « stat » pour chaque fichier donné. Le "
"FORMAT par défaut est :"
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Options d'exécution synchrone :"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPTION"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Exécuter les ARGS. Utile avec « --checkpoint » et l'une des options « --cut "
"», « --append », « --touch » ou « --unlink »"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Exécuter l'action donnée (voir plus bas) dès qu'un point de contrôle NOMBRE "
"est atteint"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Définir la date pour la prochaine option « --touch »"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
"Afficher les points de contrôle exécutés et les codes de sortie de la "
"COMMANDE"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2893,7 +2906,7 @@ msgstr ""
"Actions d'exécution synchrone. Celles-ci sont exécutées lorsque le numéro du "
"point de contrôle donné par « --checkpoint » est atteint."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2901,126 +2914,126 @@ msgstr ""
"Tronquer le FICHIER à la taille donnée par la précédente option « --length "
"» (ou 0 si elle n'est pas fournie)."
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Ajouter TAILLE octets au FICHIER. La TAILLE est fournie par la précédente "
"option « --length »"
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Mettre à jour les dates d'accès et de modification du FICHIER"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Exécuter la COMMANDE"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Taille non valable : %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Nombre en dehors de la plage permise : %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Taille négative : %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "La fonction stat(%s) a échoué"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "taille de fichier demandée : %lu, taille réelle : %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "le fichier créé n'est pas dispersé"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Erreur à la lecture du nombre près de « %s »"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGS...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "Impossible d'ouvrir « %s »"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "Impossible à parcourir"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "Le nom de fichier contient un caractère nul"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"Un fichier dispersé ne peut pas être généré sur la sortie standard. Utilisez "
"l'option « --file »"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "Masque incorrect (près de « %s »)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Champ inconnu « %s »"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "Impossible de définir la date de « %s »"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "Impossible de tronquer « %s »"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "commande « %s » échouée"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "Impossible de tronquer « %s »"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "Impossible de définir la date de « %s »"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "Impossible de supprimer « %s »"
@@ -3060,6 +3073,9 @@ msgstr "La commande s'est terminée\n"
msgid "--stat requires file names"
msgstr "--stat nécessite un nom de fichier"
+#~ msgid "OPTION"
+#~ msgstr "OPTION"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s : le paramètre ARGP_HELP_FMT doit être positif"
diff --git a/po/ga.gmo b/po/ga.gmo
index 4ee81c43efb72b72155d61435fddf67615c7f54b..5a76d7ed8e44f93b3ff8ec64854952e28dfc3974 100644
Binary files a/po/ga.gmo and b/po/ga.gmo differ
diff --git a/po/ga.po b/po/ga.po
index 044cd5e64fb44c90cfcf874b3e67c41812f10775..06c44327b7e42359d695aa4d02718cea7d6d0687 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,13 +2,13 @@
# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
# Kevin Patrick Scannell <scannell@SLU.EDU>, 2003, 2004, 2006, 2007, 2008, 2009, 2017.
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2017-01-16 20:27-0600\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-17 09:10-0600\n"
"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
"Language: ga\n"
@@ -97,7 +97,7 @@ msgid "give a short usage message"
msgstr "taispeáin beagán eolais faoin úsáid"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "AINM"
@@ -135,29 +135,29 @@ msgid "write error"
msgstr "earráid sa scríobh"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: Tá an rogha '%s' débhríoch\n"
+msgstr "%s: Tá an rogha '%s%s' débhríoch\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: Tá an rogha '%s' débhríoch; féidearthachtaí:"
+msgstr "%s: Tá an rogha '%s%s' débhríoch; féidearthachtaí:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: rogha anaithnid '%c%s'\n"
+msgstr "%s: rogha anaithnid '%s%s'\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha '%c%s'\n"
+msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha '%s%s'\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: tá argóint de dhíth i ndiaidh na rogha '--%s'\n"
+msgstr "%s: tá argóint de dhíth i ndiaidh na rogha '%s%s'\n"
#: gnu/getopt.c:621
#, c-format
@@ -232,12 +232,12 @@ msgstr "^[yYiIsS]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Pacáistithe ag %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Pacáistithe ag %s\n"
@@ -245,12 +245,11 @@ msgstr "Pacáistithe ag %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -260,7 +259,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Ceadúnas GPLv3+: GNU GPL leagan 3 nó níos nuaí <http://gnu.org/licenses/gpl."
+"Ceadúnas GPLv3+: GNU GPL leagan 3 nó níos nuaí <https://gnu.org/licenses/gpl."
"html>.\n"
"Is saorbhogearra é seo: ceadaítear duit é a athrú agus a athdháileadh.\n"
"Níl baránta AR BITH ann, an oiread atá ceadaithe de réir dlí.\n"
@@ -398,14 +397,13 @@ msgid "%s home page: <%s>\n"
msgstr "Leathanach baile %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Leathanach baile %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "Leathanach baile %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
-msgstr "Cabhair ghinearálta le bogearraí GNU: <http://www.gnu.org/gethelp/>\n"
+msgstr "Cabhair ghinearálta le bogearraí GNU: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -535,148 +533,148 @@ msgstr "Ní féidir comhad a atreorú le haghaidh na cianbhlaoisce"
msgid "Cannot execute remote shell"
msgstr "Ní féidir cianbhlaosc a rith"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Treo 'seek' as raon"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Treo 'seek' neamhbhailí"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Fritháireamh 'seek' neamhbhailí"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Fritháireamh 'seek' as raon"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Líon beart neamhbhailí"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Líon beart as raon"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Comhadchríoch gan choinne"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Cód oibríochta neamhbhailí"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Oibríocht gan tacaíocht"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Argóintí gan súil leo"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
"Tiomántán téipe a láimhseáil, ag glacadh le horduithe ó phróiseas i gcéin "
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "UIMHIR"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "socraigh an leibhéal dífhabhtaithe"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "COMHAD"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "socraigh ainm an logchomhaid dífhabhtaithe"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "ní féidir %s a oscailt"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "an iomarca argóintí"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Ordú dramhaíola"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Ní cosúil le cartlann `tar' é seo"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Líon iomlán beart léite"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Líon iomlán beart scríofa"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Líon iomlán beart scriosta"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(píopa)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Ag diúltú inneachar na cartlainne a léamh ón teirminéal (-f ar iarraidh?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"Ag diúltú inneachar na cartlainne a scríobh sa teirminéal (-f ar iarraidh?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Luach neamhbhailí record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Níor tugadh ainm cartlainne"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Ní féidir cartlann stdin/stdout a fhíorú"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Tá an chartlann seo comhbhrúite. Úsáid an rogha %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Ní féidir cartlanna comhbhrúite a nuashonrú"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Tosach na téipe, ag scor anois"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "An iomarca earráidí, ag scor"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
@@ -686,7 +684,7 @@ msgstr[2] "Méid an taifid = %lu bhloc"
msgstr[3] "Méid an taifid = %lu mbloc"
msgstr[4] "Méid an taifid = %lu bloc"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
@@ -696,38 +694,38 @@ msgstr[2] "Bloc neamhailínithe (%lu bheart) sa chartlann"
msgstr[3] "Bloc neamhailínithe (%lu mbeart) sa chartlann"
msgstr[4] "Bloc neamhailínithe (%lu beart) sa chartlann"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Ní féidir an chartlann a chúlú; is dócha go bhfuil sé doléite gan -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "Níor stopadh rmtlseek ag teorainn taifid"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: tá uimhir imleabhair neamhbhailí ann"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Uimhir imleabhair thar maoil"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr ""
"Ullmhaigh imleabhar #%d le haghaidh %s agus brúigh an eochair iontrála: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Fuarthas comhadchríoch in áit freagra ón úsáideoir"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "RABHADH: Tá an chartlann neamhiomlán"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -739,67 +737,67 @@ msgstr ""
" q Tobscoir tar\n"
" y nó líne nua Lean ar aghaidh\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Sceith fobhlaosc\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Priontáil an liosta seo\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Níl aon imleabhar nua ann; ag scor.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Ainm an chomhaid gan sonrú. Bain triail eile as.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Ionchur neamhbhailí. Clóscríobh ? chun cabhair a fháil.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "Theip ar ordú %s"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "Ní leanann %s ar an imleabhar seo"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"Seans go leanann %s ar aghaidh ar an imleabhar seo: tá ainm teasctha sa "
"cheanntásc"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "Tá méid %s mícheart (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Tá an t-imleabhar seo as ord (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Lipéad ar chartlann nach bhfuil comhoiriúnaithe le %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Níl an t-imleabhar %s comhoiriúnaithe le %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -807,11 +805,11 @@ msgstr ""
"%s: Tá an comhadainm seo rófhada le bheith stóráilte i gceanntásc il-"
"imleabhar GNU; teasctha"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "níor stop an scríobh ag teorainn bhloic"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
@@ -821,75 +819,75 @@ msgstr[2] "Níorbh fhéidir ach %lu de %lu bheart a léamh"
msgstr[3] "Níorbh fhéidir ach %lu de %lu mbeart a léamh"
msgstr[4] "Níorbh fhéidir ach %lu de %lu beart a léamh"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Ní ionann na hábhair"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Comhadchríoch gan choinne sa chartlann"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Ní ionann na cineálacha comhaid"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Ní ionann na móid"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Ní ionann na UIDanna"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Ní ionann na GIDanna"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Ní ionann na hamanna modhnaithe"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Ní ionann na méideanna"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Níl sé ceangailte le %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Ní ionann na naisc shiombalacha"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Ní ionann na huimhreacha gléis"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Fíoraigh "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Cineál anaithnid comhaid '%c', diff déanta mar ghnáthchomhad"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Tá comhaid sa chartlann agus a réimíreanna scriosta."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Tá comhaid sa chartlann agus a n-ainmneacha aistrithe."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Ní féidir le fíorú na bunchomhaid a aimsiú i gcónaí."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
@@ -899,46 +897,46 @@ msgstr[2] "THEIP AR DHEIMHNIÚ: aimsíodh %d cheanntásc neamhbhailí"
msgstr[3] "THEIP AR DHEIMHNIÚ: aimsíodh %d gceanntásc neamhbhailí"
msgstr[4] "THEIP AR DHEIMHNIÚ: aimsíodh %d ceanntásc neamhbhailí"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Bloc nialasach amháin ag %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: tá clib chomhadlainne taisce %s ann; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "tá an luach %s as raon %s: %s..%s; ag cur %s ina ionad"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "tá an luach %s as raon %s: %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Ceanntásca ochtnártha diúltacha á gcruthú"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: ainm comhaid rófhada (uasfhada %d); gan dumpáil"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: ainm comhaid rófhada (ní féidir é a scoilt); gan dumpáil"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: ainm naisc rófhada; gan dumpáil"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
@@ -948,78 +946,78 @@ msgstr[2] "%s: %s bheart níos lú sa chomhad; á stuáil le náideanna"
msgstr[3] "%s: %s mbeart níos lú sa chomhad; á stuáil le náideanna"
msgstr[4] "%s: %s beart níos lú sa chomhad; á stuáil le náideanna"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: is ar chóras comhad eile ar fad é an comhad; gan dumpáil"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "ábhar gan dumpáil"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Cineál anaithnid comhaid; rinneadh neamhshuim air"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Naisc le %s ar iarraidh."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: comhad gan athrú; gan dumpáil"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: is ionann an comhad agus an chartlann féin; gan dumpáil"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "níor dumpáladh an chomhadlann"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: athraíodh an comhad agus é á léamh"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: rinneadh neamhshuim ar an soicéad"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: rinneadh neamhshuim ar an doras"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Ag bogadh go dtí an chéad cheanntásc eile"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Comhad nach ceanntásc é á scriosadh ón chartlann"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: stampa ama dochreidte sean %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: tá an stampa ama %s %s soicind sa todhchaí"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Neamhfhreagracht gan súil leis agus comhadlann á cruthú"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: ag dul thar comhad atá ann"
@@ -1043,7 +1041,7 @@ msgstr "Ag déanamh iarracht naisc shiombalacha a bhaint amach mar naisc chrua"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Ní féidir an comhad a bhaint amach -- ar lean ó imleabhar eile"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Ceanntásc ainm fada gan choinne"
@@ -1060,7 +1058,7 @@ msgstr "Tá an %s reatha níos nuaí nó ar comhaois"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: Tá '..' in ainm an bhaill"
#: src/extract.c:1696
#, c-format
@@ -1072,22 +1070,22 @@ msgstr "%s: Níorbh fhéidir cúltaca a dhéanamh"
msgid "Cannot rename %s to %s"
msgstr "Ní féidir an t-ainm a athrú ó %s go %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Athainmníodh an chomhadlann ó %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Comhadlann nua"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: ar chóras comhad eile ar fad é an chomhadlann; níor dumpáladh é"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Athainmníodh an chomhadlann"
@@ -1215,35 +1213,35 @@ msgstr "%s: %s á scriosadh\n"
msgid "%s: Cannot remove"
msgstr "%s: Ní féidir é a bhaint"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Á fhágáil ar lár"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "bloc %s: ** bloc de NULanna **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "bloc %s: ** Deireadh an chomhaid **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "bloc %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Bearnaí sa cheanntásc; ag súil le luach uimhriúil %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1251,163 +1249,164 @@ msgstr ""
"ag glacadh le comhlánú dénártha"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Tá an luach ochtnártha %.*s as raon %s sa chartlann"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Tá ceanntásca le bunuimhir 64 i léig sa chartlann"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Teaghrán %s le sín agus bunuimhir 64 as raon %s sa chartlann"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Tá an luach le bunuimhir 256 as raon %s sa chartlann"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Tá %.*s sa chartlann; ag súil le luach uimhriúil %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Tá an luach cartlainne %s as raon %s: %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " nasc le %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " cineál anaithnid comhaid %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Nasc Fada--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Ainm Fada--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Ceanntásc Imleabhair--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Ar lean ag beart %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Comhadlann á cruthú:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Ainm á athrú ó %s go %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Ní féidir athainmniú go %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "%s á athainmniú go %s arís\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Scriosadh an comhad sular léadh é"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "macphróiseas"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "bealach idir próisis"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Roghnú comhaid logánta:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"cuir an COMHAD sainithe leis an gcartlann (úsáideach má tá dais ag tús ainm "
"an chomhaid)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "COMHADLANN"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "athraigh go dtí COMHADLANN"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "tóg na hainmneacha le baint/cruthú as COMHAD"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
"Léann -T ainmneacha a bhfuil NULL ag a ndeireadh; --verbatim-files-from "
"intuigthe freisin"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "díchumasaigh an rogha --null roimhe seo"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "bain comharthaí athfhriotail ó chomhadainmneacha (réamhshocrú)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "ná bain comharthaí athfhriotail ó chomhadainmneacha"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "léann -T ainmneacha comhaid go litriúil (gan roghanna a láimhseáil)"
+msgstr ""
+"léann -T ainmneacha comhaid go litriúil (gan éalúcháin nó roghanna a "
+"láimhseáil)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"déileálann -T le hainmneacha comhaid a thosaíonn le dais mar roghanna "
"(réamhshocrú)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "PATRÚN"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "fág comhaid as an áireamh, tugtha mar PHATRÚN"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "fág as an áireamh aon phatrún atá i gCOMHAD"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1415,24 +1414,24 @@ msgstr ""
"fág ábhar na gcomhadlann ina bhfuil CACHEDIR.TAG ar lár, seachas an comhad "
"clibe féin"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "fág gach rud faoi chomhadlanna ina bhfuil CACHEDIR.TAG ar lár"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "fág comhadlanna ina bhfuil CACHEDIR.TAG ar lár"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "fág ábhar na gcomhadlann ina bhfuil COMHAD ar lár, seachas COMHAD féin"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
"léigh patrúin eisiata i gcomhair gach comhadlann ó COMHAD, má tá sé ann"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1440,120 +1439,124 @@ msgstr ""
"léigh patrúin eisiata i gcomhair gach comhadlann agus a cuid fochomhadlann ó "
"COMHAD, má tá sé ann"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "fág gach rud faoi chomhadlanna ina bhfuil COMHAD ar lár"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "fág comhadlanna a bhfuil COMHAD iontu ar lár"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "fág comhadlanna a bhaineann le córas rialaithe foinsí ar lár"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "léigh patrúin eisiata ó na comhaid neamhaird VCS"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "fág comhaid chúltaca agus comhaid ghlasála ar lár"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "téigh isteach i gcomhadlanna go hathchúrsach (réamhshocrú)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "ná téigh isteach i bhfochomhadlanna go huathoibríoch"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Roghanna maidir le comhoiriúnú ainmneacha comhaid (cuirfear iad seo i "
"bhfeidhm do phatrúin eisiata agus do phatrúin iniata araon):"
# subject is "exclude patterns"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "meaitseálann patrúin le tús ainm an chomhaid"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
"meaitseálann patrúin tar éis aon '/' (réamhshocrú i gcás patrúin eisiata)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "ná bí cásíogair"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "dealaigh idir litreacha beaga/móra (réamhshocrú)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "úsáid saoróga (réamhshocrú do phatrúin eisiata)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "comhoiriúnú teaghráin carachtar ar charachtar"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "meaitseálann saoróga le '/' (réamhshocrú i gcás patrúin eisiata)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "ní ghlacann saoróga le '/'"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Baineadh úsáid as na roghanna seo a leanas tar éis argóintí neamhroghnacha "
+"sa mód cartlannaithe nó sa mód nuashonraithe. Braitheann na roghanna seo ar "
+"a ionad, agus ní imríonn siad tionchar ach ar na hargóintí ina ndiaidh. Cuir "
+"san ord ceart iad, le do thoil."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s - gan éifeacht"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s - gan éifeacht"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s - gan éifeacht"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "líne na n-orduithe"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: bhí an liosta comhad iarrtha ó %s léite ó %s cheana"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "ní féidir teaghrán '%s' a scoilt: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: tá carachtar nialasach sa chomhadainm a léadh"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Aimsíodh saoróga in ainmneacha comhaid"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1561,47 +1564,47 @@ msgstr ""
"Úsáid --wildcards chun meaitseáil patrún a chumasú, nó --no-wildcards chun "
"an rabhadh seo a mhúchadh"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Níor aimsíodh sa chartlann é"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Níl rud riachtanach sa chartlann"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Lipéad mícheart ar an gcartlann"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Ní cheadaítear an rogha -C laistigh de liosta comhad in éineacht le --listed-"
"incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Ní cheadaítear ach rogha amháin -C in éineacht le --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Teastaíonn an gnáth-ionchur ó na roghanna '%s' agus '%s'"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Formáid neamhbhailí chartlainne"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Níl roghanna GNU ar fáil d'fhormáid neamh-chomhoiriúnach chartlainne"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1828,7 +1831,7 @@ msgstr "Roghnaigh sruth aschurtha:"
msgid "extract files to standard output"
msgstr "bain comhaid amach agus scríobh ar an ngnáth-aschur"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "ORDÚ"
@@ -1864,7 +1867,7 @@ msgstr "úsáid COMHAD mar mhapa idir UIDanna agus ainmneacha"
msgid "use FILE to map file owner GIDs and names"
msgstr "úsáid COMHAD mar mhapa idir GIDanna agus ainmneacha"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DÁTA-NÓ-COMHAD"
@@ -2076,7 +2079,7 @@ msgstr "athbhlocáil le linn léimh (le píopaí 4.2BSD)"
msgid "Archive format selection:"
msgstr "Roghnú formáide:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMÁID"
@@ -2161,62 +2164,62 @@ msgstr "CLÁR"
msgid "filter through PROG (must accept -d)"
msgstr "scag le CLÁR (ní foláir -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Roghnú comhaid logánta:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "ná fág an córas comhaid seo agus cartlann á cruthú"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "ná bain '/' tosaigh ó ainmneacha comhaid"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"lean naisc shiombalacha; cartlannaigh agus dumpáil na comhaid a nascann na "
"naisc leo"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"lean naisc chrua; cartlannaigh agus dumpáil na comhaid a nascann na naisc leo"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "AINM-BAILL"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "tosaigh ag ball AINM-BAILL agus an chartlann á léamh"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "ná sábháil comhaid níos nuaí ná DÁTA-NÓ-COMHAD"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DÁTA"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "déan comparáid le dáta/am modhnaithe"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "MODH"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "déan cúltaca sula scriostar, roghnaigh modh oibre maidir le leaganacha"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "TEAGHRÁN"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2224,61 +2227,61 @@ msgstr ""
"déan cúltaca roimh bhaint, agus sáraigh an gnáth-iarmhír ('~' mura dtugtar é "
"leis an athróg thimpeallachta SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Trasfhoirmiú ainmneacha comhaid:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "struipeáil UIMHIR comhpháirt tosaigh ó ainmneacha comhaid"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "SLONN"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
"Úsáid ordú ionadaíochta SLONN, i bhformáid \"sed\", chun ainmneacha comhaid "
"a thrasfhoirmiú"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Aschur faisnéiseach:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "taispeáin gach comhad atá próiseáilte, go foclach"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "LORGFHOCAL"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "rialú rabhadh"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "cuir dul chun cinn ar taispeáint, gach UIMHIRú taifid (réamhshocrú 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "GNÍOMH"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "déan GNÍOMH ag gach seicphointe"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "taispeáin eolas mura bhfuil gach nasc dumpáilte"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "COMHARTHA"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2290,35 +2293,35 @@ msgstr ""
"Ceadaítear na comharthaí seo a leanas: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 agus "
"SIGUSR2; glacfar leis na hainmneacha céanna gan an réimír SIG freisin"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "taispeáin amanna mionathraithe mar UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "taispeáin an t-am athraithe leis an taifeach is mine"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "scríobh aschur foclach i gCOMHAD"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "taispeáin bloc sa chartlann le gach teachtaireacht"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "iarr deimhniú ar gach gníomh"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "taispeáin réamhshocruithe tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "taispeáin raonta bailí le haghaidh réimsí sa chomhad roghbhlúire"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2326,33 +2329,33 @@ msgstr ""
"agus á liostú nó á bhaint amach, taispeáin gach comhadlann nach bhfuil "
"comhoiriúnaithe don chuardach"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "taispeáin ainmneacha comhaid/cartlainne i ndiaidh trasfhoirmithe"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STÍL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"socraigh stíl athfhriotail ainmneacha; féach thíos le haghaidh luachanna "
"bailí do STÍL"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "cuir carachtair athfhriotail timpeall na carachtair ó TEAGHRÁN"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "ná húsáid comharthaí athfhriotail timpeall carachtair ó TEAGHRÁN"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Roghanna Comhoiriúnachta:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2360,22 +2363,22 @@ msgstr ""
"is ionann le --old-archive le linn cruthaithe; is ionann le --no-same-owner "
"le linn baint"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Roghanna eile:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "cuir bac ar úsáid de roghanna gurbh fhéidir leo a bheith urchóideach"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s': ní féidir é seo a úsáid in éineacht le '%s'"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2383,40 +2386,40 @@ msgstr ""
"Ní féidir níos mó ná ceann amháin de na roghanna '-Acdtrux', '--delete' nó "
"'--test-label' a shonrú"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Roghanna contrártha comhbhrúite"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Comhartha anaithnid: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Comhad samplach dáta gan aimsiú"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Formáid dáta anaithnid; ag baint úsáid as %s in ionad %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Rogha %s: Ag déileáil le dáta '%s' mar %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "scag an chartlann trí %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Glacann an rogha --quoting-style leis na hargóintí seo a leanas:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2424,120 +2427,120 @@ msgstr ""
"\n"
"Luachanna réamhshocraithe don tar *seo*:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Úinéir nó aitheantas grúpa neamhbhailí"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Fachtóir bacainneach neamhbhailí"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Fad téipe neamhbhailí"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Leibhéal incriminteach neamhbhailí"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Níos mó ná spriocdháta amháin"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Leagan neamhbhailí ar fhormáid na ngannchomhad"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "ní thacaítear le --atime-preserve='system' ar an chóras seo"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "ní mór do luach --checkpoint a bheith ina slánuimhir"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Mód neamhbhailí ar rogha"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Uimhir neamhbhailí"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Méid taifid neamhbhailí"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Ní foláir méid taifid a bheith iolraí de %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Tá líon na mball neamhbhailí"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Ní cheadaítear ach aon rogha --to-command amháin"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Tá an argóint dlúis míchumtha: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Dlús anaithnid: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Ní thacaíonn an leagan seo de tar le '-[0-7][lmh]'"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: suíomh na hearráide"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "earráid agus %s á parsáil"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[COMHAD]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "argóintí nach roghanna iad i %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "ní féidir TAR_OPTIONS a scoilt: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Tá gá le hargóint tar éis seanrogha '%c'."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "tá an rogha --occurrence gan bhrí in éagmais liosta comhad"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Ní mór an rogha '-M' a shonrú le níos mó ná cartlann amháin"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level gan bhrí in éagmais --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
@@ -2547,43 +2550,43 @@ msgstr[2] "%s: Lipéad imleabhair rófhada (%lu bheart ar a mhéad)"
msgstr[3] "%s: Lipéad imleabhair rófhada (%lu mbeart ar a mhéad)"
msgstr[4] "%s: Lipéad imleabhair rófhada (%lu beart ar a mhéad)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Ní féidir cartlanna le hiliomad imleabhair a fhíorú"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Ní féidir cartlanna comhbhrúite a fhíorú"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Ní féidir úsáid a bhaint as cartlanna il-ranna comhbhrúite"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Ní féidir cartlanna comhbhrúite a iarcheangal"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "Teastaíonn dáta --mtime ó --clamp-mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "is féidir --pax-option a úsáid ar chartlanna POSIX amháin"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "is féidir --acls a úsáid ar chartlanna POSIX amháin"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "is féidir --selinux a úsáid ar chartlanna POSIX amháin"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "is féidir --xattrs a úsáid ar chartlanna POSIX amháin"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2591,31 +2594,31 @@ msgstr ""
"Ní féidir ainm na comhadlainne barrleibhéil a dhéanamh amach; ba chóir duit "
"é a thabhairt le --one-top-level=X"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Ní cheadaítear fad an imleabhair a bheith níos lú ná an mhéid taifid"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Ní chruthófar cartlann fholamh (go cladhartha)"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Ní féidir na roghanna '-Aru' a úsáid in éineacht le '-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Ní foláir ceann amháin de na roghanna '-Acdtrux', '--delete', nó '--test-"
"label' a shonrú"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Scor le stádas teipthe de bharr earráidí roimhe seo"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
@@ -2625,53 +2628,62 @@ msgstr[2] "%s: Chrap an comhad %s bheart"
msgstr[3] "%s: Chrap an comhad %s mbeart"
msgstr[4] "%s: Chrap an comhad %s beart"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Tá an lorgfhocal %s anaithnid nó nach bhfuil sé curtha i bhfeidhm fós"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Tá an stampa ama lasmuigh den raon ceadaithe"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Ní féidir an patrún %s a úsáid"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Ní féidir an lorgfhocal %s a shárú"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Ceanntásc míchumtha breisithe: fad ar iarraidh"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Fad %*s as raon sa cheanntásc breisithe"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Ceanntásc míchumtha breisithe: spás bán ar iarraidh tar éis an fhaid"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Ceanntásc míchumtha breisithe: sín chothroime ar iarraidh"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Ceanntásc míchumtha breisithe: líne nua ar iarraidh"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
"Lorgfhocal anaithnid '%s' sa cheanntásc breisithe; déanfar neamhshuim air"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2679,48 +2691,48 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Tá an ceanntásc breisithe %s=%s as raon %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Ceanntásc míchumtha breisithe: %s=%s neamhbhailí"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Ceanntásc míchumtha breisithe: %s=%s sa bhreis"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
"Ceanntásc míchumtha breisithe: %s neamhbhailí: bhíothas ag súil le "
"teormharcóir %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Ceanntásc míchumtha breisithe: %s neamhbhailí: corruimhir de luachanna"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: teorainn ama neamhbhailí"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: gníomh anaithnid seicphointe"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "scríobh"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "léamh"
@@ -2728,7 +2740,7 @@ msgstr "léamh"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Seicphointe scríofa %u"
@@ -2737,12 +2749,12 @@ msgstr "Seicphointe scríofa %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Seicphointe léimh %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2751,97 +2763,101 @@ msgstr ""
"paxutils.\n"
"Is iad na ROGHANNA:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Roghanna - cruthú comhad:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "MÉID"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Cruthaigh comhad leis an MÉID seo"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Scríobh i gcomhad AINM, in ionad an ghnáth-aschuir"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Léigh ainmneacha comhaid ó COMHAD"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "Léann -T ainmneacha, foirceanta le NULanna"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Líon an comhad leis an PATRÚN sonraithe. Is é PATRÚN 'default' nó 'zeros'"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Méid bhloic sa gannchomhad"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Cruthaigh gannchomhad. Tugtar an mapa comhaid ar an chuid eile de líne na n-"
"orduithe."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "FRITHÁIREAMH"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Léim go dtí an FRITHÁIREAMH roimh scríobh na sonraí"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Ná taispeáin teachtaireachtaí diagnóiseacha neamh-mharfacha"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Roghanna - staitisticí comhaid"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Taispeáin inneachar an struct stat le haghaidh gach comhad sonraithe. "
"FORMÁID réamhshocraithe: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Roghanna - feidhmiú sioncronach:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "ROGHA"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Rith ARGÓINTÍ. Úsáideach in éineacht le --checkpoint agus ceann amháin de --"
"cut, --append, --touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Déan an gníomh sonraithe (féach thíos) nuair a shroichtear seicphointe UIMHIR"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Socraigh an dáta le haghaidh an chéad rogha --touch eile"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Taispeáin na seicphointí a ritheadh agus stádas scortha den ORDÚ"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2849,7 +2865,7 @@ msgstr ""
"Gníomhartha rite shioncronaigh. Ritear iad seo nuair a shroichtear an uimhir "
"sheicphointe a sonraíodh leis an rogha --checkpoint"
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2857,124 +2873,124 @@ msgstr ""
"Teasc COMHAD go dtí an mhéid a sonraíodh leis an rogha --length roimhe seo "
"(nó teasc go dtí 0, mura sonraítear an rogha seo)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Iarcheangail MÉID beart le COMHAD. Tógtar MÉID ón rogha --length roimhe seo."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Nuashonraigh na hamanna rochtana/mionathraithe de CHOMHAD"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Rith ORDÚ"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Scrios COMHAD"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Méid neamhbhailí: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Uimhir as raon: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Méid diúltach: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "theip ar stat(%s)"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "fad iarrtha %lu, fíorfhad %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "ní gannchomhad é an comhad cruthaithe"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Earráid agus uimhir á parsáil i ngar do `%s'"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Formáid anaithnid ar an dáta"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGÓINTÍ...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "ní féidir `%s' a oscailt"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "ní féidir 'seek' a dhéanamh"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "tá carachtar nialasach sa chomhadainm"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"ní féidir gannchomhaid a chruthú ar an ngnáth-aschur; úsáid rogha --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "masc mícheart (i ngar do `%s')"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Réimse anaithnid `%s'"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "ní féidir an t-am a shocrú ar `%s'"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "ní féidir `%s' a theascadh"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "theip ar an ordú: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "ní féidir `%s' a theascadh"
+msgstr "ní féidir `%s' a stat"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "ní féidir an t-am a shocrú ar `%s'"
+msgstr "ní féidir comhadlann `%s' a bhaint"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "ní féidir `%s' a dhínascadh"
@@ -3014,6 +3030,9 @@ msgstr "Ordú críochnaithe\n"
msgid "--stat requires file names"
msgstr "Tá ainmneacha comhaid de dhíth ar --stat"
+#~ msgid "OPTION"
+#~ msgstr "ROGHA"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr ""
#~ "%.*s: Ní mór luach deimhneach a bheith ar an pharaiméadar ARGP_HELP_FMT"
diff --git a/po/gl.gmo b/po/gl.gmo
index c7edfa1af65a72086dcc1c8eb09f1dffa762e842..e59e26db002921c01bac1184414aa3df69b27c67 100644
Binary files a/po/gl.gmo and b/po/gl.gmo differ
diff --git a/po/gl.po b/po/gl.po
index dc555b4597a7885ba2ed6d345fa959e8e739cb92..9df5bfae94deb8d2f56d43703317d0b51bed00d5 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,12 +2,12 @@
# Copyright (C) 2002 Free Software Foundation, Inc.
# Jacobo Tarr�o Barreiro <jtarrio@iname.com>, 2002.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar 1.13.25\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2002-03-26 19:17+0100\n"
"Last-Translator: Jacobo Tarr�o Barreiro <jtarrio@iname.com>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -98,7 +98,7 @@ msgid "give a short usage message"
msgstr ""
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr ""
@@ -233,12 +233,12 @@ msgstr ""
msgid "^[nN]"
msgstr ""
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr ""
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr ""
@@ -246,11 +246,11 @@ msgstr ""
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr ""
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -502,54 +502,54 @@ msgstr "Non se pode executar un int
msgid "Cannot execute remote shell"
msgstr "Non se pode executar un int�rprete de comandos remoto"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Direcci�n de desprazamento f�ra de rango"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
#, fuzzy
msgid "Invalid seek direction"
msgstr "Proporcionouse na opci�n un modo non v�lido"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
#, fuzzy
msgid "Invalid seek offset"
msgstr "Marca de tempo non v�lida"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Desprazamento f�ra de rango"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
#, fuzzy
msgid "Invalid byte count"
msgstr "Lonxitude da fita non v�lida"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
#, fuzzy
msgid "Byte count out of range"
msgstr "Desprazamento f�ra de rango"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
#, fuzzy
msgid "Premature eof"
msgstr "rmtd: Fin de ficheiro prematura\n"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
#, fuzzy
msgid "Invalid operation code"
msgstr "%s: opci�n non v�lida -- %c\n"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr ""
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
#, fuzzy
msgid "Unexpected arguments"
msgstr "Fin de ficheiro inesperado nos nomes alterados"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
#, fuzzy
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
@@ -559,146 +559,146 @@ msgstr ""
" --version Amosar informaci�n da versi�n.\n"
" --help Amosar esta axuda.\n"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr ""
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr ""
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr ""
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr ""
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, fuzzy, c-format
msgid "cannot open %s"
msgstr "Non se puido abrir %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr ""
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Comando lixo"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Isto non semella un arquivo tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr ""
-#: src/buffer.c:592
+#: src/buffer.c:594
#, fuzzy
msgid "Total bytes written"
msgstr "Bytes totais escritos: %s (%sB, %sB/s)\n"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr ""
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(canalizaci�n)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Valor non v�lido para record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Non se proporcionou o nome do arquivo"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Non se poden verifica-los arquivos da entrada/sa�da est�ndar"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr ""
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Non se poden actualiza-los arquivos comprimidos"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "No comezo da cinta, sa�ndo agora"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Demasiados erros, sa�ndo"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, fuzzy, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Tama�o do rexistro = %lu bloques"
msgstr[1] "Tama�o do rexistro = %lu bloques"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, fuzzy, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Bloque desali�ado (%lu bytes) no arquivo"
msgstr[1] "Bloque desali�ado (%lu bytes) no arquivo"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Non se pode recuar no arquivo; pode ser ilexible sen -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr ""
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: cont�n un n�mero de volume non v�lido"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Desbordamento no n�mero de volume"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Prepare o volume #%d para %s e prema enter: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Chegouse � fin de ficheiro onde se esperaba unha resposta do usuario"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "AVISO: O arquivo est� incompleto"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, fuzzy, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -710,278 +710,278 @@ msgstr ""
" ! Executar outro int�rprete de comandos\n"
" ? Amosar esta lista\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr ""
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr ""
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Non hai novos volumes; sa�ndo.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr ""
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr ""
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, fuzzy, c-format
msgid "%s command failed"
msgstr "O comando \"%s\" fallou"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s non contin�a neste volume"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, fuzzy, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s non contin�a neste volume"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s ten un tama�o incorrecto (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, fuzzy, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Este volume est� fora da secuencia"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "O arquivo non est� etiquetado para coincidir con %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "O volume %s non coincide con %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
-#: src/buffer.c:1965
+#: src/buffer.c:1962
#, fuzzy
msgid "write did not end on a block boundary"
msgstr "A fin do ficheiro (EOF) do arquivo %s non se atopa no l�mite do bloque"
-#: src/compare.c:98
+#: src/compare.c:97
#, fuzzy, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "So se puido ler %lu de %lu bytes"
msgstr[1] "So se puido ler %lu de %lu bytes"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "O contido � diferente"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Fin de ficheiro inesperado no arquivo"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "O tipo de ficheiro � diferente"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "O modo � diferente"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Os uid son diferentes"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Os gid son diferentes"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "A data de modificaci�n � diferente"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "O tama�o � diferente"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Non ligado a %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "A ligaz�n simb�lica � diferente"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "O n�mero de dispositivo � diferente"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verificar "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
"%s: Tipo de ficheiro \"%c\" desco�ecido; tr�tase coma un ficheiro normal"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr ""
-#: src/compare.c:541
+#: src/compare.c:540
#, fuzzy
msgid "Archive contains transformed file names."
msgstr "O arquivo cont�n cabeceiras base-64 obsoletas"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr ""
-#: src/compare.c:620
+#: src/compare.c:619
#, fuzzy, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "FALLO NA VERIFICACION: detect�ronse %d cabeceiras non v�lidas"
msgstr[1] "FALLO NA VERIFICACION: detect�ronse %d cabeceiras non v�lidas"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr ""
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr ""
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "valor %s f�ra do rango de %s %s..%s; substitu�ndo %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "valor %s f�ra do rango de %s %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Xerando cabeceiras octais negativas"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, fuzzy, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: ficheiro sen cambios; non se envorca"
-#: src/create.c:616
+#: src/create.c:615
#, fuzzy, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: ficheiro sen cambios; non se envorca"
-#: src/create.c:643
+#: src/create.c:642
#, fuzzy, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: ficheiro sen cambios; non se envorca"
-#: src/create.c:1106
+#: src/create.c:1105
#, fuzzy, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: O ficheiro encolleu %s bytes; enchendo con ceros"
msgstr[1] "%s: O ficheiro encolleu %s bytes; enchendo con ceros"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: o ficheiro est� nun sistema de ficheiros diferente; non se envorca"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
#, fuzzy
msgid "contents not dumped"
msgstr " (memoria volcada)"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Tipo de ficheiro desco�ecido; ign�rase este ficheiro"
-#: src/create.c:1576
+#: src/create.c:1575
#, fuzzy, c-format
msgid "Missing links to %s."
msgstr " ligaz�n a %s\n"
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: ficheiro sen cambios; non se envorca"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: o ficheiro � o arquivo; non se envorca"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr ""
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: o ficheiro cambiou mentres se l�a"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: ign�rase o socket"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: ign�rase a porta"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Pasando � seguinte cabeceira"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Borrando o que non sexan cabeceiras do arquivo"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr ""
-#: src/extract.c:320
+#: src/extract.c:319
#, fuzzy, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: a marca de tempo %s est� %lu segundos no futuro"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Inconsistencia inesperada ao crea-lo directorio"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr ""
@@ -1004,7 +1004,7 @@ msgstr "Tentando extrae-las ligaz
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Non se pode extraer -- o ficheiro � continuaci�n doutro volume"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
#, fuzzy
msgid "Unexpected long name header"
msgstr "Fin de ficheiro (EOF) inesperado no arquivo"
@@ -1035,22 +1035,22 @@ msgstr "%s: Non se puido copiar este ficheiro"
msgid "Cannot rename %s to %s"
msgstr "%s: Non se pode renomear a %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, fuzzy, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Renomeouse o directorio"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: O directorio � novo"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, fuzzy, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: o ficheiro est� nun sistema de ficheiros diferente; non se envorca"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Renomeouse o directorio"
@@ -1176,36 +1176,36 @@ msgstr "%s: Borrando %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Non se pode eliminar"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Omit�ndoo"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "bloque %s: ** Bloque de nulos **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "bloque %s: ** Fin de Ficheiro **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "bloque %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr ""
"Atop�ronse espacios na cabeceira onde se esperaba un valor n�merico de %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1213,340 +1213,340 @@ msgstr ""
"a 2"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "O valor octal do arquivo %.*s est� f�ra do rango de %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "O arquivo cont�n cabeceiras base-64 obsoletas"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "A cadea base-64 asinada do arquivo %s est� f�ra do rango de %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "O valor base-256 do arquivo est� f�ra do rango de %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "O arquivo cont�n %.*s onde se esperaba un valor num�rico de %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "O valor do arquivo %s est� f�ra do rango de %s %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " ligaz�n a %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " Tipo de ficheiro %s desco�ecido\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr ""
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr ""
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Cabeceira de Volume--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Contin�a no byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Creando o directorio:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renomeando %s a %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Non se pode renomear a %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Renomeando %s a %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Ficheiro eliminado antes da s�a lectura"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "proceso fillo"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "canle interproceso"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr ""
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr ""
-#: src/names.c:74
+#: src/names.c:73
#, fuzzy
msgid "change to directory DIR"
msgstr "Non se pode cambia-lo directorio de traballo"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr ""
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr ""
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr ""
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr ""
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr ""
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr ""
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr ""
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr ""
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr ""
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr ""
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr ""
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr ""
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr ""
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr ""
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr ""
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr ""
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr ""
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr ""
-#: src/names.c:147
+#: src/names.c:146
#, fuzzy
msgid "wildcards do not match '/'"
msgstr "O volume %s non coincide con %s"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
#, fuzzy
msgid "command line"
msgstr "O comando \"%s\" fallou"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr ""
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr ""
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr ""
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr ""
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Non atopado no arquivo"
-#: src/names.c:1379
+#: src/names.c:1409
#, fuzzy, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Non atopado no arquivo"
-#: src/names.c:1413
+#: src/names.c:1443
#, fuzzy, c-format
msgid "Archive label mismatch"
msgstr "O arquivo non est� etiquetado para coincidir con %s"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
-#: src/tar.c:88
+#: src/tar.c:87
#, fuzzy, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "As opci�ns \"-%s\" e \"-%s\" precisan da entrada est�ndar"
-#: src/tar.c:165
+#: src/tar.c:164
#, fuzzy, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Grupo non v�lido"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Qu�rense as caracter�sticas de GNU no formato de arquivo incompatible"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1762,7 +1762,7 @@ msgstr ""
msgid "extract files to standard output"
msgstr "Erro ao gravar na sa�da est�ndar"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr ""
@@ -1798,7 +1798,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr ""
@@ -1999,7 +1999,7 @@ msgstr ""
msgid "Archive format selection:"
msgstr "Arquivar da entrada est�ndar"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr ""
@@ -2084,118 +2084,118 @@ msgstr ""
msgid "filter through PROG (must accept -d)"
msgstr ""
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr ""
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr ""
-#: src/tar.c:693
+#: src/tar.c:694
#, fuzzy
msgid "don't strip leading '/'s from file names"
msgstr "Eliminadndo o \"%.*s\" inicial dos nomes dos membros"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr ""
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr ""
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr ""
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr ""
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr ""
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr ""
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr ""
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr ""
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr ""
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr ""
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr ""
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr ""
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr ""
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr ""
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr ""
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr ""
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr ""
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr ""
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2203,424 +2203,433 @@ msgid ""
"accepted"
msgstr ""
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr ""
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr ""
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr ""
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr ""
-#: src/tar.c:752
+#: src/tar.c:753
#, fuzzy
msgid "ask for confirmation for every action"
msgstr "Non se puido le-la confirmaci�n do usuario"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr ""
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr ""
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr ""
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr ""
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr ""
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr ""
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr ""
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr ""
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, fuzzy, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s: Non se pode saltar a %s"
-#: src/tar.c:933
+#: src/tar.c:934
#, fuzzy
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "Non pode especificar m�is dunha das opci�ns \"-Acdtrux\""
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Opci�ns de compresi�n conflictivas"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, fuzzy, c-format
msgid "Unknown signal name: %s"
msgstr " Tipo de ficheiro %s desco�ecido\n"
-#: src/tar.c:1028
+#: src/tar.c:1030
#, fuzzy
msgid "Date sample file not found"
msgstr "Non se atopou o ficheiro de data"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Substitu�ndo o formato de data desco�ecido %2$s por %1$s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr ""
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr ""
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr ""
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
msgstr ""
-#: src/tar.c:1253
+#: src/tar.c:1259
#, fuzzy
msgid "Invalid owner or group ID"
msgstr "Propietario non v�lido"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Factor de bloqueo non v�lido"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Lonxitude da fita non v�lida"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr ""
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "M�is dunha data de umbral"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr ""
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr ""
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr ""
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Proporcionouse na opci�n un modo non v�lido"
-#: src/tar.c:1797
+#: src/tar.c:1806
#, fuzzy
msgid "Invalid number"
msgstr "N�mero de inode non v�lido"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Tama�o de rexistro non v�lido"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "O tama�o do rexistro debe ser m�ltiplo de %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
#, fuzzy
msgid "Invalid number of elements"
msgstr "Lonxitude da fita non v�lida"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr ""
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr ""
-#: src/tar.c:2049
+#: src/tar.c:2058
#, fuzzy, c-format
msgid "Unknown density: '%c'"
msgstr "Patr�n desco�ecido `%s'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, fuzzy, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Opci�ns `-[0-7][lmh]' non soportadas por *este* tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, fuzzy, c-format
msgid "error parsing %s"
msgstr "Erro mentres se cerraba %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr ""
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "argumento %s non v�lido para %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr ""
-#: src/tar.c:2291
+#: src/tar.c:2300
#, fuzzy, c-format
msgid "Old option '%c' requires an argument."
msgstr "A antiga opci�n \"%c\" precisa dun argumento."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr ""
-#: src/tar.c:2390
+#: src/tar.c:2399
#, fuzzy
msgid "Multiple archive files require '-M' option"
msgstr "Varios ficheiros de arquivo requiren a opci�n \"-M\""
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr ""
-#: src/tar.c:2424
+#: src/tar.c:2433
#, fuzzy, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: A etiqueta do volume � longa de m�is (o l�mite � %lu bytes)"
msgstr[1] "%s: A etiqueta do volume � longa de m�is (o l�mite � %lu bytes)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Non se pode verifica-los arquivos multi-volume"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Non se poden verifica-los arquivos comprimidos"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Non se poden empregar arquivos comprimidos multi-volume"
-#: src/tar.c:2457
+#: src/tar.c:2466
#, fuzzy
msgid "Cannot concatenate compressed archives"
msgstr "Non se poden actualiza-los arquivos comprimidos"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "De xeito cobarde rex�itase crear un ficheiro baleiro"
-#: src/tar.c:2623
+#: src/tar.c:2632
#, fuzzy
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "As opci�ns \"-Aru\" son incompatibles con \"-f -\""
-#: src/tar.c:2711
+#: src/tar.c:2743
#, fuzzy
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Debe especificar unha das opci�ns \"-Acdtrux\""
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr ""
-#: src/update.c:87
+#: src/update.c:86
#, fuzzy, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: O ficheiro encolleu %s bytes"
msgstr[1] "%s: O ficheiro encolleu %s bytes"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr ""
-#: src/xheader.c:174
+#: src/xheader.c:173
#, fuzzy
msgid "Time stamp is out of allowed range"
msgstr "Marca de tempo f�ra de rango"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr ""
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr ""
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr ""
-#: src/xheader.c:677
+#: src/xheader.c:695
#, fuzzy, c-format
msgid "Extended header length %*s is out of range"
msgstr "A cadea base-64 asinada do arquivo %s est� f�ra do rango de %s"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr ""
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr ""
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr ""
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, fuzzy, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "O valor do arquivo %s est� f�ra do rango de %s %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr ""
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr ""
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, fuzzy, c-format
msgid "%s: not a valid timeout"
msgstr "%s: Grupo non v�lido"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr ""
@@ -2628,7 +2637,7 @@ msgstr ""
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, fuzzy, c-format
msgid "Write checkpoint %u"
msgstr "Punto de control de escritura %d"
@@ -2637,232 +2646,232 @@ msgstr "Punto de control de escritura %d"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, fuzzy, c-format
msgid "Read checkpoint %u"
msgstr "Punto de control de lectura %d"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
#, fuzzy
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr "Xera-los ficheiros de datos para a suite de probas de GNU tar.\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
#, fuzzy
msgid "File creation options:"
msgstr "Opci�ns de compresi�n conflictivas"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr ""
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr ""
-#: tests/genfile.c:135
+#: tests/genfile.c:130
#, fuzzy
msgid "Write to file NAME, instead of standard output"
msgstr "Erro ao gravar na sa�da est�ndar"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr ""
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr ""
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr ""
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr ""
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr ""
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr ""
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr ""
-#: tests/genfile.c:168
-msgid "OPTION"
+#: tests/genfile.c:163
+msgid "N"
msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr ""
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
-#: tests/genfile.c:193
+#: tests/genfile.c:188
#, fuzzy
msgid "Update the access and modification times of FILE"
msgstr "%s: Non se puido cambia-la hora de acceso e modificaci�n"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr ""
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, fuzzy, c-format
msgid "Invalid size: %s"
msgstr "Marca de tempo non v�lida"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, fuzzy, c-format
msgid "Number out of allowed range: %s"
msgstr "N�mero de inode f�ra de rango"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr ""
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr ""
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr ""
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr ""
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr ""
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, fuzzy, c-format
msgid "Unknown date format"
msgstr "Erro do sistema desco�ecido"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr ""
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, fuzzy, c-format
msgid "cannot open `%s'"
msgstr "Non se puido abrir %s"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
#, fuzzy
msgid "cannot seek"
msgstr "Non se pode pechar"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr ""
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr ""
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, fuzzy, c-format
msgid "Unknown field `%s'"
msgstr "Patr�n desco�ecido `%s'"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, fuzzy, c-format
msgid "cannot set time on `%s'"
msgstr "Non se puido evalua-lo ficheiro %s"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, fuzzy, c-format
msgid "cannot truncate `%s'"
msgstr "Non se puido evalua-lo ficheiro %s"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, fuzzy, c-format
msgid "command failed: %s"
msgstr "O comando \"%s\" fallou"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "Non se puido evalua-lo ficheiro %s"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "Non se puido abri-lo directorio %s"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, fuzzy, c-format
msgid "cannot unlink `%s'"
msgstr "Non se puido abrir %s"
diff --git a/po/hr.gmo b/po/hr.gmo
index 647175531ce1e3c1115ed12079b8ea70d26943a8..20e566ce96a0e5b813846bb7ca1cf7efa5e5f13f 100644
Binary files a/po/hr.gmo and b/po/hr.gmo differ
diff --git a/po/hr.po b/po/hr.po
index 40acc391c38e43f5399f96b0f53c275125875e7b..d17edb5deeb2bc0adf0b39854cf1b7ac65b98ea3 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,5 +1,5 @@
# Translation of tar to Croatian.
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2017 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
# ... wishes to thank everybody who helped in good faith.
#
@@ -8,18 +8,19 @@
# bp, travanj 2016.: to je originalni TK zadnji prijevod od 2012. godine
# samo su dodani novi msgid-ovi i uređeni fuzirani msgstr-ovi.
# korektura u dogovoru s lingvistima slijedi u dogledno vrijeme.
+# bp: siječanj 2018.: puno izmjena....
#
#
# Mirsad Todorovac <mtodorov_69@yahoo.com>, 2002.
# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
-# Božidar Putanec <bozidarp@yahoo.com>, 2016.
-#: src/create.c:1599
+# Božidar Putanec <bozidarp@yahoo.com>, 2016, 2017, 2018.
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar-1.29\n"
+"Project-Id-Version: tar-1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-17 10:51-0700\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-01-12 18:33-0800\n"
"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
"Language: hr\n"
@@ -30,20 +31,16 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 2.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: ../../Downloads/tar-1.28.90\n"
-"X-Poedit-SearchPath-0: gnu\n"
-"X-Poedit-SearchPath-1: src\n"
#: gnu/argmatch.c:134
#, c-format
msgid "invalid argument %s for %s"
-msgstr "neispravan argument %s za %s"
+msgstr "neispravni argument %s za %s"
#: gnu/argmatch.c:135
#, c-format
msgid "ambiguous argument %s for %s"
-msgstr "višeznačan argument %s za %s"
+msgstr "dvosmisleni argument %s za %s"
#: gnu/argmatch.c:154
msgid "Valid arguments are:"
@@ -74,8 +71,8 @@ msgid ""
"Mandatory or optional arguments to long options are also mandatory or "
"optional for any corresponding short options."
msgstr ""
-"Obavezni ili opcionalni argumenti dugačkih opcija također su obavezni ili "
-"opcionalni za odgovarajuće kratke opcije."
+"Obvezni ili opcijski argumenti za dugačke opcije su također obvezni i za "
+"kratke opcije."
#: gnu/argp-help.c:1615
msgid "Usage:"
@@ -83,7 +80,7 @@ msgstr "Uporaba:"
#: gnu/argp-help.c:1619
msgid " or: "
-msgstr " ili: "
+msgstr " ili: "
#: gnu/argp-help.c:1631
msgid " [OPTION...]"
@@ -102,18 +99,18 @@ msgstr "Prijavite greške na %s.\n"
#: gnu/argp-help.c:1887 gnu/error.c:195
msgid "Unknown system error"
-msgstr "Nepoznata greška sustava"
+msgstr "Nepoznata pogreška sustava"
#: gnu/argp-parse.c:81
msgid "give this help list"
-msgstr "prikaži ovaj popis pomoći"
+msgstr "ova pomoć"
#: gnu/argp-parse.c:82
msgid "give a short usage message"
-msgstr "prikaži kratke upute za uporabu"
+msgstr "kratke upute za uporabu"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "IME"
@@ -127,15 +124,15 @@ msgstr "SEK"
#: gnu/argp-parse.c:86
msgid "hang for SECS seconds (default 3600)"
-msgstr "zaustavi na SEK sekundi (zadano 3600)"
+msgstr "zaustavi se za SEK sekundi (zadano 3600)"
#: gnu/argp-parse.c:143
msgid "print program version"
-msgstr "ispiši inačicu programa"
+msgstr "inačica ovog tar programa"
#: gnu/argp-parse.c:160
msgid "(PROGRAM ERROR) No version known!?"
-msgstr "(GREŠKA PROGRAMA) Nema poznate inačice!?"
+msgstr "**Interna greška programa**: Nepoznata inačica!?"
#: gnu/argp-parse.c:613
#, c-format
@@ -144,36 +141,36 @@ msgstr "%s: Previše argumenata\n"
#: gnu/argp-parse.c:759
msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr "(GREŠKA PROGRAMA) Opcije su trebale biti prepoznate!?"
+msgstr "**Interna greška programa**: Opcije su trebale biti prepoznate!?"
#: gnu/closeout.c:122
msgid "write error"
msgstr "greška pisanja"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: opcija „%s“ je višeznačna\n"
+msgstr "%s: opcija „%s%s“ je dvosmislena\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: opcija „%s“ je višeznačna; mogućnosti:"
+msgstr "%s: opcija „%s%s“ je dvosmislena; mogućnosti:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: neprepoznata opcija „%c%s“\n"
+msgstr "%s: neprepoznata opcija „%s%s“\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: opcija „%c%s“ ne dozvoljava argument\n"
+msgstr "%s: opcija „%s%s“ ne dopušta argument\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: opcija „--%s“ zahtijeva argument\n"
+msgstr "%s: opcija „%s%s“ zahtijeva argument\n"
#: gnu/getopt.c:621
#, c-format
@@ -187,17 +184,17 @@ msgstr "%s: opcija zahtijeva argument -- „%c“\n"
#: gnu/obstack.c:338 gnu/obstack.c:340 gnu/xalloc-die.c:34
msgid "memory exhausted"
-msgstr "memorija iscrpljena"
+msgstr "memorija je iscrpljena"
#: gnu/openat-die.c:38
#, c-format
msgid "unable to record current working directory"
-msgstr "ne mogu zapisati trenutni radni direktorij"
+msgstr "nije moguće registrirati trenutačni radni direktorij"
#: gnu/openat-die.c:57
#, c-format
msgid "failed to return to initial working directory"
-msgstr "nisam se uspio vratiti u početni radni direktorij"
+msgstr "nije uspjelo vratiti se u početni radni direktorij"
#
#. TRANSLATORS:
@@ -237,7 +234,7 @@ msgstr "“"
#. locale -k LC_MESSAGES | grep '^yesexpr='
#: gnu/rpmatch.c:150
msgid "^[yY]"
-msgstr "^[dDyY]"
+msgstr "^[yYdD]"
#. TRANSLATORS: A regular expression testing for a negative answer
#. (english: "no"). Testing the first character may be sufficient.
@@ -249,12 +246,12 @@ msgstr "^[dDyY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Pakirao %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Pakirao %s\n"
@@ -262,12 +259,11 @@ msgstr "Pakirao %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -277,10 +273,10 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Licenca GPLv3+: GNU GPL inačica 3 ili novija <http://gnu.org/licenses/gpl."
-"html>.\n"
-"Ovo je slobodan softver: slobodno ga smijete mijenjati i dijeliti.\n"
-"NEMA JAMSTAVA, do krajnje mjere dozvoljene zakonom.\n"
+"Licencija GPLv3+: GNU GPL inačica 3 ili kasnija <https://gnu.org/licenses/"
+"gpl.html>.\n"
+"Ovo je slobodan softver: slobodno ga mijenjajte i dijelite.\n"
+"NEMA JAMSTVA do granica dopuštenih zakonom.\n"
"\n"
#. TRANSLATORS: %s denotes an author name.
@@ -402,8 +398,8 @@ msgid ""
"Report bugs to: %s\n"
msgstr ""
"\n"
-"Prijavite greške na %s.\n"
-"Prijavite greške prijevoda na <lokalizacija@linux.hr>.\n"
+"Prijavite programske greške (na engleskom, LC_ALL=C) na %s.\n"
+"Prijavite greške u prijevodu na <lokalizacija@linux.hr>.\n"
#: gnu/version-etc.c:247
#, c-format
@@ -413,18 +409,17 @@ msgstr "Prijavite %s greške na %s\n"
#: gnu/version-etc.c:251
#, c-format
msgid "%s home page: <%s>\n"
-msgstr "%s početna stranica: <%s>\n"
+msgstr "Internetska stranica od %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "%s početna stranica: <http://www.gnu.org/software/%s/>\n"
+msgstr "Internetska stranica od %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Općenita pomoć za korištenje GNU softvera: <http://www.gnu.org/gethelp/>\n"
+"Općenita pomoć za korištenje GNU softvera: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -433,7 +428,7 @@ msgstr ""
#: lib/paxerror.c:60 lib/paxerror.c:73
#, c-format
msgid "%s: Cannot %s"
-msgstr "%s: Ne mogu izvršiti %s"
+msgstr "%s: Funkcija %s je završila s greškom"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -442,463 +437,467 @@ msgstr "%s: Ne mogu izvršiti %s"
#: lib/paxerror.c:86
#, c-format
msgid "%s: Warning: Cannot %s"
-msgstr "%s: Upozorenje: Ne mogu izvršiti %s"
+msgstr "%s: Upozorenje: funkcija %s je završila s greškom"
#: lib/paxerror.c:95
#, c-format
msgid "%s: Cannot change mode to %s"
-msgstr "%s: Ne mogu promijeniti mod u %s"
+msgstr "%s: Nije moguće promijeniti prava dostupa od %s"
#: lib/paxerror.c:103
#, c-format
msgid "%s: Cannot change ownership to uid %lu, gid %lu"
-msgstr "%s: Ne mogu promijeniti vlasništvo u uid %lu, gid %lu"
+msgstr "%s: Nije moguće promijeniti vlasništvo u uid %lu, gid %lu"
#: lib/paxerror.c:129
#, c-format
msgid "%s: Cannot hard link to %s"
-msgstr "%s: Ne mogu napraviti čvrstu vezu na %s"
+msgstr "%s: Nije moguće napraviti čvrstu vezu na %s"
#: lib/paxerror.c:181 lib/paxerror.c:213
#, c-format
msgid "%s: Read error at byte %s, while reading %lu byte"
msgid_plural "%s: Read error at byte %s, while reading %lu bytes"
-msgstr[0] "%s: Greška čitanja na bajtu %s pri čitanju %lu bajta"
-msgstr[1] "%s: Greška čitanja na bajtu %s pri čitanju %lu bajta"
-msgstr[2] "%s: Greška čitanja na bajtu %s pri čitanju %lu bajtova"
+msgstr[0] "%s: Pogreška u čitanju na bajtu %s pri čitanju %lu bajta"
+msgstr[1] "%s: Pogreška u čitanju na bajtu %s pri čitanju %lu bajta"
+msgstr[2] "%s: Pogreška u čitanju na bajtu %s pri čitanju %lu bajtova"
#: lib/paxerror.c:194
#, c-format
msgid "%s: Warning: Read error at byte %s, while reading %lu byte"
msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes"
-msgstr[0] "%s: Upozorenje: Greška čitanja na bajtu %s pri čitanju %lu bajta"
-msgstr[1] "%s: Upozorenje: Greška čitanja na bajtu %s pri čitanju %lu bajta"
-msgstr[2] "%s: Upozorenje: Greška čitanja na bajtu %s pri čitanju %lu bajtova"
+msgstr[0] ""
+"%s: Upozorenje: Pogreška u čitanju na bajtu %s pri čitanju %lu bajta"
+msgstr[1] ""
+"%s: Upozorenje: Pogreška u čitanju na bajtu %s pri čitanju %lu bajta"
+msgstr[2] ""
+"%s: Upozorenje: Pogreška u čitanju na bajtu %s pri čitanju %lu bajtova"
#: lib/paxerror.c:261
#, c-format
msgid "%s: Cannot seek to %s"
-msgstr "%s: Ne mogu ići na %s"
+msgstr "%s: Nije moguće skiočiti/naći na %s"
#: lib/paxerror.c:277
#, c-format
msgid "%s: Warning: Cannot seek to %s"
-msgstr "%s: Upozorenje: Ne mogu ići na %s"
+msgstr "%s: Upozorenje: Nije moguće skočiti/naći na %s"
#: lib/paxerror.c:286
#, c-format
msgid "%s: Cannot create symlink to %s"
-msgstr "%s: Ne mogu napraviti simboličku vezu na %s"
+msgstr "%s: Nije moguće napraviti simboličku vezu na %s"
#: lib/paxerror.c:351
#, c-format
msgid "%s: Wrote only %lu of %lu byte"
msgid_plural "%s: Wrote only %lu of %lu bytes"
-msgstr[0] "%s: Zapisao samo %lu od %lu bajta"
-msgstr[1] "%s: Zapisao samo %lu od %lu bajta"
-msgstr[2] "%s: Zapisao samo %lu od %lu bajtova"
+msgstr[0] "%s: Zapisano je samo %lu bajt iz %lu"
+msgstr[1] "%s: Zapisano je samo %lu bajta iz %lu"
+msgstr[2] "%s: Zapisano je samo %lu bajtova iz %lu"
#: lib/paxnames.c:140
#, c-format
msgid "Removing leading `%s' from member names"
-msgstr "Uklanjam početni „%s“ iz imena elemenata"
+msgstr "Uklanja se početni „%s“ iz imena člana"
#: lib/paxnames.c:141
#, c-format
msgid "Removing leading `%s' from hard link targets"
-msgstr "Uklanjam početni „%s“ iz odredišta čvrstih veza"
+msgstr "Uklanja se početni „%s“ iz meta tvrdih veza"
#: lib/paxnames.c:154
msgid "Substituting `.' for empty member name"
-msgstr "Mijenjam „.“ za prazno ime elementa"
+msgstr "„.“ (točkom) se zamjenjuje prazno ime člana"
#: lib/paxnames.c:155
msgid "Substituting `.' for empty hard link target"
-msgstr "Mijenjam „.“ za prazno odredište čvrste veze"
+msgstr "„.“ (točkom) se zamjenjuje prazna meta tvrde veze"
#: lib/rtapelib.c:299
#, c-format
msgid "exec/tcp: Service not available"
-msgstr "exec/tcp: Usluga nije dostupna"
+msgstr "exec/tcp: Servis nije dostupan"
# FIXME -- verify against source
#: lib/rtapelib.c:303
#, c-format
msgid "stdin"
-msgstr "standardni ulaz"
+msgstr "standardni ulaz (stdin)"
#: lib/rtapelib.c:306
#, c-format
msgid "stdout"
-msgstr "standardni izlaz"
+msgstr "standardni izlaz (stdout)"
#: lib/rtapelib.c:429
#, c-format
msgid "Cannot connect to %s: resolve failed"
-msgstr "Ne mogu se spojiti na %s: rezolucija nije uspjela"
+msgstr "Nije moguće povezivanje s %s: riješenje nije uspjelo"
#: lib/rtapelib.c:502
#, c-format
msgid "Cannot redirect files for remote shell"
-msgstr "Ne mogu preusmjeriti datoteke za udaljenu ljusku"
+msgstr "Nije moguće preusmjeriti datoteke za udaljenu ljusku (remote shell)"
#: lib/rtapelib.c:516
#, c-format
msgid "Cannot execute remote shell"
-msgstr "Ne mogu pokrenuti udaljenu ljusku"
+msgstr "Nije moguće pokrenuti udaljenu ljusku (remote shell)"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
-msgstr "Smjer traženja izvan granica"
+msgstr "Smjer za skok na poziciju je izvan dosega"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
-msgstr "Neispravan smjer traženja"
+msgstr "Neispravni smjer za skok na poziciju"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
-msgstr "Neispravan pomak traženja"
+msgstr "Neispravna pozicija skoka"
# FIXME -- find xlation for 'seek offset' -- TM
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
-msgstr "Pomak traženja izvan granica"
+msgstr "Pozicija skoka je izvan dosega"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
-msgstr "Neispravan broj bajtova"
+msgstr "Neispravni broj bajtova"
# FIXME -- find xlation for 'seek offset' -- TM
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
-msgstr "Broj bajtova izvan granica"
+msgstr "Broj bajtova je izvan raspona"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
-msgstr "Preuranjen eof"
+msgstr "Preuranjen eof (kraj datoteke)"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
-msgstr "Neispravan operacijski kod"
+msgstr "Neispravni kod operacije"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operacija nije podržana"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Neočekivani argumenti"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
-msgstr "Upravlja pogonom vrpce, prihvaćajući naredbe udaljenog procesa"
+msgstr "Rad s pogonom vrpce, prihvaćajući naredbe udaljenog procesa"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "BROJ"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
-msgstr "postavi razinu debugiranja"
+msgstr "postavite razinu debugiranja (opširnost izvješća o greškama)"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "DATOTEKA"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
-msgstr "postavi ime datoteke izlaza za debugiranje"
+msgstr "zadajte naziv izlazne datoteke s podacima za uklanjanje grešaka"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
-msgstr "ne mogu otvoriti %s"
+msgstr "nije moguće otvoriti %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "previše argumenata"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
-msgstr "Naredba smeća"
+msgstr "Neispravna naredba"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Ovo ne izgleda kao tar arhiva"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Ukupno pročitano bajtova"
# FIXME -- ovo neće raditi ako je prevedeno -- Denis?
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Ukupno zapisano bajtova"
# FIXME -- ovo neće raditi ako je prevedeno -- Denis?
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
-msgstr "Izbrisano ukupno bajtova"
+msgstr "Ukupno izbrisano bajtova"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
-msgstr "(cjevovod)"
+msgstr "(cijev)"
# Hrvatski jezični portal
# otkazati > odbiti izvršiti naredbu
# odbijati > ne pristati
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
-msgstr "Čitanje sadržaja arhive s terminala je odbijeno (nedostaje -f opcija?)"
+msgstr ""
+"Uskraćuje se čitanje sadržaja arhive s terminala (nedostaje -f opcija?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
-msgstr "Ispis sadržaja arhive na terminal je odbijeno (nedostaje -f opcija?)"
+msgstr "Odbija se ispisati sadržaj arhive na terminal (nedostaje -f opcija?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Neispravna vrijednost za record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
-msgstr "Nije zadano ime arhive"
+msgstr "Nije dano ime za arhivu"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
-msgstr "Ne mogu provjeriti stdin/stdout arhivu"
+msgstr "Nije moguće provjeriti stdin/stdout arhivu"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
-msgstr "Arhiva je komprimirana. Koristite opciju %s"
+msgstr "Arhiva je komprimirana. rabite opciju %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
-msgstr "Ne mogu ažurirati komprimirane arhive"
+msgstr "Nije moguće ažurirati komprimirane arhive"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
-msgstr "Početak trake, završavam"
+msgstr "Početak trake, kraj rada"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
-msgstr "Previše grešaka, završavam"
+msgstr "Previše grešaka, kraj rada"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Veličina zapisa = %lu blok"
-msgstr[1] "Veličina sloga = %lu bloka"
-msgstr[2] "Veličina sloga = %lu blokova"
+msgstr[1] "Veličina zapisa = %lu bloka"
+msgstr[2] "Veličina zapisa = %lu blokova"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
-msgstr[0] "Neporavnat blok (%lu bajt) unutar arhive"
-msgstr[1] "Neporavnat blok (%lu bajta) unutar arhive"
-msgstr[2] "Neporavnat blok (%lu bajtova) unutar arhive"
+msgstr[0] "Neporavnani blok (%lu bajt) unutar arhive"
+msgstr[1] "Neporavnani blok (%lu bajta) unutar arhive"
+msgstr[2] "Neporavnani blok (%lu bajtova) unutar arhive"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
-msgstr "Ne mogu se pomicati unatrag unutar arhive, može biti nečitljiva bez -i"
+msgstr ""
+"Nije momoguće vratiti se i ponovno pretražiti arhivu; možda je nečitljiva "
+"bez -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
-msgstr "rmtlseek nije stao na granici zapisa"
+msgstr "rmtlseek se nije zaustavio na granici zapisa"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
-msgstr "%s: sadrži neispravan broj dijela arhive"
+msgstr "%s: sadrži neispravni broj sveska"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
-msgstr "Preljev broja dijela arhive"
+msgstr "Broj sveska je prevelik"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
-msgstr "Pripremite dio arhive #%d za %s i pritisnite [RETURN]: "
+msgstr "Pripremite svezak broj #%d za %s i pritisnite [ENTER]: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
-msgstr "Pronađen EOF gdje sam očekivao odgovor korisnika"
+msgstr "Kraj datoteke (EOF) umjesto očekivanoga odgovora korisnika"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "UPOZORENJE: Arhiva je nepotpuna"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
" q Abort tar\n"
" y or newline Continue operation\n"
msgstr ""
-" n [ime] Daj novo ime datoteke za sljedeći (i nadovezujuće) "
-"dijelove\n"
-" q Prekini tar\n"
-" y ili novi redak Nastavi rad\n"
+" n [ime] Novo ime datoteke za sljedeći (i naredne) sveske\n"
+" q Izlazi iz tar-a\n"
+" y ili novi redak Nastavlja operaciju\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
-msgstr " ! Pokreni podljusku\n"
+msgstr " ! Pokrene podljusku\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
-msgstr " ? Ispiši ovaj popis\n"
+msgstr " ? Ispiše ovaj popis\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
-msgstr "Nema novog dijela arhive, završavam.\n"
+msgstr "Nema novog sveska; kraj rada, izlaz.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
-msgstr "Ime datoteke nije navedeno. Pokušajte ponovo.\n"
+msgstr "Ime datoteke nije specificirano. Pokušajte ponovo.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
-msgstr "Neispravan unos. Unesite ? za pomoć.\n"
+msgstr "Neispravni ulazni podaci. Unesite ? za pomoć.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
-msgstr "naredba %s nije uspjela"
+msgstr "Naredba %s nije uspjela"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
-msgstr "%s nije nastavljen na ovom dijelu arhive"
+msgstr "%s se ne nastavlja na ovom svesku"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
-msgstr ""
-"%s je možda nastavljen na ovom dijelu arhive: zaglavlje sadrži skraćeno ime"
+msgstr "%s se možda nastavlja na ovom svesku: zaglavlje sadrži skraćeno ime"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
-msgstr "%s je pogrešne veličine (%s != %s + %s)"
+msgstr "%s je netočna veličina (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
-msgstr "Ovaj dio arhive je izvan niza (%s - %s != %s)"
+msgstr "Ovaj svezak je izvan sekvencije (%s - %s != %s)"
# FIXME -- clean against source! (TM)
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
-msgstr "Arhiva nije označena da odgovara %s"
+msgstr "Arhiva nije etiketirana, i ne može se podudarati s(a) %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
-msgstr "Dio arhive %s ne odgovara %s"
+msgstr "Svezak %s se ne podudara s(a) %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
-"%s: ime datoteke je predugačko za spremanje u GNU višedjelnom zaglavlju, "
-"skraćujem"
+"%s: ime datoteke je predugo za spremanje u višesvezačno zaglavlje GNU-a; "
+"skraćuje se"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "pisanje nije završilo na granici bloka"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
-msgstr[0] "Pročitao samo %lu od %lu bajta"
-msgstr[1] "Pročitao samo %lu od %lu bajta"
-msgstr[2] "Pročitao samo %lu od %lu bajtova"
+msgstr[0] "Pročitano je samo %lu od %lu bajta"
+msgstr[1] "Pročitano je samo %lu od %lu bajta"
+msgstr[2] "Pročitano je samo %lu od %lu bajtova"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Sadržaji se razlikuju"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
-msgstr "Neočekivani EOF u arhivi"
+msgstr "Neočekivani kraj datoteke (EOF) u arhivi"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
-msgstr "Vrste datoteka se razlikuju"
+msgstr "Vrsta datoteke se razlikuje"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
-msgstr "Mod se razlikuje"
+msgstr "Prava dostupa se razlikuju"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
-msgstr "Uid se razlikuje"
+msgstr "UID se razlikuje"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
-msgstr "Gid se razlikuje"
+msgstr "GID se razlikuje"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
-msgstr "Vrijeme uređivanja se razlikuje"
+msgstr "Vrijeme izmjene se razlikuje"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Veličina se razlikuje"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Nije povezan na %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Simbolička veza se razlikuje"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Broj uređaja se razlikuje"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Provjeri "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
-msgstr "%s: Nepoznata vrsta datoteke „%c“, kompariran kao normalna datoteka"
+msgstr "%s: Nepoznata vrsta datoteke „%c“, uspoređuje se kao normalna datoteka"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
-msgstr "Arhiva sadrži imena datoteka s uklonjenim početnim prefiksima."
+msgstr "Arhiva sadrži imena datoteka s uklonjenim prefiksima."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
-msgstr "Arhiva sadrži pretvorena imena datoteka."
+msgstr "Arhiva sadrži transformirana imena datoteka."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
-msgstr "Provjera možda neće uspjeti pronaći izvorne datoteke."
+msgstr "Provjera možda neće uspjeti pronaći originalne datoteke."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
@@ -906,197 +905,201 @@ msgstr[0] "NEUSPJELA PROVJERA: otkriveno %d neispravno zaglavlje"
msgstr[1] "NEUSPJELA PROVJERA: otkrivena %d neispravna zaglavlja"
msgstr[2] "NEUSPJELA PROVJERA: otkriveno %d neispravnih zaglavlja"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
-msgstr "Izolirani nulti blok na %s"
+msgstr "Izolirani nulti blok pri %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
-msgstr "%s: sadrži oznaku direktorija spremnika %s; %s"
+msgstr ""
+"%s: sadrži „cache directory tag“ (CACHEDIR.TAG) %s; %s v. http://www."
+"brynosaurus.com/cachedir/spec.html"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
-msgstr "vrijednost %s izvan %s raspona %s..%s; mijenjam sa %s"
+msgstr "vrijednost %s je izvan %s raspona %s..%s; zamijenjuje se s/sa %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "vrijednost %s izvan %s raspona %s..%s"
# FIXME -- find `padež' here from source
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
-msgstr "Stvaram negativna oktalna zaglavlja"
+msgstr "Generiranje negativnih oktalnih zaglavlja"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
-msgstr "%s: ime datoteke je predugo (najviše %d); ne arhiviram"
+msgstr "%s: ime datoteke je predugo (max %d); ne arhivira se"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
-msgstr "%s: ime datoteke je predugačko (ne može se razdvojiti); ne arhiviram"
+msgstr "%s: ime datoteke je predugo (ne može se rastaviti); ne arhivira se"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
-msgstr "%s: ime veze je predugo; ne arhiviram"
+msgstr "%s: ime veze je predugo; ne arhivira se"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
-msgstr[0] "%s: Datoteka skraćena za %s bajt; nadopunjeno nulama"
-msgstr[1] "%s: Datoteka skraćena za %s bajta; nadopunjeno nulama"
-msgstr[2] "%s: Datoteka skraćena za %s bajtova; nadopunjeno nulama"
+msgstr[0] "%s: Datoteka je skraćena za %s bajt; dopunjena s nulama"
+msgstr[1] "%s: Datoteka je skraćena za %s bajta; dopunjena s nulama"
+msgstr[2] "%s: Datoteka je skraćena za %s bajtova; dopunjena s nulama"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
-msgstr "%s: datoteka je na drugom datotečnom sustavu; ne arhiviram"
+msgstr "%s: datoteka je na drugom datotečnom sustavu; ne arhivira se"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "sadržaj nije arhiviran"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
-msgstr "%s: Nepoznata vrsta datoteke; datoteka zanemarena"
+msgstr "%s: Nepoznata vrsta datoteke; ignorira se"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Nedostaju veze na %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
-msgstr "%s: datoteka nepromijenjena; ne arhiviram"
+msgstr "%s: datoteka je nepromijenjena; ne arhivira se"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
-msgstr "%s: datoteka je arhiva; ne arhiviram"
+msgstr "%s: datoteka je arhiva; ne arhivira se"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "direktorij nije arhiviran"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
-msgstr "%s: datoteka se promijenila za vrijeme čitanja"
+msgstr "%s: datoteka se promijenila za vrijeme učitavanja"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
-msgstr "%s: utičnica zanemarena"
+msgstr "%s: utičnica je zanemarena"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
-msgstr "%s: vrata zanemarena"
+msgstr "%s: zanemarena vrata"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
-msgstr "Preskačem na sljedeće zaglavlje"
+msgstr "Propuštanje do sljedećeg zaglavlja"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
-msgstr "Brišem neispravno zaglavlje iz arhive"
+msgstr "Brisanje ne-zaglavlja iz arhive"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: nevjerojatno stara vremenska oznaka %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: vremenska oznaka %s je %s sekundi u budućnosti"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
-msgstr "%s: Neočekivana nekonzistentnost pri izradi direktorija"
+msgstr "%s: Neočekivana proturječnost pri izradi direktorija"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
-msgstr "%s: propuštanje postojeće datoteke"
+msgstr "%s: propušta se postojeća datoteka"
#: src/extract.c:901
#, c-format
msgid "%s: Directory renamed before its status could be extracted"
-msgstr "%s: Direktoriju promijenjeno ime prije ekstrakcije njegovog stanja"
+msgstr ""
+"%s: Direktorij je bio preimenovan prije nego se njegov status mogao odrediti"
#: src/extract.c:1086
msgid "Extracting contiguous files as regular files"
-msgstr "Ekstrahiram neprekinute datoteke kao obične datoteke"
+msgstr "Susjedne datoteke (contiguous files) izdvajaju se kao obične datoteke"
#: src/extract.c:1433
msgid "Attempting extraction of symbolic links as hard links"
-msgstr "Pokušavam ekstrakciju simboličkih veza kao čvrstih veza"
+msgstr "Pokušava izdvojiti simboličke veze kao tvrde veze"
#: src/extract.c:1596
#, c-format
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr ""
-"%s: Ne mogu ekstrahirati -- datoteka se nastavlja iz drugog dijela arhive"
+"%s: Nije moguće izdvojiti -- datoteka se nastavlja iz nekog drugog sveska"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
-msgstr "Neočekivano zaglavlje dugačkog imena"
+msgstr "Neočekivano dugo ime zaglavlja"
#: src/extract.c:1610
#, c-format
msgid "%s: Unknown file type '%c', extracted as normal file"
-msgstr "%s: Nepoznata vrsta datoteke „%c“, ekstrahirana kao normalna datoteka"
+msgstr "%s: Nepoznata vrsta datoteke „%c“, izdvojena kao normalna datoteka"
#: src/extract.c:1636
#, c-format
msgid "Current %s is newer or same age"
-msgstr "Trenutni %s je noviji ili jednako star"
+msgstr "Trenutačni %s je noviji ili jednako star"
#: src/extract.c:1664
-#, fuzzy, c-format
+#, c-format
msgid "%s: Member name contains '..'"
-msgstr "%s: Ime člana sadrži `..'"
+msgstr "%s: Ime člana sadrži „..“"
#: src/extract.c:1696
#, c-format
msgid "%s: Was unable to backup this file"
-msgstr "%s: Nisam uspio napraviti kopiju ove datoteke"
+msgstr ""
+"%s: Nije bilo moguće osigurati (napraviti sigurnosnu kopiju) ovu datoteku"
#: src/extract.c:1845
#, c-format
msgid "Cannot rename %s to %s"
-msgstr "Ne mogu preimenovati %s u %s"
+msgstr "Nije moguće preimenovati %s u %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
-msgstr "%s: Direktoriju je promijenjeno ime iz %s"
+msgstr "%s: Direktorij je bio preimenovan od %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
-msgstr "%s: Novi direktorij"
+msgstr "%s: Direktorij je novi"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
-msgstr "%s: direktorij je na drugom datotečnom sustavu; ne arhiviram"
+msgstr "%s: direktorij je na drugom datotečnom sustavu; ne arhivira se"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
-msgstr "%s: Direktoriju je promijenjeno ime"
+msgstr "%s: Direktoriju je bio preimenovan"
#: src/incremen.c:1003 src/incremen.c:1018
msgid "Invalid time stamp"
@@ -1104,33 +1107,35 @@ msgstr "Neispravna vremenska oznaka"
#: src/incremen.c:1047
msgid "Invalid modification time"
-msgstr "Neispravno vrijeme uređivanja (sekunde)"
+msgstr "Neispravno vrijeme izmjene (sekunde)"
#: src/incremen.c:1057
msgid "Invalid modification time (nanoseconds)"
-msgstr "Neispravno vrijeme uređivanja (nanosekunde)"
+msgstr "Neispravno vrijeme izmjene (nanosekunde)"
#: src/incremen.c:1073
msgid "Invalid device number"
-msgstr "Neispravan broj uređaja"
+msgstr "Neispravni broj uređaja"
#: src/incremen.c:1081
msgid "Invalid inode number"
-msgstr "Neispravan broj indeksnog čvora (inode)"
+msgstr "Neispravni broj indeksa čvora (inode)"
#: src/incremen.c:1137
#, c-format
msgid "%s: byte %s: %s %.*s... too long"
-msgstr "%s: bajt %s: %s %.*s... predug"
+msgstr "%s: bajt %s: %s %.*s... predugačko"
#: src/incremen.c:1153 src/incremen.c:1211 src/incremen.c:1273
msgid "Unexpected EOF in snapshot file"
-msgstr "Neočekivani EOF u datoteci snimke stanja"
+msgstr ""
+"Neočekivani kraj datoteke u snapshot (stanje osiguranja u trenutku "
+"arhiviranja) datoteci"
#: src/incremen.c:1161
#, c-format
msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x"
-msgstr "%s: bajt %s: %s %s praćen s neispravnim bajtom 0x%02x"
+msgstr "%s: bajt %s: %s %s slijedi iza neispravnog bajta 0x%02x"
#: src/incremen.c:1174
#, c-format
@@ -1153,481 +1158,488 @@ msgstr "%s: bajt %s: %s"
#: src/incremen.c:1265
msgid "Missing record terminator"
-msgstr "Nedostaje kraj zapisa"
+msgstr "Nedostaje indikator kraja zapisa"
#: src/incremen.c:1371 src/incremen.c:1374
msgid "Bad incremental file format"
-msgstr "Neispravan inkrementalni oblik datoteke"
+msgstr "Loši inkrementalni format datoteke"
#: src/incremen.c:1393
#, c-format
msgid "Unsupported incremental format version: %<PRIuMAX>"
-msgstr "Nepodržana inačica inkrementalnog oblika: %<PRIuMAX>"
+msgstr "Nepodržana verzija inkrementalnog formata: %<PRIuMAX>"
#: src/incremen.c:1549
#, c-format
msgid "Malformed dumpdir: expected '%c' but found %#3o"
-msgstr "Izobličen direktorij za ispis: očekujem „%c“, pronašao %#3o"
+msgstr "Deformirani arhivski direktorij: očekivano „%c“, a pronađeno je %#3o"
#: src/incremen.c:1559
msgid "Malformed dumpdir: 'X' duplicated"
-msgstr "Izobličen direktorij za ispis: „X“ udvostručen"
+msgstr "Deformirani arhivski direktorij: duplicirani 'X'"
#: src/incremen.c:1572
msgid "Malformed dumpdir: empty name in 'R'"
-msgstr "Izobličen direktorij za ispis: prazno ime u „R“"
+msgstr "Deformirani arhivski direktorij: prazno ime u „R“"
# bp: Malformed > Nepravilan
# prije „T“ ne dolazi „R“ > „T“ ne prethodi „R“
#: src/incremen.c:1585
msgid "Malformed dumpdir: 'T' not preceded by 'R'"
-msgstr "Nepravilan direktorij za ispis: „T“ ne prethodi „R“"
+msgstr "Deformirani arhivski direktorij: ispred „T“ ne stoji „R“"
#: src/incremen.c:1591
msgid "Malformed dumpdir: empty name in 'T'"
-msgstr "Nepravilan direktorij za ispis: prazno ime u „T“"
+msgstr "Deformirani arhivski direktorij: prazno ime u „T“"
#: src/incremen.c:1611
#, c-format
msgid "Malformed dumpdir: expected '%c' but found end of data"
-msgstr "Nepravilan direktorij za ispis: očekujem „%c“, pronašao kraj podataka"
+msgstr ""
+"Deformirani arhivski direktorij: očekivano „%c“, ali pronađen kraj podataka"
#: src/incremen.c:1618
msgid "Malformed dumpdir: 'X' never used"
-msgstr "Nepravilan direktorij za ispis: „X“ se uopće ne koristi"
+msgstr "Deformirani arhivski direktorij: „X“ se nijednom ne rabi"
#: src/incremen.c:1662
#, c-format
msgid "Cannot create temporary directory using template %s"
-msgstr "Ne mogu napraviti privremeni direktorij korištenjem predloška %s"
+msgstr "Nije moguće napraviti privremeni direktorij iz predloška %s"
#: src/incremen.c:1723
#, c-format
msgid "%s: Not purging directory: unable to stat"
-msgstr "%s: Ne uklanjam direktorij: ne mogu izvršiti stat"
+msgstr "%s: Direktorij se ne čisti: nije moguće odrediti status"
#: src/incremen.c:1736
#, c-format
msgid "%s: directory is on a different device: not purging"
-msgstr "%s: datoteka je na drugom uređaju: ne uklanjam"
+msgstr "%s: direktorij je na drugom uređaju: ne čisti se"
#: src/incremen.c:1744
#, c-format
msgid "%s: Deleting %s\n"
-msgstr "%s: Brišem %s\n"
+msgstr "%s: Brisanje %s\n"
#: src/incremen.c:1749
#, c-format
msgid "%s: Cannot remove"
-msgstr "%s: Ne mogu ukloniti"
+msgstr "%s: Nije moguće ukloniti"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
-msgstr "%s: Izostavljam"
+msgstr "%s: Propušta se"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** Blok ispunjen NUL-znakovima **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok %s: ** Kraj datoteke **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
-msgstr "Praznine u zaglavlju gdje se očekuje numerička %s vrijednost"
+msgstr "Praznine u zaglavlju, a očekuje se numerička %s vrijednost"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
-"Oktalna vrijednost %.*s iz arhive je izvan %s granica; pretpostavljam dvojni "
+"Oktalna vrijednost %.*s iz arhive je izvan %s raspona; podrazumijeva se 2-"
"komplement"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
-msgstr "Oktalna vrijednost iz arhive %.*s je izvan %s granica"
+msgstr "Oktalna vrijednost iz arhive %.*s je izvan %s raspona"
# FIXME -- obsolescent -- TM
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arhiva sadrži zastarjela base-64 zaglavlja"
# FIXME??
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
-msgstr "Base-64 vrijednost s predznakom %s iz arhive je izvan %s granica"
+msgstr "Arhiva potpisana s base-64 stringom %s je izvan raspona %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
-msgstr "Base-256 vrijednost iz arhive je izvan %s granica"
+msgstr "Base-256 vrijednost iz arhive je izvan %s raspona"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
-msgstr "Arhiva sadrži %.*s gdje je očekivana numerička %s vrijednost"
+msgstr "Arhiva sadrži %.*s, a očekuje se numerička %s vrijednost"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Vrijednost %s iz arhive je izvan %s raspona %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " veza na %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " nepoznata vrsta datoteke %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Dugačka veza--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Dugačko ime--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
-msgstr "--Zaglavlje dijela arhive--\n"
+msgstr "--Zaglavlje sveska--\n"
# FIXME -- clarify against source -- TM
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
-msgstr "--Nastavljeno na bajtu %s--\n"
+msgstr "--Nastavlja se na bajtu %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
-msgstr "Stvaram direktorij:"
+msgstr "Kreiranje direktorija:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
-msgstr "Mijenjam ime %s u %s\n"
+msgstr "%s preimenovan u %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
-msgstr "%s: Ne mogu preimenovati u %s"
+msgstr "%s: Nije moguće preimenovati u %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
-msgstr "Mijenjam ime %s natrag u %s\n"
+msgstr "%s preimenovan natrag u %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
-msgstr "%s: Datoteka uklonjena prije nego što smo ju pročitali"
+msgstr "%s: Datoteka je uklonjena prije nego što smo je pročitana"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
-msgstr "proces dijete"
+msgstr "dijete-proces (potomački proces)"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "međuprocesni kanal"
# bp: možda Izbor imena lokalne datoteke
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
-msgstr "Odabir lokalnih datoteka:"
+msgstr "Selekcija datoteka za arhiviranje u lokalne arhive:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
-msgstr ""
-"dodaj navedenu DATOTEKU u arhivu (korisno ako njeno ime počinje crticom)"
+msgstr "doda DATOTEKU u arhivu (korisno ako DATOTECI ime počinje s crticom)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
-msgstr "promijeni u direktorij DIR"
+msgstr "prijeđe u direktorij DIR"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
-msgstr "otkrij imena za otpakiranje ili napravi iz DATOTEKE"
+msgstr ""
+"učita iz DATOTEKE imena elemenata za izdvajanje iz arhive ili kreiranje "
+"arhive"
# bp: čita s NULL završena imena....
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
-msgstr "-T čita praznim znakom završena imena, implicira --verbatim-files-from"
+msgstr "-T čita s nul-znakom završena imena, implicira --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
-msgstr "onemogući utjecaj prethodne opcije --null"
+msgstr "poništava učinak prethodne --null opcije"
# original TK: ukloni navode imena datoteka pročitanih s -T (zadano)
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
-msgstr "ukloni navodnike s imena datoteka ili članova (zadano)"
+msgstr "ne citira imena ulazne datoteke ili člana (zadano); v. GNU tar manual"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
-msgstr "ne uklanjaj navodnike s imena datoteka ili članova"
+msgstr "citira imena ulaznih datoteka ili članova; v. GNU tar manual"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T doslovno čita nazive datoteka (ne gleda na opcije)"
+msgstr "-T doslovno čita imena datoteka (ne bavi se opcijama)"
# bp: novi prijevod, stari fuziran.
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
-msgstr "-T tretira nazive datoteka koji počinju s „-“ kao opcije (zadano)"
+msgstr ""
+"-T tretira nazive datoteka koji počinju s crticom (-) kao opcije (zadano)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "UZORAK"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
-msgstr "izostavi datoteke koje odgovaraju UZORKU"
+msgstr "isključi datoteke podudarene s UZORKOM"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
-msgstr "izostavi uzorke navedene u DATOTECI"
+msgstr "isključi datoteke podudarene s uzorcima u DATOTECI"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr ""
-"izostavi sadržaj direktorija koji sadrže CACHEDIR.TAG, osim datoteke oznake"
+"isključi sadržaj direktorija koji sadrže CACHEDIR.TAG osim same CACHEDIR.TAG "
+"datoteke; v. GNU tar manual"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
-msgstr "izostavi sve unutar direktorija koji sadrže CACHEDIR.TAG"
+msgstr "isključi sve ispod direktorija koji sadrže CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
-msgstr "izostavi direktorije koji sadrže CACHEDIR.TAG"
+msgstr "isključi direktorije koji sadrže CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
-msgstr "izostavi sadržaj direktorija koji sadrži DATOTEKU osim nje same"
+msgstr "isključi sadržaj direktorija koji sadrži DATOTEKU osim same DATOTEKE"
# bp: novi msgid; možda treba FILE ne prevađati?
# TK: FILE mijenja u DATOTEKA
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-"čitaj iz DATOTEKE uzorke izuzeća za svaki direktorij, ako DATOTEKA postoji"
+"ako DATOTEKA postoji, čita uzorke za isključenje za svaki direktorij iz "
+"DATOTEKE"
# bp: novi msgid
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-"čitaj iz DATOTEKE uzorke izuzeća za svaki direktorij i njegove "
-"poddirektorije, ako DATOTEKA postoji"
+"ako DATOTEKA postoji, čita uzorke za isključenje za svaki direktorij i "
+"njegove poddirektorije iz DATOTEKE"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
-msgstr "izostavi sve iz direktorija koji sadrže DATOTEKU"
+msgstr "isključi sve ispod direktorija koji sadrže DATOTEKU"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
-msgstr "izostavi direktorije koji sadrže DATOTEKU"
+msgstr "isključi direktorije koji sadrže DATOTEKU"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
-msgstr "izostavi sustavske direktorije kontrole inačice"
+msgstr "isključi VCS direktorije; v. GNU tar manual"
# bp: novi msgid
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
-msgstr "čitaj uzorke izuzeća iz VCS „ignore“ datoteka"
+msgstr "uzorke za isključenje čita iz VCS ignore datoteka"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
-msgstr "izostavi sigurnosne kopije i datoteke zaključavanja"
+msgstr "isključi backup (osiguranje) i zaključane datoteke"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
-msgstr "rekurzivno uđi u direktorije (zadano)"
+msgstr "rekurzivno ulazi u direktorije (zadano)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
-msgstr "izbjegavaj automatsko spuštanje u direktorije"
+msgstr "onemogući rekurzivni ulaz u direktorije"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
-"Opcije podudaranja imena datoteka (utječe na uzorke za isključivanje i "
-"uključivanje):"
+"Opcije za kontrolu poduraranja imena datoteka s uzorcima (vrijedi za "
+"isključenje i za uključenje):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
-msgstr "uzorci podudaraju početak naziva datoteke"
+msgstr "uzorak mora podudariti početak imena datoteke"
# bp: novi msgid
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
-msgstr "uzorci podudaraju iza svakog „/“ (zadano za izuzeća)"
+msgstr ""
+"uzorak može podudarati ikoji dio imena datoteke iza svakog „/“ (zadano za "
+"isključenje)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
-msgstr "zanemari veličinu slova"
+msgstr "ne razlikuje mala od velikih slova"
# bp: novi msgid
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
-msgstr "podudaranje razlikuje mala/velika slova (zadano)"
+msgstr "razlikuje mala od velikih slova (zadano)"
# bp: novi msgid
-# u wget.po naišao sam da je „wildcard“ višeznačnik, pa ga ovdje koristim.
-#: src/names.c:141
+# u wget.po naišao sam da je „wildcard“ načnik, pa ga ovdje koristim.
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
-msgstr "upotrijebi višeznačnike (zadano za izuzeća)"
+msgstr "rabi višeznačnike (zadano za isključenje)"
# bp: novi msgid
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
-msgstr "doslovno podudaranje znakovnog niza (string)"
+msgstr "striktno podudaranje stringova"
# bp: novi msgid
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
-msgstr "višeznačnici podudaraju „/“ (zadano za izuzeća)"
+msgstr "višeznačnik podudara „/“ (zadano za isključenje)"
# originalno TK: Dio arhive %s ne odgovara %s
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
-msgstr "višeznačnici ne podudaraju „/“"
+msgstr "višeznačnik ne podudara „/“"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Sljedeće opcije se koriste iza neobveznih argumenata za kreiranje ili "
+"ažuriranje arhive. Te opcije su ovisne o položaju i utječu samo na argumente "
+"koji ih slijede. Trebate ih ispravno poredati."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s nema učinka"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s nema učinka"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s nema učinka"
# original TK naredba %s nije uspjela
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "naredbeni redak"
# original TK %s: popis datoteka je već pročitan
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
-msgstr "%s: zatražen popis datoteka od %s je već pročitan %s"
+msgstr "%s: zatražen popis datoteka od %s je već pročitan iz %s"
# original TK ne mogu postaviti vrijeme na „%s“
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
-msgstr "niz (string) „%s“: %s ne može se rastavit"
+msgstr "nije moguće rastaviti string „%s“: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
-msgstr "%s: pročitano ime datoteke sadrži prazan znak"
+msgstr "%s: pročitano ime datoteke sadrži NULL znak"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
-msgstr "Znakovi za uspoređivanje uzoraka korišteni u imenima datoteka"
+msgstr "Imena datoteka sadrže višeznačnike"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr ""
-"Koristite --wildcards za omogućavanje uspoređivanja uzoraka ili --no-"
-"wildcards za potiskivanje ovog upozorenja"
+"Rabite --wildcards da omogućite podudaranje s uzorcima, ili --no-wildcards "
+"da prigušite ovo upozorenje"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
-msgstr "%s: Nije pronađen u arhivi"
+msgstr "%s: Nije pronađeno u arhivi"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
-msgstr "%s: Potrebna pojava nije pronađen u arhivi"
+msgstr "%s: Zatraženi nalaz nije pronađen u arhivi"
# FIXME -- clean against source! (TM)
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
-msgstr "Oznaka arhive ne odgovara"
+msgstr "Neslaganje etiketa arhiva"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-"Korištenje opcije -C u popisu datoteka nije dozvoljeno uz --listed-"
-"incremental"
+"Korištenje opcije -C u popisu datoteka nije dopušteno uz --listed-incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
-msgstr "Samo jedna opcija -C je dozvoljena uz --listed-incremental"
+msgstr "Samo jedna opcija -C je dopuštena uz --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
-msgstr "Opcije „-%s“ i „-%s“ obje zahtijevaju standardni ulaz"
+msgstr "Obje opcije „-%s“ i „-%s“ zahtijevaju standardni ulaz"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
-msgstr "%s: Neispravan oblik arhive"
+msgstr "%s: Neispravni format arhive"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
-msgstr "GNU mogućnosti zatražene na nekompatibilnom obliku arhive"
+msgstr "Zatražene su GNU značajke za nekompatibilni format arhive"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
msgstr ""
-"Nepoznat stil navođenja „%s“. Pokušajte „%s --quoting-style=help“ za prikaz "
-"popisa."
+"Nepoznat stil citiranja „%s“. Pokušajte „%s --quoting-style=help“ za popis."
#: src/tar.c:354
msgid ""
@@ -1639,13 +1651,13 @@ msgid ""
" tar -tvf archive.tar # List all files in archive.tar verbosely.\n"
" tar -xf archive.tar # Extract all files from archive.tar.\n"
msgstr ""
-"GNU „tar“ sprema više datoteka u arhivu na vrpci ili disku i može vratiti "
+"GNU tar sprema puno datoteka u arhivu na vrpcu ili na disk i može vratiti "
"pojedinačne datoteke iz arhive.\n"
"\n"
"Primjeri:\n"
-" %s -cf arhiva.tar foo bar # Napravi arhiva.tar od datoteka foo i bar.\n"
-" %s -tvf arhiva.tar # Opširno ispiši sve datoteke iz arhiva.tar.\n"
-" %s -xf arhiva.tar # Ekstrahiraj sve datoteke iz arhiva.tar.\n"
+" tar -cf arhiva.tar foo bar # Kreira arhiva.tar od datoteka foo i bar\n"
+" tar -tvf arhiva.tar # Izlista sve datoteke sadržane u arhiva.tar\n"
+" tar -xf arhiva.tar # Izdvoji sve datoteke iz arhiva.tar\n"
#: src/tar.c:363
msgid ""
@@ -1658,99 +1670,98 @@ msgid ""
" nil, existing numbered if numbered backups exist, simple otherwise\n"
" never, simple always make simple backups\n"
msgstr ""
-"Sufiks sigurnosne kopije je `~', osim ako je postavljen drugi s --suffix "
-"ili\n"
-"SIMPLE_BACKUP_SUFFIX. Kontrola inačice može biti postavljena s --backup\n"
-"ili s VERSION_CONTROL, vrijednosti su:\n"
+"Sufiks za osiguranje (sigurnosne kopije) je „~“, ako nije promijenjen s\n"
+"opcijom --suffix ili SIMPLE_BACKUP_SUFFIX.\n"
+"Varijantu kontrole postavite ili s opcijom --backup, ili s VERSION_CONTROL,\n"
+"a moguće vrijednosti za KONTROLU su:\n"
"\n"
-" none, off ne radi sigurnosne kopije\n"
-" t, numbered radi numerirane sigurnosne kopije\n"
-" nil, existing numerirane ako numerirane sigurnosne kopije postoje,\n"
-" inače jednostavne\n"
-" never, simple uvijek radi jednostavne sigurnosne kopije\n"
+" none, off ne praviti osiguranje (sigurnosne kopije)\n"
+" t, numbered radi numerirane kopije osiguranja\n"
+" nil, existing numerirane, ako postoje numerirane kopije, inače "
+"jednostavne\n"
+" never, simple uvijek radi jednostavno osiguranje\n"
#: src/tar.c:393
msgid "Main operation mode:"
-msgstr "Glavni način rada:"
+msgstr "Osnovni način rada:"
#: src/tar.c:396
msgid "list the contents of an archive"
-msgstr "ispiši sadržaj arhive"
+msgstr "izlista sadržaj arhive"
#: src/tar.c:398
msgid "extract files from an archive"
-msgstr "ekstrahiraj datoteke iz arhive"
+msgstr "izdvoji datoteke iz arhive"
#: src/tar.c:401
msgid "create a new archive"
-msgstr "napravi novu arhivu"
+msgstr "kreira novu arhivu"
#: src/tar.c:403
msgid "find differences between archive and file system"
-msgstr "nađi razlike između arhive i datotečnog sustava"
+msgstr "traži razlike između arhive i datotečnoga sustava"
#: src/tar.c:406
msgid "append files to the end of an archive"
-msgstr "dodaj datoteke na kraj arhive"
+msgstr "pridoda datoteke na kraj arhive"
#: src/tar.c:408
msgid "only append files newer than copy in archive"
-msgstr "dodaj samo datoteke novije od kopije u arhivi"
+msgstr "doda datoteke, ali samo ako su novije od kopija u arhivi"
#: src/tar.c:410
msgid "append tar files to an archive"
-msgstr "dodaj tar datoteke u arhivu"
+msgstr "doda tar datoteke u arhivu"
#: src/tar.c:413
msgid "delete from the archive (not on mag tapes!)"
-msgstr "izbriši iz arhive (ne na magnetskim vrpcama!)"
+msgstr "ukloni iz arhive (ne i za magnetske vrpce!)"
#: src/tar.c:415
msgid "test the archive volume label and exit"
-msgstr "provjeri oznaku dijela arhive i izađi"
+msgstr "testira etiketu sveska arhive, i iziđe"
#: src/tar.c:420
msgid "Operation modifiers:"
-msgstr "Modifikatori operacija:"
+msgstr "Opcije za dodatno podešavanje:"
#: src/tar.c:423
msgid "handle sparse files efficiently"
-msgstr "učinkovito upravljaj raštrkanim datotekama"
+msgstr "učinkovito obradi raspršene (sparse) datoteke"
# bp: novi msgid
#: src/tar.c:424
msgid "TYPE"
-msgstr "Metoda"
+msgstr "POSTUPAK"
# bp: novi msgid
#: src/tar.c:425
msgid "technique to detect holes"
-msgstr "metoda za otkrivanje rupa"
+msgstr "postupak za otkrivanje rupa"
#: src/tar.c:426
msgid "MAJOR[.MINOR]"
-msgstr "GLAVNI[.SPOREDNI]"
+msgstr "MAJOR[.MINOR]"
#: src/tar.c:427
msgid "set version of the sparse format to use (implies --sparse)"
-msgstr ""
-"postavi inačicu raštrkanog oblika za korištenje (podrazumijeva --sparse)"
+msgstr "inačica sparse formata za upotrebu (implicira --sparse)"
#: src/tar.c:429
msgid "handle old GNU-format incremental backup"
-msgstr "upravljaj inkrementalnim sigurnosnim kopijama starog GNU oblika"
+msgstr "obradi inkrementalno osiguranje (backup) u starom GNU-formatu"
#: src/tar.c:431
msgid "handle new GNU-format incremental backup"
-msgstr "upravljaj inkrementalnim sigurnosnim kopijama novog GNU oblika"
+msgstr "obradi inkrementalno osiguranje (backup) u novom GNU-formatu"
#: src/tar.c:433
msgid "dump level for created listed-incremental archive"
-msgstr "razina ispisa za stvorene ispisane-inkrementalne arhive"
+msgstr "BROJ je dump level za arhivu kreiranu s --listed-incremental opcijom"
#: src/tar.c:435
msgid "do not exit with nonzero on unreadable files"
-msgstr "ne izlazi s kodom različitim od nule u slučaju nečitljivih datoteka"
+msgstr "ne izlazi s neuspjehom zbog nečitljivih datoteka"
#: src/tar.c:437
msgid ""
@@ -1759,146 +1770,146 @@ msgid ""
"diff, --extract or --list and when a list of files is given either on the "
"command line or via the -T option; NUMBER defaults to 1"
msgstr ""
-"Obradi samo svako BROJ-to pojavljivanje svake datoteke u arhivi. Ova je "
-"opcija ispravna samo uz jednu od podnaredbi --delete, --diff, --extract ili "
-"--list te kad je popis datoteka naveden u naredbenom retku ili uz opciju -T. "
-"BROJ je uobičajeno 1."
+"procesira samo BROJ-to pojavljivanje svake datoteke u arhivi. Ova je opcija "
+"ispravna samo uz jednu od podnaredbi --delete, --diff, --extract ili --list, "
+"te kad je popis datoteka naveden na naredbenom retku, ili uz opciju -T. "
+"Zadano BROJ=1"
#: src/tar.c:443
msgid "archive is seekable"
-msgstr "arhiva se može pretraživati"
+msgstr "arhiva dopušta skok na poziciju"
#: src/tar.c:445
msgid "archive is not seekable"
-msgstr "arhiva se ne može pretraživati"
+msgstr "arhiva ne dopušta skok na poziciju"
#: src/tar.c:447
msgid "do not check device numbers when creating incremental archives"
-msgstr "ne provjeravaj brojeve uređaja pri stvaranju inkrementalnih arhiva"
+msgstr "ne provjerava broj uređaja pri kreiranju inkrementalnih arhiva"
#: src/tar.c:450
msgid "check device numbers when creating incremental archives (default)"
-msgstr "provjeri brojeve uređaja pri stvaranju inkrementalnih arhiva (zadano)"
+msgstr "provjerava broj uređaja pri stvaranju inkrementalnih arhiva (zadano)"
#: src/tar.c:456
msgid "Overwrite control:"
-msgstr "Upravljanje prepisivanjem:"
+msgstr "Kontrola prepisivanja (pisanjem preko) postojećih datoteka:"
#: src/tar.c:459
msgid "attempt to verify the archive after writing it"
-msgstr "pokušaj provjeriti arhivu nakon pisanja u nju"
+msgstr "isproba arhivu nakon što je zapisana"
#: src/tar.c:461
msgid "remove files after adding them to the archive"
-msgstr "ukloni datoteke nakon dodavanja u arhivu"
+msgstr "izbriše datoteke nakon što su dodane u arhivu"
# bp: fuzirano
#: src/tar.c:463
msgid "don't replace existing files when extracting, treat them as errors"
msgstr ""
-"ne zamjenjuj postojeće datoteke pri ekstrakciji, tretiraj ih kao pogreške"
+"ne prepiše postojeće datoteke prilikom izdvajanja, tretira ih kao greške"
# bp: fuzirano, dodano
#: src/tar.c:466
msgid "don't replace existing files when extracting, silently skip over them"
-msgstr "ne zamjenjuj postojeće datoteke pri ekstrakciji, tiho ih preskoči"
+msgstr ""
+"ne prepiše postojeće datoteke prilikom izdvajanja, jednostavno ih preskoči"
#: src/tar.c:469
msgid "don't replace existing files that are newer than their archive copies"
-msgstr "ne zamjenjuj postojeće datoteke novije od kopija u arhivi"
+msgstr ""
+"ne prepiše postojeće datoteke ako su novije od njihovih kopija u arhivi"
#: src/tar.c:471
msgid "overwrite existing files when extracting"
-msgstr "prepiši postojeće datoteke pri ekstrakciji"
+msgstr "prepiše postojeće datoteke prilikom izdvajanja"
#: src/tar.c:473
msgid "remove each file prior to extracting over it"
-msgstr "ukloni svaku datoteku prije ekstrakcije preko nje"
+msgstr "izbriše svaku datoteku prije izdvajanja preko nje same"
#: src/tar.c:475
msgid "empty hierarchies prior to extracting directory"
-msgstr "isprazni hijerarhije prije ekstrahiranja direktorija"
+msgstr "rekurzivno briše direktorije prije izdvajanja direktorija iz arhive"
#: src/tar.c:477
msgid "preserve metadata of existing directories"
-msgstr "očuvaj metapodatke postojećih direktorija"
+msgstr "sačuva metapodatke postojećih direktorija"
#: src/tar.c:479
msgid "overwrite metadata of existing directories when extracting (default)"
-msgstr "prepiši metapodatke postojećih direktorija pri ekstrakciji (zadano)"
+msgstr ""
+"prepiše metapodatke postojećih direktorija prilikom izdvajanja (zadano)"
# original TK prepiši postojeće datoteke pri ekstrakciji
#: src/tar.c:482
msgid "preserve existing symlinks to directories when extracting"
-msgstr "očuvaj postojeće simboličke veze na direktorije prilikom ekstrahiranja"
+msgstr "sačuva postojeće simboličke veze na direktorije prilikom izdvajanja"
# bp: novi msgid
#: src/tar.c:485
msgid "create a subdirectory to avoid having loose files extracted"
msgstr ""
-"napravi poddirektorij radi izbjegavanja gubitka datoteka prilikom "
-"ekstrahiranja"
+"napravi poddirektorij da izbjegne izdvajanje neželjenih datoteka (tarbomb)"
#: src/tar.c:491
msgid "Select output stream:"
-msgstr "Odaberi izlazni tok podataka:"
+msgstr "Izbor izlaznog potoka (stream):"
#: src/tar.c:494
msgid "extract files to standard output"
-msgstr "ekstrahiraj datoteke na standardni izlaz"
+msgstr "izdvoji datoteke na standardni izlaz"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "NAREDBA"
#: src/tar.c:496
msgid "pipe extracted files to another program"
-msgstr "proslijedi ekstrahirane datoteke drugom programu kroz cjevovod"
+msgstr "proslijedi izdvojene datoteke kroz cijev u program NAREDBA"
#: src/tar.c:498
msgid "ignore exit codes of children"
-msgstr "zanemari izlazne kodove djece"
+msgstr "ignorira izlazne kodove potomačkih procesa"
#: src/tar.c:500
msgid "treat non-zero exit codes of children as error"
-msgstr "postupaj s izlaznim kodovima djece različitim od nule kao s greškama"
+msgstr "tretira izlazne kodove potomka različite od nule kao grešku"
#: src/tar.c:505
msgid "Handling of file attributes:"
-msgstr "Upravljanje svojstvima datoteka:"
+msgstr "Manipuliranje s atributima datoteka:"
#: src/tar.c:508
msgid "force NAME as owner for added files"
-msgstr "prisilno postavi IME kao vlasnika dodanih datoteka"
+msgstr "postavi IME kao vlasnika dodanih datoteka"
#: src/tar.c:510
msgid "force NAME as group for added files"
-msgstr "prisilno postavi IME kao grupu dodanih datoteka"
+msgstr "postavi IME kao grupu dodanih datoteka"
-# bp: novi msgid
-# FILE u DATOTEKA, jer je TK to radio ranije
-# bp: možda je bolje ne prevoditi FILE
#: src/tar.c:512
msgid "use FILE to map file owner UIDs and names"
-msgstr "upotrijebi DATOTEKU za usporedbu UID-ova vlasnika datoteke i imena"
+msgstr "preslika korisničke UID-ove i imena iz DATOTEKE na arhivirane datoteke"
# bp: novi msgid
#: src/tar.c:514
msgid "use FILE to map file owner GIDs and names"
-msgstr "upotrijebi DATOTEKU za usporedbu GID-ova i imena"
+msgstr "preslika korisničke GID-ove i imena iz DATOTEKE na arhivirane datoteke"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATUM-ILI-DATOTEKA"
#: src/tar.c:516
msgid "set mtime for added files from DATE-OR-FILE"
-msgstr "postavi ‘mtime’ dodanih datoteka iz DATUM-ILI-DATOTEKA"
+msgstr ""
+"primijeni vrijeme izmjene (mtime) na dodane datoteke iz DATUM-ILI-DATOTEKA"
#: src/tar.c:518
msgid ""
"only set time when the file is more recent than what was given with --mtime"
-msgstr "postavi vrijeme samo ako je datoteka novija od opcije „--mtime“"
+msgstr "primijeni vrijeme samo ako je datoteka novija od --mtime"
#: src/tar.c:519
msgid "CHANGES"
@@ -1906,11 +1917,11 @@ msgstr "PROMJENE"
#: src/tar.c:520
msgid "force (symbolic) mode CHANGES for added files"
-msgstr "prisili (simboličke) PROMJENE moda dodanih datoteka"
+msgstr "prisilno primjeni (simboličke) PROMJENE na dodane datoteke"
#: src/tar.c:522
msgid "METHOD"
-msgstr "METODA"
+msgstr "NAČIN"
#: src/tar.c:523
msgid ""
@@ -1918,55 +1929,56 @@ msgid ""
"reading (METHOD='replace'; default) or by not setting the times in the first "
"place (METHOD='system')"
msgstr ""
-"očuvaj vremena pristupa ispisanih datoteka, ili vraćanjem vremena nakon "
-"čitanja (METODA='replace'; zadano), ili ne postavljanjem vremena "
-"(METODA='system')"
+"očuvati vremena pristupa arhiviranih datoteka vraćanjem vremena nakon "
+"čitanja (NAČIN='replace'; zadano), ili ne postavljanjem vremena "
+"(NAČIN='system')"
#: src/tar.c:527
msgid "don't extract file modified time"
-msgstr "ne ekstrahiraj vrijeme uređivanja datoteke"
+msgstr "ne izdvaja vrijeme izmjene datoteke"
#: src/tar.c:529
msgid ""
"try extracting files with the same ownership as exists in the archive "
"(default for superuser)"
msgstr ""
-"pokušaj ekstrahirati datoteke s istim vlasništvom kakvo je u arhivi (zadano "
-"za administratora)"
+"pokuša izdvojiti datoteke s istim vlasništvom kakvo je u arhivi (zadano za "
+"administratora)"
#: src/tar.c:531
msgid "extract files as yourself (default for ordinary users)"
-msgstr "otpakiraj datoteke kao trenutni korisnik (zadano za obične korisnike)"
+msgstr "datoteke izdvoji kao svoje vlastite (zadano za obične korisnike)"
#: src/tar.c:533
msgid "always use numbers for user/group names"
-msgstr "uvijek koristi brojke za imena korisnika/grupe"
+msgstr "uvijek rabi brojke umjesto imena za korisnika/grupu"
#: src/tar.c:535
msgid "extract information about file permissions (default for superuser)"
-msgstr "izdvoji informacije o dozvolama datoteka (zadano za administratora)"
+msgstr ""
+"izvadi informacije o pravima dostupa datoteci (zadano za administratora)"
#: src/tar.c:539
msgid ""
"apply the user's umask when extracting permissions from the archive (default "
"for ordinary users)"
msgstr ""
-"primijeni korisnički umask pri ekstrakciji dozvola iz arhive (zadano za "
-"obične korisnike)"
+"primijeni korisnikov umask prilikom izdvajanja prava dostupa iz arhive "
+"(zadano za obične korisnike)"
# bp: novi msgid
#: src/tar.c:541
msgid ""
"member arguments are listed in the same order as the files in the archive"
-msgstr "članovi argument su navedeni u istom poretku kao datoteke u arhivi"
+msgstr "argumenti članova su popisani u istom poretku kao datoteke u arhivi"
#: src/tar.c:545
msgid ""
"delay setting modification times and permissions of extracted directories "
"until the end of extraction"
msgstr ""
-"odgodi postavljanje vremena uređivanja i dozvola ekstrahiranih direktorija "
-"do kraja ekstrakcije"
+"odgodi postavljanje vremena izmjene i prava dostupa izdvojenih direktorija "
+"do svršetka izdvajanja"
#: src/tar.c:548
msgid "cancel the effect of --delay-directory-restore option"
@@ -1980,26 +1992,26 @@ msgstr "POREDAK"
# bp: novi msid
#: src/tar.c:551
msgid "directory sorting order: none (default), name or inode"
-msgstr "sortiranje direktorija: none (zadano), „name“ ili „inode“"
+msgstr "poreda direktorije po: none (zadano), name ili inode"
# bp: novi msgid
#: src/tar.c:553
msgid "directory sorting order: none (default) or name"
-msgstr "sortiranje direktorija: none (zadano) ili „name“"
+msgstr "poreda direktorije po: none (zadano) ili name"
# bp: fuzirano; dodano
#: src/tar.c:560
msgid "Handling of extended file attributes:"
-msgstr "Upravljanje proširenim svojstvima datoteka:"
+msgstr "Manipuliranje s proširenim atributima datoteka:"
# bp: novi msgid
#: src/tar.c:563
msgid "Enable extended attributes support"
-msgstr "Omogući podršku za proširenje svojstava datoteka"
+msgstr "Omogući podršku za proširene atribute"
#: src/tar.c:565
msgid "Disable extended attributes support"
-msgstr "Onemogući podršku za proširenje svojstava datoteka"
+msgstr "Onemogući podršku za proširene atribute"
# bp: sljedećih sedam novih mgsgid-ova
#: src/tar.c:566 src/tar.c:568
@@ -2008,31 +2020,31 @@ msgstr "MASKA"
#: src/tar.c:567
msgid "specify the include pattern for xattr keys"
-msgstr "specificiraj uključenje uzorak za xattr ključeve"
+msgstr "specificira uključi-uzorak za xattr ključeve"
#: src/tar.c:569
msgid "specify the exclude pattern for xattr keys"
-msgstr "specificiraj izuzeće uzorak za xattr ključeve"
+msgstr "specificira isključi-uzorak za xattr ključeve"
#: src/tar.c:571
msgid "Enable the SELinux context support"
-msgstr "Omogući podršku za SELinux kontekst"
+msgstr "Omogući SELinux kontekstnu podršku"
#: src/tar.c:573
msgid "Disable the SELinux context support"
-msgstr "Onemogući podršku za SELinux kontekst"
+msgstr "Onemogući SELinux kontekstnu podršku"
#: src/tar.c:575
msgid "Enable the POSIX ACLs support"
-msgstr "Omogući podršku za POSIX ACLs"
+msgstr "Omogući podršku za POSIX ACLs"
#: src/tar.c:577
msgid "Disable the POSIX ACLs support"
-msgstr "Onemogući podršku za POSIX ACLs"
+msgstr "Onemogući podršku za POSIX ACLs"
#: src/tar.c:582
msgid "Device selection and switching:"
-msgstr "Odabir i zamjena uređaja:"
+msgstr "Izbor i zamjena uređaja:"
#: src/tar.c:584
msgid "ARCHIVE"
@@ -2040,28 +2052,28 @@ msgstr "ARHIVA"
#: src/tar.c:585
msgid "use archive file or device ARCHIVE"
-msgstr "koristi datoteku ili uređaj ARHIVA"
+msgstr "rabi arhiviranu datoteku ili uređaj ARHIVA"
#: src/tar.c:587
msgid "archive file is local even if it has a colon"
-msgstr "datoteka arhive je lokalna iako sadrži dvotočje"
+msgstr "arhivirana datoteka je lokalna iako sadrži dvotočku „:“"
#: src/tar.c:589
msgid "use given rmt COMMAND instead of rmt"
-msgstr "koristi navedenu rmt NAREDBU umjesto rmt"
+msgstr "rabi navedenu rmt NAREDBU umjesto rmt"
#: src/tar.c:591
msgid "use remote COMMAND instead of rsh"
-msgstr "koristi udaljenu NAREDBU umjesto rsh"
+msgstr "rabi udaljenu NAREDBU umjesto rsh"
#: src/tar.c:595
msgid "specify drive and density"
-msgstr "navedi uređaj i gustoću"
+msgstr "specifikacija uređaja i gustoće pisanja"
# FIXME -- volume -- find more suitable (ask others) -- TM
#: src/tar.c:609
msgid "create/list/extract multi-volume archive"
-msgstr "napravi/ispiši/ekstrahiraj višedjelnu arhivu"
+msgstr "napraviti/izlistati/izdvojiti višesvezačne arhive"
#: src/tar.c:611
msgid "change tape after writing NUMBER x 1024 bytes"
@@ -2069,15 +2081,15 @@ msgstr "promijeni vrpcu nakon zapisivanja BROJ x 1024 bajtova"
#: src/tar.c:613
msgid "run script at end of each tape (implies -M)"
-msgstr "pokreni skriptu na kraju svake vrpce (podrazumijeva -M)"
+msgstr "pokrene skriptu na kraju svake vrpce (podrazumijeva -M)"
#: src/tar.c:616
msgid "use/update the volume number in FILE"
-msgstr "koristi/ažuriraj broj dijela arhive u DATOTECI"
+msgstr "rabi/ažurira broj sveska u DATOTECI"
#: src/tar.c:621
msgid "Device blocking:"
-msgstr "Podjela uređaja u blokove:"
+msgstr "Uređaj i blokovi:"
#: src/tar.c:623
msgid "BLOCKS"
@@ -2089,51 +2101,51 @@ msgstr "BLOKOVI x 512 bajtova po zapisu"
#: src/tar.c:626
msgid "NUMBER of bytes per record, multiple of 512"
-msgstr "BROJ bajtova po zapisu, višekratnik 512"
+msgstr "BROJ bajtova po zapisu, višekratnik od 512"
#: src/tar.c:628
msgid "ignore zeroed blocks in archive (means EOF)"
-msgstr "zanemari blokove u arhivi pretvorene u nulu (znači EOF)"
+msgstr "ignorira blokove s nulom u arhivi (to jest EOF)"
#: src/tar.c:630
msgid "reblock as we read (for 4.2BSD pipes)"
-msgstr "ponovo napravi blokove pri čitanju (za 4.2BSD cjevovode)"
+msgstr "obnovi blokove u tijeku čitanja (za 4.2BSD cijevi)"
#: src/tar.c:635
msgid "Archive format selection:"
-msgstr "Odabir oblika arhive:"
+msgstr "Selekcija formata arhive:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
-msgstr "OBLIK"
+msgstr "FORMAT"
#: src/tar.c:638
msgid "create archive of the given format"
-msgstr "stvori arhivu zadanog oblika"
+msgstr "kreira arhivu danog formata"
#: src/tar.c:640
msgid "FORMAT is one of the following:"
-msgstr "OBLIK je jedan od sljedećih:"
+msgstr "FORMAT je jedan od:"
#: src/tar.c:641
msgid "old V7 tar format"
-msgstr "stari V7 tar oblik"
+msgstr "stari format tar V7"
#: src/tar.c:644
msgid "GNU format as per tar <= 1.12"
-msgstr "GNU oblik za tar <= 1.12"
+msgstr "GNU format za tar <= 1.12"
#: src/tar.c:646
msgid "GNU tar 1.13.x format"
-msgstr "GNU tar 1.13.x oblik"
+msgstr "GNU tar 1.13.x format"
#: src/tar.c:648
msgid "POSIX 1003.1-1988 (ustar) format"
-msgstr "POSIX 1003.1-1988 (ustar) oblik"
+msgstr "POSIX 1003.1-1988 (ustar) format"
#: src/tar.c:650
msgid "POSIX 1003.1-2001 (pax) format"
-msgstr "POSIX 1003.1-2001 (pax) oblik"
+msgstr "POSIX 1003.1-2001 (pax) format"
#: src/tar.c:651
msgid "same as pax"
@@ -2149,11 +2161,11 @@ msgstr "isto kao --format=posix"
#: src/tar.c:658
msgid "keyword[[:]=value][,keyword[[:]=value]]..."
-msgstr "ključna_riječ[[:]=vrijednost][,ključna_riječ[[:]=vrijednost]]..."
+msgstr "keyword[[:]=vrijednost][,keyword[[:]=vrijednost]]..."
#: src/tar.c:659
msgid "control pax keywords"
-msgstr "kontrolne pax ključne riječi"
+msgstr "kontrolira pax ključne riječi"
#: src/tar.c:660
msgid "TEXT"
@@ -2164,20 +2176,20 @@ msgid ""
"create archive with volume name TEXT; at list/extract time, use TEXT as a "
"globbing pattern for volume name"
msgstr ""
-"Napravi arhivu s imenom dijela arhive TEKST. Pri ispisu/otpakiranju koristi "
-"TEKST za traženje uzorka za ime dijela arhive."
+"kreira arhivu s imenom sveska TEKST; pri listanju/izdvajanju rabi TEKST kao "
+"globbing uzorak za ime sveska"
#: src/tar.c:666
msgid "Compression options:"
-msgstr "Opcije kompresije:"
+msgstr "Opcije za kompresiju:"
#: src/tar.c:668
msgid "use archive suffix to determine the compression program"
-msgstr "koristi sufiks arhive za određivanje programa za kompresiju"
+msgstr "arhivin sufiks određuje program za kompresiju"
#: src/tar.c:670
msgid "do not use archive suffix to determine the compression program"
-msgstr "ne koristi sufiks arhive za određivanje programa za kompresiju"
+msgstr "arhivin sufiks ne određuje program za kompresiju"
#: src/tar.c:672
msgid "PROG"
@@ -2185,261 +2197,264 @@ msgstr "PROGRAM"
#: src/tar.c:673
msgid "filter through PROG (must accept -d)"
-msgstr "filtriraj kroz PROGRAM (mora prihvaćati -d)"
+msgstr "filtrira arhivu kroz PROGRAM (mora prihvatiti -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
-msgstr "Odabir lokalnih datoteka:"
+msgstr "Selekcija lokalnih datoteka:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
-msgstr "ostani u lokalnom datotečnom sustavu pri stvaranju arhive"
+msgstr "kreira arhivu u lokalnom datotečnom sustavu"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
-msgstr "ne uklanjaj početne „/“ iz imena datoteka"
+msgstr "ne skida početne „/“ iz imena datoteka"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
-msgstr "slijedi simboličke veze; arhiviraj i ispiši datoteke na koje pokazuju"
+msgstr "slijedi simboličke veze; arhivira i sprema datoteke u koje veze gađaju"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
-msgstr "slijedi čvrste veze; arhiviraj i ispiši datoteke na koje se odnose"
+msgstr "slijedi čvrste veze; arhivira i sprema datoteke na koje veze pokazuju"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
-msgstr "IME-ELEMENTA"
+msgstr "IME-ČLANA"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
-msgstr "započni s elementom IME-ELEMENTA u arhivi"
+msgstr "čitanje arhive započeti s članom IME-ČLANA"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
-msgstr "spremi samo datoteke novije od DATUM-ILI-DATOTEKA"
+msgstr "sprema samo datoteke novije od DATUM-ILI-DATOTEKA"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATUM"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
-msgstr "usporedi datum i vrijeme samo ako su podaci promijenjeni"
+msgstr ""
+"usporedi datum i vrijeme, ali samo ako su podaci promijenjeni; testira samo "
+"mtime"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "KONTROLA"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
-msgstr "napravi sigurnosnu kopiju prije uklanjanja, odaberi KONTROLU inačice"
+msgstr ""
+"osiguranje (sigurnosne kopije) napravi prije uklanjanja; odaberite varijantu "
+"KONTROLE"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
-msgstr "NIZ"
+msgstr "STRING"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
-"napravi sigurnosnu kopiju prije uklanjanja, zamijeni uobičajeni sufiks („~“ "
-"osim ako je promijenjen varijablom okoline SIMPLE_BACKUP_SUFFIX)"
+"osiguranje (sigurnosne kopije) napravi prije uklanjanja, promijeni "
+"uobičajeni sufiks „~“ (ako nije promijenjen varijablom okoline "
+"SIMPLE_BACKUP_SUFFIX) u STRING"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
-msgstr "Pretvaranja imena datoteka:"
+msgstr "Transformacija imena datoteka:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
-msgstr "ukloni BROJ vodećih komponenti iz imena datoteka pri otpakiranju"
+msgstr "skine BROJ vodećih komponenti iz imena datoteka prilikom izdvajanja"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "IZRAZ"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
-msgstr "koristi sed zamjenu IZRAZA za promjenu imena datoteka"
+msgstr "transformacija imena datoteka upotrebom sed IZRAZA"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informativni izlaz:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
-msgstr "opširno ispiši obrađene datoteke"
+msgstr "izlista procesirane datoteke"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "KLJUČNA_RIJEČ"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
-msgstr "kontrola upozorenja"
+msgstr "upravljanje s upozorenjima"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
-msgstr "prikaži poruke o napretku svakih BROJ zapisa (zadano 10)"
+msgstr "poruke o progresu pokaže svakih BROJ zapisa (zadano 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
-msgstr "RADNJA"
+msgstr "AKCIJA"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
-msgstr "izvrši RADNJU na svakoj kontrolnoj točki"
+msgstr "izvrši AKCIJU na svakoj kontrolnoj točki"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
-msgstr "ispiši poruku ako nisu ispisane sve veze"
+msgstr "ispiše poruku ako sve veze nisu arhivirane"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
"SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; the names without SIG prefix are also "
"accepted"
msgstr ""
-"Ispiši ukupan broj bajtova nakon obrade arhive. Uz argument - ispiši ukupan "
-"broj bajtova nakon primanja ovog SIGNALA. Dozvoljeni signali su: SIGHUP, "
-"SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2. Također se prihvaćaju imena bez prefiksa "
-"SIG."
+"ispiše ukupan broj bajtova nakon obrade arhive; s argumentom - ispiše ukupan "
+"broj bajtova nakon primanja ovog SIGNALA. Dopušteni signali su: SIGHUP, "
+"SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2; prihvaćaju se također i imena bez SIG "
+"prefiksa"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
-msgstr "ispiši vremena uređivanja datoteka u UTC-u"
+msgstr "ispiše vremena izmjene datoteka u UTC-u"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
-msgstr "ispiši potpunu rezoluciju vremena datoteke"
+msgstr "ispis (u punoj rezoluciji) vremena datoteka"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
-msgstr "pošalji opširan izlaz u DATOTEKU"
+msgstr "pošalje opširan izlaz u DATOTEKU"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
-msgstr "prikaži broj bloka u arhivi uz svaku poruku"
+msgstr "broj bloka u arhivi u svakoj poruci"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
-msgstr "traži potvrdu svake radnje"
+msgstr "pita za potvrdu za svaku akciju"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
-msgstr "prikaži zadane postavke za tar"
+msgstr "zadane (defaults) tar postavke"
# bp: novi msgid
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
-msgstr "prikaži valjane raspone za snapshot-datoteke polja"
+msgstr "valjani rasponi za polja snapshot-datoteke"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
-"pri ispisu ili ekstrakciji, ispiši svaki direktorij koji ne odgovara "
+"pri listanju ili izdvajanju ispiše svaki direktorij koji se ne podurara s "
"uvjetima pretraživanja"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
-msgstr "prikaži imena datoteke ili arhive nakon pretvaranja"
+msgstr "imena datoteka ili arhiva nakon transformacije"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STIL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
-msgstr ""
-"postavi stil navođenja imena; pogledajte niže ispravne vrijednosti STILA"
+msgstr "stil citiranja imena; pogledajte niže valjane vrijednosti za STIL"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
-msgstr "dodatno navedi znakove iz NIZA"
+msgstr "dodatno uvijek citira i znakove iz STRINGA"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
-msgstr "onemogući navođenje za znakove iz NIZA"
+msgstr "onemogući citiranje znakova iz STRINGA"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
-msgstr "Opcije kompatibilnosti:"
+msgstr "Opcije za kompatibilnost:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
-"pri stvaranju, isto kao --old-archive; pri ekstrahiranju, isto kao --no-same-"
-"owner"
+"pri kreiranju isto kao --old-archive; pri izdvajanju isto kao --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Ostale opcije:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
-msgstr "onemogući korištenje nekih potencijalno opasnih opcija"
+msgstr "deaktivira nekoliko potencijalno opasnih opcija"
# bp: fuziran, dotjeran
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
-msgstr "%s: ne može se koristiti s %s"
+msgstr "„%s“: ne može se rabiti s „%s“"
# bp: fuziran, dodana
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr ""
-"Ne možete navesti više od jedne od opcija „-Acdtrux“, „--delete“ ili „--test-"
+"Smijete navesti samo jednu od opcija „-Acdtrux“, „--delete“ ili „--test-"
"label“"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
-msgstr "Konfliktne opcije komprimiranja"
+msgstr "Konfliktne opcije za kompresiju"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Nepoznato ime signala: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
-msgstr "Datoteka s primjerom datuma nije pronađena"
+msgstr "Datoteka s uzorkom datuma nije pronađena"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
-msgstr "Mijenjam %s za nepoznat oblik datuma %s"
+msgstr "S(a) %s zamijenjuje se nepoznati format datuma %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
-msgstr "Opcija %s: Postupam s datumom „%s“ kao %s"
+msgstr "Opcija %s: Datum „%s“ tretira se kao %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
-msgstr "filtriraj arhivu kroz %s"
+msgstr "filtrira arhivu kroz %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
-msgstr "Ispravni argumenti opcije --quoting-style su:"
+msgstr "Valjane vrijednosti za opciju --quoting-style su:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2448,205 +2463,205 @@ msgstr ""
"Uobičajeno ponašanje *ovog* programa tar je:\n"
# bp: fuzirano, dodano
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
-msgstr "Neispravan vlasnik ili grupni ID"
+msgstr "Neispravni vlasnik ili ID grupe"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
-msgstr "Neispravan faktor pakiranja u blokove"
+msgstr "Neispravna veličina bloka"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Neispravna duljina vrpce"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
-msgstr "Neispravna vrijednost inkrementalne razine"
+msgstr "Neispravna vrijednost za inkrement razine"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
-msgstr "Više od jednog datuma praga"
+msgstr "Više od jednog praga datuma"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
-msgstr "Neispravna vrijednost raštrkane inačice"
+msgstr "Neispravna vrijednost za sparse verziju (sparse version)"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
-msgstr "--atime-preserve='system' nije podržan na ovoj platformi"
+msgstr "--atime-preserve='system' opcija nije podržana na ovoj platformi"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
-msgstr "vrijednost --checkpoint nije cjelobrojna"
+msgstr "vrijednost --checkpoint nije cijeli broj"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
-msgstr "Neispravan mod naveden opcijom"
+msgstr "U opciji je naveden neispravni format prava dostupa"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
-msgstr "Neispravan broj"
+msgstr "Neispravni broj"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
-msgstr "Pogrešna veličina zapisa"
+msgstr "Neispravna veličina zapisa"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
-msgstr "Veličina sloga mora biti višekratnik %d."
+msgstr "Veličina zapisa mora biti višekratnik od %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Neispravan broj elemenata"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
-msgstr "Dozvoljena je samo jedna opcija --to-command"
+msgstr "Dopuštena je samo jedna opcija --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
-msgstr "Izobličen argument gustoće: %s"
+msgstr "Deformirani argument gustoće: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Nepoznata gustoća: „%c“"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
-msgstr "*Ovaj* tar ne podržava opcije „-[0-7][lmh]“"
+msgstr "Opcije „-[0-7][lmh]“ *ovaj* tar ne podržava"
# bp: novi msgid
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: mjesto greške"
# bp: fuzirano, dotjerano
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
-msgstr "greška u analiziranju „%s“"
+msgstr "greška pri analizi %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[DATOTEKA]..."
# bp: fuzirano, popravljeno
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
-msgstr "neispravan argument u %s"
+msgstr "argumenti, koji nisu opcije u %s"
# bp: novi msgid
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
-msgstr "ne mogu rastaviti TAR_OPTIONS: %s"
+msgstr "nije moguće razdijeliti TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Stara opcija „%c“ zahtijeva argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence nema smisla bez popisa datoteka"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
-msgstr "Višedjelne arhive zahtijevaju opciju „-M“"
+msgstr "Više arhivskih datoteka zahtijeva opciju „-M“"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level nema smisla bez --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
-msgstr[0] "%s: Oznaka dijela arhive je predugačka (ograničenje je %lu bajt)"
-msgstr[1] "%s: Oznaka dijela arhive je predugačka (ograničenje je %lu bajta)"
-msgstr[2] "%s: Oznaka dijela arhive je predugačka (ograničenje je %lu bajtova)"
+msgstr[0] "%s: Etiketa sveska je preduga (ograničenje je %lu bajt)"
+msgstr[1] "%s: Etiketa sveska je preduga (ograničenje je %lu bajta)"
+msgstr[2] "%s: Etiketa sveska je preduga (ograničenje je %lu bajtova)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
-msgstr "Ne mogu provjeriti višedjelne arhive"
+msgstr "Nemoguće je provjeriti svezačne arhive"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
-msgstr "Ne mogu provjeriti komprimirane arhive"
+msgstr "Nije moguće provjeriti komprimirane arhive"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
-msgstr "Ne mogu koristiti višedjelne komprimirane arhive"
+msgstr "Nemoguće je rabiti višesvezačne komprimirane arhive"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
-msgstr "Ne mogu spojiti komprimirane arhive"
+msgstr "Nije moguće spojiti komprimirane arhive"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
-msgstr "opcija „--clamp-mtime“ zahtijeva datum specificiran s „--mtime“"
+msgstr "opcija --clamp-mtime zahtijeva datum specificiran s --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
-msgstr "--pax-option se može koristiti samo na POSIX arhivama"
+msgstr "--pax-option može se rabiti samo na POSIX arhivama"
# bp: fuzirano, popravljeno
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
-msgstr "--acls se može koristiti samo na POSIX arhivama"
+msgstr "--acls može se rabiti samo na POSIX arhivama"
# bp: fuzirano, popravljeno
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
-msgstr "--selinux se može koristiti samo na POSIX arhivama"
+msgstr "--selinux može se rabiti samo na POSIX arhivama"
# bp: fuzirano, popravljeno
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
-msgstr "--xattrs se može koristiti samo na POSIX arhivama"
+msgstr "--xattrs može se rabiti samo na POSIX arhivama"
# bp: novi msgid
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
-"Ne mogu odrediti naziv najvišeg direktorija; zadajte ga eksplicitno s --one-"
-"top-level=DIR"
+"Nije moguće odrediti ime vrhovnoga direktorija; specificirajte ga "
+"eksplicitno s --one-top-level=DIR"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
-msgstr "Duljina dijela arhive ne može biti manja od veličine zapisa"
+msgstr "Duljina sveska ne može biti manja od veličine zapisa"
# LOL -- TM
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
-msgstr "Kukavički odbijam napraviti praznu arhivu"
+msgstr "Pravljenje prazne arhive se kukavički odbija"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Opcije „-Aru“ nisu kompatibilne s „-f -“"
# bp: fuzirano, popravljeno
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Morate navesti jednu od opcija „-Acdtrux“, „--delete“ ili „--test-label“"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
-msgstr "Izlazim sa stanjem neuspjeha zbog prethodnih grešaka"
+msgstr "Izlaz sa statusom neuspjeha zbog prethodnih grešaka"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
@@ -2654,377 +2669,387 @@ msgstr[0] "%s: Datoteka skraćena za %s bajt"
msgstr[1] "%s: Datoteka skraćena za %s bajta"
msgstr[2] "%s: Datoteka skraćena za %s bajtova"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Ključna riječ %s je nepoznata ili još nije implementirana"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
-msgstr "Vremenska oznaka je izvan dozvoljenih granica"
+msgstr "Vremenska oznaka je izvan dopuštenoga raspona"
+
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
-#: src/xheader.c:205
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
-msgstr "Uzorak %s se ne može koristiti"
+msgstr "Uzorak %s se ne može rabiti"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
-msgstr "Ključnu riječ %s se ne može zaobići"
+msgstr "Ključnu riječ %s nije moguće prepisati (nadjačati)"
+
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
-#: src/xheader.c:668
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
-msgstr "Izobličeno prošireno zaglavlje: nedostaje duljina"
+msgstr "Deformirano prošireno zaglavlje: nedostaje duljina"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
-msgstr "Duljina proširenog zaglavlja %*s je izvan granica"
+msgstr "Duljina proširenog zaglavlja %*s je izvan raspona"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
-msgstr "Izobličeno prošireno zaglavlje: nedostaje praznina nakon duljine"
+msgstr "Deformirano prošireno zaglavlje: nedostaje praznina nakon duljine"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
-msgstr "Izobličeno prošireno zaglavlje: nedostaje znak jednakosti"
+msgstr "Deformirano prošireno zaglavlje: nedostaje znak jednakosti"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
-msgstr "Izobličeno prošireno zaglavlje: nedostaje novi redak"
+msgstr "Deformirano prošireno zaglavlje: nedostaje novi redak (newline)"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
-msgstr "Zanemarujem nepoznatu ključnu riječ proširenog zaglavlja „%s“"
+msgstr "Ignorira se nepoznata ključna riječ proširenog zaglavlja „%s“"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
-"Stvoreni par ključna_riječ/vrijednost je predugačak (ključna_riječ=%s, "
-"duljina=%s)"
+"Predugi generirani par ključna_riječ/vrijednost (ključna_riječ=%s, duljina="
+"%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Prošireno zaglavlje %s=%s je izvan raspona %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
-msgstr "Izobličeno prošireno zaglavlje: neispravan %s=%s"
+msgstr "Deformirano proširenje zaglavlja: neispravni %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
-msgstr "Izobličeno prošireno zaglavlje: suvišan %s=%s"
+msgstr "Deformirano prošireno zaglavlje: suvišan %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
-msgstr ""
-"Izobličeno prošireno zaglavlje: neispravan %s: neočekivan znak razdvajanja %c"
+msgstr "Deformirano proširenje zaglavlja: neispravni %s: neočekivani međaš %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
-"Izobličeno prošireno zaglavlje: neispravan %s: neparan broj vrijednosti"
+"Deformirano proširenje zaglavlja: neispravni %s: neparan broj vrijednosti"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
-msgstr "%s: nije ispravno vremensko ograničenje"
+msgstr "%s: nije ispravno vremensko ograničenje (timeout)"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
-msgstr "%s: nepoznata radnja kontrolne točke"
+msgstr "%s: nepoznata akcija kontrolne točke"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
-msgstr "piši"
+msgstr "pisati"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
-msgstr "čitaj"
+msgstr "(u/pro)čitati"
#. TRANSLATORS: This is a "checkpoint of write operation",
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
-msgstr "Kontrolna točka pisanja %u"
+msgstr "Zapisati kontrolnu točku %u"
#. TRANSLATORS: This is a "checkpoint of read operation",
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
-msgstr "Kontrolna točka čitanja %u"
+msgstr "Učitati kontrolnu točku %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr ""
-"genfile rukuje podatkovnim datotekama GNU paxutils skupa testova.\n"
+"genfile rukuje podatkovnim datotekama GNU paxutils testsuite.\n"
"OPCIJE su:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
-msgstr "Opcije stvaranja datoteka:"
+msgstr "Opcije za kreiranje datoteka:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "VELIČINA"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
-msgstr "Napravi datoteku navedene VELIČINE"
+msgstr "Kreiranje datoteke dane VELIČINE"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Piši u datoteku IME umjesto na standardni izlaz"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
-msgstr "Čitaj imena datoteka iz DATOTEKE"
+msgstr "Učitati imena datoteka iz DATOTEKE"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T čita imena završena praznim (null) znakom"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
-msgstr "Popuni datoteku navedenim UZORKOM. UZORAK je „default“ ili „zeros“"
+msgstr "Popuni datoteku s navedenim UZORKOM. UZORAK je „default“ ili „zeros“"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
-msgstr "Veličina bloka za raštrkanu datoteku"
+msgstr "Veličina bloka za raspršenu (sparse) datoteku"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
-"Stvori raštrkanu datoteku. Ostatak naredbenog retka zadaje mapu datoteke."
+"Generira raspršenu (sparse) datoteku. Ostatak naredbe zada mapu datoteke."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
-msgstr "POMAK"
+msgstr "ODMAK"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
-msgstr "Idi na zadani pomak prije pisanja podataka"
+msgstr "Otiđe na zadani odmak prije pisanja podataka"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
-msgstr "Izostavi sve dijagnostičke poruke koje nisu fatalne"
+msgstr "Priguši sve dijagnostičke poruke koje nisu fatalne"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
-msgstr "Opcije statistike datoteka:"
+msgstr "Opcije za statistiku datoteka:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
-"Ispiši sadržaj statistike strukture za svaku navedenu datoteku. Uobičajeni "
-"OBLIK je: "
+"Ispiše sadržaj struct stat za svaku navedenu datoteku. Standardni FORMAT je: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Opcije sinkronog izvršavanja:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPCIJA"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Izvrši ARGUMENTE. Korisno uz --checkpoint i jednu od opcija --cut, --append, "
"--touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
-msgstr ""
-"Izvrši zadane radnje (pogledajte dolje) pri dostizanju kontrolne točke BROJ"
+msgstr "Izvrši dane akcije (v. dolje) pri dostizanju kontrolne točke BROJ"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
-msgstr "Postavi datum za sljedeću opciju --touch"
+msgstr "Zadaje datum za sljedeću --touch opciju"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
-msgstr "Prikaži izvršene kontrolne točke i izlazno stanje NAREDBE"
+msgstr "Pokaže izvršene kontrolne točke i izlazni status NAREDBE"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
-"Radnje sinkronog izvršavanja. One se izvršavaju kad se dostigne broj "
-"kontrolne točke zadan opcijom --checkpoint."
+"Sinkrono izvršene akcije. Izvršavaju se kad se dostigne broj kontrolne točke "
+"dan opcijom --checkpoint."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
"Skrati DATOTEKU na veličinu zadanu prethodnom opcijom --length (ili 0 ako "
-"nije zadano)"
+"veličina nije dana)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
-"Dodaj VELIČINA bajtova u DATOTEKU. VELIČINA je zadana prethodnom opcijom --"
+"Dodati VELIČINU bajtova u DATOTEKU. VELIČINA je zadana prethodnom opcijom --"
"length."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
-msgstr "Ažuriraj vrijeme pristupa i uređivanja DATOTEKE"
+msgstr "Ažurira vremena dostupa i izmjene DATOTEKE"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Izvrši NAREDBU"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Izbriše DATOTEKU"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Neispravna veličina: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
-msgstr "Broj izvan dozvoljenih granica: %s"
+msgstr "Broj je izvan dopuštenoga raspona: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negativna veličina: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
-msgstr "stat(%s) nije uspio"
+msgstr "nije uspjelo odrediti status od %s"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "tražena duljina datoteke %lu, stvarna %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
-msgstr "stvorena datoteka nije raštrkana"
+msgstr "kreirana datoteka nije raspršena (sparse)"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
-msgstr "Greška analize broja kod „%s“"
+msgstr "Greška analize broja u blizini „%s“"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
-msgstr "Nepoznat oblik datuma"
+msgstr "Nepoznat format datuma"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENTI...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
-msgstr "ne mogu otvoriti „%s“"
+msgstr "nije moguće otvoriti „%s“"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
-msgstr "ne mogu tražiti"
+msgstr "nije moguće skočiti na poziciju"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "ime datoteke sadrži prazan (null) znak"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-"ne mogu stvoriti raštrkane datoteke na standardnom izlazu, koristite opciju "
-"--file"
+"nemoguće je generirati raspršene (sparse) datoteke na standardnom izlazu, "
+"rabite opciju --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
-msgstr "netočna maska (kod „%s“)"
+msgstr "netočna maska (blizu „%s“)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Nepoznato polje „%s“"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
-msgstr "ne mogu postaviti vrijeme na „%s“"
+msgstr "nije moguće postaviti vrijeme na „%s“"
# bp: fuzirano.
# možda je „vezu“ suvišna
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
-msgstr "ne mogu ukloniti vezu „%s“"
+msgstr "nije moguće skratiti „%s“"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "naredba %s nije uspjela"
# bp: fuzirano.
# možda je „vezu“ suvišna
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "ne mogu ukloniti vezu „%s“"
+msgstr "nije moguće dobiti status od „%s“"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "ne mogu postaviti vrijeme na „%s“"
+msgstr "direktorij „%s“ nije moguće ukloniti"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
-msgstr "ne mogu ukloniti vezu „%s“"
+msgstr "nije moguće ukloniti vezu (unlink) „%s“"
#: tests/genfile.c:918
#, c-format
msgid "Command exited successfully\n"
-msgstr "Izlaz naredbe uspješan\n"
+msgstr "Naredba je uspješno izvršena\n"
#: tests/genfile.c:920
#, c-format
msgid "Command failed with status %d\n"
-msgstr "Naredba nije uspjela sa stanjem %d\n"
+msgstr "Naredba nije uspjela; status %d\n"
#: tests/genfile.c:924
#, c-format
msgid "Command terminated on signal %d\n"
-msgstr "Naredba završena signalom %d\n"
+msgstr "Naredba okončana signalom %d\n"
#: tests/genfile.c:926
#, c-format
@@ -3034,574 +3059,17 @@ msgstr "Naredba zaustavljena signalom %d\n"
#: tests/genfile.c:929
#, c-format
msgid "Command dumped core\n"
-msgstr "Naredba je izbacila jezgru\n"
+msgstr "Naredba je proizvela core dump\n"
#: tests/genfile.c:932
#, c-format
msgid "Command terminated\n"
-msgstr "Naredba završena\n"
+msgstr "Naredba je okončana\n"
#: tests/genfile.c:964
#, c-format
msgid "--stat requires file names"
msgstr "--stat zahtijeva imena datoteka"
-#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-#~ msgstr "%.*s: ARGP_HELP_FMT parametar mora biti pozitivan"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: opcija „--%s“ ne dozvoljava argument\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: neprepoznata opcija „--%s“\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: opcija „-W %s“ je višeznačna\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: opcija „-W %s“ ne dozvoljava argument\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: opcija „-W %s“ zahtijeva argument\n"
-
-#~ msgid "Unlink FILE"
-#~ msgstr "Ukloni vezu DATOTEKE"
-
-#~ msgid "same as both -p and -s"
-#~ msgstr "isto kao -p i -s zajedno"
-
-#~ msgid ""
-#~ "The --preserve option is deprecated, use --preserve-permissions --"
-#~ "preserve-order instead"
-#~ msgstr ""
-#~ "Opcija --preserve je zastarjela, koristite --preserve-permissions --"
-#~ "preserve-order umjesto nje"
-
-#~ msgid "Field too long while reading snapshot file"
-#~ msgstr "Polje predugačko pri čitanju datoteke snimke stanja"
-
-#~ msgid "Read error in snapshot file"
-#~ msgstr "Greška čitanja u datoteci snimke stanja"
-
-#~ msgid "Unexpected field value in snapshot file"
-#~ msgstr "Neočekivana vrijednost polja u datoteci snimke stanja"
-
-#~ msgid "Cannot get working directory"
-#~ msgstr "Ne mogu saznati trenutni radni direktorij"
-
-#~ msgid "sort names to extract to match archive"
-#~ msgstr "razvrstaj imena za ekstrakciju da odgovaraju arhivi"
-
-#~ msgid "Invalid group"
-#~ msgstr "Neispravna grupa"
-
-#~ msgid "--occurrence cannot be used in the requested operation mode"
-#~ msgstr "--occurrence se ne može koristiti u traženom načinu rada"
-
-#~ msgid "Cannot combine --listed-incremental with --newer"
-#~ msgstr "Ne mogu kombinirati --listed-incremental s --newer"
-
-#~ msgid "--preserve-order is not compatible with --listed-incremental"
-#~ msgstr "--preserve-order nije kompatibilno s --listed-incremental"
-
-#~ msgid "Extended header length is out of allowed range"
-#~ msgstr "Duljina proširenog zaglavlja je izvan dozvoljenih granica"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ilegalna opcija -- %c\n"
-
-#~ msgid "block size"
-#~ msgstr "veličina bloka"
-
-#~ msgid "Cannot dup"
-#~ msgstr "Neuspjeli dup"
-
-#~ msgid "Cannot use compressed or remote archives"
-#~ msgstr "Ne mogu koristiti komprimirane ili udaljene (remote) arhive"
-
-#~ msgid "tar (child)"
-#~ msgstr "tar (podproces)"
-
-#~ msgid "tar (grandchild)"
-#~ msgstr "tar (pod-podproces)"
-
-#~ msgid "Reading %s\n"
-#~ msgstr "Čitam %s\n"
-
-#~ msgid "WARNING: No volume header"
-#~ msgstr "UPOZORENJE: Nema zaglavlja za dio arhive"
-
-#~ msgid "Child returned status %d"
-#~ msgstr "Podproces završio uz status %d"
-
-#~ msgid "Member names contain `..'"
-#~ msgstr "Imena članova sadrže `..'"
-
-# FIXME -- clarify this against source -- TM -- didn't help
-# Paul E. said this means:
-#
-# "tar" read a LONGNAME or LONGLINK header from the archive in a context
-# where it was not expected.
-#~ msgid "Visible long name error"
-#~ msgstr "Vidljiva pogreška u dugom imenu"
-
-#~ msgid "Error is not recoverable: exiting now"
-#~ msgstr "Greška iz koje se ne mogu oporaviti: završavam s radom"
-
-#~ msgid "Device number out of range"
-#~ msgstr "Broj uređaja izvan opsega"
-
-#~ msgid "Visible longname error"
-#~ msgstr "Vidljiva pogreška u dugom imenu"
-
-#~ msgid "Renamed %s to %s"
-#~ msgstr "Preimenovao %s u %s"
-
-#~ msgid "Symlinked %s to %s"
-#~ msgstr "Napravio simbolički link %s prema %s"
-
-#~ msgid "Unknown demangling command %s"
-#~ msgstr "Nepoznata naredba za demangliranje %s"
-
-#~ msgid "Missing file name after -C"
-#~ msgstr "Nedostaje ime datoteke nakon -C"
-
-#~ msgid "rmtd: Cannot allocate buffer space\n"
-#~ msgstr "rmtd: Ne mogu alocirati prostor za međuspremnik\n"
-
-#~ msgid "Cannot allocate buffer space"
-#~ msgstr "Ne mogu alocirati prostor za međuspremnik"
-
-#~ msgid ""
-#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n"
-#~ "You may redistribute it under the terms of the GNU General Public "
-#~ "License;\n"
-#~ "see the file named COPYING for details."
-#~ msgstr ""
-#~ "Ovaj program dolazi BEZ GARANCIJA, do granica dozvoljenih zakonom.\n"
-#~ "Možete ga redistribuirati pod uvjetima GNU General Public License;\n"
-#~ "vidi datoteku imena COPYING za detalje."
-
-#~ msgid "Premature end of file"
-#~ msgstr "Prerani kraj datoteke"
-
-# FIXME -- now this is supposed to be funny
-#~ msgid "rmtd: Garbage command %c\n"
-#~ msgstr "rmtd: %c je neispravna naredba\n"
-
-#~ msgid ""
-#~ "GNU `tar' saves many files together into a single tape or disk archive, "
-#~ "and\n"
-#~ "can restore individual files from the archive.\n"
-#~ msgstr ""
-#~ "GNU `tar' sprema mnogo datoteka zajedno u jednu arhivu na traci ili "
-#~ "disku, i\n"
-#~ "može povratiti pojedinačne datoteke iz arhive.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "If a long option shows an argument as mandatory, then it is mandatory\n"
-#~ "for the equivalent short option also. Similarly for optional arguments.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ako duga opcija pokazuje agument kao obavezan, onda je obavezan\n"
-#~ "i za ekvivalentnu kratku opciju također. Jednako vrijedi i za "
-#~ "opcionalne\n"
-#~ "argumente.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Main operation mode:\n"
-#~ " -t, --list list the contents of an archive\n"
-#~ " -x, --extract, --get extract files from an archive\n"
-#~ " -c, --create create a new archive\n"
-#~ " -d, --diff, --compare find differences between archive and file "
-#~ "system\n"
-#~ " -r, --append append files to the end of an archive\n"
-#~ " -u, --update only append files newer than copy in archive\n"
-#~ " -A, --catenate append tar files to an archive\n"
-#~ " --concatenate same as -A\n"
-#~ " --delete delete from the archive (not on mag tapes!)\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Glavni mod rada:\n"
-#~ " -t, --list ispiši sadržaje arhive\n"
-#~ " -x, --extract, --get ekstrahiraj datoteke iz arhive\n"
-#~ " -c, --create kreiraj novu arhivu\n"
-#~ " -d, --diff, --compare nađi razlike između arhive i datotečnog "
-#~ "sustava\n"
-#~ " -r, --append nadodaj datoteke na kraj arhive\n"
-#~ " -u, --update nadodaj samo datoteke novije od kopije u "
-#~ "arhivi\n"
-#~ " -A, --catenate nadodaj tar datoteke na arhivu\n"
-#~ " --concatenate isto kao -A\n"
-#~ " --delete izbriši iz arhive (ne radi na magnetskim "
-#~ "trakama!)\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Operation modifiers:\n"
-#~ " -W, --verify attempt to verify the archive after writing "
-#~ "it\n"
-#~ " --remove-files remove files after adding them to the "
-#~ "archive\n"
-#~ " -k, --keep-old-files don't replace existing files when "
-#~ "extracting\n"
-#~ " --overwrite overwrite existing files when extracting\n"
-#~ " --overwrite-dir overwrite directory metadata when "
-#~ "extracting\n"
-#~ " -U, --unlink-first remove each file prior to extracting over "
-#~ "it\n"
-#~ " --recursive-unlink empty hierarchies prior to extracting "
-#~ "directory\n"
-#~ " -S, --sparse handle sparse files efficiently\n"
-#~ " -O, --to-stdout extract files to standard output\n"
-#~ " -G, --incremental handle old GNU-format incremental backup\n"
-#~ " -g, --listed-incremental=FILE\n"
-#~ " handle new GNU-format incremental backup\n"
-#~ " --ignore-failed-read do not exit with nonzero on unreadable "
-#~ "files\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Modifikatori operacija: -W, --verify pokušaj verificirati "
-#~ "arhivu nakon pisanja\n"
-#~ " --remove-files obriši datoteke nakon njihovog dodavanja "
-#~ "arhivi\n"
-#~ " -k, --keep-old-files ne zamjenjuj postojeće datoteke kod "
-#~ "ekstrakcije\n"
-#~ " --overwrite prepisuj postojeće datoteke kod ekstrakcije\n"
-#~ " --overwrite-dir prepisuj meta-podatke direktorija kod "
-#~ "ekstrakcije\n"
-#~ " -U, --unlink-first obriši svaku datoteku prije ekstrakcije preko "
-#~ "nje\n"
-#~ " --recursive-unlink isprazni hijerarhije prije ekstrahiranja u\n"
-#~ " direktorij\n"
-#~ " -S, --sparse tretiraj efikasno 'sparse' datoteke\n"
-#~ " (slabo popunjene datoteke)\n"
-#~ " -O, --to-stdout ekstrahiraj datoteke na standardni izlaz\n"
-#~ " -G, --incremental obradi inkrementalni backup starog GNU-"
-#~ "formata\n"
-#~ " -g, --listed-incremental=FILE\n"
-#~ " obradi inkrementalni backup novog GNU-formata\n"
-#~ " --ignore-failed-read\n"
-#~ " ne završavaj uz ne-nula izlazni kod na\n"
-#~ " nečitljivim datotekama\n"
-
-# FIXME -- 'volume number' -- TM
-#~ msgid ""
-#~ "\n"
-#~ "Handling of file attributes:\n"
-#~ " --owner=NAME force NAME as owner for added files\n"
-#~ " --group=NAME force NAME as group for added files\n"
-#~ " --mode=CHANGES force (symbolic) mode CHANGES for added "
-#~ "files\n"
-#~ " --atime-preserve don't change access times on dumped files\n"
-#~ " -m, --modification-time don't extract file modified time\n"
-#~ " --same-owner try extracting files with the same "
-#~ "ownership\n"
-#~ " --no-same-owner extract files as yourself\n"
-#~ " --numeric-owner always use numbers for user/group names\n"
-#~ " -p, --same-permissions extract permissions information\n"
-#~ " --no-same-permissions do not extract permissions information\n"
-#~ " --preserve-permissions same as -p\n"
-#~ " -s, --same-order sort names to extract to match archive\n"
-#~ " --preserve-order same as -s\n"
-#~ " --preserve same as both -p and -s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Tretiranje atributa datoteka:\n"
-#~ " --owner=NAME forsiraj NAME za vlasnika dodanih "
-#~ "datoteka\n"
-#~ " --group=NAME forsiraj NAME za grupu dodanih datoteka\n"
-#~ " --mode=CHANGES forsiraj (symboličke) promjene pristupnog\n"
-#~ " moda za dodane datoteke\n"
-#~ " --atime-preserve ne mijenjaj vremena pristupa (access "
-#~ "time)\n"
-#~ " pohranjenim datotekama\n"
-#~ " -m, --modification-time ne ekstrahiraj vremena modifikacije\n"
-#~ " --same-owner pokušaj postaviti vlasništvo datoteka\n"
-#~ " kao u arhivi\n"
-#~ " --no-same-owner ekstrahiraj datoteke pod svojim "
-#~ "vlasništvom\n"
-#~ " --numeric-owner uvijek koristi numerička imena\n"
-#~ " korisnika/grupa\n"
-#~ " -p, --same-permissions ekstrahiraj informacije o dozvolama\n"
-#~ " --no-same-permissions ne ekstrahiraj informacije o dozvolama\n"
-#~ " --preserve-permissions isto kao -p\n"
-#~ " -s, --same-order sortiraj imena kod ekstrakcije da "
-#~ "odgovaraju\n"
-#~ " arhivi\n"
-#~ " --preserve-order isto kao -s\n"
-#~ " --preserve isto kao -p i -s zajedno\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Device selection and switching:\n"
-#~ " -f, --file=ARCHIVE use archive file or device ARCHIVE\n"
-#~ " --force-local archive file is local even if has a "
-#~ "colon\n"
-#~ " --rsh-command=COMMAND use remote COMMAND instead of rsh\n"
-#~ " -[0-7][lmh] specify drive and density\n"
-#~ " -M, --multi-volume create/list/extract multi-volume "
-#~ "archive\n"
-#~ " -L, --tape-length=NUM change tape after writing NUM x 1024 "
-#~ "bytes\n"
-#~ " -F, --info-script=FILE run script at end of each tape (implies -"
-#~ "M)\n"
-#~ " --new-volume-script=FILE same as -F FILE\n"
-#~ " --volno-file=FILE use/update the volume number in FILE\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Selektiranje i mijenjanje uređaja:\n"
-#~ " -f, --file=ARCHIVE koristi datoteku ili uređaj za "
-#~ "arhiviranje\n"
-#~ " ARCHIVE\n"
-#~ " --force-local ime arhive je lokalno čak i ako sadrži\n"
-#~ " dvotočku\n"
-#~ " --rsh-command=COMMAND koristi remote COMMAND umjesto rsh\n"
-#~ " -[0-7][lmh] specificiraj drive i density\n"
-#~ " -M, --multi-volume kreiraj/izlistaj/ekstrahiraj višedjelne\n"
-#~ " arhive\n"
-#~ " -L, --tape-length=NUM promijeni traku nakon ispisivanja\n"
-#~ " NUM x 1024 bajtova\n"
-#~ " -F, --info-script=FILE pokreni skriptu na kraju svake trake\n"
-#~ " (podrazumijeva -M)\n"
-#~ " --new-volume-script=FILE isto kao -F FILE\n"
-#~ " --volno-file=FILE koristi/nadopuni volume number u FILE\n"
-
-# FIXME -- clear this 'device blocking' xlation -- TM
-# FIXME -- vidi ovaj 'znači EOF' u man -- TM
-#~ msgid ""
-#~ "\n"
-#~ "Device blocking:\n"
-#~ " -b, --blocking-factor=BLOCKS BLOCKS x 512 bytes per record\n"
-#~ " --record-size=SIZE SIZE bytes per record, multiple of 512\n"
-#~ " -i, --ignore-zeros ignore zeroed blocks in archive (means "
-#~ "EOF)\n"
-#~ " -B, --read-full-records reblock as we read (for 4.2BSD pipes)\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Faktor grupiranja u blokove na uređaju (device blocking):\n"
-#~ " -b, --blocking-factor=BLOCKS BLOCKS x 512 bajtova po zapisu (record)\n"
-#~ " --record-size=SIZE SIZE bajtova po zapisu, višekratnik od "
-#~ "512\n"
-#~ " -i, --ignore-zeros ignoriraj blokove ispunjene nulama u "
-#~ "arhivi\n"
-#~ " (koji inače znače EOF)\n"
-#~ " -B, --read-full-records pregrupiraj blokove dok čitaš\n"
-#~ " (za 4.2BSD cjevovode -- pipes)\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Archive format selection:\n"
-#~ " -V, --label=NAME create archive with volume name "
-#~ "NAME\n"
-#~ " PATTERN at list/extract time, a globbing "
-#~ "PATTERN\n"
-#~ " -o, --old-archive, --portability write a V7 format archive\n"
-#~ " --posix write a POSIX format archive\n"
-#~ " -j, --bzip2 filter the archive through bzip2\n"
-#~ " -z, --gzip, --ungzip filter the archive through gzip\n"
-#~ " -Z, --compress, --uncompress filter the archive through compress\n"
-#~ " --use-compress-program=PROG filter through PROG (must accept -"
-#~ "d)\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Selekcija formata arhive:\n"
-#~ " -V, --label=NAME kreiraj arhivu s imenom dijela "
-#~ "arhive NAME\n"
-#~ " PATTERN u vrijeme izlistavanja/ekstrakcije,\n"
-#~ " koristi PATTERN za globbing\n"
-#~ " -o, --old-archive, --portability ispiši V7 format arhivu\n"
-#~ " --posix ispiši POSIX format arhivu\n"
-#~ " -j, --bzip2 filtriraj arhivu kroz bzip2\n"
-#~ " -z, --gzip, --ungzip filtriraj arhivu kroz gzip\n"
-#~ " -Z, --compress, --uncompress filtriraj arhivu kroz compress\n"
-#~ " --use-compress-program=PROG filtriraj kroz program PROG (moji "
-#~ "mora\n"
-#~ " prihvaćati opciju -d)\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Local file selection:\n"
-#~ " -C, --directory=DIR change to directory DIR\n"
-#~ " -T, --files-from=NAME get names to extract or create from file "
-#~ "NAME\n"
-#~ " --null -T reads null-terminated names, disable -"
-#~ "C\n"
-#~ " --exclude=PATTERN exclude files, given as a PATTERN\n"
-#~ " -X, --exclude-from=FILE exclude patterns listed in FILE\n"
-#~ " --anchored exclude patterns match file name start "
-#~ "(default)\n"
-#~ " --no-anchored exclude patterns match after any /\n"
-#~ " --ignore-case exclusion ignores case\n"
-#~ " --no-ignore-case exclusion is case sensitive (default)\n"
-#~ " --wildcards exclude patterns use wildcards (default)\n"
-#~ " --no-wildcards exclude patterns are plain strings\n"
-#~ " --wildcards-match-slash exclude pattern wildcards match "
-#~ "'/' (default)\n"
-#~ " --no-wildcards-match-slash exclude pattern wildcards do not match "
-#~ "'/'\n"
-#~ " -P, --absolute-names don't strip leading `/'s from file names\n"
-#~ " -h, --dereference dump instead the files symlinks point to\n"
-#~ " --no-recursion avoid descending automatically in "
-#~ "directories\n"
-#~ " -l, --one-file-system stay in local file system when creating "
-#~ "archive\n"
-#~ " -K, --starting-file=NAME begin at file NAME in the archive\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Selekcija lokalnih datoteka:\n"
-#~ " -C, --directory=DIR promijeni direktorij u DIR\n"
-#~ " -T, --files-from=NAME dobavi imena za ekstrahirati ili kreirati\n"
-#~ " iz datoteke NAME\n"
-#~ " --null -T čita nul-terminirana imena, onemogući -"
-#~ "C\n"
-#~ " --exclude=PATTERN izostavi datoteke, dane s PATTERN\n"
-#~ " -X, --exclude-from=FILE izostavi uzorak datoteka: pobrojane u "
-#~ "FILE\n"
-#~ " --anchored - koje započinju tim imenom (default)\n"
-#~ " --no-anchored - koje se podudaraju s uzorkom nakon "
-#~ "nekog '/'\n"
-#~ " --ignore-case izostavljanje ignorira razliku\n"
-#~ " između velikih i malih slova\n"
-#~ " --no-ignore-case izostavljanje uzima u obzir razliku\n"
-#~ " između malih i velikih slova "
-#~ "(default)\n"
-#~ " --wildcards izostavi uzorke koristi wildcard "
-#~ "(default)\n"
-#~ " --no-wildcards uzorci za izostavljanje su obični nizovi\n"
-#~ " --wildcards-match-slash izostavi uzorak wildcard podudara '/'\n"
-#~ " (default)\n"
-#~ " --no-wildcards-match-slash\n"
-#~ " izostavi uzorak - wildcard ne podudara "
-#~ "'/'\n"
-#~ " -P, --absolute-names ne briši vodeće `/' iz imena datoteka\n"
-#~ " -h, --dereference ne arhiviraj simbolički link nego "
-#~ "datoteku\n"
-#~ " na koju pokazuje\n"
-#~ " --no-recursion ne idi rekurzivno u poddirektorije\n"
-#~ " -l, --one-file-system ne prelazi na drugi datotečni sustav\n"
-#~ " kod kreiranja datoteka\n"
-#~ " -K, --starting-file=NAME počni s imenom NAME u arhivi kod "
-#~ "ekstrakcije\n"
-
-#~ msgid ""
-#~ " -N, --newer=DATE only store files newer than DATE\n"
-#~ " --newer-mtime=DATE compare date and time when data changed "
-#~ "only\n"
-#~ " --after-date=DATE same as -N\n"
-#~ msgstr ""
-#~ " -N, --newer=DATE pohranjuj samo datoteke novije od DATE\n"
-#~ " --newer-mtime=DATE usporedi datum i vrijeme samo\n"
-#~ " ako su se promijenili podaci\n"
-#~ " --after-date=DATE isto kao -N\n"
-
-#~ msgid ""
-#~ " --backup[=CONTROL] backup before removal, choose version "
-#~ "control\n"
-#~ " --suffix=SUFFIX backup before removal, override usual "
-#~ "suffix\n"
-#~ msgstr ""
-#~ " --backup[=CONTROL] backup-iraj prije brisanja, izaberi "
-#~ "mehanizam\n"
-#~ " kontrole verzije\n"
-#~ " --suffix=SUFFIX backup-iraj prije brisanja, promijeni\n"
-#~ " standardni sufiks.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Informative output:\n"
-#~ " --help print this help, then exit\n"
-#~ " --version print tar program version number, then exit\n"
-#~ " -v, --verbose verbosely list files processed\n"
-#~ " --checkpoint print directory names while reading the archive\n"
-#~ " --totals print total bytes written while creating archive\n"
-#~ " -R, --block-number show block number within archive with each "
-#~ "message\n"
-#~ " -w, --interactive ask for confirmation for every action\n"
-#~ " --confirmation same as -w\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Informativni ispis:\n"
-#~ " --help ispiši ovu pomoć, potom završi\n"
-#~ " --version ispiši broj verzije tar programa, potom završi\n"
-#~ " -v, --verbose opširno izlistaj imena datoteka kod procesiranja\n"
-#~ " --checkpoint ispisuj imena direktorija dok čitaš arhivu\n"
-#~ " --totals ispisuj ukupan broj ispisanih bajtova dok "
-#~ "kreiraš\n"
-#~ " arhivu\n"
-#~ " -R, --block-number prikaži broj bloka unutar arhive uz svaku poruku\n"
-#~ " -w, --interactive traži odobrenje za svaku akciju\n"
-#~ " --confirmation isto kao -w\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GNU tar cannot read nor produce `--posix' archives. If POSIXLY_CORRECT\n"
-#~ "is set in the environment, GNU extensions are disallowed with `--posix'.\n"
-#~ "Support for POSIX is only partially implemented, don't count on it yet.\n"
-#~ "ARCHIVE may be FILE, HOST:FILE or USER@HOST:FILE; DATE may be a textual "
-#~ "date\n"
-#~ "or a file name starting with `/' or `.', in which case the file's date is "
-#~ "used.\n"
-#~ "*This* `tar' defaults to `-f%s -b%d'.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "GNU tar ne može čitati ili proizvoditi `--posix' arhive. Ako je\n"
-#~ "POSIXLY_CORRECT definirano u environment okolini, GNU ekstenzije se\n"
-#~ "onemogućuju pomoću `--posix'. Podrška za POSIX je samo djelomično\n"
-#~ "implementirana, ne računajte još na nju.\n"
-#~ "ARCHIVE može biti FILE, HOST:FILE ili USER@HOST:FILE; DATE može biti\n"
-#~ "tekstualni datum ili ime datoteke koje započinje s `/' ili `.',\n"
-#~ "u kojem slučaju je korišten datum datoteke.\n"
-#~ "*Ovaj* `tar' podrazumijeva `-f%s -b%d'.\n"
-
-#~ msgid "Obsolete option, now implied by --blocking-factor"
-#~ msgstr "Zastarjela opcija, sada podrazumijevana s --blocking-factor"
-
-#~ msgid "Obsolete option name replaced by --blocking-factor"
-#~ msgstr "Zastarjelo ime opcije zamijenjeno s --blocking-factor"
-
-#~ msgid "Obsolete option name replaced by --read-full-records"
-#~ msgstr "Zastarjelo ime opcije zamijenjeno s --read-full-records"
-
-#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?"
-#~ msgstr "Upozorenje: opcija -I nije podržana; možda ste mislili -j ili -T?"
-
-#~ msgid "Obsolete option name replaced by --touch"
-#~ msgstr "Zastarjelo ime opcije zamijenjeno s --touch"
-
-#~ msgid "Obsolete option name replaced by --absolute-names"
-#~ msgstr "Zastarjelo ime opcije zamijenjeno s --absolute-names"
-
-#~ msgid "Obsolete option name replaced by --block-number"
-#~ msgstr "Zastarjelo ime opcije zamijenjeno s --block-number"
-
-#~ msgid "Warning: the -y option is not supported; perhaps you meant -j?"
-#~ msgstr "Upozorenje: opcija -y nije podržana; možda ste željeli -j?"
-
-#~ msgid "Obsolete option name replaced by --backup"
-#~ msgstr "Zastarjelo ime opcije zamijenjeno s --backup"
-
-#~ msgid "Written by John Gilmore and Jay Fenlason."
-#~ msgstr "Napisali John Gilmore i Jay Fenlason."
-
-#~ msgid "Error exit delayed from previous errors"
-#~ msgstr "Pogrešan izlaz (naknadno) zbog prijašnjih pogrešaka"
-
-#~ msgid ""
-#~ "If a long option shows an argument as mandatory, then it is mandatory\n"
-#~ "for the equivalent short option also.\n"
-#~ "\n"
-#~ " -l, --file-length=LENGTH LENGTH of generated file\n"
-#~ " -p, --pattern=PATTERN PATTERN is `default' or `zeros'\n"
-#~ " --help display this help and exit\n"
-#~ " --version output version information and exit\n"
-#~ msgstr ""
-#~ "Ako duga opcija pokazuje argument kao obavezan, tada je on obavezan\n"
-#~ "također i za ekvivalentnu kratku verziju opcije.\n"
-#~ "\n"
-#~ " -l, --file-length=LENGTH LENGTH (duljina) generirane datoteke\n"
-#~ " -p, --pattern=PATTERN PATTERN je `default' ili `zeros'\n"
-#~ " --help ispiši ovu pomoć i završi\n"
-#~ " --version ispiši informaciju o verziji i završi\n"
+#~ msgid "OPTION"
+#~ msgstr "OPCIJA"
diff --git a/po/hu.gmo b/po/hu.gmo
index d4852ca889697464e608b5847a45f4adb318e106..2265dbe134ba3f01c4731c1b3264efb9a55b1fef 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 92272ec8c12f5da7f717cc6372b61715d0e086c3..14aefeeecebad6b8953b098fd4d4c8fb40deefad 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,25 +1,25 @@
# Hungarian translation of the GNU tar.
-# Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010, 2014, 2015, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010, 2014, 2015, 2016, 2018 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
#
# Gábor István <stive@mezobereny.hu>, 2002.
# Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2007, 2008, 2009, 2010, 2014, 2016.
-# Balázs Úr <urbalazs@gmail.com>, 2015.
-#: src/create.c:1599
+# Balázs Úr <urbalazs@gmail.com>, 2015, 2018.
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-28 11:58+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-01-20 14:21+0100\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: gnu/argmatch.c:134
@@ -101,7 +101,7 @@ msgid "give a short usage message"
msgstr "rövid használati utasítás megjelenítése"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NÉV"
@@ -139,29 +139,29 @@ msgid "write error"
msgstr "íráshiba"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n"
+msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű, lehetőségek:"
+msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű, lehetőségek:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: a(z) „%c%s” kapcsoló ismeretlen\n"
+msgstr "%s: a(z) „%s%s” kapcsoló ismeretlen\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „%c%s” kapcsoló nem enged meg argumentumot\n"
+msgstr "%s: a(z) „%s%s” kapcsoló nem enged meg argumentumot\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: a(z) „--%s” kapcsolóhoz argumentum szükséges\n"
+msgstr "%s: a(z) „%s%s” kapcsolóhoz argumentum szükséges\n"
#: gnu/getopt.c:621
#, c-format
@@ -236,12 +236,12 @@ msgstr "^[iIyY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Csomagolta: %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Csomagolta: %s\n"
@@ -249,12 +249,11 @@ msgstr "Csomagolta: %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -264,8 +263,8 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Licenc: GPLv3+: A GNU GPL 3. vagy újabb változata <http://gnu.org/licenses/"
-"gpl.html>\n"
+"Licenc: GPLv3+: A GNU GPL 3. vagy újabb változata <https://gnu.org/licenses/"
+"gpl.html>.\n"
"Ez egy szabad szoftver: terjesztheti és/vagy módosíthatja.\n"
"NINCS GARANCIA, a törvény által engedélyezett mértékig.\n"
"\n"
@@ -402,16 +401,15 @@ msgid "%s home page: <%s>\n"
msgstr "A(z) %s honlapja: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "A(z) %s honlapja: <http://www.gnu.org/software/%s/>.\n"
+msgstr "A(z) %s honlapja: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Általános segítség a GNU szoftverek használatához: <http://www.gnu.org/"
-"gethelp/>.\n"
+"Általános segítség a GNU szoftverek használatához: <https://www.gnu.org/"
+"gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -534,196 +532,196 @@ msgstr "Nem irányíthatók át fájlok a távoli parancssorhoz"
msgid "Cannot execute remote shell"
msgstr "Nem futtatható távoli parancssor"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "A keresési irány kívül esik a tartományon"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Érvénytelen pozicionálási irány"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Érvénytelen pozicionálási eltolás"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "A keresési eltolás kívül esik a tartományon"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Érvénytelen bájtszám"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "A bájtszám kívül esik a tartományon"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Idő előtti fájlvége"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Érvénytelen működési kód"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "A művelet nem támogatott"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Váratlan paraméterek"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
"Szalagos meghajtó manipulálása, parancsok elfogadása távoli folyamattól"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "SZÁM"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "hibakeresési szint beállítása"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FÁJL"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "hibakeresés kimeneti fájlnevének beállítása"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "a(z) %s nem nyitható meg"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "túl sok argumentum"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Értelmetlen parancs"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Ez nem úgy néz ki, mint egy tar archívum"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Olvasott bájtok teljes száma"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Kiírt bájtok teljes száma"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Törölt bájtok teljes száma"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(cső)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Az archívumtartalom olvasásának visszautasítása a terminálról (hiányzó -f "
"kapcsoló?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"Az archívumtartalom írásának visszautasítása a terminálra (hiányzó -f "
"kapcsoló?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "A record_size értéke érvénytelen"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Nem adott meg archívumnevet"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Nem ellenőrizhető az archívum, ha a szabványos be/kimenetet használja"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Az archívum tömörített. Használja a(z) %s kapcsolót."
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Tömörített archívumok nem frissíthetők"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "A szalag eleje, most kilépek"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Túl sok hiba, kilépek"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Rekordméret = %lu blokk"
msgstr[1] "Rekordméret = %lu blokk"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Kitöltetlen blokk (%lu bájt) az archívumban"
msgstr[1] "Kitöltetlen blokk (%lu bájt) az archívumban"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Nem törölhető vissza az archív fájl, lehet hogy olvashatatlan lesz a -i "
"nélkül"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "az rmtlseek nem állt meg egy rekord határán"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: érvénytelen kötetszámot tartalmaz"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Kötetszám-túlcsordulás"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Készítse elő a(z) %d kötetet %s számára és üssön entert:"
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Fájlvége a várt felhasználói válasz helyett"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "FIGYELMEZTETÉS: Az archívum befejezetlen"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -734,67 +732,67 @@ msgstr ""
" q A Tar megszakítása\n"
" y vagy újsor A művelet folytatása\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Új parancsértelmező hívása\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Ezen lista kiírása\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Nincs új kötet, kilépés.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Nincs megadva fájlnév, próbálkozzon újra.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Érvénytelen bemenet. A súgó a ? beírásával kérhető le.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "A(z) „%s” parancs meghiúsult"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s nem folytatódik ezen a köteten"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s lehetséges, hogy ezen a köteten folytatódott: a fejléc csonkolt nevet "
"tartalmaz"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s mérete hibás (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Ez a kötet kívül esik a sorozaton (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Az archívum nincs úgy címkézve, hogy megfeleljen a következőhöz: %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "A(z) %s kötet nem felel meg a következőnek: %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -802,214 +800,214 @@ msgstr ""
"%s: a fájlnév túl hosszú egy GNU többkötetes fejlécben való tároláshoz, "
"csonkításra került"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "az írás nem egy rekord határán fejeződött be"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Csak %lu bájt olvasható %lu bájtból"
msgstr[1] "Csak %lu bájt olvasható %lu bájtból"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "A tartalom eltér"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Váratlan fájlvége jel az archívumban"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "A fájltípus eltér"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "A mód eltér"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Az Uid eltér"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "A Gid eltér"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "A módosítási idő eltér"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "A méret eltér"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Nincs a következőre linkelve: %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "A szimbolikus link eltér"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Az eszközszám eltér"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Ellenőrzés "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
"%s: A(z) „%c” fájltípus ismeretlen, a diffelés normális fájlként történt"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Az archívum eltávolított előtagokkal rendelkező fájlneveket tartalmaz."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Az archívum átalakított fájlneveket tartalmaz."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr ""
"Lehetséges, hogy az ellenőrzés nem fogja megtalálni az eredeti fájlokat."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "AZ ELLENŐRZÉS SIKERTELEN: %d érvénytelen fejléc található"
msgstr[1] "AZ ELLENŐRZÉS SIKERTELEN: %d érvénytelen fejléc található"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Egy magányos nulla blokk %s helyen"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: fájl gyorsítótár-könyvtár címkét tartalmaz (%s); %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr ""
"a(z) %s érték a(z) %s %s...%s tartományán kívül esik, helyettesítve a "
"következővel: %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "a(z) %s érték a(z) %s %s...%s tartományán kívül esik"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Negatív oktális fejlécek előállítása"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: a fájlnév túl hosszú (maximum: %d), nem kerül kiírásra"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: a fájlnév túl hosszú (nem darabolható), nem kerül kiírásra"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: a fájlnév túl hosszú, nem kerül kiírásra"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: a fájl zsugorítva %s bájtra, nullákkal kerül kitöltésre"
msgstr[1] "%s: a fájl zsugorítva %s bájtra, nullákkal kerül kitöltésre"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: a fájl eltérő fájlrendszeren van, nem kerül kiírásra"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "a tartalom nem került kiírásra"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Ismeretlen fájltípus, fájl a figyelmen kívül hagyva"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Hiányzó linkek a következőre: „%s”."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: a fájl változatlan, nem kerül kiírásra"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: a fájl az archívumban van, nem kerül kiírásra"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "a könyvtár nem került kiírásra"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: a fájl módosult olvasás közben"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: a foglalat figyelmen kívül hagyva"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: ajtó figyelmen kívül hagyva"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Ugrás a következő fejlécre"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "A nem fejlécek törlése az archívumból"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: valószínűtlenül régi időbélyeg: %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: a(z) %s időbélyeg %s másodperccel a jövőbe mutat"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Váratlan inkonzisztencia a könyvtár létrehozása során"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: meglévő fájl kihagyása"
@@ -1032,7 +1030,7 @@ msgstr "Kísérlet a szimbolikus linkek kibontására közvetlen linkként"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: nem lehet kibontani -- a fájl egy másik köteten folytatódik"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Váratlan hosszú névfejléc"
@@ -1049,7 +1047,7 @@ msgstr "A jelenlegi „%s” újabb vagy egyező korú"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: A tagnév „..” szöveget tartalmaz"
#: src/extract.c:1696
#, c-format
@@ -1061,22 +1059,22 @@ msgstr "%s: Nem sikerült biztonsági mentést készíteni erről a fájlról"
msgid "Cannot rename %s to %s"
msgstr "%s: Nem nevezhető át a következőre: %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: A könyvtár át lett nevezve a következőről: %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: a könyvtár új"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: a könyvtár eltérő fájlrendszeren van, nem kerül kiírásra"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: a könyvtár át lett nevezve"
@@ -1207,36 +1205,36 @@ msgstr "%s: %s törlése\n"
msgid "%s: Cannot remove"
msgstr "%s: nem távolítható el"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: kihagyás"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blokk %s: ** A blokk üres **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blokk %s: ** Fájlvége **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blokk %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr ""
"Üres értékek a fejléc azon részében, ahol a program a(z) %s számértéket várta"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1244,162 +1242,162 @@ msgstr ""
"feltételezi, hogy kettes komplemens"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Az archívum %.*s oktális értéke túllépi a(z) %s tartományt"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Az archívum elavulófélben levő base-64-es fejléceket tartalmaz"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr ""
"Az archívum előjeles base-64 karakterlánca (%s) túllépi a(z) %s tartományt"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Az archívum base-256-os értéke túllépi a(z) %s tartományt"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Az archívum %.*s értéket tartalmaz, ahol a program %s számértéket vár"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Az archívum %s értéke túllépi a(z) %s %s..%s tartományát"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " link a következőre: %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " ismeretlen fájltípus: %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Hosszú link--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Hosszú név--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Kötetfejléc--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Folytatva %s bájttól--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Könyvtár létrehozása:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "%s átnevezése a következőre: %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Nem nevezhető át a következőre: %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "%s helyreállítása a következő névre: %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: a fájl el lett távolítva a beolvasás előtt"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "gyermekfolyamat"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "folyamatközi csatorna"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Helyi fájlnévválasztás:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"az adott FÁJL hozzáadása az archívumhoz (hasznos, ha neve kötőjellel "
"kezdődik)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "KÖNYVTÁR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "váltás a KÖNYVTÁR könyvtárba"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "kibontandó nevek lekérdezése vagy létrehozás a FÁJLBÓL"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
"a -T nullal lezárt neveket olvas, következik belőle a --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "a korábbi --null kapcsoló hatásának letiltása"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"a bemeneti fájl vagy tagnevek idézettségének megszüntetése (alapértelmezett)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "ne szüntesse meg a bemeneti fájl vagy tagnevek idézettségét"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "a -T változatlan fájlneveket olvas (nincs kapcsolókezelés)"
+msgstr ""
+"a -T változatlan fájlneveket olvas (nincs elfedés vagy kapcsolókezelés)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "a -T a kötőjellel kezdődő fájlneveket kapcsolónak tekinti (alapeset)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "MINTA"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "a MINTAKÉNT megadott fájlok kihagyása"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "a FÁJLBAN megadott minták kihagyása"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1407,24 +1405,24 @@ msgstr ""
"a CACHEDIR.TAG-et tartalmazó könyvtárak tartalmának kihagyása, a címkefájl "
"kivételével"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "a CACHEDIR.TAG-et tartalmazó könyvtárak alatt minden kihagyása"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "a CACHEDIR.TAG-et tartalmazó könyvtárak kihagyása"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"a FÁJLT tartalmazó könyvtárak tartalmának kihagyása, a FÁJL kivételével"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "kizáró minták olvasása minden egyes könyvtárhoz a FÁJLBÓL, ha létezik"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1432,120 +1430,124 @@ msgstr ""
"kizáró minták olvasása minden egyes könyvtárhoz és annak alkönyvtáraihoz a "
"FÁJLBÓL, ha létezik"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "a FÁJLT tartalmazó könyvtárak alatt minden kihagyása"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "a FÁJLT tartalmazó könyvtárak kihagyása"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "verziókezelő rendszer könyvtárainak kihagyása"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "kizárási minták olvasása a VCS ignore fájlokból"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "mentési és zárolási fájlok kihagyása"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "belépés a könyvtárakba rekurzívan (alapértelmezett)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "ne lépjen be automatikusan a könyvtárakba"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Fájlnévillesztés beállításai (érintik mind a kihagyási, mind a felvételi "
"mintákat):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "a minták illesztése a fájlnevek elejére"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "a minták illesztése bármely „/” után (alapértelmezett kihagyáskor)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "kis- és nagybetűk figyelmen kívül hagyása"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "kis- és nagybetűkre érzékeny illesztés (alapértelmezett)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "helyettesítő karakterek használata (alapértelmezett kihagyáskor)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "szó szerinti karakterlánc-illesztés"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr ""
"a helyettesítő karakterek illeszkednek a „/” jelre (alapértelmezett "
"kihagyáskor)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "a helyettesítő karakterek nem illeszkednek a „/” jelre"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"A következő kapcsolók voltak használva minden nem elhagyható argumentum után "
+"az archívumlétrehozási vagy -frissítési módban. Ezek a kapcsolók helyzetiek, "
+"és csak az őket követő argumentumokat érintik. Rendezze őket újra megfelelő "
+"sorrendbe."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "a -C %s kapcsolónak nincs hatása"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "a --%s %s kapcsolónak nincs hatása"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "a --%s kapcsolónak nincs hatása"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "parancssor"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: a(z) %s helyről kért fájllista már be van olvasva innen: %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "nem darabolható a(z) „%s” karakterlánc: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: a beolvasott fájlnév null karaktert tartalmaz"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Mintaillesztő karaktereket használt a fájlnevekben"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1553,47 +1555,47 @@ msgstr ""
"Használja a --wildcards kapcsolót a mintaillesztés engedélyezéséhez, vagy a "
"--no-wildcards kapcsolót ezen figyelmeztetés letiltásához"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Nem található az archívumban"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: A szükséges előfordulás nem található az archívumban"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Hibás archívumcímke"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"A -C használata fájllistán belül nem engedélyezett a --listed-incremental "
"kapcsolóval"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Csak egy -C engedélyezett a --listed-incremental kapcsolóval"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "A(z) „%s” és a(z) „%s” kapcsolók mind a szabványos bemenetet igénylik"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Érvénytelen archívumformátum"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU szolgáltatásokat kértél inkompatibilis az archívumformátumokon"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1819,7 +1821,7 @@ msgstr "Kimeneti adatfolyam kiválasztása:"
msgid "extract files to standard output"
msgstr "fájlok kibontása a szabványos kimenetre"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "PARANCS"
@@ -1855,7 +1857,7 @@ msgstr "a FÁJL használata a fájltulajdonos UID-ek és nevek leképezésére"
msgid "use FILE to map file owner GIDs and names"
msgstr "a FÁJL használata a fájltulajdonos GID-ek és nevek leképezésére"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DÁTUM-VAGY-FÁJL"
@@ -2069,7 +2071,7 @@ msgstr "újrablokkolás olvasáskor (4.2BSD csövekhez)"
msgid "Archive format selection:"
msgstr "Archívumformátum kiválasztása:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMÁTUM"
@@ -2154,63 +2156,63 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "tömörítése a PROG használatával (el kell fogadnia a -d kapcsolót)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Helyi fájlválasztás:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "az archívum létrehozásakor maradjon a helyi fájlrendszeren"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "ne vágja le a kezdő „/” jelet a fájlnevekből"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"szimbolikus linkek követése; az általuk mutatott fájlok archiválása és "
"kiíratása"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"közvetlen linkek követése; az általuk mutatott fájlok archiválása és "
"kiíratása"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "TAGNÉV"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "kezdés a TAGNÉV tagnál az archívum olvasásakor"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "csak a DÁTUM-VAGY-FÁJL dátumnál újabb fájlok tárolása"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DÁTUM"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "dátum és idő összehasonlítása ha csak a dátum módosult"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "FELÜGYELET"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "mentés eltávolítás előtt, a FELÜGYELET verzió kiválasztása"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "KARAKTERLÁNC"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2218,62 +2220,62 @@ msgstr ""
"mentés eltávolítás előtt, a szokásos utótag („~”, hacsak a "
"SIMPLE_BACKUP_SUFFIX környezeti változó nem bírálja felül) felülbírálása"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Fájlnév-átalakítások:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "a fájlnevek SZÁM darab kezdő összetevőjének levágása kibontáskor"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "KIFEJEZÉS"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
"A KIFEJEZÉS sed helyettesítőkifejezés használata fájlnevek átalakítására"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informatív kimenet:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "feldolgozott fájlok bőbeszédű listázása"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "KULCSSZÓ"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "figyelmeztetés felügyelete"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"előrehaladási üzenetek megjelenítése minden SZÁM. rekordnál (alapértelmezés: "
"10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "MŰVELET"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "a MŰVELET végrehajtása minden ellenőrzőponton"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "üzenet kiírása, ha nem minden link került kiíratásra"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SZIGNÁL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2285,35 +2287,35 @@ msgstr ""
"Az engedélyezett szignálok: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 és SIGUSR2; a "
"SIG előtag nélküli nevek is elfogadottak"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "a fájlmódosítási idők kiírása UTC szerint"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "fájl módosítási idejének kiírása teljes pontossággal"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "bőbeszédű kimenet küldése a FÁJLBA"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "az archívumon belüli blokkszám megjelenítése minden egyes üzenettel"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "megerősítés kérése minden egyes művelethez"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "a tar alapértelmezéseinek megjelenítése"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "érvényes tartományok megjelenítése a pillanatkép-fájl mezőkhöz"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2321,31 +2323,31 @@ msgstr ""
"listázáskor vagy kibontáskor minden egyes, a keresési feltételnek meg nem "
"felelő könyvtár listázása"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "fájl- vagy archívumnevek megjelenítése átalakítás után"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STÍLUS"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "az idézési stílus beállítása, az érvényes STÍLUS értékeket lásd alább"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "a KARAKTERLÁNCBÓL származó karakterek kiegészítő idézése"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "a KARAKTERLÁNCBÓL származó karakterek idézésének letiltása"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Kompatibilitási kapcsolók:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2353,22 +2355,22 @@ msgstr ""
"létrehozáskor megegyezik a --old-archive kapcsolóval; kibontáskor a --no-"
"same-owner kapcsolóval"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Egyéb kapcsolók:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "néhány potenciálisan káros kapcsoló használatának letiltása"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "a(z) „%s” kapcsoló nem használható a következővel: „%s”"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2376,40 +2378,40 @@ msgstr ""
"A következő kapcsolók közül egynél többet nem használhat: „-Acdtrux”, „--"
"delete” vagy „--test-label”"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "A tömörítési kapcsolók ütköznek"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Ismeretlen szignálnév: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "A dátummintafájl nem található"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "%s cseréje az ismeretlen %s dátumformátumhoz"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "„%s” kapcsoló: A(z) „%s” dátum kezelése mint %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "az archívum tömörítése a(z) %s használatával"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "A --quoting-style kapcsoló érvényes paraméterei:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2417,164 +2419,164 @@ msgstr ""
"\n"
"*Ezen* tar alapértelmezései:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Érvénytelen tulajdonos- vagy csoportazonosító"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Érvénytelen blokkolási tényező"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Érvénytelen szalagméret"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Hibás növekményszintérték"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Egynél több küszöbdátum"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Érvénytelen ritka verzió érték"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr ""
"Az --atime-preserve='system' nem támogatott ezen az operációs rendszeren"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "A --checkpoint értéke nem egy egész"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Érvénytelen mód került megadásra a kapcsolóban"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Érvénytelen szám"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Érvénytelen rekordméret"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "A rekordméretnek %d többszörösének kell lennie."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Érvénytelen elemszám"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Csak egy --to-command kapcsoló engedélyezett"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Rosszul formázott sűrűségargumentum: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Ismeretlen sűrűség: „%c”"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "A „-[0-7][lmh]” kapcsolókat *ez* a tar NEM támogatja"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: a hiba helye"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "hiba a(z) „%s” elemzésekor"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FÁJL]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "nem kapcsoló argumentumok ebben: %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "nem darabolható a TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "A régi „%c” kapcsoló paramétert igényel."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "a --occurrence értelmetlen fájllista nélkül"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Több archívumfájl esetén szükséges a „-M” kapcsoló"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "a --level értelmetlen a --listed-incremental nélkül"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: A kötetcímke túl hosszú (a korlát %lu bájt)"
msgstr[1] "%s: A kötetcímke túl hosszú (a korlát %lu bájt)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "A többkötetes archívumok nem ellenőrizhetők"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "A tömörített archívumok nem ellenőrizhetők"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Nem használhatók többkötetes tömörített archívumok"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Tömörített archívumok nem fűzhetők össze"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "a --clamp-mtime egy, a --mtime használatával megadott dátumot igényel"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "a --pax kapcsoló csak POSIX archívumokon használható"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "a --acls kapcsoló csak POSIX archívumokon használható"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "a --selinux kapcsoló csak POSIX archívumokon használható"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "a --xattrs kapcsoló csak POSIX archívumokon használható"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2582,136 +2584,145 @@ msgstr ""
"Nem lehet kikövetkeztetni a felsőszintű könyvtár nevét; állítsa be világosan "
"a --one-top-level=KVT kapcsolóval"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "A kötet hossza nem lehet kisebb a rekord méreténél"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Üres archívum létrehozása visszautasítva"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Az „-Aru” kapcsolók összeférhetetlenek a „-f -” kapcsolóval"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Meg kell adnia a következő kapcsolók egyikét: „-Acdtrux”, „--delete” vagy „--"
"test-label”"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Kilépés hibaállapottal a korábbi hibák miatt"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: A fájl zsugorítva %s bájttal"
msgstr[1] "%s: A fájl zsugorítva %s bájttal"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "A(z) %s kulcsszó ismeretlen vagy még nincs megvalósítva"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Az időbélyeg kívül esik az engedélyezett tartományon"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "A(z) %s minta nem használható"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "A(z) %s minta nem bírálható felül"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Rosszul formázott kiterjesztett fejléc: a hossz hiányzik"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "A kiterjesztett fejléc %*s hossza kívül esik a tartományon"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr ""
"Rosszul formázott kiterjesztett fejléc: a hossz után hiányzik egy üres hely "
"karakter"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "A kiterjesztett fejléc hibás: egy egyenlőségjel hiányzik"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Rosszul formázott kiterjesztett fejléc: az újsor hiányzik"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
"A(z) „%s” ismeretlen kiterjesztett fejléc kulcsszó figyelmen kívül marad"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Az előállított kulcsszó/érték pár túl hosszú (kulcsszó: %s, hossz: %s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "A kiterjesztett fejléc %s=%s értéke túllépi a(z) %s..%s tartományát"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Rosszul formázott kiterjesztett fejléc: érvénytelen %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Rosszul formázott kiterjesztett fejléc: többlet %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
"Rosszul formázott kiterjesztett fejléc: érvénytelen %s: váratlan határoló "
"(%c)"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
"Rosszul formázott kiterjesztett fejléc: érvénytelen %s: az értékek száma "
"páratlan"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: érvénytelen időtúllépés"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: ismeretlen ellenőrzőpont-művelet"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "írás"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "olvasás"
@@ -2719,7 +2730,7 @@ msgstr "olvasás"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "%u. írási ellenőrzőpont"
@@ -2728,12 +2739,12 @@ msgstr "%u. írási ellenőrzőpont"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "%u. olvasási ellenőrzőpont"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2741,99 +2752,103 @@ msgstr ""
"a genfiles adatfájlokat kezel a GNU paxutils tesztcsomag számára.\n"
"A KAPCSOLÓK:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Fájllétrehozási kapcsolók:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "MÉRET"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Az adott MÉRETŰ fájl létrehozása"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Írás a NÉV nevű fájlba a szabványos kimenet helyett"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Fájlnevek beolvasása a FÁJLBÓL"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "a -T nullal lezárt neveket olvas"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"A fájl feltöltése az adott MINTÁVAL. A MINTA a 'default' (alapértelmezett) "
"vagy 'zeros' (nullák) egyike"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Egy blokk mérete ritka fájlhoz"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Ritka fájl előállítása. A parancssor többi része megadja a fájlleképezést."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "ELTOLÁS"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Az adott eltolásra pozicionálás az adatok kiírása előtt"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Nem végzetes diagnosztikai üzenetek elnyomása"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Fájlstatisztika kapcsolói:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"A stat struktúra tartalmának kiírása minden egyes megadott fájlhoz. Az "
"alapértelmezett FORMÁTUM: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Szinkron végrehajtási kapcsolók:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "KAPCSOLÓ"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Az adott ARGS végrehajtása. Hasznos a --checkpoint és a --cut, --append, --"
"touch vagy --unlink egyikével"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Az adott művelet (lásd alább) végrehajtása a SZÁM-adik ellenőrzőpont elérése "
"után"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Dátum beállítása a következő --touch kapcsoló számára"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
"Végrehajtott ellenőrzőpontok és a PARANCS kilépési állapotának megjelenítése"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2841,7 +2856,7 @@ msgstr ""
"Szinkron végrehajtási tevékenységek. Ezek a --checkpoint kapcsoló által "
"megadott számú ellenőrzőpont elérésekor kerülnek végrehajtásra."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2849,126 +2864,126 @@ msgstr ""
"A FÁJL csonkolása az előző --length kapcsoló által megadott méretre (vagy "
"nullára, ha nincs megadva)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"MÉRET bájt hozzáfűzése a FÁJLHOZ. A MÉRETET az előző --length kapcsoló adja "
"meg."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "A FÁJL hozzáférési és módosítási idejének frissítése"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "A PARANCS végrehajtása"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "FÁJL törlése"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Érvénytelen méret: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "A szám kívül esik az engedélyezett tartományon: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negatív méret: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "a stat(%s) meghiúsult"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "a kért fájlhossz %lu, a tényleges %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "a létrehozott fájl nem ritka"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Hiba a(z) „%s” közelében található szám elemzésekor"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Ismeretlen dátumformátum"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENTUMOK...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "a(z) „%s” nem nyitható meg"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "Nem lehet pozicionálni"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "a fájlnév null karaktert tartalmaz"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"nem állíthatók elő ritka fájlok a szabványos kimeneten, használja a --file "
"kapcsolót"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "helytelen maszk (a(z) „%s” közelében)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Ismeretlen mező: „%s”"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "nem állítható be az idő a következőn: „%s”"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "a(z) „%s” nem csonkítható"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "A(z) „%s” parancs meghiúsult"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "a(z) „%s” nem csonkítható"
+msgstr "a(z) „%s” nem érhető el"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "nem állítható be az idő a következőn: „%s”"
+msgstr "a(z) „%s” könyvtár nem távolítható el"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "a(z) „%s” nem törölhető"
@@ -3008,72 +3023,5 @@ msgstr "A parancs befejeződött\n"
msgid "--stat requires file names"
msgstr "a --stat fájlneveket igényel"
-#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-#~ msgstr "%.*s: Az ARGP_HELP_FMT paraméternek pozitívnak kell lennie"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: a(z) „--%s” kapcsoló ismeretlen\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: a „-W %s” kapcsolóhoz argumentum szükséges\n"
-
-#~ msgid "Unlink FILE"
-#~ msgstr "A FÁJL törlése"
-
-#~ msgid "same as both -p and -s"
-#~ msgstr "azonos, mint a -p és -s egyszerre"
-
-#~ msgid ""
-#~ "The --preserve option is deprecated, use --preserve-permissions --"
-#~ "preserve-order instead"
-#~ msgstr ""
-#~ "A --preserve kapcsoló elavult, használja a --preserve-permissions --"
-#~ "preserve-order kapcsolókat helyette"
-
-#~ msgid "--occurrence cannot be used with %s"
-#~ msgstr "a --occurrence nem használható ezzel: %s"
-
-#~ msgid "Cannot combine --listed-incremental with --newer"
-#~ msgstr ""
-#~ "A --listed-incremental és a --newer kapcsolók nem használhatók egyszerre"
-
-#~ msgid "--verify cannot be used with %s"
-#~ msgstr "A --verify nem használható ezzel: %s"
-
-#~ msgid "--preserve-order is not compatible with --listed-incremental"
-#~ msgstr ""
-#~ "a --preserve-order nem kompatibilis a --listed-incremental kapcsolóval"
-
-#~ msgid "Field too long while reading snapshot file"
-#~ msgstr "Túl hosszú mező a pillanatképfájl olvasása közben"
-
-#~ msgid "Read error in snapshot file"
-#~ msgstr "Olvasási hiba a pillanatképfájlban"
-
-#~ msgid "Unexpected field value in snapshot file"
-#~ msgstr "Váratlan mezőérték a pillanatképfájlban"
-
-#~ msgid "Cannot get working directory"
-#~ msgstr "A munkakönyvtár nem kérdezhető le"
-
-#~ msgid "%s: Directory removed before we read it"
-#~ msgstr "%s: a könyvtár el lett távolítva a beolvasás előtt"
-
-#~ msgid "sort names to extract to match archive"
-#~ msgstr ""
-#~ "kibontandó nevek rendezése, az archívumnak való megfelelés érdekében"
-
-#~ msgid "Invalid group"
-#~ msgstr "Érvénytelen csoport"
-
-#~ msgid "Extended header length is out of allowed range"
-#~ msgstr "A kiterjesztett fejléc hossza kívül esik a tartományon"
+#~ msgid "OPTION"
+#~ msgstr "KAPCSOLÓ"
diff --git a/po/id.gmo b/po/id.gmo
index 65bf8c8fafaf1467f64554f4ba6995dc7388f570..c447fb010965cd7d3c121b2f7245dbd225e954d8 100644
Binary files a/po/id.gmo and b/po/id.gmo differ
diff --git a/po/id.po b/po/id.po
index 00853d3163650add824aa83fb7fef135ebf6087a..ee9a9f3d1a3f2e6cb27e064aaee34c0a379e2e4f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -4,12 +4,12 @@
# Tedi Heriyanto <tedi_h@gmx.net>, 1999, 2002.
# Arif E. Nugroho <arif_endro@yahoo.com>, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar 1.28\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2014-08-02 10:00+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -97,7 +97,7 @@ msgid "give a short usage message"
msgstr "berikan sebuah pesan penggunaan singkat"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NAMA"
@@ -232,12 +232,12 @@ msgstr "^[yY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Dibungkus oleh %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Dibungkus oleh %s\n"
@@ -245,11 +245,11 @@ msgstr "Dibungkus oleh %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
#, fuzzy
msgid ""
"\n"
@@ -526,190 +526,190 @@ msgstr "Tidak dapat menjalankan remote shell"
msgid "Cannot execute remote shell"
msgstr "Tidak dapat menjalankan remote shell"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Arah pencarian di luar jangkauan"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Arah pencarian tidak valid"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Ofset pencarian tidak valid"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Offset pencarian di luar jangkauan"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Jumlah byte tidak valid"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Jumlah byte di luar jangkauan"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "EOF prematur"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Kode operasi tidak valid"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operasi tidak didukung"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Unexpected tidak terduga"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Manipulasi sebuah tape drive, menerima perintah dari proses remote"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NOMOR"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "tentukan tingkat penelusuran"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "BERKAS"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "tentukan keluaran nama berkas penelusuran"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "tidak dapat membuka %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "terlalu banyak argumen"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Perintah sampah"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Ini sepertinya bukan sebuah tar archive"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Total byte dibaca"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Total byte ditulis"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Total byte dihapus"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(pipe)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Refusing to read archive contents from terminal (missing -f option?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Refusing to write archive contents to terminal (missing -f option?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Nilai record_size tidak valid"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Tidak diberikan nama archive"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Tidak dapat memverifikasi stdin/stdout archive"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Archive terkompres. Gunakan %s pilihan"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Tidak dapat update compressed archives"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Berada pada awal tape, berhenti sekarang"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Terlalu banyak errors, berhenti"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Ukuran record = %lu blok"
msgstr[1] "Ukuran record = %lu blok"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Blok tidak sesuai (%lu byte) dalam arsip"
msgstr[1] "Blok tidak sesuai (%lu byte) dalam arsip"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Tidak dapat backspace file archives; kemungkinan tidak bisa dibaca tanpa -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek tidak dapat berhenti di sebuah batas rekaman"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: berisi nomor volum yang tidak valid"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Nomor volum overflow"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Mempersiapkan volume #%d untuk %s dan tekan return: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "EOF pada saat user reply diharapkan"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "PERINGATAN: Archive tidak lengkap"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -721,65 +721,65 @@ msgstr ""
" q Batalkan tar\n"
" y or newline Lanjutkan operasi\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Spawn sebuah subshell\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Tampilkan daftar ini\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Tidak ada new volume; keluar.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Nama berkas tidak dispesifikasikan. Coba lagi.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Masukan tidak valid. Ketik ? untuk bantuan.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "Perintah %s gagal"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s tidak dilanjutkan di volume ini"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s mungkin dilanjutkan di volume ini: header berisi nama terpotong"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s adalah ukuran yang salah (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Volume ini di luar urutan (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Label archive tidak cocok dengan %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Volume %s tidak sesuai dengan %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -787,211 +787,211 @@ msgstr ""
"%s: nama berkas terlalu panjang untuk diurutkan dalam sebuah GNU multivolume "
"header, dipotong"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "tulis tidak berhenti di batas blok"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Hanya dapat membaca %lu dari %lu byte"
msgstr[1] "Hanya dapat membaca %lu dari %lu byte"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Isi berbeda"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Unexpected EOF dalam archive"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Tipe berkas berbeda"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Mode berbeda"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid berbeda"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid berbeda"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Mod time berbeda"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Ukuran berbeda"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Tidak dilink ke %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symlink berbeda"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Nomor perangkat berbeda"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verifikasi "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Tipe berkas '%c' tidak dikenal, lakukan diff sebagai berkas normal"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Archive berisi nama berkas dengan awalan dihapus."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Arsip berisikan header yang kadaluarsas"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Verifikasi mungkin gagal untuk menemukan berkas orisinil."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "GAGAL VERIFIKASI: header %d tidak valid terdeteksi"
msgstr[1] "GAGAL VERIFIKASI: header %d tidak valid terdeteksi"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Sebuah lone blok nol di %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: berisi sebuah cache direktori tag %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "nilai %s dari %s di luar jangkauan %s..%s; menggantikan %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "nilai %s dari %s di luar dari jangkauan %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Membuat header oktal negatif"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: nama berkas terlalu panjang (maksimal %d); tidak di-dump"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
"%s: nama berkas terlalu panjang (tidak dapat memisahkan); tidak di-dump"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: nama link terlalu panjang; tidak di-dump"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Berkas diperkecil %s byte; dipadding dengan nol"
msgstr[1] "%s: Berkas diperkecil %s byte; dipadding dengan nol"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: file berada pada filesistem yang berbeda; tidak di-dump"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "isi tidak didump"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Tipe file tidak dikenal; file diabaikan"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Hilang hubungan ke %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: berkas tidak berubah; tidak di-dump"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: berkas adalah archive; tidak di-dump"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "direktori tidak didump"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: berkas berubah saat kita membacanya"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: soket diabaikan"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: door diabaikan"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Skip ke header berikutnya"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Menghapus non-header dari archive"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: implausibly penanda waktu lama %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: penanda %s adalah %s dalam masa datang"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Inkonsistensi tidak diharapkan ketika membuat direktori"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: skipping existing file"
@@ -1015,7 +1015,7 @@ msgid "%s: Cannot extract -- file is continued from another volume"
msgstr ""
"%s: Tidak dapat mengekstrak -- berkas adalah kelanjutan dari volume lain"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Tidak terduga nama header panjang"
@@ -1044,22 +1044,22 @@ msgstr "%s: Tidak dapat melakukan backup berkas ini"
msgid "Cannot rename %s to %s"
msgstr "Tidak dapat mengubah nama %s ke %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Direktori telah diubah nama dari %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Direktori adalah baru"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: directory berada pada filesistem yang berbeda; tidak di-dump"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Direktori telah diganti nama"
@@ -1186,194 +1186,194 @@ msgstr "%s: Menghapus %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Tidak dapat menghapus"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Mengabaikan"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** Blok dari KOSONG **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok %s: ** Akhir dari Berkas **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Kosong dalam header saat diharapkan nilai %s numerik"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr "Nilai oktal arsip %.*s di luar batasan %s; asumsikan komplemen dua"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Nilai oktal arsip %.*s di luar batasan %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arsip berisikan header base-64 yang kadaluarsas"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Arsip yang ditandatangahi dengan string base-64 %s di luar batasan %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Nilai arsip base-256 di luar batasan %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arsip berisikan %.*s ketika nilai numerik %s diharapkan"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Nilai arsip %s dari %s di luar batasan %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " link ke %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " tipe file tidak dikenal %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Link Panjang--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Nama Panjang--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Volume Header--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Diteruskan pada byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Membuat direktori:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Mengganti nama %s ke %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s:Tidak dapat mengganti nama ke %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Mengganti nama %s kembali ke %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Berkas dihapus sebelum kita membacanya"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "proses anak"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "saluran interproses"
-#: src/names.c:69
+#: src/names.c:68
#, fuzzy
msgid "Local file name selection:"
msgstr "Pemilihan berkas lokal:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"tambahkan berkas yang diberikan ke archive (berguna jika namanya berawal "
"dengan sebuah dash)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "pindah ke direktori DIR"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "dapatkan nama untuk ekstrak atau buat dari BERKAS"
-#: src/names.c:78
+#: src/names.c:77
#, fuzzy
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T baca nama berakhiran kosong, non-aktifkan -C"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "non-aktifkan efek dari pilihan --null sebelumnya"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "unquote nama berkas baca dengan (baku)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "jangan unquote nama berkas baca dengan"
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "POLA"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "jangan masukan berkas, berikan sebagai sebuah POLA"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "jangan masukan pola yang terdaftar dalam BERKAS"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1381,25 +1381,25 @@ msgstr ""
"jangan masukan isi dari direktori berisi CACHEDIR.TAG, kecuali untuk berkas "
"tag itu sendiri"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "jangan masukan apapun dibawah direktori berisi CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "jangan masukan direktori berisi CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"jangan masukan isi dari direktori berisi BERKAS, kecuali untuk BERKAS itu "
"sendiri"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "read exclude patterns for each directory from FILE, if it exists"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1407,117 +1407,117 @@ msgstr ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "jangan masukan apapun dibawah direktori berisi BERKAS"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "jangan masukan direktori berisi BERKAS"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "jangan masukan direktori sistem pengontrol direktori"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "read exclude patterns from the VCS ignore files"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "abaikan berkas cadangan dan berkas kunci"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "rekursif kedalam direktori (baku)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "hindari penurunan secara otomatis dalam direktori"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Pilihan nama berkas cocok (mempengaruhi baik pola exclude dan include):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "pencocokan pola nama berkas mulai"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "pencocokan polah setelah '/' apapun (baku untuk exclusion)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "abaikan perbedaan huruf besar dan huruf kecil"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "pencocokan dengan memperhatikan huruf besar dan huruf kecil (baku)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "gunakan wildcards (baku untuk exclusion)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "pencocok verbatim string"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "wildcards cocok '/' (baku untuk exclusion)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "wildcards tidak cocok '/'"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "Perintah gagal"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: file list requested from %s daftar berkas telah dibaca %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "tidak dapat menset waktu di '%s': %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: nama berkas yang dibaca berisi karakter nul"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Pola pencocokan karakter digunakan dalam nama berkas."
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1525,47 +1525,47 @@ msgstr ""
"Gunakan --wildcards untuk mengaktifkan pencocokan pola, atau --no-wildcards "
"untuk menekan peringatan ini"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Tidak ditemukan dalam archive"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Kejadian yang diinginkan tidak ditemukan dalam archive"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Label archive tidak cocok"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Menggunakan pilihan -C didalam daftar berkas tidak diijinkan dengan --listed-"
"incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Hanya satu pilihan -C yang diijinkan dengan --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Pilihan '-%s' dan '-%s' membutuhkan standard masukan"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Format archive tidak valid"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Feature GNU dibutuhkan untuk format archive yang tidak kompatibel"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1786,7 +1786,7 @@ msgstr "Pilih stream keluaran:"
msgid "extract files to standard output"
msgstr "ekstrak berkas ke standar keluaran"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "PERINTAH"
@@ -1822,7 +1822,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATE-ATAU-BERKAS"
@@ -2031,7 +2031,7 @@ msgstr "reblok saat kita baca (untuk 4.2BSD pipes)"
msgid "Archive format selection:"
msgstr "Pemilihan format archive:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2115,59 +2115,59 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "saring melalui PROG (harus menerima -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Pemilihan berkas lokal:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "tetap dalam sistem berkas lokal ketika membuat archive"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "jangan hilangkan awalan '/' dari nama berkas"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "ikuti symlinks; berkas archive dan dump yang mereka tunjuk ke"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "ikuti hard links; berkas archive dan dump yang mereka refer ke"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "NAMA-ANGGOTA"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "berawal di anggota NAMA-ANGGOTA dalam archive"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "hanya simpan berkas lebih baru dari DATE-OR-FILE"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "TANGGAL"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "bandingkan tanggal dan waktu hanya ketika data berubah"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "KONTROL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "backup sebelum penghapusan, pilih PENGONTROL versi"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "STRING"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2175,60 +2175,60 @@ msgstr ""
"backup sebelum penghapusan, override akhiran biasa ('~' kecuali di override "
"oleh variabel lingkungan SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Transformasi nama berkas:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
"hilangkan NOMOR yang mengawali komponen dari nama berkas di waktu ekstraksi"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "EKSPRESI"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "gunakan sed EKSPRESI replace untuk mengubah nama berkas"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Keluaran informative:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "proses daftar berkas secara verbose"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "KATA KUNCI"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "pengendali peringatan"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "tampilkan pesan perkembangan setiap rekaman ke ANGKA (baku 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "AKSI"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "jalankan AKSI disetiap titik pemeriksaan"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "tampilkan sebuah pesan jika tidak seluruh link didump"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SINYAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2240,35 +2240,35 @@ msgstr ""
"adalah: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 dan SIGUSR2; nama tanpa awalah SIG "
"juga diterima"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "tampilkan waktu modifikasi berkas dalam UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "tampilkan waktu berkas sampai ke resolusi penuh"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "kirim keluaran verbose ke BERKAS"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "tampilkan jumlah blok didalam archive dengan setiap pesan"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "minta konfirmasi untuk setiap aksi"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "tampilkan tar baku"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "show valid ranges for snapshot-file fields"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2276,31 +2276,31 @@ msgstr ""
"ketika mendaftar atau mengekstrak, daftar setiap direktori yang tidak cocok "
"dengan kriteria pencarian"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "tampilkan berkas atau nama berkas setelah transformasi"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "GAYA"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "set nama quoting gaya; lihat dibawah untuk nilai GAYA yang valid"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "sebagai tambahan karakter quote dari STRING"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "non-aktifkan quoting untuk karakter dari STRING"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Pilihan yang kompatibel:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2308,22 +2308,22 @@ msgstr ""
"ketika membuat, sama seperti --old-archive; ketika mengekstrak, sama seperti "
"--no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Pilihan lain:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "non-aktifkan penggunaan dari pilihan berbahaya yang berpotensial"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' Tidak dapat mencari ke '%s'"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2331,40 +2331,40 @@ msgstr ""
"Anda tidak bisa menspesifikasikan lebih dari satu pilihan '-Acdtrux' atau '--"
"test-label'"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Pilihan kompresi konflik"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Nama sinyal: %s tidak dikenal"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Tanggal contoh berkas tidak ditemukan"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Menggantikan %s untuk format tanggal tidak dikenal %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Pilihan %s: memperlakukan tanggal '%s' sebagai %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "saring archive melalui %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Argumen yang valid untuk pilihan --quoting-style adalah:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2372,163 +2372,163 @@ msgstr ""
"\n"
"*Ini* tar baku ke:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Pemilik tidak valid"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Faktor bloking tidak valid"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Panjang tape tidak valid"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Nilai tingkat peningkatan tidak valid"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Lebih dari satu treshold date"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Nilai versi sparse tidak valid"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "pilihan --atime-preserve='system' tidak didukung di platform ini"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "nilai --checkpoint bukan sebuah integer"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Mode tidak tepat diberikan pada pilihan"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Nomor tidak valid"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Ukuran record tidak valid"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Jumlah record harus kelipatan dari %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Jumlah dari elemen tidak valid"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Hanya satu pilihan --to-command yang diijinkan"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Salah bentuk kepadatan argumen: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Kepadatan tidak diketahui: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Pilihan '-[0-7][lmh]' tidak didukung oleh tar *ini*"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, fuzzy, c-format
msgid "error parsing %s"
msgstr "Error parsing nomor didekat `%s'"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[BERKAS]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "argumen %s untuk %s tidak valid"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, fuzzy, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "tidak dapat menset waktu di '%s': %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Pilihan 'lama' '%c' membutuhkan argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence tidak berarti tanpa sebuah daftar berkas"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Berkas multiple archive membutuhkan pilihan '-M'"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level tidak berarti tanpa --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Label volume terlalu panjang (batasnya adalah %lu byte)"
msgstr[1] "%s: Label volume terlalu panjang (batasnya adalah %lu byte)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Tidak dapat verifikasi multi-volume archives"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Tidak dapat verify compressed archives"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Tidak dapat menggunakan multi-volume compressed archives"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Tidak dapat update compressed archives"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option hanya dapat digunakan dalam archive POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls hanya dapat digunakan dalam archive POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux hanya dapat digunakan dalam archive POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs hanya dapat digunakan dalam archive POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2536,83 +2536,92 @@ msgstr ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Panjang volume tidak dapat lebih kecil dari ukuran rekaman"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Secara takut menolak untuk membuat sebuah archive kosong"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Pilihan '-Aru' tidak kompatibel dengan '-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Anda harus menspesifikasikan salah satu dari pilihan '-Acdtrux' atau '--test-"
"label'"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Keluar dengan status gagal karena error error sebelumnya"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Berkas mengecil sebanyak %s byte"
msgstr[1] "%s: Berkas mengecil sebanyak %s byte"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Kata kunci %s tidak diketahui atau belum diimplementasikan"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Penanda waktu di luar dari jangkauan yang diijinkan"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Pola %s tidak dapat digunakan"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Kata kunci %s tidak dapat dioverride"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Salah bentuk ekstensi header: hilang panjang"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Ekstensi panjang header %*s diluar dari jangkauan"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Salah bentuk ekstensi header: hilang blank setelah panjang"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Salah bentuk ekstensi header: hilang tanda sama dengan"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Salah bentuk ekstensi header: hilang baris baru"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Mengabaikan kata kunci ekstensi '%s' yang tidak diketahui"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2621,46 +2630,46 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Ekstensi header %s=%s diluar dari jangkauan %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Salah bentuk ekstensi header: tidak valid %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Salah bentuk ekstensi header: kelebihan %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Salah bentuk ekstensi header: tidak valid %s: tidak diduga pembatas %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Salah bentuk ekstensi header: tidak valid %s: jumlah dari nilai ganjil"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: bukan sebuah kehabisan waktu yang valid"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: aksi titik pemeriksaan tidak diketahui"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "tulis"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "baca"
@@ -2668,7 +2677,7 @@ msgstr "baca"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Menulis titik pemeriksaan %u"
@@ -2677,12 +2686,12 @@ msgstr "Menulis titik pemeriksaan %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Membaca titik pemeriksaan %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2690,96 +2699,100 @@ msgstr ""
"genfile memanipulasi berkas data untuk suite pemeriksaan GNU paxutils.\n"
"PILIHAN adalah:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Pilihan pembuatan berkas:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "UKURAN"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Buat berkas dari UKURAN yang diberikan"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Tulis ke berkas NAMA, daripada ke standar keluaran"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Baca nama berkas dari BERKAS"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T baca nama berakhiran null"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "Isi berkas dengan POLA yang diberikan. POLA adalah 'baku' atau 'nol'"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Ukuran dari sebuah blok untuk berkas sparse"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Buat berkas sparse. Sisa dari baris perintah memberikan peta berkas."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "OFSET"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Cari ke ofset yang diberikan sebelum menulis data"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Pilihan statistik berkas:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Tampilkan isi dari statistik struk untuk setiap berkas yang diberikan. "
"FORMAT baku adalah: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "pilihan eksekusi synchronous:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "PILIHAN"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Jalankan ARG. Berguna dengan --checkpoint dan satu dari --cut, --append, --"
"touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Lakukan aksi yang diberikan (lihat dibawah) ketika mencapai titik "
"pemeriksaan NOMOR"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Set tanggal untuk pilihan --touch selanjutnya"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
"Tampilkan titik pemeriksaan yang dijalankan dan status keluar dari PERINTAH"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2787,7 +2800,7 @@ msgstr ""
"Aksi eksekusi synchronous. Ini dijalankan ketika titik pemeriksaan nomor "
"yang diberikan oleh pilihan --checkpoint dicapai."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2795,126 +2808,126 @@ msgstr ""
"Potong BERKAS ke ukuran yang dispesifikasikan oleh pilihan --length "
"sebelumnya (atau 0, jika ini tidak diberikan)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Tambahkan UKURAN bytes ke BERKAS. UKURAN yang diberikan oleh pilihan --"
"length sebelumnya."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Update waktu akses dan modifikasi dari BERKAS"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Jalankan PERINTAH"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Ukuran: %s tidak valid"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Jumlah diluar dari jangkauan yang diijinkan: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Ukuran negatif: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) gagal"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "panjang berkas yang diminta %lu, sebenernya %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "pembuatan berkas tidak sparse"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Error parsing nomor didekat `%s'"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Format tanggal tidak diketahui"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARG...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "tidak dapat membuka `%s'"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "Tidak dapat mencari"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "nama berkas berisi karakter null"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"tidak dapat menghasilkan berkas sparse di standar keluaran, gunakan pilihan "
"--file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "mask tidak benar (didekat `%s')"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Field `%s' tidak diketahui"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "tidak dapat menset waktu di `%s'"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "tidak dapat memutus '%s'"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "Perintah %s gagal"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "tidak dapat memutus '%s'"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "tidak dapat menset waktu di `%s'"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "tidak dapat memutus `%s'"
@@ -2954,6 +2967,9 @@ msgstr "Perintah berakhir\n"
msgid "--stat requires file names"
msgstr "--stat membutuhkan nama berkas"
+#~ msgid "OPTION"
+#~ msgstr "PILIHAN"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT parameter harus positif"
diff --git a/po/it.gmo b/po/it.gmo
index cae203117c8dcac2118979fa8465b7524ad169c1..cc1e79b498d58b13959859e7f00740427edbd6e7 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 0032110159f1994165ce431372272f4300ce5d2c..24e3c7a4fb5a995f3b26e0a97bc0e1114b60501f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,18 +1,18 @@
# Italian translation of GNU tar.
-# Copyright (C) 2008, 2009, 2010, 2011, 2013, 2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011, 2013, 2014, 2016, 2017 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
#
# Lele Gaifax <lele@nautilus.eclipse.it>, 1996.
# Marco d'Itri <md@linux.it>, 1998.
-# Milo Casagrande <milo@milo.name>, 2008-2010, 2011, 2013, 2014, 2016.
+# Milo Casagrande <milo@milo.name>, 2008-2010, 2011, 2013, 2014, 2016, 2017.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar-1.29\n"
+"Project-Id-Version: tar-1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-17 19:00+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-18 09:05+0100\n"
"Last-Translator: Milo Casagrande <milo@milo.name>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"Language: it\n"
@@ -21,7 +21,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 2.0.4\n"
#: gnu/argmatch.c:134
#, c-format
@@ -100,7 +100,7 @@ msgid "give a short usage message"
msgstr "Mostra un breve messaggio sull'uso"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NOME"
@@ -138,29 +138,29 @@ msgid "write error"
msgstr "Errore di scrittura"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: l'opzione \"%s\" è ambigua\n"
+msgstr "%s: l'opzione \"%s%s\" è ambigua\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: l'opzione \"%s\" è ambigua; possibilità:"
+msgstr "%s: l'opzione \"%s%s\" è ambigua; possibilità:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: opzione \"%c%s\" non riconosciuta\n"
+msgstr "%s: opzione \"%s%s\" non riconosciuta\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: l'opzione \"%c%s\" non accetta un argomento\n"
+msgstr "%s: l'opzione \"%s%s\" non accetta un argomento\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: l'opzione \"--%s\" richiede un argomento\n"
+msgstr "%s: l'opzione \"%s%s\" richiede un argomento\n"
#: gnu/getopt.c:621
#, c-format
@@ -235,12 +235,12 @@ msgstr "^[sSyY].*"
msgid "^[nN]"
msgstr "^[nN].*"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Pacchetto creato da %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Pacchetto creato da %s\n"
@@ -248,12 +248,11 @@ msgstr "Pacchetto creato da %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -263,8 +262,8 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Licenza GPLv3+: GNU GPL versione 3 o successiva <http://gnu.org/licenses/gpl."
-"html>\n"
+"Licenza GPLv3+: GNU GPL versione 3 o successiva <https://gnu.org/licenses/"
+"gpl.html>.\n"
"Questo programma è software libero: siete liberi di modificarlo e "
"ridistribuirlo.\n"
"Non c'è ALCUNA GARANZIA, per quanto consentito dalle vigenti normative.\n"
@@ -403,14 +402,13 @@ msgid "%s home page: <%s>\n"
msgstr "Sito web di %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Sito web di %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "Sito web di %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
-msgstr "Aiuto per l'utilizzo di software GNU: <http://www.gnu.org/gethelp/>\n"
+msgstr "Aiuto per l'utilizzo di software GNU: <https://www.gnu.org/gethelp/>\n"
# (ndt) metto tra virgolette visto che è
# il nome di una funzione non traducibile
@@ -531,197 +529,197 @@ msgstr "Impossibile reindirizzare i file dalla shell remota"
msgid "Cannot execute remote shell"
msgstr "Impossibile eseguire la shell remota"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Direzione di seek fuori dell'intervallo"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Direzione di seek non valida"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Offset di seek non valido"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Offset di seek fuori dell'intervallo"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Conteggio byte non valido"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Conteggio byte fuori dell'intervallo"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "EOF prematuro"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Codice d'operazione non valido"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operazione non supportata"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Argomenti non attesi"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
"Manipola un dispositivo a nastro, accettando comandi da un processo remoto"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NUMERO"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "Imposta il livello di debug"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FILE"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "Imposta il nome del file di output per il debug"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "impossibile aprire %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "troppi argomenti"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Comando spazzatura"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Questo non sembra un archivio tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Byte totali letti"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Byte totali scritti"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Byte totali eliminati"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(pipe)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Lettura del contenuto dell'archivio dal terminale non consentita (manca "
"l'opzione -f?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"Scrittura del contenuto dell'archivio sul terminale non consentita (manca "
"l'opzione -f?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Valore di record_size non valido"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Non è stato indicato il nome di un archivio"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Impossibile verificare archivi su stdin/stdout"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "L'archivio è compresso. Usare l'opzione %s."
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Impossibile aggiornare archivi compressi"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "All'inizio del nastro, uscita immediata"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Troppi errori, uscita"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Dimensioni del record = %lu blocco"
msgstr[1] "Dimensioni del record = %lu blocchi"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Blocco non allineato nell'archivio (%lu byte)"
msgstr[1] "Blocco non allineato nell'archivio (%lu byte)"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Impossibile muoversi all'indietro nel file dell'archivio; potrebbe non "
"essere\n"
"leggibile senza l'opzione -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek non si è fermata al limite di un record"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: contiene un numero di volume non valido"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Overflow del numero di volume"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Preparare il volume #%d per %s e premere Invio: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Ricevuto EOF quando era attesa la risposta dell'utente"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "Attenzione: l'archivio non è completo"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -733,67 +731,67 @@ msgstr ""
" q Termina tar\n"
" y o Invio Continua l'operazione\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Esegue una subshell\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Stampa questo elenco\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Nessun nuovo volume; uscita.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Nome file non specificato. Riprovare.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Input non valido. Premere ? per l'aiuto.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "comando \"%s\" non riuscito"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s non continua su questo volume"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s potrebbe continuare su questo volume: l'intestazione contiene un nome "
"troncato"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s è la dimensione sbagliata (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Questo volume è fuori sequenza (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "L'archivio non ha un'etichetta corrispondente a %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Il volume %s non corrisponde a %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -801,212 +799,212 @@ msgstr ""
"%s: il nome del file è troppo lungo per essere scritto in un'intestazione "
"GNU multi-volume, troncato"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "write non si è fermata al limite di un record"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "È stato possibile leggere solo %lu byte di %lu"
msgstr[1] "È stato possibile leggere solo %lu byte di %lu"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "I contenuti sono differenti"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "EOF inatteso nell'archivio"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "I tipi dei file sono diversi"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "I modi sono diversi"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Gli UID sono diversi"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "I GID sono diversi"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Gli orari di modifica sono diversi"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Le dimensioni sono diverse"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Non è collegato a %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "I collegamenti simbolici sono diversi"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "I numeri dei device sono diversi"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verifica "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: tipo di file \"%c\" sconosciuto, confrontato come un file normale"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "L'archivio contiene nomi di file con i prefissi iniziali rimossi."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "L'archivio contiene nomi di file trasformati."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "La verifica potrebbe non riuscire a trovare i file originali."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "Errore di verifica: trovata %d intestazione non valida"
msgstr[1] "Errore di verifica: trovate %d intestazioni non valide"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Un singolo blocco di zeri a %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: contiene un'etichetta di directory cache %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "valore %s fuori dall'intervallo (%s) %s..%s; sostituzione con %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "valore %s fuori dall'intervallo (%s) %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Generazione delle intestazioni ottali negative"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: il nome del file è troppo lungo (max %d); non archiviato"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
"%s: il nome del file è troppo lungo (impossibile dividerlo); non archiviato"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: il nome del collegamento è troppo lungo; non archiviato"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: file ristretto di %s byte; riempito con zeri"
msgstr[1] "%s: file ristretto di %s byte; riempito con zeri"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: il file si trova su un altro file system; non archiviato"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "contenuti non archiviati"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: tipo di file sconosciuto; file ignorato"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Collegamenti mancanti a %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: il file non è modificato; non archiviato"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: il file è l'archivio; non archiviato"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "directory non archiviata"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: file modificato mentre era in lettura"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: socket ignorato"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: door ignorata"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Passaggio alla prossima intestazione"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Eliminazione non-intestazione dall'archivio"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: orario %s inverosimilmente vecchio"
# (ndt) problema del plurale...
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: l'orario %s è %s secondi nel futuro"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: incoerenza inaspettata nel creare la directory"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: file esistente saltato"
@@ -1030,7 +1028,7 @@ msgstr ""
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: impossibile estrarre -- il file continua da un altro volume"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Intestazione di nome lungo inattesa"
@@ -1054,7 +1052,7 @@ msgstr "Il file %s corrente è più recente o ha la stessa data"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: il nome del membro contiene \"..\""
#: src/extract.c:1696
#, c-format
@@ -1066,22 +1064,22 @@ msgstr "%s: impossibile eseguire il backup di questo file"
msgid "Cannot rename %s to %s"
msgstr "Impossibile rinominare %s in %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: directory rinominata da %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: directory nuova"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: la directory si trova su un altro file system; non archiviato"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: directory rinominata"
@@ -1207,35 +1205,35 @@ msgstr "%s: eliminazione di %s\n"
msgid "%s: Cannot remove"
msgstr "%s: impossibile rimuoverlo"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: omesso"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blocco %s: ** Blocco di NUL **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blocco %s: ** Fine del file **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blocco %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Trovati spazi nell'intestazione dove era atteso il valore numerico %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1243,161 +1241,160 @@ msgstr ""
"che sia in complemento a due"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Il valore ottale %.*s dell'archivio è fuori dall'intervallo %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "L'archivio contiene intestazioni base-64 obsolete"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr ""
"La stringa base-64 con segno %s dell'archivio è fuori dall'intervallo %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Il valore base-256 dell'archivio è fuori dall'intervallo %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "L'archivio contiene %.*s dove era atteso il valore numerico %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Il valore %s dell'archivio è fuori dall'intervallo (%s) %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " collegamento a %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " tipo di file sconosciuto %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Collegamento lungo--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Nome lungo--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Intestazione del volume--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Continua al byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Creazione directory:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Rinomina di %s in %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: impossibile rinominarlo in %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Rinomina di %s nuovamente in %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: file rimosso prima di poterlo leggere"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "il processo figlio"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "il canale tra processi"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Selezione dei nomi file locali:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "Aggiunge FILE all'archivio (utile se il nome inizia con un trattino)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "Passa alla directory DIR"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "Prende i nomi da estrarre o creare dal file FILE"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T legge nomi terminati da NULL, implica --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "Disabilita l'effetto dell'opzione --null precedente"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"Toglie i caratteri di citazione dai nomi dei file o dei membri (predefinito)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "Non toglie i caratteri di citazione dai nomi dei file o dei membri"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T legge i nomi file come sono (senza gestione opzioni)"
+msgstr "-T legge i nomi file come sono (senza escape o gestione opzioni)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T considera i nomi file che iniziano con un trattino come opzioni "
"(predefinito)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "MODELLO"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "Esclude i file i cui nomi corrispondono a MODELLO"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "Esclude i modelli elencati in FILE"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1405,24 +1402,24 @@ msgstr ""
"Esclude i contenuti delle directory contenenti CACHEDIR.TAG, a parte il "
"file .TAG stesso"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "Esclude tutto quanto all'interno di directory contenenti CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "Esclude le directory contenenti CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"Esclude i contenuti delle directory contenenti FILE, a parte FILE stesso "
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "Legge i modelli di esclusione per ogni directory da FILE (se esiste)"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1430,119 +1427,123 @@ msgstr ""
"Legge i modelli di esclusione per ogni directory e sotto-directory da FILE "
"(se esiste)"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "Esclude tutto quanto all'interno di directory contenenti FILE"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "Esclude le directory contenenti FILE"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "Esclude le directory dei sistemi di controllo della versione"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "Legge i file di esclusione dai file \"ignore\" dei CVS"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "Esclude i file di backup e di blocco"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "Entra ricorsivamente nelle directory (predefinito)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "Non entra automaticamente nelle directory"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Opzioni di corrispondenza del nome del file (vale sia per i modelli di "
"esclusione che inclusione):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "I modelli corrispondono all'inizio del nome del file"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
"I modelli corrispondono dopo qualsiasi \"/\" (predefinito per le esclusioni)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "Non fa differenza tra maiuscole e minuscole"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "Considera diverse le maiuscole e le minuscole (predefinito)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "Utilizza i metacaratteri (predefinito per le esclusioni)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "Corrispondenza letterale della stringa"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "I metacaratteri corrispondono \"/\" (predefinito per le esclusioni)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "I metacaratteri non corrispondono \"/\""
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Le seguenti opzioni erano utilizzate dopo un qualsiasi argomento non "
+"opzionale in modalità creazione o aggiornamento. Queste opzioni sono "
+"posizionali e funzionano solo sugli argomenti che le seguono: riorganizzarle "
+"correttamente."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s non ha alcun effetto"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s non ha alcun effetto"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s non ha alcun effetto"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "riga di comando"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: l'elenco file richiesto da %s è già stato letto da %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "impossibile dividere la stringa \"%s\": %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: il nome di file letto contiene un carattere NULL"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Usati caratteri di corrispondenza nei nomi dei file."
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1550,47 +1551,47 @@ msgstr ""
"Usare --wildcards per abilitare la corrispondenza o --no-wildcards per "
"disabilitare l'avviso"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: non trovato nell'archivio"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: occorrenza richiesta non trovata nell'archivio"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Etichetta dell'archivio non corrispondente"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"L'utilizzo dell'opzione -C all'interno dell'elenco dei file non è consentita "
"con --listed-incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Solo un'opzione -C è consentita con --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Le opzioni \"%s\" e \"%s\" richiedono entrambe lo standard input"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: formato dell'archivio non valido"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Richieste funzionalità GNU su un formato di archivio incompatibile"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1814,7 +1815,7 @@ msgstr "Selezione stream di output:"
msgid "extract files to standard output"
msgstr "Estrae i file sullo standard output"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "COMANDO"
@@ -1850,7 +1851,7 @@ msgstr "Usa FILE per mappare gli UID dei proprietari del file e i nomi"
msgid "use FILE to map file owner GIDs and names"
msgstr "Usa FILE per mappare i GID dei proprietari del file e i nomi"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATA-O-FILE"
@@ -2063,7 +2064,7 @@ msgstr "Rifà i blocchi durante la lettura (per le pipe di 4.2BSD)"
msgid "Archive format selection:"
msgstr "Selezione formato di archiviazione:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMATO"
@@ -2150,64 +2151,64 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "Filtra attraverso PROG (deve accettare -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Selezione dei file locali:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "Resta nel file system locale durante la creazione dell'archivio"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "Non rimuove le \"/\" iniziali dai nomi dei file"
# (ndt) hmmm... non molto chiara...
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"Segue i collegamenti simbolici; archivia ed esegue il dump dei file a cui "
"puntano"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"Segue i collegamenti fisici; archivia ed esegue il dump dei file a cui si "
"riferiscono"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "NOME"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "Inizia dal membro NOME durante la lettura dell'archivio"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "Archivia solo i file più recenti di DATA-O-FILE"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATA"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "Confronta data e ora solo quando il contenuto è cambiato"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "CONTROLLO"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "Esegue un backup prima di rimuovere, usando il CONTROLLO di versione"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "STRINGA"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2215,63 +2216,63 @@ msgstr ""
"Esegue un backup prima di rimuovere, sovrascrivendo il suffisso \"~\" a meno "
"che non sia sovrascritto dalla variabile d'ambiente SIMPLE_BACKUP_SUFFIX"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Trasformazioni dei nomi di file:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
"Toglie NUMERO componenti iniziali dai nomi dei file durante l'estrazione"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "ESPRESSIONE"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
"Usa un'ESPRESSIONE di sostituzione di sed per trasformare i nomi dei file"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Output informativo:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "Elenca prolissamente i file elaborati"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "PAROLACHIAVE"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "Controllo di avviso"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"Visualizza un messaggio di avanzamento ogni NUMERO-esimo record (predefinito "
"10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "AZIONE"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "Esegue l'azione a ogni punto di controllo"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "Stampa un messaggio se non tutti i collegamenti sono archiviati"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SEGNALE"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2283,35 +2284,35 @@ msgstr ""
"sono: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 e SIGUSR2; sono accettati anche i "
"nomi senza il prefisso SIG"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "Stampa le date di modifica del file in formato UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "Stampa la data del file in tutti i suoi dettagli"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "Invia l'output prolisso al FILE"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "Mostra il numero di blocco nell'archivio con ogni messaggio"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "Chiede conferma per ogni azione"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "Mostra le impostazioni predefinite di tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "Mostra gli intervalli validi per i campi snapshot-file"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2319,33 +2320,33 @@ msgstr ""
"All'elencazione o all'estrazione, elenca ogni directory che non corrisponde "
"al criterio di ricerca"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "Mostra il nome del file o dell'archivio dopo la trasformazione"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STILE"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"Imposta lo stile di citazione del nome; consultare più sotto per i valori di "
"STILE consentiti"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "Caratteri di citazione aggiuntivi da STRINGA"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "Disabilita la citazione per i caratteri dalla STRINGA"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Opzioni di compatibilità:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2353,22 +2354,22 @@ msgstr ""
"Alla creazione, uguale a --old-archive; all'estrazione, uguale a --no-same-"
"owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Altre opzioni:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "Disabilita l'uso di alcune opzioni potenzialmente dannose"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "L'opzione \"%s\" non può essere usata con \"%s\""
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2376,40 +2377,40 @@ msgstr ""
"Non è possibile indicare più di un'opzione \"-Acdtrux\", \"--delete\" o \"--"
"test-label\""
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Conflitto tra le opzioni di compressione"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Nome del segnale sconosciuto: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "File campione della data non trovato"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Sostituzione di %s al posto del formato di data sconosciuto %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Opzione %s: la data \"%s\" viene considerata come %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "Filtra l'archivio attraverso %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Argomenti validi per l'opzione --quoting-style sono:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2417,163 +2418,163 @@ msgstr ""
"\n"
"Questa versione di tar ha le seguenti impostazioni predefinite:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Proprietario o ID gruppo non valido"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Fattore del blocco non valido"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Lunghezza del nastro non valida"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Valore del livello incrementale non valido"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Più di una data di soglia"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Valore versione sparsa non valido"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve=\"system\" non è supportato su questa piattaforma"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "Il valore --checkpoint non è un intero"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Modo fornito sull'opzione non valido"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Numero non valido"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Dimensione del record non valida"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "La dimensione del record deve essere un multiplo di %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Numero di elementi non valido"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Consentita solo un'opzione --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Argomento densità non corretto: \"%s\""
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Densità sconosciuta: \"%c\""
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Le opzioni \"-[0-7][lmh]\" non sono gestite da questa versione di tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: posizione dell'errore"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "Errore nell'analizzare %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FILE]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "argomenti non opzione in %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "impossibile dividere TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "La vecchia opzione \"%c\" richiede un argomento."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence non ha senso senza un elenco di file"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Archivi multipli richiedono l'opzione \"-M\""
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "L'opzione --level non è utilizzabile senza --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: l'etichetta di volume è troppo lunga (il limite è %lu byte)"
msgstr[1] "%s: l'etichetta di volume è troppo lunga (il limite sono %lu byte)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Impossibile verificare archivi multi-volume"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Impossibile verificare archivi compressi"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Impossibile usare archivi multi-volume compressi"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Impossibile concatenare archivi compressi"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime necessita di una data specificata utilizzando --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option può essere usata solo su archivi POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls può essere usata solo su archivi POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux può essere usata solo su archivi POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs può essere usata solo su archivi POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2581,84 +2582,93 @@ msgstr ""
"Impossibile determinare il nome della directory principale, impostarlo con --"
"one-top-level=DIR"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
"La lunghezza del volume non può essere minore della dimensione del record"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Rifiuto totale di creare un archivio vuoto"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Le opzioni \"-Aru\" sono incompatibili con \"-f -\""
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"È necessario specificare una delle opzioni \"-Acdtrux\", \"--delete\" o \"--"
"test-label\""
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Uscita con stato di fallimento in base agli errori precedenti"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: il file si è ridotto di %s byte"
msgstr[1] "%s: il file si è ridotto di %s byte"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "La parola chiave %s è sconosciuta o non ancora implementata"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Orario fuori dall'intervallo consentito"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Il modello %s non può essere usato"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "La parola chiave %s non può essere sostituita"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Intestazione estesa malformata: manca la lunghezza"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "La lunghezza dell'intestazione estesa %*s è fuori dall'intervallo"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Intestazione estesa malformata: manca lo spazio dopo la lunghezza"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Intestazione estesa malformata: manca il segno di uguale"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Intestazione estesa malformata: manca un newline"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Parola chiave sconosciuta \"%s\" dell'intestazione estesa ignorata"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2667,48 +2677,48 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "L'intestazione estesa %s=%s è fuori dall'intervallo %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Intestazione estesa malformata: %s=%s non valido"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Intestazione estesa malformata: %s=%s in eccesso"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
"Intestazione estesa malformata: %s non valido: delimitatore %c non atteso"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
"Intestazione estesa malformata: %s non valido: numero dispari di valori"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: timeout non valido"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: azione di punto di controllo sconosciuta"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "lettura"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "scrittura"
@@ -2716,7 +2726,7 @@ msgstr "scrittura"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Punto di controllo di scrittura %u"
@@ -2725,12 +2735,12 @@ msgstr "Punto di controllo di scrittura %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Punto di controllo di lettura %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2738,99 +2748,103 @@ msgstr ""
"genfile manipola i file per la suite di test GNU paxutils.\n"
"Le opzioni sono:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Opzioni di creazione file:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "DIMENSIONE"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Crea file della DIMENSIONE indicata"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Scrive sul file NOME invece dello standard output"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Legge i nomi dei file da FILE"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T legge nomi terminati da NULL"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Riempie il file con il MODELLO fornito. MODELLO è \"default\" o \"zeros\""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Dimensione del blocco per il file sparso"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Genera file sparso. Il resto della riga di comando fornisce la mappa del "
"file."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "OFFSET"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Si posiziona all'OFFSET indicato prima di scrivere i dati"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Elimina i messaggi di diagnostica che non sono errori"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Opzioni per le statistiche:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Stampa i contenuti di struct stat per ogni file dato. Il FORMATO predefinito "
"è:"
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Opzioni di esecuzione sincrona:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPZIONE"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Esegue ARGOMENTI. Utile con --checkpoint e uno tra --cut, --append, --touch, "
"--unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Esegue l'azione indicata (consultare più sotto) al raggiungimento del punto "
"di controllo NUMERO"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Imposta la data per l'opzione --touch successiva"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
"Visualizza i punti di controllo eseguiti e lo stato di uscita del COMANDO"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2838,7 +2852,7 @@ msgstr ""
"Azioni di esecuzione sincrona. Queste sono eseguite quando viene raggiunto "
"il punto di controllo fornito dall'opzione --checkpoint."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2846,85 +2860,85 @@ msgstr ""
"Tronca il FILE alla dimensione specificata dall'opzione --length precedente "
"(0 se non viene fornita)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Aggiunge DIMENSIONE byte al FILE. DIMENSIONE è fornita dall'opzione --length "
"precedente."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Aggiorna l'orario di accesso e modifica del FILE"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Esegue il COMANDO"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Elimina FILE"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Dimensione non valida: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Numero fuori dall'intervallo consentito: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Dimensione negativa: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) non riuscita"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "lunghezza file richiesta %lu, effettiva %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "il file creato non è sparso"
# (ndt) ?
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Errore nell'analizzare il numero vicino a \"%s\""
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Formato data non conosciuto"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGOMENTI...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "impossibile aprire \"%s\""
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "impossibile eseguire seek"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "il nome del file contiene caratteri NULL"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
@@ -2932,42 +2946,42 @@ msgstr ""
"file"
# (ndt) ?
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "maschera non corretta (vicino a \"%s\")"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Campo \"%s\" sconosciuto"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "impossibile impostare l'orario su \"%s\""
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "impossibile troncare \"%s\""
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "comando non riuscito: \"%s\""
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "impossibile troncare \"%s\""
+msgstr "impossibile eseguire stat su \"%s\""
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "impossibile impostare l'orario su \"%s\""
+msgstr "impossibile rimuovere la directory \"%s\""
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "impossibile eseguire l'unlink di %s"
@@ -3007,33 +3021,5 @@ msgstr "Comando terminato\n"
msgid "--stat requires file names"
msgstr "--stat richiede i nomi dei file"
-#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-#~ msgstr "%.*s: il parametro ARGP_HELP_FMT deve essere positivo"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: l'opzione \"--%s\" non accetta un argomento\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: opzione \"--%s\" non riconosciuta\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: l'opzione \"-W %s\" non accetta un argomento\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: l'opzione \"-W %s\" richiede un argomento\n"
-
-#~ msgid "Unlink FILE"
-#~ msgstr "Esegue l'unlink di FILE"
-
-#~ msgid "same as both -p and -s"
-#~ msgstr "Come -p e -s assieme"
-
-#~ msgid ""
-#~ "The --preserve option is deprecated, use --preserve-permissions --"
-#~ "preserve-order instead"
-#~ msgstr ""
-#~ "L'opzione --preserve è deprecata, usare --preserve-permissions --preserve-"
-#~ "order"
+#~ msgid "OPTION"
+#~ msgstr "OPZIONE"
diff --git a/po/ja.gmo b/po/ja.gmo
index 4ff1096fb4b249a43bd698c1d26573d9f5bcb69d..ba6493886ab965ddb77c0040fb7e756d14f87675 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 8b0a13d135ca19b8c0a808097ae4ea73f6417bc3..f3c4cd299312eeacd241f0ff87dea0fa8516d7e0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,18 +1,18 @@
-# Japanese messages for GNU tar 1.28.90
-# Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Free Software Foundation, Inc.
+# Japanese messages for GNU tar 1.30
+# Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
-# Masahito Yamaga <ma@yama-ga.com>, 2016.
+# Masahito Yamaga <ma@yama-ga.com>, 2017.
# derived from the version by
# Daisuke Yamashita <yamad@mb.infoweb.ne.jp>, 1999-2001.
# Masahito Yamaga <yamaga@ipc.chiba-u.ac.jp>, 2007.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: GNU tar 1.29\n"
+"Project-Id-Version: GNU tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-17 07:44+0900\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-18 07:23+0900\n"
"Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
"Language: ja\n"
@@ -99,7 +99,7 @@ msgid "give a short usage message"
msgstr "û������ˡ��å�������ɽ��"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NAME"
@@ -137,29 +137,29 @@ msgid "write error"
msgstr "���ߥ��顼"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: ���ץ���� '%s' �Ϥ����ޤ��Ǥ�\n"
+msgstr "%s: ���ץ���� '%s%s' �Ϥ����ޤ��Ǥ�\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: ���ץ���� '%s' �Ϥ����ޤ��Ǥ�. ��ǽ��������Τ�"
+msgstr "%s: ���ץ���� '%s%s' �Ϥ����ޤ��Ǥ�. ��ǽ��������Τ�"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: ̤�ΤΥ��ץ���� '%c%s'\n"
+msgstr "%s: ̤�ΤΥ��ץ���� '%s%s'\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: ���ץ���� '%c%s' �˰����Ϥ���ޤ���\n"
+msgstr "%s: ���ץ���� '%s%s' �˰����Ϥ���ޤ���\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: ���ץ���� '--%s' �ˤϰ�����ɬ�פǤ�\n"
+msgstr "%s: ���ץ���� '%s%s' �ˤϰ�����ɬ�פǤ�\n"
#: gnu/getopt.c:621
#, c-format
@@ -234,12 +234,12 @@ msgstr "^[yY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "�ѥå�������: %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "�ѥå�������: %s\n"
@@ -247,12 +247,11 @@ msgstr "
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -262,7 +261,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"���ѵ��� GPLv3+: GNU GPL version 3 �ޤ��Ϥ���ʹ� <http://gnu.org/licenses/"
+"���ѵ��� GPLv3+: GNU GPL version 3 �ޤ��Ϥ���ʹ� <https://gnu.org/licenses/"
"gpl.html>\n"
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
@@ -404,14 +403,13 @@ msgid "%s home page: <%s>\n"
msgstr "%s �ۡ���ڡ���: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "%s �ۡ���ڡ���: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s �ۡ���ڡ���: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
-msgstr "GNU ���եȥ��������Ѿ�ΰ���Ū�إ��: <http://www.gnu.org/gethelp/>\n"
+msgstr "GNU ���եȥ��������Ѿ�ΰ���Ū�إ��: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -530,190 +528,190 @@ msgstr "
msgid "Cannot execute remote shell"
msgstr "��֥����뤬�¹ԤǤ��ޤ���"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "�����������ϰϳ�"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "̵���ʸ�������"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "̵���ʸ������ե��å�"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "�������ե��åȤ��ϰϳ�"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "̵���ʥХ��ȿ�"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "�Х��ȿ����ϰϳ�"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "�ե���������潪λ"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "̵����������"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "��������Ƥ��ʤ����"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "ͽ�����̰���"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "��֥ץ����������̿�������դ��ƥơ��ץɥ饤�֤����"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NUMBER"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "�ǥХå���٥������"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FILE"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "�ǥХå����ϥե�����̾������"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "%s ���ޤ���"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "������¿�����ޤ�"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "���פʥ��ޥ��"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "����� tar ���������֤ǤϤʤ��褦�Ǥ�"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "���ɤ߹��ߥХ��ȿ�"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "���Ф��Х��ȿ�"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "������Х��ȿ�"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(�ѥ���)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "ü�����饢�������֤����Ƥ��ɤ��Τ���� (-f ���ץ����λ���˺��?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "ü���˥��������֤����Ƥ�Ф��Τ���� (-f ���ץ����λ���˺��?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "record_size ��̵�����ͤǤ�"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "����������̾�����ꤵ��Ƥ��ޤ���"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "ɸ�������ϤΥ��������֤ϸ��ڤǤ��ޤ���"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "���������֤ϰ��̤���Ƥ��ޤ�. %s ���ץ�����ȤäƤ�������"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "���̤��줿���������֤ϥ��åץǡ��ȤǤ��ޤ���"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "�ơ��פ���Ƭ�Ǥ�. ��������ߤ��ޤ�"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "���顼��¿�����ޤ�. ��������ߤ��ޤ�"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "��Ͽ������ = %lu �֥��å�"
msgstr[1] "��Ͽ������ = %lu �֥��å�"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "������������Υ��饤����Ȥ���Ƥ��ʤ��֥��å� (%lu �Х���)"
msgstr[1] "������������Υ��饤����Ȥ���Ƥ��ʤ��֥��å� (%lu �Х���)"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"���������֥ե���������������᤻�ޤ���. -i �ʤ��Ǥ��ɤ�ʤ������Τ�ޤ���."
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek ��Ͽ�ζ����ǻߤ�ޤ���"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: ̵���ʥܥ�塼���ֹ��ޤ�Ǥ��ޤ�"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "�ܥ�塼���ֹ椬�����С��ե������ޤ���"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "�ܥ�塼�� #%d (%s) ��������ޤ�. ��������Ƥ�������: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "�桼������������ EOF ��ɬ�פȤʤ�ޤ�"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "�ٹ�: ���������֤��Դ����Ǥ�"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -725,67 +723,67 @@ msgstr ""
" q tar ��λ\n"
" y �ޤ��ϲ��� �����³\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! ���֥������ư\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? ���Υꥹ�Ȥ�ɽ��\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "�������ܥ�塼�ब����ޤ���. ��λ���ޤ�.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "�ե�����̾�����ꤵ��Ƥ��ޤ���. �⤦����.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "����������. ? �ǥإ�פ�ɽ��\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s ���ޥ�ɤ����Ԥ��ޤ���"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s �Ϥ��Υܥ�塼����Ϣ³���Ƥ��ޤ���"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s �Ϥ��Υܥ�塼���Ǥ����餯Ϣ³���Ƥ��ޤ�: �إå��Ͼ�ά���줿̾����ޤ��"
"���ޤ�"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s �������ʥ������Ǥ� (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "���Υܥ�塼���Ϣ³���Ƥ��ޤ��� (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "���������֤� %s �˰��פ����٥뤬�դ��Ƥ��ޤ���"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "�ܥ�塼�� %s �� %s �˰��פ��ޤ���"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -793,210 +791,210 @@ msgstr ""
"%s: �ե�����̾��Ĺ��� GNU �ޥ���ܥ�塼��إå�����¸�Ǥ��ʤ��Τ��ڤ�Τ�"
"�ޤ�"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "���ߤ��֥��å������ǽ���äƤ��ޤ���"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "%lu �Х��Ȥ����� %lu �Х��Ȥ����ɤ߹��ळ�Ȥ��Ǥ��ޤ���"
msgstr[1] "%lu �Х��Ȥ����� %lu �Х��Ȥ����ɤ߹��ळ�Ȥ��Ǥ��ޤ���"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "���Ƥ��ۤʤ�ޤ�"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "�������������ͽ������ EOF ������ޤ�"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "�ե����륿���פ��ۤʤ�ޤ�"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "�⡼�ɤ��ۤʤ�ޤ�"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "�桼�� ID ���ۤʤ�ޤ�"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "���롼�� ID ���ۤʤ�ޤ�"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "�ǽ��������郎�ۤʤ�ޤ�"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "���������ۤʤ�ޤ�"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "%s �˥���Ƥ��ޤ���"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "����ܥ�å�����ۤʤ�ޤ�"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "�ǥХ����ֹ椬�㤤�ޤ�"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "����"
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: ̤�ΤΥե����륿���� '%c', �̾�ե�����Ⱥ�ʬ����ޤ�"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "���������������Ƭ����������줿�ե�����̾������ޤ�."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "���������֤��Ѵ����줿�ե�����̾���ޤޤ�Ƥ��ޤ�"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "���Υե�����ν�߳�ǧ�˼��Ԥ�����ǽ��������ޤ�."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "��ǧ����: %d �Ĥ�̵���ʥإå������Ĥ���ޤ���"
msgstr[1] "��ǧ����: %d �Ĥ�̵���ʥإå������Ĥ���ޤ���"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "%s �˸�Ω���������֥��å�"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: ����å��� �ǥ��쥯�ȥ� ���� %s ��ޤ�Ǥ��ޤ�; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "�� %s �� %s ���ϰ� %s..%s �ˤ���ޤ��� -- %s ������"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "�� %s �� %s ���ϰ� %s..%s �ˤ���ޤ���"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "��� 8 �ʥإå����������ޤ�"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: �ե�����̾��Ĺ��� (���� %d) �Τǥ���פ��ޤ���"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: �ե�����̾��Ĺ��� (ʬ����ǽ) �Τǥ���פ��ޤ���"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: ���̾��Ĺ���Τǥ���פ��ޤ���"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: %s �Х��Ⱦ������ʤä��Τǡ����������ޤ�"
msgstr[1] "%s: %s �Х��Ⱦ������ʤä��Τǡ����������ޤ�"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: �ե�����ϰۤʤ�ե����륷���ƥ��ˤ���Τǥ���פ��ޤ���"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "���Ƥ����פ��ޤ���"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: ̤�ΤΥե��������; �ե������̵�뤵��ޤ�"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "%s �ؤΥ������ޤ���."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: �ѹ�����Ƥ��ʤ��Τǥ���פ��ޤ���"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: �ϥ��������֤ʤΤǥ���פ��ޤ���"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "�ǥ��쥯�ȥ�����פ��ޤ���"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: �ɤ߹�����ե����뤬�ѹ�����Ƥ��ޤ�"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: �����åȤ�̵�뤷�ޤ�"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: door ��̵�뤷�ޤ�"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "���Υإå����åפ��ޤ�"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "���������֤���إå��Ǥʤ���Τ������ޤ�"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: ���餯�Ť������ॹ����� %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: �����ॹ����� %s �� %s ������Ƥ��ޤ�"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: �ǥ��쥯�ȥ����������¬��̷�⤬������ޤ���"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: ��¸�ե�������åפ��ޤ�"
@@ -1019,7 +1017,7 @@ msgstr "
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: ���Ф��ޤ��� -- �ե�������̤Υܥ�塼�फ��³���Ƥ��ޤ�"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "ͽ������Ĺ��̾���إå�"
@@ -1036,7 +1034,7 @@ msgstr "
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: ���С�̾���ޤ�Τ� '..'"
#: src/extract.c:1696
#, c-format
@@ -1048,22 +1046,22 @@ msgstr "%s:
msgid "Cannot rename %s to %s"
msgstr "%s ��̾���� %s ���ѹ��Ǥ��ޤ���"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: �ǥ��쥯�ȥ�̾�� %s �����ѹ�����ޤ���"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: �ǥ��쥯�ȥ�Ͽ���������ޤ���"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: �ǥ��쥯�ȥ�ϰۤʤ�ե����륷���ƥ��ˤ���Τǥ���פ��ޤ���"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: �ǥ��쥯�ȥ�̾���ѹ�����ޤ���"
@@ -1189,215 +1187,215 @@ msgstr "%s: %s
msgid "%s: Cannot remove"
msgstr "%s: ����Ǥ��ޤ���"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: ��ά���ޤ�"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "�֥��å� %s: ** NUL �Υ֥��å� **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "�֥��å� %s: ** �ե�����ν�ü **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "�֥��å� %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "���� %s �Ȥʤ�٤��إå����֤����ˤʤäƤ��ޤ�"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr "8 �ʿ��� %.*s �� %s ���ϰϳ��Ǥ� -- 2 ������ȸ��ʤ��ޤ�"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "8 �ʿ��� %.*s �� %s ���ϰϳ��Ǥ�"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "���������֤��Ѥ줿 base-64 �إå����ޤޤ�Ƥ��ޤ�"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "����դ� base-64 ʸ���� %s �� %s ���ϰϳ��Ǥ�"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "base-256 �ͤ� %s ���ϰϳ��Ǥ�"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "���������֤� %.*s ���ޤޤ�Ƥ��ޤ����������Ͽ��� %s �Ȥʤ�Ϥ��Ǥ�"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "���������֤��� %s �� %s ���ϰ� %s..%s ��ˤ���ޤ���"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " %s �ؤΥ��\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " �����ʥե����륿���� %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--�����--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Ĺ��̾��--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--�ܥ�塼��إå�--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--�Х��� %s ��Ϣ³--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "�ǥ��쥯�ȥ�����:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "̾���� %s ���� %s ���ѹ����ޤ�\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: ̾���� %s ���ѹ��Ǥ��ޤ���"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "̾���� %s ���� %s ���ᤷ�ޤ�\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: �ɤ߹��߰����˺������ޤ���"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "�ҥץ�����"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "�ץ������֥���ͥ�"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "��������ե�����̾����:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"���ꤵ�줿 FILE �������֤��ɲ� (���å��� ' �ǻϤޤ�ե�����̾�ξ�����"
"��)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "�ǥ��쥯�ȥ� DIR �ذ�ư"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "��Фޤ��Ϻ�������̾����ե����� FILE �������"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T �� null �ǽ����̾�����ɤ߹���; --verbatim-files-from ��ż�"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "���� --null ���ץ����θ��̤�̵����"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "���ϥե�����ޤ��ϥ��С�̾����ѽ�λ���� (ɸ��)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "���ϥե�����ޤ��ϥ��С�̾����ѽ�λ���ʤ�"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T ���ե�����̾��ʸ���̤���ɤ߹��� (���ץ��������ʤ�)"
+msgstr ""
+"-T ���ե�����̾��ʸ���̤���ɤ߹��� (���������פޤ��ϥ��ץ��������ʤ�)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "-T ���ե�����̾����å���ǻϤޤ륪�ץ����Ȥ��ƽ��� (ɸ��)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "PATTERN"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "PATTERN �˰��פ���ե���������"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "FILE ����줿�ѥ���������"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr "�����ե����뼫�Ȥ���� CACHEDIR.TAG ��ޤ�ǥ��쥯�ȥ�����Ƥ����"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "CACHEDIR.TAG ��ޤ�ǥ��쥯�ȥ�ʲ������Ƥ����"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "CACHEDIR.TAG ��ޤ�ǥ��쥯�ȥ�����"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "FILE ���Ȥ���� FILE ��ޤ�ǥ��쥯�ȥ�����Ƥ����"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "�ƥǥ��쥯�ȥ�ν����ѥ������FILE (¸�ߤ�����) �����ɤ��"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1405,116 +1403,119 @@ msgstr ""
"�ƥǥ��쥯�ȥꤪ��Ӥ��Υ��֥ǥ��쥯�ȥ�ν����ѥ������FILE (¸�ߤ�����) "
"�����ɤ��"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "FILE ��ޤ�ǥ��쥯�ȥ�ʲ������Ƥ����"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "FILE ��ޤ�ǥ��쥯�ȥ�����"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "�С��������������ƥ�Υǥ��쥯�ȥ�����"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "�����ѥ������VCS̵��ե����뤫���ɤ��"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "�Хå����åפ�������ƥե��������å�"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "�ǥ��쥯�ȥ��緫��˲��äƤ��� (default)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "�ǥ��쥯�ȥ��ưŪ�˲��äƤ����ʤ�"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr "�ե�����̾���ץ��ץ���� (����/��ޤ�ξ�ѥ�����˺���):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "�ե�����̾����Ƭ�ȥѥ�������"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "Ǥ�դ� '/' �ʹߤ˥ѥ������� (ɸ��ǽ���)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "��ʸ����ʸ����̵��"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "��ʸ����ʸ�����θ���ư��� (ɸ��)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "�磻��ɥ����ɤ���� (ɸ��ǽ���)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "���Ūʸ�������"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "�磻��ɥ����ɤ� '/' �˰��� (ɸ��ǽ���)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "�磻��ɥ����ɤ� '/' �˰��פ��ʤ�"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"���Υ��ץ����������ֺ����⡼�ɤޤ��Ϲ����⡼�ɤǥ��ץ����Ǥʤ�������"
+"��ǻ���. �����Υ��ץ����Ϥ�����³�������Τߤ˱ƶ�����Τǰ��֤�ľ����"
+"��������."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s �ϸ��̤ʤ�"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s �ϸ��̤ʤ�"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s �ϸ��̤ʤ�"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "���ޥ�ɥ饤��"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: %s �����ᤵ�줿�ե���������ϴ��� %s �����ɤ߹��ߺѤ�"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "ʸ���� '%s' ��ʬ��Ǥ��ޤ���: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: �ɤ߹��ޤ줿�ե�����̾�˥̥�ʸ��"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "�ѥ�����ޥå���ʸ�����ե�����̾�˻Ȥ��Ƥ��ޤ�"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1522,46 +1523,46 @@ msgstr ""
"�ѥ�����ޥå���ͭ���ˤ���ʤ� --wildcards, ���ηٹ���ߤ���ʤ� --no-"
"wildcards ��ȤäƤ�������"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: ������������˸��Ĥ���ޤ���"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: ������������˸��Ĥ���ޤ���"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "���������֥�٥뤬���פ��ޤ���"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"�ե�����ꥹ����� -C ���ץ����� --listed-incremental �Ȱ��˻Ȥ��ޤ���"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "-C ���ץ����� 1�Ĥ����ʤ� --listed-incremental �Ȱ��˻Ȥ��ޤ�"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "���ץ���� '%s' �� '%s' �Ϥɤ����ɸ�����Ϥ�ɬ�פǤ�"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: ̵���ʥ��������ַ���"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU ��ͭ�ε�ǽ�ϡ���ߴ��ʷ�����ɬ�פȤ��ޤ�"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1776,7 +1777,7 @@ msgstr "
msgid "extract files to standard output"
msgstr "�ե��������Ф���ɸ����Ϥ˽���"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "COMMAND"
@@ -1812,7 +1813,7 @@ msgstr "
msgid "use FILE to map file owner GIDs and names"
msgstr "�ե������ͭ�� GID ��̾����ޥåפ���Τ� FILE �����"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATE-OR-FILE"
@@ -2017,7 +2018,7 @@ msgstr "
msgid "Archive format selection:"
msgstr "���������ַ���������"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2101,59 +2102,59 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "PROG ��ͳ�ǥե��륿 (-d ������դ���ɬ�פ���)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "��������ե���������:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "���������ֺ������˥�������ե����륷���ƥ�˸���"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "�ե�����̾������Ƭ�� '/' ��������ʤ�"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "����ܥ�å���ɤ�; ����餬�ؤ��ե�����������֤��ƥ����"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "�ϡ��ɥ�ɤ�; ����餬�ؤ��ե�����������֤��ƥ����"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "MEMBER-NAME"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "���������֤��ɤ����˥��С� MEMBER-NAME �dz���"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "DATE-OR-FILE ��뿷�����ե�����Τߤ��Ǽ"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATE"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "�ǡ������ѹ����줿���������դ���ӻ�������"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "CONTROL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "������˥С����������� CONTROL �ˤ��ƥХå����å�"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "STRING"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2161,59 +2162,59 @@ msgstr ""
"������˥Хå����å�, �̾�������� (�Ķ��ѿ� SIMPLE_BACKUP_SUFFIX ��̤�����"
"�� '~') ����"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "�ե�����̾�Ѵ�:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "��л��˥ե�����̾������Ƭ�� NUMBER �ĤΥ���ݥͥ�Ȥ����"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "EXPRESSION"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "�ե�����̾���Ѵ��� sed ���ִ� EXPRESSION �����"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "����:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "��������Ƥ���ե�����ΰ������Ĺ��ɽ��"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "KEYWORD"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "�ٲ�����"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "NUMBER (ɸ�� 10) ���ܤε�Ͽ���Ȥ˿�Ľ��å�������ɽ��"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "ACTION"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "�Ƹ���� ACTION ��¹�"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "���ƤΥ������פ���ʤ�����å�������ɽ��"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2224,86 +2225,86 @@ msgstr ""
"�������Х��ȿ���ɽ��. ���Ĥ��줿 SIGNAL ��: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 "
"����� SIGUSR2. SIG ��Ƭ�����ʤ�̾���Ǥ��"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "�ե�����ι�������� UTC ��ɽ��"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "�ե�����λ���������������ɽ��"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "��Ĺ���Ϥ� FILE ������"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "������������Υ֥��å�����ơ���å������դ���ɽ��"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "���Ƥ�ư����ǧ"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "tar �δ����ͤ�ɽ��"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "���ʥåץ���åȥե�������ΰ���������ϰϤ�ɽ��"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr "��������л���, �������˰��פ��ʤ��ǥ��쥯�ȥ��ơ�����ɽ��"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "�Ѵ���˥ե�����̾�ޤ��ϥ���������̾��ɽ��"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STYLE"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "̾�����ѷ���������. ͭ���� STYLE �ͤϲ�������."
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "���� STRING ����ʸ�������"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "STRING �����ʸ�����Ѥ�̵����"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "�ߴ����ץ����:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr "�������� --old-archive ��Ʊ��. ��л��� --no-same-owner ��Ʊ��"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "����¾���ץ����:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "����Ū�˳��ˤʤ륪�ץ����λ��Ѥ�̵����"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' �� '%s' �Ȱ��˻Ȥ��ޤ���"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2311,40 +2312,40 @@ msgstr ""
"'-Acdtrux', '--delete' �ޤ��� '--test-label' ���ץ����Τ��� 2�İʾ���ꤹ��"
"���ȤϤǤ��ޤ���"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "���̥��ץ��������äƤ��ޤ�"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "̤�ΤΥ����ʥ�̾: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "���ե���ץ�ե����뤬���Ĥ���ޤ���"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "̤�Τ����եե����ޥåȤ� %2$s ����� %1$s �Ȥ��ޤ�"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "���ץ���� %s: ���� '%s' �� %s �Ȥ��ư���"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "%s ��ͳ�ǥ��������֤�ե��륿"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "--quoting-style ���ץ������Ф���ͭ���ʰ���:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2352,163 +2353,163 @@ msgstr ""
"\n"
"�֤��Ρ�tar �ε�����:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "̵���ʽ�ͭ�Ԥޤ��ϥ��롼��ID"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "̵���ʥ֥��å�����"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "̵���ʥơ��פ�Ĺ��"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "̵������ʬ��٥���"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "1�İʾ���ߵ�Ȥʤ�����"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "̵���ʤޤФ� (sparse) �С��������"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' �Ϥ��Υץ�åȥե�����Ǥϼ�������Ƥ��ޤ���"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint �ͤ������ǤϤ���ޤ���"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "���ץ����ǻ��ꤵ�줿�⡼�ɤ�̵���Ǥ�"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "̵���ʿ�"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "̵���ʵ�Ͽ������"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "��Ͽ�������� %d ���ܿ��Ǥʤ���Ф����ޤ���"
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "̵���ʥ�����ȿ�"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "--to-command ���ץ����� 1�Ĥ�������"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "����������̩�ٰ���: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "̤�Τ�̩��: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "���ץ���� '-[0-7][lmh]' �ϡ֤��Ρ�tar �Ǥϼ�������Ƥ��ޤ���"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: ���顼�ξ��"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "%s �ι�ʸʬ�ϻ��˥��顼"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[�ե�����]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "%s ���ץ�������"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "TAR_OPTIONS ��ʬ��Ǥ��ޤ���: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "�Ť����ץ���� '%c' �ϰ�����ɬ�פȤ��ޤ�"
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence �ϥե�����������ʤ����̵��̣"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "ʣ�緿���������֥ե�����ˤ� '-M' ���ץ����ɬ�פǤ�"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--listed-incremental �ʤ��� --level ��̵��̣�Ǥ�"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: �ܥ�塼���٥뤬Ĺ�����ޤ� (%lu �Х�������)"
msgstr[1] "%s: �ܥ�塼���٥뤬Ĺ�����ޤ� (%lu �Х�������)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "�ޥ���ܥ�塼�ॢ�������֤��ǧ�Ǥ��ޤ���"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "���̤��줿���������֤ϳ�ǧ�Ǥ��ޤ���"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "�ޥ���ܥ�塼��˰��̤��줿���������֤ϻȤ��ޤ���"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "���̤��줿���������֤�Ϣ��Ǥ��ޤ���"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime �� --mtime �ǻ��ꤵ�줿������ɬ�פǤ�"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option �� POSIX ���������֤ǤΤȤ��ޤ�"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls �� POSIX ���������֤ǤΤȤ��ޤ�"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux �� POSIX ���������֤ǤΤȤ��ޤ�"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs �� POSIX ���������֤ǤΤȤ��ޤ�"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2516,129 +2517,138 @@ msgstr ""
"�ȥåץ�٥�ǥ��쥯�ȥ�̾�������ǽ; --one-top-level=DIR ������Ū�˻��ꤷ��"
"��������"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "�ܥ�塼��Ĺ�ϥ쥳���ɥ�������꾮�����ƤϤ����ޤ���"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "���Υ��������ֺ����Ϥ��Ƽϴꤤ�ޤ�"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "���ץ���� '-Aru' �� '-f -' �Ȥ����Ƥ�ޤ���"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"'-Acdtrux', '--delete' �ޤ��� '--test-label' ���ץ����Τ����������줫 1�Ĥ�"
"���ꤷ�ʤ���Фʤ�ޤ���"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "���Υ��顼�ˤ�꼺�ԥ��ơ������ǽ�λ���ޤ�"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: �ե����뤬 %s �Х��Ⱦ������ʤäƤ��ޤ�"
msgstr[1] "%s: �ե����뤬 %s �Х��Ⱦ������ʤäƤ��ޤ�"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "������� %s ��̤�Τޤ���̤����"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "�����ॹ����פ����Ĥ��줿�ϰϳ��Ǥ�"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "�ѥ����� %s �ϻȤ��ޤ���"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "������� %s ��ʤ���ޤ���"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "���������γ�ĥ�إå�: Ĺ���λ��꤬����ޤ���"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "��ĥ�إå�Ĺ %*s ���ϰϳ��Ǥ�"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "���������γ�ĥ�إå�: Ĺ���θ�˥֥������ޤ���"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "���������γ�ĥ�إå�: = (��������) ���椬����ޤ���"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "���������γ�ĥ�إå�: ���Ԥ�����ޤ���"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "̤�Τγ�ĥ�إå�������� '%s' ��̵��"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "�������줿������ɤ��ͤΥڥ���Ĺ��ޤ� (�������=%s, Ĺ��=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "��ĥ�إå� %s=%s �� %s..%s ���ϰ���ˤ���ޤ���"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "���������γ�ĥ�إå�: %s=%s ������"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "���������γ�ĥ�إå�: %s=%s ��;ʬ"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "���������γ�ĥ�إå�: %s ��̵��: ͽ�����̶��ڤ�ʸ�� %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "���������γ�ĥ�إå�: %s ��̵��: �����"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: ̵���ʥ����ॢ����"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: ̤�Τθ������"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "����"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "�ɤ߽Ф�"
@@ -2646,7 +2656,7 @@ msgstr "
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "�����å��ݥ���� %u ��Ф��ޤ�"
@@ -2655,12 +2665,12 @@ msgstr "
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "�����å��ݥ���� %u ���ɤ߹��ߤޤ�"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2668,93 +2678,97 @@ msgstr ""
"genfile �� GNU paxutils �ƥ��ȥ��åȤ��Ф��ƥǡ����ե���������ޤ�.\n"
"���ץ�����:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "�ե�����������ץ����:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "SIZE"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "���ꤵ�줿 SIZE �Υե���������"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "ɸ����Ϥ�����˥ե����� NAME �˽���"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "FILE ����ե�����̾���ɤ߹���"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T �� null �ǽ����̾�����ɤ߹��ߤޤ�"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"���ꤵ�줿 PATTERN �ǥե���������ޤ�. PATTERN �� 'default' �ޤ��� 'zeros'"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "�ޤФ�� (sparse) �ե�����Υ֥��å�������"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"�ޤФ�� (sparse) �ե����������. �Ĥ�Υ��ޥ�ɥ饤��ǥե�����ޥåפ����."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "���ե��å�"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "�ǡ�����Ф����˻��ꤵ�줿���ե��åȤޤǸ���"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "��̿Ū�Ǥʤ����ǥ�å�����������"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "�ե��������ץ��ץ����:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr "�ơ��λ���ե�������Ф��� struct stat �����Ƥ�ɽ��. ɸ�� FORMAT ��: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Ʊ���¹ԥ��ץ����:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPTION"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"ARGS ��¹�. --checkpoint ����� --cut, --append, --touch, --unlink ����� 1"
"�ĤȤȤ�˻��Ѥ���Ȥ褤"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "�����å��ݥ���� NUMBER ��ã���˻��ꤵ�줿��������� (��������) ��¹�"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "���� --touch ���ץ��������դ�����"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "�¹Ԥ��줿�����å��ݥ���Ȥ� COMMAND �ν�λ���ơ�������ɽ��"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2762,7 +2776,7 @@ msgstr ""
"Ʊ���¹ԥ��������. ������ --checkpoint option �ǻ��ꤵ�줿�����å��ݥ����"
"�ֹ����ã�����Ȥ��˼¹Ԥ����."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2770,123 +2784,123 @@ msgstr ""
"FILE �� --length ���ץ���� (�ޤ��ϻ��꤬�ʤ���� 0) �ǻ��ꤵ�줿���������ڤ�"
"�Τ�"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr "FILE �� SIZE �Х����ɵ�. SIZE ������ --length ���ץ����ǻ���."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "FILE �κǽ�������������Ⱥǽ����������"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "COMMAND ��¹�"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "FILE ����"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "̵���ʥ�����: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "�ֹ椬���Ĥ��줿�ϰϳ�: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "�������: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) ����"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "�ᤵ�줿�ե�����Ĺ %lu, �ºݤ��� %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "�������줿�ե�����ϥ��ѡ����ǤϤ���ޤ���"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "`%s' �ζ�ǿ�����ʸʬ�ϻ��˥��顼"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "̤�Τ����շ���"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGS...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "`%s' ���ޤ���"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "�ܤ��Ф��ޤ���"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "�ե�����̾���̥�ʸ����ޤ�Ǥ��ޤ�"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"�ޤФ�� (sparse) �ե������ɸ����Ϥ˽Ф��ޤ���. --file ���ץ��������"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "�����ʥޥ��� (`%s' �˶ᤤ)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "̤�ΤΥե������ `%s'"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "`%s' �˻��������Ǥ��ޤ���"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "`%s' �� truncate �Ǥ��ޤ���"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "���ޥ�ɼ���: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "`%s' �� truncate �Ǥ��ޤ���"
+msgstr "`%s' �� stat �Ǥ��ޤ���"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "`%s' �˻��������Ǥ��ޤ���"
+msgstr "�ǥ��쥯�ȥ� `%s' �����Ǥ��ޤ���"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "`%s' �� unlink �Ǥ��ޤ���"
@@ -2926,6 +2940,9 @@ msgstr "
msgid "--stat requires file names"
msgstr "--stat �ˤϥե�����̾��ɬ��"
+#~ msgid "OPTION"
+#~ msgstr "OPTION"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT �ѥ����������ͤǤʤ���Фʤ�ޤ���"
diff --git a/po/ko.gmo b/po/ko.gmo
index 18b07b8e074f5452b75a9439923b96d280e82db5..c20867f7474cad8246f7b3966dda78576dc259c7 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index f1f6a562abb236f2722c7026e28ba46ec427f1b0..44f5f4845fec479e3052bcd9b1da61030b6930cb 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,12 +4,12 @@
# Bang Jun-Young <bangjy@nownuri.net>, 1996-1997.
# Seong-ho Cho <darkcircle.0426@gmail.com>, 2016.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: GNU tar 1.29\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2016-09-22 02:59+0900\n"
"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
"Language-Team: Korean <translation-team-ko@googlegroups.com>\n"
@@ -100,7 +100,7 @@ msgid "give a short usage message"
msgstr "간단한 사용법 메시지를 보여줍니다"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "<명칭>"
@@ -236,12 +236,12 @@ msgstr "^[yY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "%s(%s)(으)로 패키지 구성함\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "%s(으)로 패키지 구성함\n"
@@ -249,11 +249,11 @@ msgstr "%s(으)로 패키지 구성함\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
#, fuzzy
msgid ""
"\n"
@@ -532,204 +532,204 @@ msgstr "원격 셸의 파일을 리다이렉션할 수 없습니다"
msgid "Cannot execute remote shell"
msgstr "원격 셸을 실행할 수 없습니다"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "탐색 방향 범위를 벗어났습니다"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "부적절한 탐색 방향"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "부적절한 탐색 오프셋"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "탐색 오프셋 범위를 벗어났습니다"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "부적절한 바이트 계수"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "바이트 계수 범위를 벗어났습니다"
#
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "빨리 나타난 파일 끝 문자"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "잘못된 동작 코드"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "동작을 지원하지 않습니다"
#
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "예기치 않은 인자"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "원격 프로세스 명령을 받아들여 테이프 드라이브를 다룹니다"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "<번호>"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "디버깅 레벨을 설정하십시오"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "<파일>"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "디버깅 출력 파일 이름을 설정하십시오"
#
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "%s을(를) 열 수 없습니다"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "인자가 너무 많습니다"
#
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "쓸모없는 명령"
#
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "이것은 tar 아카이브가 아닌 것 같습니다"
#
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "총 읽기 바이트"
#
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "총 쓰기 바이트"
#
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "총 삭제 바이트"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(파이프)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"터미널에서 아카이브 내용 읽기를 거부하고 있습니다(-f 옵션이 빠졌습니까?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"터미널에서 아카이브 내용 기록을 거부하고 있습니다(-f 옵션이 빠졌습니까?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "record_size로 부적절한 값"
#
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "아카이브 이름을 설정하지 않았습니다"
#
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "표준입/출력 아카이브를 검증할 수 없습니다"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "압축 아카이브입니다. %s 옵션을 사용하십시오"
#
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "압축 아카이브를 업데이트할 수 없습니다"
#
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "테이프의 시작 부분. 지금 끝냄"
#
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "오류가 너무 많습니다. 끝냄"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "레코드 크기 = %lu 블록"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "아카이브에 비정렬 블록 있음(%lu 바이트)"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "아카이브 파일을 후진할 수 없습니다. -i 옵션이 없으면 읽을 수 없습니다"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "레코드 범위에서 rmtlseek 동작을 멈추지 않았습니다"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: 잘못된 볼륨 번호 값이 있습니다"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "볼륨 번호 값 범위 초과"
#
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "%2$s의 볼륨 #%1$d번을 준비한 후 return키를 치십시오: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "사용자의 응답이 필요한 곳에 EOF가 있음"
#
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "경고: 아카이브가 불완전합니다"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -741,71 +741,71 @@ msgstr ""
" y 또는 newline 처리 과정 계속\n"
"\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! 하위 셸 실행\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? 이 목록 출력\n"
#
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "새 볼륨 아님. 빠져나갑니다.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "파일 이름을 지정하지 않았습니다. 다시 시도하십시오.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "부적절한 입력. 도움말을 보려면 ? 기호를 입력하십시오.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s 명령 실행 실패"
#
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s은(는) 현재 볼륨 뒤로 계속되지 않습니다"
#
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s은(는) 현재 볼륨 뒤로 계속되는 것 같습니다: 헤더에 잘린 이름이 있습니다"
#
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s은(는) 잘못된 크기입니다(%s != %s + %s)"
#
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "이 볼륨은 반복 순서를 벗어납니다(%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "아카이브에 %s와(과) 일치하는 레이블을 붙이지 않았습니다"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "%s 볼륨이 %s와(과) 일치하지 않음"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -813,232 +813,232 @@ msgstr ""
"%s: GNU 다중 볼륨 헤더에 파일 이름을 저장하기에 너무 깁니다. 파일 이름을 자름"
#
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "블록 경계로 기록을 끝내지 않았습니다"
#
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "%2$lu 바이트 중 %1$lu 바이트만 읽을 수 있습니다"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "내용이 다름"
#
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "아카이브에 예기치 않은 파일 끝 문자"
#
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "파일 형식이 다름"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "모드가 다름"
#
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "uid가 다름"
#
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "gid가 다름"
#
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "변경 일시가 다름"
#
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "크기가 다름"
#
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "%s에 연결하지 않음"
#
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "심볼릭 링크 다름"
#
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "장치 번호 다름"
#
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "검증 "
#
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: 알 수 없는 '%c' 파일 형식. 일반 파일과 다릅니다."
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "아카이브에 따라 붙은 접두부를 제거한 파일 이름이 있습니다."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "아카이브에 변환 파일 이름이 있습니다."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "원본 파일 위치를 찾을 때 검증에 실패한 것 같습니다."
#
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "검증 실패: 부적절한 헤더 %d개를 발견했습니다"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "%s에 단독 0 블록"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: %s 캐시 디렉터리 태그가 있습니다. %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr ""
"%1$s 값은 %3$s..%4$s 범위의 %2$s 값을 벗어납니다. %5$s(으)로 대신합니다."
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "%2$s의 %3$s..%4$s 범위를 벗어나는 %1$s 값"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "음의 8진수 헤더 만드는 중"
#
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: 파일 이름이 너무 깁니다(최대 %d문자). 덤프 가져오지 않음"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: 파일 이름이 너무 깁니다(나눌 수 없음). 덤프 가져오지 않음"
#
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: 링크 이름이 너무 깁니다. 덤프 가져오지 않음"
#
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: 파일 크기가 %s 바이트로 줄었습니다. 0 값으로 채움"
#
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: 다른 파일 시스템에 있는 파일입니다. 덤프 가져오지 않음"
#
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "내용 덤프를 가져오지 않음"
#
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: 알 수 없는 파일 타입: 파일을 무시함"
#
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "%s 링크 빠짐."
#
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: 파일을 바꾸지 않았습니다. 덤프 가져오지 않음"
#
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: 아카이브 파일입니다. 덤프 가져오지 않음"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "디렉터리 덤프를 저장하지 않았습니다"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: 파일을 읽고 나서 내용이 바뀌었습니다"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: 소켓을 무시했습니다"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: door 값을 무시했습니다"
#
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "다음 헤더로 건너 뜀"
#
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "아카이브에서 비헤더 부분을 제거함"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: 상당히 오래된 %s 타임스탬프"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: %s 타임스탬프는 앞으로 %s초 입니다."
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: 디렉터리를 만들 때 예상치 못한 모순을 발견했습니다"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: 기존 파일 건너뜀"
@@ -1062,7 +1062,7 @@ msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: 추출할 수 없음 -- 다른 볼륨에 연결한 파일입니다"
#
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "예상치 못한 긴 파일 헤더"
@@ -1094,25 +1094,25 @@ msgid "Cannot rename %s to %s"
msgstr "%s을(를) %s(으)로 이름을 바꿀 수 없습니다"
#
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: 디렉터리 이름이 이전 %s 디렉터리 이름에서 바뀌었습니다"
#
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: 새 디렉터리입니다"
#
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: 다른 파일 시스템에 있는 디렉터리. 덤프를 가져오지 않았습니다"
#
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: 디렉터리 이름이 바뀌었습니다"
@@ -1243,227 +1243,227 @@ msgid "%s: Cannot remove"
msgstr "%s: 제거할 수 없습니다"
#
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: 생략"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "%s 블록: ** 널 블록 **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "%s 블록: ** 파일의 끝 **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "%s 블록: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "%s 숫자값이 나타나야 하는 헤더가 비어있습니다"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
"아카이브의 %.*s 8진수 값이 %s 값 범위를 벗어났습니다. 2의 보수인 것 같습니다"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "아카이브의 %.*s 8진수 값이 %s 값 범위를 벗어났습니다"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "아카이브에 오래된 64진 헤더가 있습니다"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "아카이브의 %s 부호화 64진 문자열 값이 %s 값 범위를 벗어났습니다"
#
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "아카이브 256진 값이 %s 범위를 벗어납니다"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "아카이브에 %.*s(이)가 있는데, %s 숫자 값이 필요합니다"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "아카이브의 %1$s 값이 %3$s..%4$s 범위의 %2$s 값을 벗어났습니다"
#
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " %s(으)로 링크\n"
#
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr "알 수 없는 %s 파일 형식\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--긴 링크--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--긴 이름--\n"
#
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--볼륨 헤더--\n"
#
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--%s 바이트에서 계속--\n"
#
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "디렉터리를 만드는 중:"
#
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "%s 이름을 %s 이름으로 바꾸는 중\n"
#
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: %s 이름으로 바꿀 수 없습니다"
#
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr ""
"%s 이름을 %s 이름으로 되돌리는 중\n"
" \n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: 파일을 읽기 전에 제거했습니다"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "하위 프로세스"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "프로세스간 통신 채널"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "로컬 파일 이름 선택:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"설정 <파일>을 아카이브에 추가(파일 이름에 대시 문자를 앞에 붙이면 좋습니다)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "<디렉터리>"
#
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "<디렉터리>로 전환"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "<파일>에서 추출할 이름을 가져오거나 지정 이름으로 만듦"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T에서 널 문자로 끝난 이름을 읽습니다. --vervatim-files-from을 생략함"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "이전 --null 옵션 적용 비활성화"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "입력 파일 또는 구성 요소 이름 따옴표 제거(기본)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "입력 파일 또는 구성 요소 이름에서 따옴표 제거하지 않음"
-#: src/names.c:87
+#: src/names.c:86
#, fuzzy
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr "-T에서 있는 그대로의 파일 이름을 읽습니다(옵션 처리 안함)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "-T에서 옵션에 쓰는 대시 문자로 시작하는 파일 이름을 취급합니다(기본값)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "<패턴>"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "주어진 <패턴> 값에 해당하는 파일 제외"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "<파일> 목록에 있는 패턴 제외"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr "태그 파일을 제외하고 CACHEDIR.TAG가 들어잇는 디렉터리의 모든 내용 제외"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "CACHEDIR.TAG가 들어있는 디렉터리의 모든 항목 제외"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "CACHEDIR.TAG가 들어있는 디렉터리 제외"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "<파일> 자신을 제외하고, <파일>이 들어있는 디렉터리 내용 제외"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "<파일>이 있다면 각 디렉터리에 대한 제외 패턴을 <파일>에서 읽기"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1471,117 +1471,117 @@ msgstr ""
"<파일>이 있다면 각 디렉터리 및 하위 디렉터리에 대한 제외 패턴을 <파일> 에서 "
"읽기"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "<파일>이 들어있는 디렉터리의 모든 항목 제외"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "<파일>이 들어있는 디렉터리 제외"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "버전 관리 시스템 디렉터리 제외"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "VCS 무시 파일의 제외 패턴 읽기"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "백업 및 잠금 파일 제외"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "디렉터리의 모든 계층에 대해 처리(기본값)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "디렉터리로의 자동 진입을 피합니다"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr "파일 이름 비교 옵션(제외 및 포함 옵션 모두 해당):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "파일 이름 시작 부분에 일치하는 패턴"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "임의의 '/' 위치 다음에 일치하는 패턴(제외 조건용 기본값)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "대소문자 무시"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "대소문자 일치(기본값)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "와일드카드 사용(제외 조건용 기본값)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "있는 그대로의 문자열 일치 여부 비교"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "'/' 문자 와일드카드 비교 대상에 포함(제외 조건용 기본값)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "'/' 문자 와일드카드 비교 대상에 포함 안 함"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "명령행"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%1$s: %3$s에서 이미 읽은 파일 목록을 %2$s에서 요청했습니다"
#
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "'%s' 문자열 나눌 수 없음: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: 읽은 파일 이름에 널 문자가 있습니다"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "파일 이름에 사용하는 패턴 비교 문자"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1590,46 +1590,46 @@ msgstr ""
"wildcards를 사용하십시오"
#
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: 아카이브에 없음"
#
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: 아카이브에 필요한 내용이 없습니다"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "아카이브 레이블 일치하지 않음"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr "파일 목록에서 -C 옵션은 --listed-incremental 옵션과 사용할 수 없습니다"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "-C 옵션은 --listed-incremental 옵션만 함께 사용할 수 있습니다"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "'%s' 및 '%s' 옵션은 표준 입력이 필요합니다"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: 부적절한 아카이브 형식"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "비호환 아카이브 형식에서 GNU 기능을 필요로 합니다"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1848,7 +1848,7 @@ msgstr "출력 스트림 선택:"
msgid "extract files to standard output"
msgstr "표준 출력으로 파일 추출"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "<명령>"
@@ -1884,7 +1884,7 @@ msgstr "파일 소유자 UID 및 이름을 매핑할 때 <파일> 사용"
msgid "use FILE to map file owner GIDs and names"
msgstr "파일 소유자 GID 및 이름을 매핑할 때 <파일> 사용"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "<날짜-또는-파일>"
@@ -2088,7 +2088,7 @@ msgstr "읽었을 때 블록 재배치(4.2BSD 파이프용)"
msgid "Archive format selection:"
msgstr "아카이브 형식 선택:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "<형식>"
@@ -2172,60 +2172,60 @@ msgstr "<프로그램>"
msgid "filter through PROG (must accept -d)"
msgstr "<프로그램>으로 필터링합니다(-d 옵션을 받아들여야 함)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "로컬 파일 선택:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "아카이브를 만들 때 로컬 파일 시스템에서 대기"
#
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "파일 이름 앞에 붙은 '/' 제거하지 않음"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "심볼릭 링크를 따라서 가리키는 파일을 아카이빙하고 덤프 보관합니다"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "하드 링크를 따라서 가리키는 파일을 아카이빙하고 덤프 보관합니다"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "<구성원-이름>"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "아카이브를 읽을 때 <구성원-이름> 구성원으로 시작"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "<날짜-또는-파일>보다 최신인 파일만 저장합니다"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "<날짜>"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "날짜만 바뀌었을 때 날짜 및 시간 비교"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "<처리방식>"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "제거 전 백업하고, 버전 <관리자> 선택"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "<문자열>"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2233,59 +2233,59 @@ msgstr ""
"지우기 전에 일반적인 접미부를 붙여 백업합니다(SIMPLE_BACKUP_SUFFIX 환경 변수"
"를 설정하기 전에는 '~' 문자 사용)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "파일 이름 변환:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "추출할 때 파일 이름 앞에 오는 <번호> 갯수의 요소를 뺍니다"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "<표현식>"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "파일 이름을 변환할 <표현식> 대신 sed 사용"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "정보 출력:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "처리한 파일 목록을 자세하게 보여줍니다"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "<키워드>"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "경고 출력 제어"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "모든 <번호> 번째 레코드(기본 10)의 진행 메시지 나타냄"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "<동작>"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "각 검사 지점에서 <동작> 실행"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "모든 링크의 덤프를 가져오지 않았을 때 메시지 출력"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "<시그널>"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2296,129 +2296,129 @@ msgstr ""
"을 때 총 바이트 수를 출력합니다. 허용 시그널은 SIGHUP, SIGQUIT, SIGINT, "
"SIGUSR1, SIGUSR2 입니다. SIG 접두부가 빠진 이름을 지닌 시그널도 허용합니다."
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "파일 수정 일시를 UTC로 출력"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "파일 작성 시간을 완전한 형식으로 출력"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "자세한 출력을 <파일>로 보냄"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "각 메시지로 아카이브 블록 번호 표시"
#
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "각 동작 수행시 확인"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "tar 기본 설정 표시"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "스냅샷 파일 필드 유효 범위 표시"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr "내용 조회 및 추출시, 검색어와 일치하지 않는 각각의 디렉터리 표시"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "변환 처리 후 파일 또는 아카이브 이름 표시"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "<스타일>"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"이름 인용 부호 처리 방식을 설정합니다. 올바른 <스타일> 값은 아래를 참고하십시"
"오"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "<문자열> 문자 인용 부호 처리 추가"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "<문자열>의 문자 인용 부호 처리 비활성화"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "호환 옵션:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr "만들 때는 --old-archive와 같고, 추출할 때는 --no-same-owner와 같습니다"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "다른 옵션:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "잠재적으로 위험한 옵션 사용을 비활성화"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s'은(는) '%s'와(과) 사용할 수 없습니다"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr ""
"'-Acdtrux', '--delete', '--test-label' 옵션 중 하나 이상을 지정하면 안 됩니다"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "헷갈리는 압축 옵션"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "알 수 없는 시그널 이름: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "날짜 샘플 파일이 없습니다"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "알 수 없는 %2$s 날짜 형식에서 %1$s을(를) 바꿉니다"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "%s 옵션: '%s' 날짜를 %s(으)로 취급합니다"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "%s(으)로 아카이브를 필터링합니다"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "--quoting-style 옵션에 유효한 인자 값:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2426,167 +2426,167 @@ msgstr ""
"\n"
"*이* tar 기본 옵션은 다음과 같습니다:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "부적절한 소유자 ID 또는 그룹 ID"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "부적절한 블로킹 인수"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "부적절한 테이프 길이"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "잘못된 증분 레벨 값"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "하나 이상의 임계 일자 값"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "잘못된 희소 버전 값"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system'은 이 플랫폼에서 지원하지 않습니다"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint 값이 정수형이 아닙니다"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "옵션에 부적절한 모드가 주어짐"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "부적절한 숫자 값"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "부적절한 레코드 크기"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "레코드 크기는 %d의 배수여야 합니다."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "부적절한 요소 갯수"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "--to-command 옵션만 사용할 수 있습니다"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "비정상적인 밀도 인자 값: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "알 수 없는 밀도 값: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "'-[0-7][lmh]' 옵션은 *이* tar에서 지원하지 않습니다"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: 오류 위치"
#
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "%s 해석 오류"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[<파일>]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "%s에 옵션이 없는 인자 값"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "TAR_OPTIONS 값을 쪼갤 수 없습니다: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "오래된 '%c' 옵션에 인자 값이 필요합니다."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "파일 목록이 없으면 --occurrence 옵션은 의미가 없습니다"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "여러 아카이브 파일을 지정하려면 '-M' 옵션이 필요합니다."
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--listed-incremental 옵션이 없으면 --level 옵션은 의미가 없습니다"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: 볼륨 레이블이 너무 깁니다(%lu 바이트로 제한)"
#
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "다중-볼륨 아카이브를 검증할 수 없습니다"
#
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "압축된 아카이브를 검증할 수 없습니다"
#
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "압축된 다중-볼륨 아카이브를 사용할 수 없습니다"
#
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "압축 아카이브를 이어 붙일 수 없습니다"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime 옵션을 사용하려면 --mtime으로 날짜를 지정해야합니다"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option 옵션은 POSIX 아카이브에만 사용할 수 있습니다"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls 옵션은 POSIX 아카이브에만 사용할 수 있습니다"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux 옵션은 POSIX 아카이브에만 사용할 수 있습니다"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs 옵션은 POSIX 아카이브에만 사용할 수 있습니다"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2594,127 +2594,136 @@ msgstr ""
"최상위 디렉터리 이름을 추측할 수 없습니다. --one-top-level=<디렉터리> 옵션으"
"로 분명하게 지정하십시오"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "볼륨 길이는 레코드 크기보다 작을 수 없습니다"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "빈 아카이브 만들기를 조심스럽게 거부하고 있습니다"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "'-Aru' 옵션은 '-f -' 옵션과 함께 사용할 수 없습니다"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "'-Acdtrux', '--delete', '--test-label' 옵션 중 하나를 지정해야합니다"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "앞서 발생한 오류로 실패 코드를 반환하며 빠져나감"
#
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: 파일 크기가 %s 바이트로 줄었습니다"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "%s 키워드를 인식할 수 없거나 아직 구현하지 않았습니다"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "타임스탬프가 허용 범위를 벗어났습니다"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "%s 패턴을 사용할 수 없습니다"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "%s 키워드를 중복 우선 적용할 수 없습니다"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "잘못된 확장 헤더: 길이 정보 빠짐"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "%*s 확장 헤더 길이가 범위를 벗어납니다"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "잘못된 확장 헤더: 길이 정보 다음 공백 빠짐"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "잘못된 확장 헤더: 등호 기호 빠짐"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "잘못된 확장 헤더: 개행 문자 빠짐"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "알 수 없는 '%s' 확장 헤더 키워드 무시"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "생성한 키워드/값 쌍이 너무 깁니다(키워드=%s, 길이=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "%s=%s 확장 헤더가 %s..%s 범위를 벗어납니다"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "잘못된 확장 헤더: 부적절한 %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "잘못된 확장 헤더: %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "잘못된 확장 헤더: 부적절한 %s: 예상치 못한 구분 기호 %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "잘못된 확장 헤더: 부적절한 %s: 비정상적인 숫자값"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: 유효하지 않은 제한 시간"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: 알 수 없는 검사 지점 동작"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "쓰기"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "읽기"
@@ -2723,7 +2732,7 @@ msgstr "읽기"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "기록 검사 지점 %u"
@@ -2733,12 +2742,12 @@ msgstr "기록 검사 지점 %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "읽기 검사 지점 %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2746,93 +2755,97 @@ msgstr ""
"genfile은 GNU paxutils 테스트 모음용 데이터 파일을 다룹니다.\n"
"옵션은 다음과 같습니다:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "파일 생성 옵션:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "<크기>"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "주어진 <크기>의 파일을 만듭니다"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "표준 출력 대신 파일 <이름>"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "<파일>의 파일 이름을 읽습니다"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T 옵션은 널 문자로 끝난 이름을 읽습니다"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"설정 <패턴>으로 파일을 채웁니다. <패턴>은 'default' 또는 'zeros' 입니다"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "성긴 파일 블록 크기"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "성긴 파일을 만듭니다. 명령행의 나머지 부분에는 파일 맵을 지정합니다."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "<오프셋>"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "데이터 기록 전 설정 오프셋 탐색"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "치명적이지 않은 진단 메시지 숨김"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "파일 통계 옵션:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"지정 파일의 구조 상태 내용을 출력합니다. 기본 <형식>은 다음과 같습니다: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "동기화 실행 옵션:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "<옵션>"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"<인자>를 실행합니다. --checkpoint와 --cut, --append, --touch, --unlink 옵션 "
"중 하나를 병행하면 쓸만합니다."
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "검사 지점 <번호>에 도달할 때 다음 동작(하단 참조)을 수행합니다"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "다음 --touch 옵션의 날짜 설정"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "실행한 검사 지점과 <명령>의 상태 코드를 나타냅니다"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2840,138 +2853,138 @@ msgstr ""
"실행 동작을 동기화합니다. --checkpoint 옵션으로 지정한 검사 지점 번호에 도달"
"하면 실행합니다."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
"앞서 --length 옵션으로 지정한 크기만큼 <파일>을 자릅니다(설정하지 않으면 0)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"<파일>에 <크기> 값 만큼의 바이트를 붙여넣습니다. <크기>는 앞서 언급한 --"
"length 옵션에 지정합니다."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "<파일>의 접근 및 수정 시각 업데이트"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "<명령> 실행"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "부적절한 크기: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "숫자 값이 허용 범위를 벗어남: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "음수 크기: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) 처리 실패"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "요청한 파일 길이는 %lu지만, 실제 길이는 %lu 입니다"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "만든 파일은 성긴 파일이 아닙니다"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "`%s' 부근 숫자 값 해석 오류"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "알 수 없는 날짜 형식"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[<인자>...]"
#
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "`%s'을(를) 열 수 없습니다"
#
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "탐색할 수 없음"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "파일 이름에 널 문자가 있습니다"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr "표준 출력에 분할 파일을 만들 수 없습니다. --file 옵션을 사용하십시오"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "올바르지 않은 마스크(`%s' 부근)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "알 수 없는 `%s' 필드"
#
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "`%s' 시간에 맞출 수 없습니다"
#
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "`%s'을(를) 자를 수 없습니다"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "명령 실행 실패: %s"
#
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "`%s'을(를) 자를 수 없습니다"
#
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "`%s' 시간에 맞출 수 없습니다"
#
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "`%s' 링크를 해제할 수 없습니다"
@@ -3011,6 +3024,9 @@ msgstr "명령 실행 중단\n"
msgid "--stat requires file names"
msgstr "--stat에 파일 이름이 필요합니다"
+#~ msgid "OPTION"
+#~ msgstr "<옵션>"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT 매개 변수는 양수 값이어야 합니다"
diff --git a/po/ky.gmo b/po/ky.gmo
index b07d8f4789ba7eecc3fbb4afbddb42da5b455cc7..1d7b6e6ca83e4328562ada5891a7fda8d3d6d90e 100644
Binary files a/po/ky.gmo and b/po/ky.gmo differ
diff --git a/po/ky.po b/po/ky.po
index 569cfdc878350b71a1edef9ef3f08938fde86d1a..a64e0453b91b5cc8e62f53711be6bd267c8ba68e 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -3,12 +3,12 @@
# This file is distributed under the same license as the PACKAGE package.
# Azilet Beishenaliev <aziletb@gmail.com>, 2007.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar 1.18\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2007-09-01 01:06+0100\n"
"Last-Translator: Azilet Beishenaliev <aziletb@gmail.com>\n"
"Language-Team: Kirghiz <i18n-team-ky-kyrgyz@lists.sourceforge.net>\n"
@@ -100,7 +100,7 @@ msgid "give a short usage message"
msgstr "Колдонуу жөнүндө кыска маалымат көрсөтөт"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "АТЫ"
@@ -238,12 +238,12 @@ msgstr "^[оО]"
msgid "^[nN]"
msgstr "^[жЖ]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr ""
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr ""
@@ -251,11 +251,11 @@ msgstr ""
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr ""
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -506,195 +506,195 @@ msgstr "Алыстагы команда процессору иштетилге
msgid "Cannot execute remote shell"
msgstr "Алыстагы команда процессору иштетилген жок"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Издөө жолу диапазондун тышында"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
#, fuzzy
msgid "Invalid seek direction"
msgstr "Опцияда жарабаган укук абалы берилди"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
#, fuzzy
msgid "Invalid seek offset"
msgstr "Жараксыз көлөм: %s"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Издөө даражасы диапазондун тышында"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
#, fuzzy
msgid "Invalid byte count"
msgstr "Лентанын узундугу жараксыз"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
#, fuzzy
msgid "Byte count out of range"
msgstr "Издөө даражасы диапазондун тышында"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
#, fuzzy
msgid "Premature eof"
msgstr "rmtd: Файлдын соңу эрте келди\n"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
#, fuzzy
msgid "Invalid operation code"
msgstr "Негизги иштөө абалы:"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr ""
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
#, fuzzy
msgid "Unexpected arguments"
msgstr "Архивде күтүлбөгөн жерде файлдын соңу бар"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "N"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr ""
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "ФАЙЛ"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr ""
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, fuzzy, c-format
msgid "cannot open %s"
msgstr "`%s' ачылбай жатат"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "аргументтердин саны көп"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Туура эмес команда"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Бул tar-архиви эмес окшойт"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Алынган жалпы байт"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Жазылган жалпы байт"
-#: src/buffer.c:593
+#: src/buffer.c:595
#, fuzzy
msgid "Total bytes deleted"
msgstr "Өчүрүлгөн жалпы байт: %s\n"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(канал)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "record_size мааниси жарабайт"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Архивдин аты берилген жок"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Архивдин stdin/stdout текшерүүсү болбой жатат"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Архив кысыштырылган абалда. %s опциясын колдонгула"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Кысыштырылган архивдерди жаңырталбай калды"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Лентанын башына келди, иш бүттү"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Өтө көп ката бар, иш бүттү"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Маалыматтын көлөмү = %lu блок"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Архивде түз жайлашпаган блок бар (%lu байт)"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Архивдеги файл өчпөй калды; архив ачылбаса -i деп колдонгула"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek маалыматтын чегинде токтогон жок"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: жараксыз том номери бар"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Томдун номери батпай калды"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "%2$s үчүн %1$d-томду даярдап Enter'ди басыңыз: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Колдонуучудан жооп күтүбатканда файлдын соңу келип калды"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "ЭСКЕРТҮҮ: Архив толук эмес"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -705,274 +705,274 @@ msgstr ""
" q\t\ttar программасынын ишин бүтүр\n"
"y же Ввод\t\tИшти улант\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Команда строкасын ач\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Бул тизмени жаз\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Жаңы том жок; иш бүттү.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Файлдын аты берилген жок. Кайра жазып көргүлө.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Туура эмес ввод. Жардам үчүн ? жазгыла.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s командасы аткарылбай калды"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s мунун бул томдо уландысы жок"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s бул томдо уланса керек: башкы-маалыматта аты кыскартылыптыр"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s көлөмү туура эмес (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, fuzzy, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Бул том иретте эмес"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Архивдин тамгасы %s менен келишпей жатат"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "%s тому %s менен келишпей жатат"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
"%s: файлдын аты көп-томдук GNU башкы-маалымат үчүн өтө узун, кыскартылды"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
#, fuzzy
msgid "write did not end on a block boundary"
msgstr "rmtlseek маалыматтын чегинде токтогон жок"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "%2$lu байттан %1$lu гана окулду"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Мазмундары окшобойт"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Архивде күтүлбөгөн жерде файлдын соңу бар"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Файл түрү окшошпойт"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Укук абалдары окшошпойт"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid окшошпойт"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid окшошпойт"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Алмаштыруу убактылары окшошпойт"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Көлөмү окшошпойт"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "%s жака шилтенген эмес"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Символикалык шилтеме окшошпойт"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Аспап номери окшошпойт"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Текшерүү "
-#: src/compare.c:480
+#: src/compare.c:479
#, fuzzy, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: `%c' файл түрү бүлгисиз, жөнөкөй файл катары салыштырды"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Архивдин ичинде префикстери алынган файл аттары бар."
-#: src/compare.c:541
+#: src/compare.c:540
#, fuzzy
msgid "Archive contains transformed file names."
msgstr "Архивде эски түрдөгү base-64 башкы-маалымат бар"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Текшерүү учурунда алгачкы файлдар табылбай калышы мүмкүн."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "ТЕКШЕРҮҮ КАТАСЫ: %d жараксыз башкы маалымат табылды"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "%s болгон жерде нөлдүк блок бар"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: мунун ичинде %s деген кэш-папка белгиси бар; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "%s мааниси %s диапазонунун тышында %s..%s; ордуна %s коюлат"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "%s мааниси %s диапазонунун тышында %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Терс сегиздик системасында башкы маалыматтар даярдалууда"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: файлдын аты өтө узун (эң көп %d болот); кошулбайт"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: файлдын аты өтө узун (бөлүнбөйт); кошулбайт"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: шилтеменин аты өтө узун; кошулбайт"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Файл %s байтка азайды; нөлдөр менен толтурулат"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: файл башка файл-системасында; кошулбайт"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "астындагылар кошулган жок"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Файлдын түрү белгисиз; файл каралбайт"
-#: src/create.c:1576
+#: src/create.c:1575
#, fuzzy, c-format
msgid "Missing links to %s."
msgstr "%s жака шилтемелер жок.\n"
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: файл алмашкан жок; кошулбайт"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: файл архив экен; кошулбайт"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "папка кошулган жок"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: файлды окуу учурунда файл алмашты"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: сокет каралбайт"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: door каралбайт"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Эмики башкы-маалыматка өттү"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Архивде башкы-маалымат болбогондор өчүрүлөт"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: %s убакыт тамгасы өтө эски"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: %s убакыт тамгасы %s сек. келечекте"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Папка ачыбатканда күтүлбөгөн нерселер болду"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr ""
@@ -995,7 +995,7 @@ msgstr "Символикалык шилтемелерди түз шилтеме
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Чыгарылган жок -- файл башка томдон уланып келиптир"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Башкы-маалымат узун"
@@ -1024,22 +1024,22 @@ msgstr "%s: Бул файлдын резерв копиясы алыналбай
msgid "Cannot rename %s to %s"
msgstr "%s файлы %s деп алмаштыралбай калды"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Папканын эски аты %s эле"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Папка жаңы"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, fuzzy, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: файл башка файл-системасында; кошулбайт"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Папка алмаштырылды"
@@ -1166,35 +1166,35 @@ msgstr "%s: %s өчүрүлүп жатат\n"
msgid "%s: Cannot remove"
msgstr "%s: Өчүрүлбөй жатат"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Муну аттады"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "блок %s: ** нөлдөр болгон блок **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "блок %s: ** Файлдын соңу **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "блок %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Башкы-маалыматта сан түрүндө %s болотурган жерде бош жерлер бар"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1202,89 +1202,89 @@ msgstr ""
"экилик системадагы терси алынды"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr ""
"Архивдин сегиздик системадагы мааниси болгон %.*s %s диапазонунун тышында"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Архивде эски түрдөгү base-64 башкы-маалымат бар"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Архивдеги base-64 түрүндөгү %s сөзү %s диапазонунун тышында"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Архивдин base-256 мааниси %s диапазонунун тышында"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr ""
"Архивдин ичинде %.*s бар, алардын ордунда сан түрүндө %s болушу керек эле"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Архивдин %s мааниси %s түрүнүн %s..%s диапазонунда эмес"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " %s жака шилтеме\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " белгисиз файл түрү %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Узун шилтеме--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Узун ат--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Томдун башкы-маалыматы--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--%s-байттан баштап уланды--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Жаңы папка ачылыбатат:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "%s'тин атын %s деп алмаштырды\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Аты %s деп алмаштыралбай калды"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "%s'тин атын кайра %s деп алмаштырды\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Файл окулганча өчүрүлүп кетти"
@@ -1292,80 +1292,80 @@ msgstr "%s: Файл окулганча өчүрүлүп кетти"
# орусчада дочерный процесс, бир процесс өз ичинен жаңы бир
# процесс жаратканда ошол чайлд процесс болот. Биз эмне дейбиз?
# Мен туулган процесс дейм.
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "туулган процесс"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "процесс-аралык канал"
-#: src/names.c:69
+#: src/names.c:68
#, fuzzy
msgid "Local file name selection:"
msgstr "Локалдуу файлдарды тандоо:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "ФАЙЛды архивге кош (файлдын аты тире менен баштаган учурда пайдалуу)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "ПАПКА"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "ПАПКА папкасына өт"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "чыгарылатурган же жаңы ачылатурган файлдарды АТЫ деген файлдан кара"
-#: src/names.c:78
+#: src/names.c:77
#, fuzzy
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T опциясы нөл менен бүткөн аттарды окуйт, -C опциясы өчүрүлөт"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr ""
-#: src/names.c:83
+#: src/names.c:82
#, fuzzy
msgid "unquote input file or member names (default)"
msgstr ""
"-T менен алынган файлдардын аттарындагы ковычкалар өчүрүлөт (алдынала "
"тандалат)"
-#: src/names.c:85
+#: src/names.c:84
#, fuzzy
msgid "do not unquote input file or member names"
msgstr "-T менен алынган файлдардын аттарындагы ковычкалар калаберет"
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
#, fuzzy
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T менен алынган файлдардын аттарындагы ковычкалар өчүрүлөт (алдынала "
"тандалат)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "ШАБЛОН"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "ШАБЛОН менен уйкаш файлдар ишке алынбайт"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "ФАЙЛда тизмеленген шаблондор менен уйкаш файлдар ишке алынбайт"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1373,148 +1373,148 @@ msgstr ""
"CACHEDIR.TAG файлы болгон папкалардын астындагылары тэг файлдан тышкарысы "
"кошулбайт"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "CACHEDIR.TAG файлы болгон папкалардын астындагыларынын баары кошулбайт"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "CACHEDIR.TAG файлы болгон папкалар кошулбайт"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"ФАЙЛ файлы болгон папкалардын астындагылары ФАЙЛ файлындан тышкарысы "
"кошулбайт"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "ФАЙЛ файлы болгон папкалардын астындагыларынын баары кошулбайт"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "ФАЙЛ файлы болгон папкалар кошулбайт"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr ""
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr ""
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "папкалардын тереңине кирет (алдынала тандалган)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "папкалардын тереңине кирип кетүүнү токтот"
# inclusion, exclusion - Kyrgyz equiv?
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr "Файлдын атына уйкаштыруу опциялары (бардык шаблондорго тиешелүү):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "шаблондор файлдын атынын башталышы менен уйкаштырылат"
-#: src/names.c:135
+#: src/names.c:134
#, fuzzy
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
"шаблондор `/' символунан кийин келген ар жерде уйкашына каралат (алдынала "
"тандалган)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "тамгалардын чоң-кичинесине каралбайт"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "уйкаштырууда тамгалардын чоң-кичинесине каралат (алдынала тандалган)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "шаблондор колдонулат (иштен алынбаган файлдарга алдынала тандалат)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "кандай жазылса ошондой колдонулат"
-#: src/names.c:145
+#: src/names.c:144
#, fuzzy
msgid "wildcards match '/' (default for exclusion)"
msgstr "шаблондор `/' символун издейт (алдынала тандалган)"
-#: src/names.c:147
+#: src/names.c:146
#, fuzzy
msgid "wildcards do not match '/'"
msgstr "шаблондор `/' символун издебейт"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
#, fuzzy
msgid "command line"
msgstr "%s командасы аткарылбай калды"
-#: src/names.c:897
+#: src/names.c:896
#, fuzzy, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: файл тизмеси окулган"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, fuzzy, c-format
msgid "cannot split string '%s': %s"
msgstr "`%s'ке убакыт аталган жок"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: алынган файлдын атында бош тамгалар бар"
-#: src/names.c:1358
+#: src/names.c:1388
#, fuzzy
msgid "Pattern matching characters used in file names"
msgstr "Файлдын аттарында уйкаштарды издөө үчүн колдонулган тамгалар бар."
-#: src/names.c:1360
+#: src/names.c:1390
#, fuzzy
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
@@ -1522,45 +1522,45 @@ msgid ""
msgstr ""
"Уйкаштарды издөө үчүн --wildcards опциясын колдонуңуз, же --no-wildcards"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Архивде табылган жок"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Керектүү нерселер архивде табылган жок"
-#: src/names.c:1413
+#: src/names.c:1443
#, fuzzy, c-format
msgid "Archive label mismatch"
msgstr "Архивдин тамгасы %s менен келишпей жатат"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
-#: src/tar.c:88
+#: src/tar.c:87
#, fuzzy, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "`-%s' жана `-%s' опцияларына стандарт кирүү(input) керек"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Архивдин форматы жарабайт"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Бул форматтагы архив үчүн жарабаган GNU өзгөчөлүктөрү суралууда"
-#: src/tar.c:265
+#: src/tar.c:264
#, fuzzy, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1791,7 +1791,7 @@ msgstr "Чыгаруу() жолун танда:"
msgid "extract files to standard output"
msgstr "файлдарды стандарт чыгарууга (output) жөнөт"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "КОМАНДА"
@@ -1828,7 +1828,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "ДАТА-ЖЕ-ФАЙЛ"
@@ -2038,7 +2038,7 @@ msgstr "окубатканда кайрадан блокторго бөлүп ч
msgid "Archive format selection:"
msgstr "Архивдин форматын тандоо:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "ФОРМАТ"
@@ -2125,64 +2125,64 @@ msgstr "ПРОГ"
msgid "filter through PROG (must accept -d)"
msgstr "ПРОГ менен ишке ал (-d опциясы болушу керек)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Локалдуу файлдарды тандоо:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "архивди жасабатканда локалдуу файл системасында кал"
-#: src/tar.c:693
+#: src/tar.c:694
#, fuzzy
msgid "don't strip leading '/'s from file names"
msgstr "файл аттарынын башындагы '/'терди өчүрбө"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"символикалык шилтемелерге барат; алар көрсөткөн файлдарды архивге кошот"
-#: src/tar.c:697
+#: src/tar.c:698
#, fuzzy
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"символикалык шилтемелерге барат; алар көрсөткөн файлдарды архивге кошот"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "МҮЧӨНҮН-АТЫ"
-#: src/tar.c:699
+#: src/tar.c:700
#, fuzzy
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "архивдеги МҮЧӨНҮН-АТЫ мүчөсүнөн башта"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "ДАТА-ЖЕ-ФАЙЛ'дан жаңы болгон файлдарды гана сакта"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "ДАТА"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "датасы алмашканда гана дата жана убактысын салыштыр"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "CONTROL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "өчүрөрдөн мурун копиясын сактап кал, CONTROL версиясын танда"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "STRING"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2190,63 +2190,63 @@ msgstr ""
"өчүрөрдөн мурун копиясын сактап калат, жалпы колдонулган суфикс кошулат (бул "
"суфикс SIMPLE_BACKUP_SUFFIX жолу менен алмаштырылбаган болсо '~' болот)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Файлдын атынын алмашуулары:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "чыгаруу учурунда файл аттарынын башындагы N компонентти алып салат"
# выражение кыргызча кандай? СҮЙЛӨМ башка жерде да бар
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "СҮЙЛӨМ"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "файлдардын аттарын алмаштыруу үчүн sed replace EXPRESSION колдонгула"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Маалыматтандыруу:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "ишке алынган файлдарды кеңири маалыматы менен тизмеле"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr ""
-#: src/tar.c:729
+#: src/tar.c:730
#, fuzzy
msgid "warning control"
msgstr "үстүнө көчүрүү контролу:"
# Ушу 'record' сөзүнө жакшы котормо табалбай койдум
# 'маалымат' деп жазыбаттым эле, бул жерде келишпей калаткен
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "ар N записьтен кийин маалымат берип турат (алдынала 10 болот)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr ""
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr ""
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "баардык шилтемелер кошулбай калса билдирүү жазып чыгар"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "СИГНАЛ"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2258,36 +2258,36 @@ msgstr ""
"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 жана SIGUSR2; SIG префикси жазылбаган "
"аттарын да колдонсо болот."
-#: src/tar.c:744
+#: src/tar.c:745
#, fuzzy
msgid "print file modification times in UTC"
msgstr "файлды алмаштыруу датасын UTC түрүндө көрсөт"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr ""
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "чыккан кеңири маалыматты ФАЙЛ файлына жибер"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "ар билдирүүдө архивдин ичиндеги блок номерин көрсөт"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "ар ишти аткарууга макулдук сурап тур"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "tar'да алдынала коюлган опцияларды көрсөтөт"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2295,33 +2295,33 @@ msgstr ""
"тизмелөө же чыгаруу учурунда издөө критериясына жатпаган папкаларды да "
"тизмелейт"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "алмаштыруудан кийин файлдын же архивдин аттарын көрсөтөт"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "СТИЛЬ"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"аттарга ковычка кошуу стилин тандаңыз; жарактуу СТИЛЬ түрдөрү төмөндө "
"көрсөтүлөт."
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "STRING ичинде болгон тамгаларга кошумча ковычка кошот"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "STRING ичинде болгон тамгаларга ковычка кошпойт"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Келишүү опциялары:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2329,63 +2329,63 @@ msgstr ""
"жаңы архив жасабатканда --old-archive менен бирдей; чыгарыбатканда --no-same-"
"owner менен бирдей"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Башка опциялар:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "зыяндуу көрүнгөн опцияларды колдонууга тыюуу салат"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, fuzzy, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s: %s орунуна баралбай жатат"
-#: src/tar.c:933
+#: src/tar.c:934
#, fuzzy
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "`-Acdtrux' опцияларынан бирөөнү гана колдоно аласыңар"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Бирбирине келишпеген кысыштыруу опциялары берилди"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Сигналдын аты белгисиз: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Датанын шаблон файлы табылган жок"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Белгисиз %1$s дата форматынын ордуна %2$s коюлат"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, fuzzy, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "%s опциясы: `%s' датасын %s деп алды"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, fuzzy, c-format
msgid "filter the archive through %s"
msgstr "архивди gzip менен ишке ал"
-#: src/tar.c:1137
+#: src/tar.c:1143
#, fuzzy
msgid "Valid arguments for the --quoting-style option are:"
msgstr "--quoting-style опциясы үчүн мындай аргументтер бар:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2393,301 +2393,310 @@ msgstr ""
"\n"
"*Бул* tar алдынала мындай иштетилет:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
#, fuzzy
msgid "Invalid owner or group ID"
msgstr "Ээси жарабайт"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Блок көлөмү жараксыз"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Лентанын узундугу жараксыз"
-#: src/tar.c:1481
+#: src/tar.c:1486
#, fuzzy
msgid "Invalid incremental level value"
msgstr "Файлдын форматы туура эмес"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Бирден көп ченемдөөчү дата бар"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "кеңири жайлаштыруу форматынын версиясы жарактуу эмес"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "Бул платформада --atime-preserve='system' опциясы иштебейт"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint опциясына жазылган аргумент сан эмес"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Опцияда жарабаган укук абалы берилди"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Жарабаган номер"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Маалымат көлөмү жарабайт"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Маалыматтын көлөмү %d көбөйтүндүсү болушу керек."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Элементтердин саны жарабайт"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "--to-command опциясы бир эле жолу жазылыш керек"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Тыгыздык аргументи туура эмес: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, fuzzy, c-format
msgid "Unknown density: '%c'"
msgstr "Түшүнүксүз тыгыздык: `%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, fuzzy, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "*Бул* tar `-[0-7][lmh]' опцияларын иштетпейт"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, fuzzy, c-format
msgid "error parsing %s"
msgstr "`%s' жанындагы санды окубатканда ката чыкты"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[ФАЙЛ]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "%2$s үчүн %1$s аргументи жарабайт"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr ""
-#: src/tar.c:2291
+#: src/tar.c:2300
#, fuzzy, c-format
msgid "Old option '%c' requires an argument."
msgstr "Эски болгон `%c' опциясына параметр керек."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "Файл тизмеси болбосо --occurrence дегендин мааниси болбойт"
-#: src/tar.c:2390
+#: src/tar.c:2399
#, fuzzy
msgid "Multiple archive files require '-M' option"
msgstr "Бир нече архив файлы болсо `-M' опциясы колдонулушу керек"
-#: src/tar.c:2407
+#: src/tar.c:2416
#, fuzzy
msgid "--level is meaningless without --listed-incremental"
msgstr "Файл тизмеси болбосо --occurrence дегендин мааниси болбойт"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Томдун тамгасы өтө узун (эң көп %lu байт боло алат)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Көп-томдуу архивдерди текшералбай калды"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Кысыштырылган архивдерди текшералбай калды"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Көп-томдуу кысыштырылган архивдерди колдоналбай калды"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Кысыштырылган архивдер кошулалбайт"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option POSIX архивдеринде гана колдонула алат"
-#: src/tar.c:2481
+#: src/tar.c:2490
#, fuzzy
msgid "--acls can be used only on POSIX archives"
msgstr "--pax-option POSIX архивдеринде гана колдонула алат"
-#: src/tar.c:2486
+#: src/tar.c:2495
#, fuzzy
msgid "--selinux can be used only on POSIX archives"
msgstr "--pax-option POSIX архивдеринде гана колдонула алат"
-#: src/tar.c:2491
+#: src/tar.c:2500
#, fuzzy
msgid "--xattrs can be used only on POSIX archives"
msgstr "--pax-option POSIX архивдеринде гана колдонула алат"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Бош архив жаратуудан уялып баш тартып жатат"
-#: src/tar.c:2623
+#: src/tar.c:2632
#, fuzzy
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "`-Aru' опциялары `-f -' менен келишпейт"
-#: src/tar.c:2711
+#: src/tar.c:2743
#, fuzzy
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "`-Acdtrux' опцияларынан бирөөнү тандап колдонуңуз"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr ""
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Файл %s байтка азайды"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "%s сөзү белигсиз же азырынча киргизилген эмес"
-#: src/xheader.c:174
+#: src/xheader.c:173
#, fuzzy
msgid "Time stamp is out of allowed range"
msgstr "Сан жарактуу маанилердин тышында: %s"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "%s шаблону колдонулбайт"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "%s ачкыч сөзү алмаштырылбайт"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Кеңейтилген башкы-маалымат бузук: узундук жок"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Кеңейтилген башкы-маалыматтын узундугу - %*s - диапазондун тышында"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr ""
"Кеңейтилген башкы-маалымат бузук: узундуктан кийин бош жер (пробел) жок"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Кеңейтилген башкы-маалымат бузук: барабар символу жок"
# newline эмне болот?
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Кеңейтилген башкы-маалымат бузук: жаңы сап жок"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, fuzzy, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Кеңейтилген башкы-маалыматта белгисиз `%s' сөзү каралбайт"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Чыккан ачкыч-сөз/маани экилиги ото узун (ачкыч-сөз=%s, узундугу=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "%s=%s түрүндөгү кеңейтилген башкы-маалымат %s..%s диапазондун тышында"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Кеңейтилген башкы-маалымат бузук: %s=%s туура эмес"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Кеңейтилген башкы-маалымат бузук: %s=%s ашыкча көп"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
"Кеңейтилген башкы-маалымат бузук: туура эмес %s: күтүлбөгөн жерде бул - %c - "
"бөлүүчү символ бар"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Кеңейтилген башкы-маалымат бузук: туура эмес %s: так санда маани бар"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, fuzzy, c-format
msgid "%s: not a valid timeout"
msgstr "%s: Жараксыз группа"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr ""
@@ -2695,7 +2704,7 @@ msgstr ""
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Жазууну текшерүү жери: %u"
@@ -2704,12 +2713,12 @@ msgstr "Жазууну текшерүү жери: %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Окуунун текшерүү жери: %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2717,99 +2726,98 @@ msgstr ""
"genfile, GNU paxutils пакетинин дата файлдарын ишке алат.\n"
"ОПЦИЯЛАР мындай:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Жаңы файл ачуу опциялары:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "КӨЛӨМ"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Көсөтүлгөн КӨЛӨМдө жаңы файл ач"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Стандарт чыгарууга жазбай, АТЫ деген файлга жаз"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Файлдын аттарын ФАЙЛдан ал"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T опциясы бош/нөл (null) менен бүткөн аттарды окуйт"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Файлды тандалган ШАБЛОН менен толтурат. ШАБЛОН 'default' же 'zeros' болот"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Кеңири жайлашкан файлдын блок көлөмү"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Файлды кеңири жайлаштыр. Кийинки команда строкаларында файлдын картасы бар."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
#, fuzzy
msgid "OFFSET"
msgstr "ОРУН"
# seek the given offset - orunga jyl
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "данный(data) жазаардан мурун айтылган орунга жыл"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Файлдын статистикасынын опциялары:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Алынган ар бир файл үчүн struct stat курамын көрсөтөт. Алдынала тандалган "
"ФОРМАТ мындай: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Синхрондуу иштетүүнүн опциялары:"
-#: tests/genfile.c:168
-#, fuzzy
-msgid "OPTION"
-msgstr " [ОПЦИЯ...]"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
#, fuzzy
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Жазылган КОМАНДАны иштет. Бул --checkpoint жана --cut, --append, --touch "
"бирөөсү менен колдонулганда пайдалуу"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "N текшерүү жерине жеткенде буларды (төмөндү карагыла) аткар"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Эмики --touch опциясы үчүн дата жазгыла"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Өтүлгөн текшерүү жердерди жана КОМАНДАнын бүтүрүү статусун көрсөтөт"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2817,7 +2825,7 @@ msgstr ""
"Синхрондуу аткаруу иштери. Булар --checkpoint опциясы менен берилгенн "
"текшерүү жерине жеткенде аткарылат."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2825,125 +2833,125 @@ msgstr ""
"ФАЙЛды --length опциясы менен берилген көлөмгө кыскартат (берилбеген болсо 0 "
"болот)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr "ФАЙЛга КӨЛӨМ байт кошот. КӨЛӨМ --length опциясы менен берилет."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "ФАЙЛдын колдонуу жана алмашуу убакыттарын жаңылайт."
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Бул команданы иштеткиле - КОМАНДА"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Жараксыз көлөм: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Сан жарактуу маанилердин тышында: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Көлөмү терс сан: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) аткарылбай калды"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr ""
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr ""
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "`%s' жанындагы санды окубатканда ката чыкты"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Датанын форматы түшүнүксүз"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[АРГУМЕНТТЕР...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "`%s' ачылбай жатат"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "издөө болбой калды"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "файлдын атында бош тамга бар"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"кеңири(чоң) файлдарды стандарт чыгарууга жибералбайт, --file опциясын "
"колдонуңуз"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "туура эмес маска (`%s' жанында)"
# фиелд деген кандай болот?
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Белгисиз поле `%s'"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "`%s'ке убакыт аталган жок"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, fuzzy, c-format
msgid "cannot truncate `%s'"
msgstr "`%s' ачылбай жатат"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, fuzzy, c-format
msgid "command failed: %s"
msgstr "%s командасы аткарылбай калды"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "`%s'ке убакыт аталган жок"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "`%s'ке убакыт аталган жок"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, fuzzy, c-format
msgid "cannot unlink `%s'"
msgstr "`%s' ачылбай жатат"
@@ -2983,6 +2991,10 @@ msgstr "Команда жабылды\n"
msgid "--stat requires file names"
msgstr "--stat опциясы менен файл аттары жазылыш керек"
+#, fuzzy
+#~ msgid "OPTION"
+#~ msgstr " [ОПЦИЯ...]"
+
# положительный кыргызча кандайле?
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT параметринин мааниси оң болуш керек"
diff --git a/po/ms.gmo b/po/ms.gmo
index 6a34841b7370cf91b854270e33216c21cd50e163..02cf0d093e65c4e9e16482115134e3663ab8d0c3 100644
Binary files a/po/ms.gmo and b/po/ms.gmo differ
diff --git a/po/ms.po b/po/ms.po
index 0bf2b056ab79f1c7c323ebe1a5bc30cf95c39b1c..5656e67175e0be8c86c66cfe96aeffc02a8aebc5 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -2,12 +2,12 @@
# Copyright (C) 2002 Free Software Foundation, Inc.
# Hasbullah Bin Pit <sebol@ikhlas.com>, 2002.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar 1.13.25\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2002-11-23 02:38+0800\n"
"Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -97,7 +97,7 @@ msgid "give a short usage message"
msgstr ""
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr ""
@@ -233,12 +233,12 @@ msgstr ""
msgid "^[nN]"
msgstr ""
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr ""
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr ""
@@ -246,11 +246,11 @@ msgstr ""
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr ""
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -501,54 +501,54 @@ msgstr "Tak boleh laksanakan shell jauh"
msgid "Cannot execute remote shell"
msgstr "Tak boleh laksanakan shell jauh"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Hala rayauan diluar julat"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
#, fuzzy
msgid "Invalid seek direction"
msgstr "Mod tidak sah diberi pada opsyen"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
#, fuzzy
msgid "Invalid seek offset"
msgstr "Setem masa tidak sah"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Offset rayauan diluar julat"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
#, fuzzy
msgid "Invalid byte count"
msgstr "panjang pita tidak sah"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
#, fuzzy
msgid "Byte count out of range"
msgstr "Offset rayauan diluar julat"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
#, fuzzy
msgid "Premature eof"
msgstr "rmtd: eof tak matang\n"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
#, fuzzy
msgid "Invalid operation code"
msgstr "%s: opsyen tidak sah -- %c\n"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr ""
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
#, fuzzy
msgid "Unexpected arguments"
msgstr "Penghujungan tanpa diduga data imej PNM"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
#, fuzzy
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
@@ -558,148 +558,148 @@ msgstr ""
" --version Output maklumat versi.\n"
" --help Output bantuan ini.\n"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr ""
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr ""
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr ""
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr ""
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, fuzzy, c-format
msgid "cannot open %s"
msgstr "Tak dapat tutup"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr ""
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Arahan sampah"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Ia nampaknya bukan seperti arkib tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr ""
-#: src/buffer.c:592
+#: src/buffer.c:594
#, fuzzy
msgid "Total bytes written"
msgstr "Jumlah byte ditulis: %s (%sB, %sB/s)\n"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr ""
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(paip)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Nilai tidak sah bagi record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Tiada nama arkib diberi"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Tak dapat menentusahkan arkib stdin/stdout"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr ""
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Tak dapat mengemaskini arkib termampat"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Pada permulaan pita, keluar sekarang"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Terlalu banyak ralat, keluar"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, fuzzy, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Saiz rekod = %lu blok"
msgstr[1] "Saiz rekod = %lu blok"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, fuzzy, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Blok tidak dijajar (%lu byte) pada arkib"
msgstr[1] "Blok tidak dijajar (%lu byte) pada arkib"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "tak dapat backspace fail arkib; ia mungkin tak boleh dibaca tanpa -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr ""
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: mengandungi nombor volum yg tidak sah"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
#, fuzzy
msgid "Volume number overflow"
msgstr "Nombor volum melimpah"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Menyedia volum #%d bagi %s dan tekan return: "
# libgnomeui/gnome-app-helper.c:127
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "EOF dimana maklumbalas pengguna dijangka"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "AMARAN: Arkib tidak lengkap"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, fuzzy, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -711,274 +711,274 @@ msgstr ""
" ! Spawn subshell\n"
" ? Cetak senarai ini\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr ""
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr ""
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Tiada volum baru; keluar.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr ""
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr ""
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, fuzzy, c-format
msgid "%s command failed"
msgstr "Arahan '%s' gagal"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s tidak bersambung pada volum ini"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, fuzzy, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s tidak bersambung pada volum ini"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s adalah salah saiz (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, fuzzy, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Volum ini tidak dalam turutan"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arkib tidak dilabelkan supaya memadan %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Volum %s tidak sepadan %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr ""
-#: src/compare.c:98
+#: src/compare.c:97
#, fuzzy, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Hanya boleh membaca %lu drpd %lu byte"
msgstr[1] "Hanya boleh membaca %lu drpd %lu byte"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Kandungan berlainan"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "EOF tanpa diduga pada arkib"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Jenis fail berbeza"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Mod berbeza"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid berbeza"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid berbeza"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Masa mod berbeza"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Saiz berbeza"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Tidak dipautkan ke %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symlink berbeza"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Nombor beranti berbeza"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Tentusah"
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Jenis fail tak dikenali '%c', berlainan dengan fail normal"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr ""
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr ""
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr ""
-#: src/compare.c:620
+#: src/compare.c:619
#, fuzzy, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "GAGAL TENTUSAH: %d pengepala tak sah dikesan"
msgstr[1] "GAGAL TENTUSAH: %d pengepala tak sah dikesan"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr ""
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr ""
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "nilai %s diluar julat %s %s..%s; menggantikan %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "nilai %s diluar julat %s %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Menjana pengepala oktal negatif"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, fuzzy, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: fail tidak berubah; tidak dilonggokkan"
-#: src/create.c:616
+#: src/create.c:615
#, fuzzy, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: fail tidak berubah; tidak dilonggokkan"
-#: src/create.c:643
+#: src/create.c:642
#, fuzzy, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: fail tidak berubah; tidak dilonggokkan"
-#: src/create.c:1106
+#: src/create.c:1105
#, fuzzy, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Fail mengucup sebanyak %s byte; pad dengan sifar"
msgstr[1] "%s: Fail mengucup sebanyak %s byte; pad dengan sifar"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: fail adalah pada sistemfail lain; tidak dilonggokkan"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr ""
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Jenis fail tak dikenali; fail diabaikan"
-#: src/create.c:1576
+#: src/create.c:1575
#, fuzzy, c-format
msgid "Missing links to %s."
msgstr "Pautan ke %s\n"
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: fail tidak berubah; tidak dilonggokkan"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: fail adalah arkib; tidak dilonggokkan"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr ""
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: fail berubah bila kami membacanya"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: soket diabaikan"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: pintu diabaikan"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Melangkah ke pengepala berikut"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Memadam bukan-pengepala drpd arkib"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr ""
-#: src/extract.c:320
+#: src/extract.c:319
#, fuzzy, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: setem masa %s adalah %lu pada masa akan datang"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Ketidakkonsistenan luar dugaan bila membuat direktori"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr ""
@@ -1001,7 +1001,7 @@ msgstr "Cuba mengekstrak pautan simbolik sebagai pautan keras"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Tak dapat ekstrak -- fail bersambung dari volum lain"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
#, fuzzy
msgid "Unexpected long name header"
msgstr "Penghujungan tanpa diduga data imej PNM"
@@ -1031,22 +1031,22 @@ msgstr "%s: Tak dapat backup fail ini"
msgid "Cannot rename %s to %s"
msgstr "%s: Tak dapat menukarnama ke %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, fuzzy, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Direktori telah ditukarnama"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Direktori adalah baru"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, fuzzy, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: fail adalah pada sistemfail lain; tidak dilonggokkan"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Direktori telah ditukarnama"
@@ -1172,374 +1172,374 @@ msgstr "%s: Memadam %s\n"
msgid "%s: Cannot remove"
msgstr "%s: tak dapat buang"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr ""
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** Blok TIADA **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok %s: ** Akhir Fail **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Pengepala kosong dimana nilai %s numerik dijangka"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr "Nilai oktal arkib %.*s diluar julat %s; anggap kedua-dua pelengkap"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Nilai oktal arkib %.*s diluar julat %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr ""
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Rentetan %s base-64 ditandatangani arkibadalah diluar julat %s "
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Nilai base-256 arkub adalah diluar julat %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arkib mengandungi %.*s dimana nilai %s numerik dijangka"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Nilai %s arkib adalah dijuar julat %s %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr "Pautan ke %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr "jenis fail tak diketahui %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr ""
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr ""
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Pengepala Volum--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Bersambung pada byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Mencipta direktori:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Menukarnama %s ke %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Tak dapat menukarnama ke %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Menukarnama %s kembali ke %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Fail dibuang sebelum kami membacanya"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "proses anak"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "saluran antaraproses"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr ""
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr ""
-#: src/names.c:74
+#: src/names.c:73
#, fuzzy
msgid "change to directory DIR"
msgstr "Tak dapat tukar direktori kerja"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr ""
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr ""
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr ""
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr ""
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr ""
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr ""
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr ""
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr ""
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr ""
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr ""
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr ""
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr ""
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr ""
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr ""
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr ""
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr ""
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr ""
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr ""
-#: src/names.c:147
+#: src/names.c:146
#, fuzzy
msgid "wildcards do not match '/'"
msgstr "Volum %s tidak sepadan %s"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
#, fuzzy
msgid "command line"
msgstr "Arahan '%s' gagal"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr ""
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr ""
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr ""
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr ""
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Tak dijumpai pada arkib"
-#: src/names.c:1379
+#: src/names.c:1409
#, fuzzy, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Tak dijumpai pada arkib"
-#: src/names.c:1413
+#: src/names.c:1443
#, fuzzy, c-format
msgid "Archive label mismatch"
msgstr "Arkib tidak dilabelkan supaya memadan %s"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
-#: src/tar.c:88
+#: src/tar.c:87
#, fuzzy, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Opsyen `-%s' dan `-%s' kedua-duanya memerlukan input piawai"
-#: src/tar.c:165
+#: src/tar.c:164
#, fuzzy, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Kumpulan tidak sah"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr ""
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1743,7 +1743,7 @@ msgstr ""
msgid "extract files to standard output"
msgstr "Ralat ketika menulis ke output piawai"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr ""
@@ -1779,7 +1779,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr ""
@@ -1980,7 +1980,7 @@ msgstr ""
msgid "Archive format selection:"
msgstr "opsyen format arkib konflik"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr ""
@@ -2063,118 +2063,118 @@ msgstr ""
msgid "filter through PROG (must accept -d)"
msgstr ""
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr ""
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr ""
-#: src/tar.c:693
+#: src/tar.c:694
#, fuzzy
msgid "don't strip leading '/'s from file names"
msgstr "Membuang awalan `%.*s' drpd nama ahli"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr ""
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr ""
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr ""
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr ""
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr ""
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr ""
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr ""
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr ""
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr ""
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr ""
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr ""
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr ""
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr ""
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr ""
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr ""
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr ""
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr ""
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr ""
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2182,423 +2182,432 @@ msgid ""
"accepted"
msgstr ""
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr ""
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr ""
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr ""
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr ""
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr ""
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr ""
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr ""
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr ""
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr ""
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr ""
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr ""
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr ""
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr ""
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, fuzzy, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s: Tak dapat rayau ke %s"
-#: src/tar.c:933
+#: src/tar.c:934
#, fuzzy
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "Anda tak boleh nyatakan lebih drpd satu opsyen `-Acdtrux'"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Opsyen mampatan konflik"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, fuzzy, c-format
msgid "Unknown signal name: %s"
msgstr "jenis fail tak diketahui %s\n"
-#: src/tar.c:1028
+#: src/tar.c:1030
#, fuzzy
msgid "Date sample file not found"
msgstr "Fail tarikh tidak dijumpai"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Mengganti %s bagi format tarikh tak diketahui %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr ""
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr ""
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr ""
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
msgstr ""
-#: src/tar.c:1253
+#: src/tar.c:1259
#, fuzzy
msgid "Invalid owner or group ID"
msgstr "Pemilik tidak sah"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Faktor pemblokan tidak sah"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "panjang pita tidak sah"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr ""
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr ""
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr ""
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr ""
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr ""
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Mod tidak sah diberi pada opsyen"
-#: src/tar.c:1797
+#: src/tar.c:1806
#, fuzzy
msgid "Invalid number"
msgstr "Nombot inod tidak sah"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Saiz rekod tidak sah"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Saiz rekod mesti dalam gandaan %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
#, fuzzy
msgid "Invalid number of elements"
msgstr "panjang pita tidak sah"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr ""
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr ""
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr ""
-#: src/tar.c:2066
+#: src/tar.c:2075
#, fuzzy, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Opsyen `-[0-7][lmh]' tak disokong oleh tar *ini*"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr ""
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr ""
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "hujah tidak sah %s bagi %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr ""
-#: src/tar.c:2291
+#: src/tar.c:2300
#, fuzzy, c-format
msgid "Old option '%c' requires an argument."
msgstr "OPsyen lama `%c' memerlukan hujah."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr ""
-#: src/tar.c:2390
+#: src/tar.c:2399
#, fuzzy
msgid "Multiple archive files require '-M' option"
msgstr "Fail akrib beraneka memerlukan opsyen `-M'"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr ""
-#: src/tar.c:2424
+#: src/tar.c:2433
#, fuzzy, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Label volum adalah terlalu panjang (had adalah %lu byte)"
msgstr[1] "%s: Label volum adalah terlalu panjang (had adalah %lu byte)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Tak dapat menentusah arkib multi-volume"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Tak dapat menentusahkan arkib termampat"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Tak dapat menggunakan arkib multi-volume termampat"
-#: src/tar.c:2457
+#: src/tar.c:2466
#, fuzzy
msgid "Cannot concatenate compressed archives"
msgstr "Tak dapat mengemaskini arkib termampat"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Secara dayus enggan mencipta arkib kosong"
-#: src/tar.c:2623
+#: src/tar.c:2632
#, fuzzy
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Opsyen `-Aru' tak serasi dengan `-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
#, fuzzy
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Anda mesti nyatakan satu drpd opsyen `-Acdtrux'"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr ""
-#: src/update.c:87
+#: src/update.c:86
#, fuzzy, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Fail mengecil sebanyak %s byte"
msgstr[1] "%s: Fail mengecil sebanyak %s byte"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr ""
-#: src/xheader.c:174
+#: src/xheader.c:173
#, fuzzy
msgid "Time stamp is out of allowed range"
msgstr "Setem masa diluar julat"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr ""
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr ""
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr ""
-#: src/xheader.c:677
+#: src/xheader.c:695
#, fuzzy, c-format
msgid "Extended header length %*s is out of range"
msgstr "Rentetan %s base-64 ditandatangani arkibadalah diluar julat %s "
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr ""
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr ""
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr ""
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, fuzzy, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Nilai %s arkib adalah dijuar julat %s %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr ""
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr ""
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, fuzzy, c-format
msgid "%s: not a valid timeout"
msgstr "%s: Kumpulan tidak sah"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr ""
@@ -2606,7 +2615,7 @@ msgstr ""
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, fuzzy, c-format
msgid "Write checkpoint %u"
msgstr "Menulis titiksemak %d"
@@ -2615,231 +2624,231 @@ msgstr "Menulis titiksemak %d"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, fuzzy, c-format
msgid "Read checkpoint %u"
msgstr "Membaca titiksemak %d"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
#, fuzzy
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr "Menjana fail data untuk suit ujian GNU tar.\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
#, fuzzy
msgid "File creation options:"
msgstr "Opsyen mampatan konflik"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr ""
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr ""
-#: tests/genfile.c:135
+#: tests/genfile.c:130
#, fuzzy
msgid "Write to file NAME, instead of standard output"
msgstr "Ralat ketika menulis ke output piawai"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr ""
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr ""
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr ""
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr ""
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr ""
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr ""
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr ""
-#: tests/genfile.c:168
-msgid "OPTION"
+#: tests/genfile.c:163
+msgid "N"
msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr ""
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr ""
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr ""
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, fuzzy, c-format
msgid "Invalid size: %s"
msgstr "Setem masa tidak sah"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, fuzzy, c-format
msgid "Number out of allowed range: %s"
msgstr "Nombor inod diluar julat"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr ""
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr ""
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr ""
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr ""
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr ""
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, fuzzy, c-format
msgid "Unknown date format"
msgstr "Ralat sistem tidak diketahui"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr ""
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr ""
-#: tests/genfile.c:448
+#: tests/genfile.c:439
#, fuzzy
msgid "cannot seek"
msgstr "Tak dapat tutup"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr ""
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr ""
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, fuzzy, c-format
msgid "Unknown field `%s'"
msgstr "jenis fail tak diketahui %s\n"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, fuzzy, c-format
msgid "cannot set time on `%s'"
msgstr "%s: Tak dapat rayau ke %s"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, fuzzy, c-format
msgid "cannot truncate `%s'"
msgstr "%s: Tak dapat menukarnama ke %s"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, fuzzy, c-format
msgid "command failed: %s"
msgstr "Arahan '%s' gagal"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, c-format
msgid "cannot stat `%s'"
msgstr ""
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "Tak dapat simpan direktori kerja"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, fuzzy, c-format
msgid "cannot unlink `%s'"
msgstr "%s: Tak dapat symlink ke %s"
diff --git a/po/nb.gmo b/po/nb.gmo
index a6a0fa95d59c0b8ffef2f8d9c24b9999dc15af74..ee855fba70fcb067cf2ea0ef61334bccba862e38 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index af85b4048e410a09c0f5caccd1862569367dc092..12c275fee7e81d853ba51b679203ae38136a355b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,18 +1,18 @@
-# Norwegian (Bokmål) translation of GNU tar.
+# Norwegian (bokmål) translation of GNU tar.
# Copyright (C) 2016 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
# Karl Anders Øygard <Karl.Oygard@fou.telenor.no>, 1996.
# Espen Skjelnes Johnsen <espejohn@sn.no>, 1997.
# Johnny A. Solbu <johnny@solbu.net, 2014.
-# Åka Sikrom <a4@hush.com>, 2016.
+# Åka Sikrom <a4@hush.com>, 2016-2017.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-22 13:28+0100\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-24 09:13+0100\n"
"Last-Translator: Åka Sikrom <a4@hush.com>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"
@@ -21,7 +21,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
#: gnu/argmatch.c:134
#, c-format
@@ -100,7 +100,7 @@ msgid "give a short usage message"
msgstr "vis en kort bruksanvisning"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NAVN"
@@ -138,29 +138,29 @@ msgid "write error"
msgstr "skrivefeil"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: valget «%s» er flertydig\n"
+msgstr "%s: valget «%s%s» er flertydig\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: valget «%s» er flertydig, og kan bety følgende:"
+msgstr "%s: valget «%s%s» er flertydig, og kan bety følgende:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: «%c%s» er et ukjent valg\n"
+msgstr "%s: «%s%s» er et ukjent valg\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: valget «%c%s» tillater ikke argumenter\n"
+msgstr "%s: valget «%s%s» tillater ikke argumenter\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: valget «--%s» krever et argument\n"
+msgstr "%s: valget «%s%s» krever et argument\n"
#: gnu/getopt.c:621
#, c-format
@@ -235,12 +235,12 @@ msgstr "^[jJ]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Pakket av %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Pakket av %s\n"
@@ -248,12 +248,11 @@ msgstr "Pakket av %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -403,12 +402,11 @@ msgid "%s home page: <%s>\n"
msgstr "Nettside for %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
msgstr "Nettside for %s: <http://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
"Generell hjelp til bruk av GNU-programvare: <http://www.gnu.org/gethelp/>\n"
@@ -532,194 +530,194 @@ msgstr "Klarte ikke å videresende filer til eksternt skall"
msgid "Cannot execute remote shell"
msgstr "Klarte ikke å kjøre eksternt skall"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Søkeretning er utenfor tillatt rekkevidde"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Ugyldig søkeretning"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Ugyldig søkeforskyvning"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Søkeforskyvning er utenfor tillatt rekkevidde"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Ugyldig antall byte"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Opptelling av byte er utenfor tillatt rekkevidde"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "For tidlig slutt på fil"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Ugyldig handlingskode"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Handlinga støttes ikke"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Uventede argumenter"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Styr en båndstasjon, og godta kommandoer fra eksterne prosesser"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NUMMER"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "endre feilsøkningsnivå"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FIL"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "endre navn på feilsøkingsfil"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "klarte ikke å åpne %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "for mange argumenter"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Ugyldig kommando"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Dette ser ikke ut som et tar-arkiv"
#
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Antall leste byte"
#
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Antall skrevne byte"
#
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Antall slettede byte"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(datarør)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Nekter å lese arkivinnhold fra terminal (glemte du «-f»?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Nekter å sende arkivinnhold til terminal (glemte du «-f»?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Ugyldig verdi for «record_size»"
#
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Arkivnavn mangler"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Klarte ikke å kontrollere stdin-/stdout-arkiv"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Arkivet er komprimert. Bruk valget %s"
#
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Komprimerte arkiver kan ikke oppdateres"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Nådde begynnelsen av båndet. Avslutter nå"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Det har oppstått for mange feil. Avslutter"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Registerstørrelse = %lu blokk"
msgstr[1] "Registerstørrelse = %lu blokker"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Ujustert blokk (%lu byte) i arkivet"
msgstr[1] "Ujustert blokk (%lu byte) i arkivet"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Klarte ikke å gå tilbake i arkivfila. Den kan være uleselig uten «-i»"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek stoppet ikke på en registergrense"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: inneholder ugyldig volumnummer"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Alle mulige volumnumre er oppbrukt"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Klargjør volum #%d for %s og trykk Enter: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "EOF der svar fra bruker skulle vært"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "ADVARSEL: Arkivet er ufullstendig"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -730,65 +728,65 @@ msgstr ""
" q Avbryt tar\n"
" y eller linjeskift Fortsett handling\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Start et underskall\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Skriv ut denne lista\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Intet nytt volum. Avslutter.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Filnavn mangler. Prøv på nytt.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Ugyldig inndata. Skriv «?» for for hjelp.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s kommando mislyktes"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s fortsetter ikke i dette volumet"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s fortsetter kanskje på dette volumet. Hodet inneholder avkortet navn"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s er feil størrelse (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Dette volumet er ute av sekvens (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arkiv ikke navngitt for å passe med %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Volumet «%s» stemmer ikke overens med «%s»"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -796,210 +794,210 @@ msgstr ""
"%s: filnavnet er for langt tid å lagres i et GNU-multivolum-hode, og blir "
"derfor avkortet"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "skriving endte ikke ved en blokkgrense"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Klarte bare å lese %lu av %lu byte"
msgstr[1] "Klarte bare å lese %lu av %lu byte"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Innholdet er ulikt"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Uventet slutt på fil i arkivet"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Filtypen er ulik"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Modus er ulik"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid er ulik"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid er ulik"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Endringstiden er ulik"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Størrelsen er ulik"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Ikke lenket til %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symbolsk lenke er ulik"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Enhetsnummer avviker"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Kontroller "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Ukjent filtype «%c», diffet som vanlig fil"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Arkivet inneholder filnavn med ledende prefikser fjernet."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Arkivet inneholder forvandlede filnavn."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Verifikasjon kan mislykkes i å finne originalfilene."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "KONTROLLFEIL: fant %d ugyldig arkivhode"
msgstr[1] "KONTROLLFEIL: fant %d ugyldige arkivhoder"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Enslig null-blokk ved %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: inneholder en buffermappetag %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "verdien %s er utenfor %s rekkevidde %s..%s. Erstatter %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "verdien %s er utenfor %s rekkevidde %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Lager negative oktalhoder"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: filnavnet er for langt (maks %d), og fila ble ikke dumpet"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: filnavnet er for langt og/eller splittet, og fila ble ikke dumpet"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: lenkenavnet er for langt, og fila ble ikke dumpet"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Fila krympet med %s byte. Fyller ut med nuller"
msgstr[1] "%s: Fila krympet med %s byte. Fyller ut med nuller"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: fila er på et annet filsystem, og ble derfor ikke dumpet"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "innholdet ble ikke dumpet"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Ukjent filtype. Fila ignoreres"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Mangler lenker til %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: fila er uendret, og ble ikke dumpet"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: fila er selve arkivet, og ble ikke dumpet"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "mappe ble ikke dumpet"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: fil endret mens vi leste den"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: sokkel ignorert"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: dør ignorert"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Hopper til neste startseksjon"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Tar bort ikke-hodedata fra arkivet"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: usansynlig gammelt tidsstempel %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: tidsstempel %s er %s sekunder i fremtiden"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Uventet inkonsekvens ved opprettelse av mappe"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: hopper over eksisterende fil"
@@ -1022,7 +1020,7 @@ msgstr "Forsøker å pakke ut symbolske lenker som harde lenker"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Klarte ikke å pakke ut -- fila fortsettes fra et annet volum"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Uventet langt navnehode"
@@ -1039,7 +1037,7 @@ msgstr "Gjeldende %s er nyere eller samme alder"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: Medlemsnavn inneholder «..»"
#: src/extract.c:1696
#, c-format
@@ -1051,22 +1049,22 @@ msgstr "%s: Klarte ikke å lage sikkerhetskopi av denne fila"
msgid "Cannot rename %s to %s"
msgstr "Klarte ikke å endre navn på %s til %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Mappa har endret navn fra %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Mappa er ny"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: mappa er på et annet filsystem, og ble ikke dumpet"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Mappa har endret navn"
@@ -1192,192 +1190,193 @@ msgstr "%s: Sletter %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Klarte ikke å fjerne"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Utelater"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blokk %s: ** Blokk med NUL-er **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blokk %s: ** Slutt på fil **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blokk %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Blankt hvor numerisk %s-verdi forventes"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr "Arkivoktalverdi %.*s er ut av %s rekkevidde; forutsatt toerkomplement"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Arkivets oktalverdi %.*s er utenfor %s rekkevidde"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arkivet inneholder foreldede base-64-hoder"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Arkiv-signert base-64-streng %s er utenfor %s-rekkevidde"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Arkivets base-256-verdi er utenfor %s-rekkevidde"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arkivet inneholder %.*s hvor numerisk %s-verdi forventes"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Arkivverdi %s er utenfor %s-intervallet %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " lenke til %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " ukjent filtype %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Lang lenke--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Langt navn--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Volumhode--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Fortsatte ved byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Lager mappe:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Endrer navn på %s til %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Klarte ikke å endre navn til %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Endrer navn %s tilbake til %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Fila ble fjernet før programmet rakk å lese den"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "underprosess"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "mellomprosesskanal"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Lokalt filvalg:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"legg oppgitt FIL til arkivet (nyttig hvis navnet starter med en bindestrek)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "MAP"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "bytt til mappa MAP"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "få navn å pakke ut eller opprette fra FIL"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T les null-adskilte navn, og slår av «-C»"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "deaktiverer effekten til foregående --null-valg"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "avsitér inndatafil eller medlemsnavn (standard)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "ikke avsitér inndatafil eller medlemsnavn"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T les filnavn nøyaktig slik de er (ingen valghåndtering)"
+msgstr ""
+"-T les filnavn nøyaktig slik de er (ingen håndtering av valg eller "
+"skiftesekvenser)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "-T behandle filnavn som begynner med bindestrek som valg (standard)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "MØNSTER"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "ekskludere filer, gitt som et MØNSTER"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "ekskluder mønster listet i FIL"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1385,24 +1384,24 @@ msgstr ""
"ekskluder innholdet av mapper som inneholder CACHEDIR.TAG, med unntak av "
"selve tagg-fila"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "ekskluder alt under mapper som inneholder CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "ekskluder mapper som inneholder CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"ekskluder innholdet av mapper som inneholder FIL, med unntak av selve FIL-en"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "lese ekskluder mønstre for hver mappe fra FIL, hvis den finnes"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1410,116 +1409,119 @@ msgstr ""
"lese ekskluder mønstre for hver mappe fra FIL og dens undermapper, hvis den "
"finnes"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "ekskluder alt under mapper som inneholder FIL"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "ekskluder mapper som inneholder FIL"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "ekskluder versjonskontrollsystemmapper"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "les ekskluder mønstre fra VCS-ignorere filer"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "ekskluder sikkerhetskopi- og låsefiler"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "gå rekursivt ned i mapper (standard)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "unngå automatisk nedstigning i mapper"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr "valg for filnavntreff (påvirker både ekskluder- og inkludermønstre):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "mønstre passer med filnavnstart"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "mønstre passer etter «/» (standard for ekskludering)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "ignorer bokstavstørrelse"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "match forskjell på små og store bokstaver (standard)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "bruk jokertegn (standard for ekskludering)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "ordrett strengsammenligning"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "jokertegn samsvarer «/» (standard for ekskludering)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "jokertegn samsvarer ikke «/»"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Følgende ekstravalg ble brukt i arkivmodus etter argumenter som ikke godtar "
+"ekstravalg. Plasser valgene etter argumenter som godtar dem hvis du vil at "
+"de skal ha noen effekt."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s har ingen effekt"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s har ingen effekt"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s har ingen effekt"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "kommandolinje"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: filliste forespurt fra %s allerede lest fra %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "Klarte ikke å splitte strengen «%s». %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: lest filnavn inneholder nulltegn"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Mønster samsvarer med tegn som brukes i filnavn"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1527,47 +1529,47 @@ msgstr ""
"Bruk --wildcards for å aktivere mønstergjenkjenning, eller --no-wildcards "
"for å undertrykke denne advarselen"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Finnes ikke i arkivet"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Obligatorisk forekomst finnes ikke i arkivet"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Arkivetikett samsvarer ikke"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Valget «-C» kan ikke brukes i fillista i kombinasjon med «--listed-"
"incremental»"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Kun ett -C-valg er tillatt med --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Valgene «-%s» og «-%s» vil begge ha standard inn"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Ugyldig arkivformat"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU-funksjoner forsøkt på inkompatibelt arkiv-format"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1787,7 +1789,7 @@ msgstr "Velg utdatastrøm:"
msgid "extract files to standard output"
msgstr "pakk ut filer til standardutdata"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "KOMMANDO"
@@ -1824,7 +1826,7 @@ msgstr "bruk valgt FIL for å tilknytte fileiers UID og navn"
msgid "use FILE to map file owner GIDs and names"
msgstr "bruk valgt FIL for å tilknytte fileiers GID og navn"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATO-ELLER-FIL"
@@ -2032,7 +2034,7 @@ msgstr "Omblokker ved lesning (for 4.2BSD-rør)"
msgid "Archive format selection:"
msgstr "Arkivformatvalg:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2116,60 +2118,60 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "filtrér gjennom PROGRAM (må akseptere -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Lokalt filvalg:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "bli i lokale filsystem når du oppretter arkiv"
#
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "ikke fjern ledende «/» fra filnavn"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "Følg symbolske lenker; arkiver og dump filene de peker til"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "følg harde lenker; arkiver og dump filene de refererer til"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "MEDLEMS-NAVN"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "begynn med medlem MEDLEMSNAVN ved lesing av arkivet"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "bare lagre filer som er nyere enn DATO-ELLER-FIL"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATO"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "sammenlign dato og tid kun ved dataendringer "
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "KONTROLL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "sikkerhetskopi før sletting, velg versjonskontroll"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "STRENG"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2177,59 +2179,59 @@ msgstr ""
"sikkerhetskopi før sletting, overstyr vanlig suffiks («~» med mindre "
"overstyrt av miljøvariabelen SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Filnavnforvandlinger:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "fjern NUMMER antall innledende komponenter fra filnavn ved utpakking"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "UTTRYKK"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "bruk sed erstatnings-UTTRYKK for å forvandle filnavn"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informativ utdata:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "vis navn på alle filer som behandles"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "NØKKELORD"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "advarselskontroll"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "vis framdriftsmeldinger hver ANTALL register (standard 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "HANDLING"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "utfør HANDLING på hvert sjekkpunkt"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "skriv ut en melding hvis ikke alle lenker ble dumpet"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2241,35 +2243,35 @@ msgstr ""
"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 og SIGUSR2; navnene uten SIG-prefikset er "
"også akseptert"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "vis endringstidspunkt som UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "vis full oppløsning på filtider"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "send detaljert utdata til FIL"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "vis blokknummer i arkiv med hver melding"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "be om bekreftelse for hver handling"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "vis tar-standarder"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "vis gyldige verdiområder for øyeblikksbildefilfelt"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2277,31 +2279,31 @@ msgstr ""
"ved listing eller utpakking, vis hver mappe som ikke samsvarer med "
"søkekriteriene"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "Vis fil eller arkivnavn etter forvandling"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STIL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "angi siteringsstil; se nedenfor for gyldige STIL-verdier"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "i tillegg sitér fra STRENG"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "deaktiver sitering av tegn fra STRENG"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Kompatibilitetsvalg:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2309,22 +2311,22 @@ msgstr ""
"ved opprettelse, samme som --old-archive. ved utpakking, samme som --no-"
"same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Andre valg:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "deaktiver bruk av noen potensielt skadelige valg"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» kan ikke brukes sammen med «%s»"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2332,40 +2334,40 @@ msgstr ""
"Du kan ikke angi flere enn ett av valgene «-Acdtrux», «--delete» og «--test-"
"label» samtidig"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Konflikt i kompresjonsflagg"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Ukjent signalnavn: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Fant ikke dato-eksempelfil"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Erstatter %s for ukjent datoformat %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Valg %s: Behandler dato «%s» som «%s»"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtrer arkivet gjennom %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Gyldige argumenter for valget --quoting-style er:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2373,165 +2375,165 @@ msgstr ""
"\n"
"*Denne* tar standardiserer til:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Ugyldig eier eller gruppe-ID"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Ugyldig blokkeringsfaktor"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Ugyldig tapelengde"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Ugyldig inkrementell nivåverdi"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Mer enn én grense-dato"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Ugyldig version for filer med huller"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve=«system» støttes ikke på denne platformen"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint-verdien er ikke et heltall"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Ugyldig modus gitt i flagg"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Ugyldig nummer"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Ugyldig registerstørrelse"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Blokkstørrelse må være delbart på %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr " Ugyldig antall elementer"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Kun ett «--to-command»-alternativ tillatt"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Feilformatert tetthetsargument: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Ukjent tetthet «%c»"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Valgene «-[0-7][lmh]» støttes ikke av *denne* implementasjonen av tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: plassering av feilen"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "feil under tolkning av %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FIL] …"
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "%s inneholder argumenter som ikke er valg"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "klarte ikke å dele opp «TAR_OPTIONS»: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Gammelt valg «%c» behøver et argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence er meningsløs uten en filliste"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Ved flere arkivfiler behøves «-M»-valget"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--lever er meningsløs uten --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Volumetikett er for lang (grensen er %lu byte)"
msgstr[1] "%s: Volumetikett er for lang (grensen er %lu byte)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Arkiv som går over flere volum kan ikke kontrolleres"
#
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Komprimerte arkiver kan ikke kontrolleres"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Komprimerte arkiver som går over flere volum kan ikke brukes"
#
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Klarte ikke å sette sammen komprimerte arkiver"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "«--clamp-mtime» krever at du oppgir en dato med «--mtime»"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "valget «--pax-option kan bare brukes på POSIX-arkiver"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "valget «--acls» kan bare brukes på POSIX-arkiver"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "valget «--selinux» kan bare brukes på POSIX-arkiver"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "valget «--xattrs» kan bare brukes på POSIX-arkiver"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2539,81 +2541,90 @@ msgstr ""
"Klarte ikke å finne navn på toppnivå-mappe. Velg det manuelt med --one-top-"
"level=MAP"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Volum kan ikke være kortere enn registerstørrelse"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Programmet nekter på feigt vis å lage et tomt arkiv"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Valgene «-Aru» kan ikke brukes i kombinasjon med «-f -»"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Du må velge ett av «-Acdtrux», «--delete» eller «--test-label»"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Avslutter med feilkode på grunn av tidligere feil"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Fila krympet med %s byte"
msgstr[1] "%s: Fila krympet med %s byte"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Nøkkelordet %s er ukjent eller støttes ikke"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Tidsstempelet er utenfor tillatt rekkevidde"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Mønsteret %s kan ikke brukes"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Nøkkelordet %s kan ikke overstyres"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Feilformatert utvidet hode: lengde mangler"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Utvidet header lengde %*s er utenfor rekkevidde"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Utvidet hode er feilformatert: blanktegn mangler etter lengde"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Utvidet hode er feilformatert: likhetstegn mangler"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Utvidet hode er feilformatert: linjeskift mangler"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ignorerer ukjent nøkkelord for utvidet hode («%s»)"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2621,46 +2632,46 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Utvidet hode %s=%s er utenfor rekkevidde %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Feilformatert utvidet hode: ugyldig %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Feilformatert utvidet hode: overflødig %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Feilformatert utvidet hode: ugyldig %s: skilletegnet %c er uventet"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Feilformatert utvidet hode: ugyldig %s: merkelig antall verdier"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s er et ugyldig tidsavbrudd"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: ukjent sjekkpunkt handling"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "skrive"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "lese"
@@ -2668,7 +2679,7 @@ msgstr "lese"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Skriver kontrollpunkt %u"
@@ -2677,12 +2688,12 @@ msgstr "Skriver kontrollpunkt %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Leser kontrollpunkt %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2690,94 +2701,98 @@ msgstr ""
"genfile manipulerer datafiler for GNU paxutils-testpakke.\n"
"VALG er:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Filopprettingsvalg"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "størrelse"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Opprett fil av angitt STØRRELSE"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Skriv til fil NAVN i stedet for standardutdata"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Les filnavn fra FIL"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T leser null-terminerte navn"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Fyll fila med valgt MØNSTER. MØNSTER er enten «default» (standard) eller "
"«zeros» (nuller)"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Størrelse på en blokk for filer med huller"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Lag fil med huller. Resten av kommandolinja gir filkartet"
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "FORSKYVNING"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Søke til den angitte forskyvning før skriving av data"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Ikke vis ukritiske feilmeldinger"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Filstatistiske valg:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Skriv ut innholdet i «struct stat» for hvert angitt fil. Standardformatet er:"
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Synkronkjøringsvalg:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "VALG"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Kjør ARG. Nyttig i kombinasjon med «--checkpoint og enten «--cut», «--"
"append», «--touch» eller «--unlink»"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Utfør angitt handling (se nedenfor) ved oppnådd sjekkpunktANTALL"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Angi dato for neste --touch-valg"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Vis utførte sjekkpunkter og avsluttstatusen til KOMMANDO"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2785,7 +2800,7 @@ msgstr ""
"Synkronkjøringshandlinger. Disse utføres når sjekkpunktnummer angitt av --"
"checkpoint-valget er nådd."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2793,125 +2808,125 @@ msgstr ""
"Forkort FIL til størrelsen valgt ved forrige «--length» (eller 0 hvis det "
"ikke er valgt)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Legg valgt STØRRELSE (i byte) til en FIL. STØRRELSE bestemmes av forrige «--"
"length»."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Oppdater tilgangs- og endringstidspunkt for FIL"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Kjør valgt KOMMANDO"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Slett valgt FIL"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "%s er en ugyldig størrelse"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "%s er utenfor tillatt rekkevidde"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negativ størrelse: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) mislyktes"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "forespurt fillengde: %lu . Virkelig: %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "opprettet fil har ikke huller"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "feil ved analyse av tall ved «%s»"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARG…]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "klarte ikke å åpne «%s»"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "klarte ikke å søke"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "filnavn inneholder null-tegn"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"filer med huller kan ikke sendes til standardutdata. Bruk valget «--file»"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "ugyldig maske (ved «%s»)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Feltet «%s» er ukjent"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "Klarte ikke å endre tid på «%s»"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "Klarte ikke å avkorte «%s»"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "kommando mislyktes: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "Klarte ikke å avkorte «%s»"
+msgstr "klarte ikke å hente info om «%s»"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "Klarte ikke å endre tid på «%s»"
+msgstr "klarte ikke å fjerne mappa «%s»"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "Klarte ikke å fjerne lenke til «%s»"
@@ -2951,6 +2966,9 @@ msgstr "Kommandoen avsluttet\n"
msgid "--stat requires file names"
msgstr "valget «--stat» krever filnavn"
+#~ msgid "OPTION"
+#~ msgstr "VALG"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: parameteret ARGP_HELP_FMT må være positivt"
diff --git a/po/nl.gmo b/po/nl.gmo
index 53ce56a0864e40e49639d1c4cad2a588a3599d18..cf436e89fc76a827a6dcadf2e0f402ff3fa05c89 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 735e63bc3c648b71e56daa1f11ecdb48041548b5..cfbd6e36d1d39a43f622fa2299f7fe452db14695 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,20 +1,21 @@
# Dutch translations for GNU tar.
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2018 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
#
-# “Moet men krabben waar het jeukt?”
+# “Hoeperdepoep!”
#
-# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2016.
# Erwin Poeze <erwin.poeze@gmail.com>, 2009.
# Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
-#: src/create.c:1599
+# Benno Schulenberg <vertaling@coevern.nl>, 2005, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2016, 2018.
+#
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar-1.29\n"
+"Project-Id-Version: tar-1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-20 10:15+0200\n"
-"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-01-26 19:14+0100\n"
+"Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
@@ -22,7 +23,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Poedit 2.0.4\n"
#: gnu/argmatch.c:134
#, c-format
@@ -103,7 +104,7 @@ msgid "give a short usage message"
msgstr "een korte gebruikssamenvatting tonen"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NAAM"
@@ -141,29 +142,29 @@ msgid "write error"
msgstr "schrijffout"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: optie '%s' is niet eenduidig\n"
+msgstr "%s: optie '%s%s' is niet eenduidig\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
+msgstr "%s: optie '%s%s' is niet eenduidig; mogelijkheden zijn:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: onbekende optie '%c%s'\n"
+msgstr "%s: onbekende optie '%s%s'\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: optie '%c%s' staat geen argument toe\n"
+msgstr "%s: optie '%s%s' staat geen argument toe\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: optie '--%s' vereist een argument\n"
+msgstr "%s: optie '%s%s' vereist een argument\n"
#: gnu/getopt.c:621
#, c-format
@@ -238,12 +239,12 @@ msgstr "^[jJyY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "In pakketvorm gebracht door %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "In pakketvorm gebracht door %s\n"
@@ -251,12 +252,11 @@ msgstr "In pakketvorm gebracht door %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -269,7 +269,7 @@ msgstr ""
"Dit is vrije software: u mag het vrijelijk wijzigen en verder verspreiden.\n"
"De precieze licentie is GPL-3+: GNU General Public License versie 3 of "
"later.\n"
-"Zie http://gnu.org/licenses/gpl.html voor de volledige (Engelse) tekst.\n"
+"Zie https://gnu.org/licenses/gpl.html voor de volledige (Engelse) tekst.\n"
"Deze software kent GEEN GARANTIE, voor zover de wet dit toestaat.\n"
"\n"
@@ -408,15 +408,14 @@ msgid "%s home page: <%s>\n"
msgstr "Webpagina van %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Webpagina van %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "Webpagina van %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Algemene hulp bij gebruik van GNU-software: <http://www.gnu.org/gethelp/>\n"
+"Algemene hulp bij gebruik van GNU-software: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -535,193 +534,193 @@ msgstr "Kan geen bestanden omleiden voor shell op afstand"
msgid "Cannot execute remote shell"
msgstr "Kan gindse shell niet uitvoeren"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Sprongrichting valt buiten bereik"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Ongeldige sprongrichting"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Ongeldige sprongpositie"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Sprongpositie valt buiten bereik"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Ongeldig byte-aantal"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Byte-aantal valt buiten bereik"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Voortijdig einde van bestand"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Ongeldige bewerkingscode"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Bewerking wordt niet ondersteund"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Onverwachte argumenten"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
"Een magneetband manipuleren, en opdrachten accepteren van een ander proces."
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "AANTAL"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "debug-niveau instellen"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "BESTAND"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "naam van debug-uitvoerbestand instellen"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "kan %s niet openen"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "te veel argumenten"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Ongeldige opdracht"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Dit ziet er niet uit als een tar-archief"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Totaal aantal gelezen bytes"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Totaal aantal geschreven bytes"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Totaal aantal verwijderde bytes"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(pijp)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Archiefinhoud wordt niet van terminal gelezen (ontbrekende optie '-f'?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"Archiefinhoud wordt niet naar terminal geschreven (ontbrekende optie '-f'?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Ongeldige waarde voor recordgrootte"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Geen archiefnaam opgegeven"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Kan archieven op standaardinvoer of -uitvoer niet verifiëren"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Archief is gecomprimeerd. Gebruik optie '%s'."
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Kan ingepakte archieven niet bijwerken"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Aan het begin van de band -- tar sluit nu af."
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Te veel fouten -- tar sluit nu af."
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Recordgrootte = %lu blok"
msgstr[1] "Recordgrootte = %lu blokken"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Niet-uitgelijnd blok (%lu byte) in archief"
msgstr[1] "Niet-uitgelijnd blok (%lu bytes) in archief"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Kan niet terugzoeken in archiefbestand; het kan onleesbaar zijn zonder -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek() is niet gestopt op een recordgrens"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: bevat een ongeldig deelnummer"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Deelnummer-overloop"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Zet deel #%d voor %s klaar en druk op Enter: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "een lege tekst, terwijl gebruikersinvoer werd verwacht"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "WAARSCHUWING: Archief is onvolledig"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -733,65 +732,65 @@ msgstr ""
" q tar afbreken\n"
" y of Enter doorgaan\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! een subshell starten\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? dit lijstje tonen\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Geen nieuw deel -- tar sluit af.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Geen bestandsnaam opgegeven. Probeer het nog eens.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Ongeldige invoer. Typ ? voor hulp.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "Opdracht %s is mislukt"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s gaat niet verder in dit deel"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s gaat mogelijk verder in dit deel: de kop bevat een afgekapte naam"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s heeft een verkeerde grootte (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Dit deel valt buiten de reeks (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Archief bevat geen label, kan niet overeenkomen met %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Deel %s komt niet overeen met %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -799,211 +798,211 @@ msgstr ""
"%s: bestandsnaam is te lang om opgeslagen te worden in een GNU-meerdelenkop; "
"afgekapt"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "schrijven is niet gestopt op een recordgrens"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Kon slechts %lu van %lu byte lezen"
msgstr[1] "Kon slechts %lu van %lu bytes lezen"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Inhouden verschillen"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Onverwacht einde-van-bestand in archief"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Bestandssoort verschilt"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Modus verschilt"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "UID verschilt"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "GID verschilt"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Wijzigingstijd verschilt"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Grootte verschilt"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Niet gekoppeld aan %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symbolische koppeling verschilt"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Apparaatnummer verschilt"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verifiëren "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Onbekende bestandssoort '%c'; gedifft als gewoon bestand"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Archief bevat bestandsnamen waarvan de prefixen verwijderd zijn."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Archief bevat getransformeerde bestandsnamen."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Een verificatie kan mogelijk de originele bestanden niet vinden."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "Verificatie is MISLUKT: %d ongeldige kop gevonden"
msgstr[1] "Verificatie is MISLUKT: %d ongeldige koppen gevonden"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Een los blok met nullen op %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: map bevat cache-markering %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "waarde %s valt buiten bereik voor %s (%s..%s); wordt vervangen door %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "waarde %s valt buiten bereik voor %s (%s..%s)"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Er worden negatieve octale koppen gemaakt"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: bestandsnaam is te lang (max %d); niet gearchiveerd"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
"%s: bestandsnaam is te lang (kan niet worden gesplitst); niet gearchiveerd"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: koppelingsnaam is te lang; niet gearchiveerd"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Bestand is gekrompen met %s byte; aangevuld met nullen"
msgstr[1] "%s: Bestand is gekrompen met %s bytes; aangevuld met nullen"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: bestand staat op een ander bestandssysteem; niet gearchiveerd"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "inhoud niet gearchiveerd"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Onbekende bestandssoort; bestand genegeerd"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Ontbrekende koppelingen naar %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: bestand is ongewijzigd; niet gearchiveerd"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: bestand is het archief zelf; niet gearchiveerd"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "map is niet gearchiveerd"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: bestand is gewijzigd tijdens het lezen"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: socket genegeerd"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: deur genegeerd"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Alles tot aan volgende kop wordt overgeslagen"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Niet-kop wordt uit archief verwijderd"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: onwaarschijnlijk oud tijdsstempel %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: tijdsstempel %s ligt %s seconden in de toekomst"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Onverwachte inconsistentie tijdens aanmaken van map"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: bestaand bestand wordt overgeslagen"
@@ -1027,7 +1026,7 @@ msgstr ""
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Kan niet uitpakken -- bestand gaat door vanuit een ander deel"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Onverwachte langenaamkop"
@@ -1044,7 +1043,7 @@ msgstr "Huidige %s is nieuwer of even oud"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: Lidnaam bevat '..'"
#: src/extract.c:1696
#, c-format
@@ -1056,22 +1055,22 @@ msgstr "%s: Kan geen reservekopie van dit bestand maken"
msgid "Cannot rename %s to %s"
msgstr "Kan %s niet tot %s hernoemen"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Map is hernoemd van %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Map is nieuw"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: bestand staat op een ander bestandssysteem; niet gearchiveerd"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Map is hernoemd"
@@ -1199,35 +1198,35 @@ msgstr "%s: Verwijderen van %s...\n"
msgid "%s: Cannot remove"
msgstr "%s: Kan niet verwijderen"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Overgeslagen"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** Blok van NUL-tekens **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok %s: ** Einde-van-bestand **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Witruimte in kop waar numerieke waarde voor %s werd verwacht"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1235,162 +1234,161 @@ msgstr ""
"aangenomen"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Octaalwaarde %.*s in archief valt buiten bereik voor %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Archief bevat ouderwetse grondtal-64 koppen"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Tekenreeks %s (met grondtal-64-met-teken) valt buiten bereik voor %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Grondtal-256 waarde in archief valt buiten bereik voor %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Archief bevat %.*s waar numerieke waarde voor %s werd verwacht"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Waarde %s in archief valt buiten bereik voor %s (%s..%s)"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " koppeling naar %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " onbekende bestandssoort %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Lange koppeling--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Lange naam--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Deelkop--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Verder bij byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Aanmaken van map:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Hernoemen van %s naar %s...\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "Kan %s niet naar %s hernoemen"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Hernoemen van %s terug naar %s...\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Bestand werd verwijderd voordat het gelezen kon worden"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "dochterproces"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "interproces-kanaal"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Lokale bestandsnaamkeuze:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"het gegeven BESTAND aan het archief toevoegen (handig als de naam begint met "
"een '-')"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "MAP"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "naar MAP gaan"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "namen van in of uit te pakken bestanden uit BESTAND halen"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
"'-T' leest met NUL afgesloten namen; impliceert '--verbatim-files-from'"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "het resultaat van de vorige '--null'-optie ongedaan maken"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"aanhalingstekens verwijderen rond invoerbestand of lidnamen (standaard)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "geen aanhalingstekens verwijderen rond invoerbestand of lidnamen"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "'-T' leest bestandsnamen verbatim (ziet geen opties)"
+msgstr "'-T' leest bestandsnamen verbatim (ziet geen opties noch escapes)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"'-T' ziet bestandsnamen die beginnen met een streepje als opties (standaard)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "PATROON"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "bestanden uitsluiten, gegeven als een PATROON"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "uitsluitingspatronen staan opgesomd in BESTAND"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1398,24 +1396,24 @@ msgstr ""
"inhoud van mappen die CACHEDIR.TAG bevatten uitsluiten, behalve CACHEDIR.TAG "
"zelf"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "alles onder mappen die CACHEDIR.TAG bevatten uitsluiten"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "mappen die CACHEDIR.TAG bevatten uitsluiten"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"inhoud van mappen die BESTAND bevatten uitsluiten, behalve BESTAND zelf"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "uitsluitingspatronen voor mappen uit BESTAND lezen, als deze bestaat"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1423,117 +1421,121 @@ msgstr ""
"uitsluitingspatronen voor mappen en submappen uit BESTAND lezen, als deze "
"bestaat"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "alles onder mappen die BESTAND bevatten uitsluiten"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "mappen die BESTAND bevatten uitsluiten"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "systeemmappen van versiebeheer uitsluiten"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "uitsluitingspatronen uit VCS-ignore-bestanden lezen"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "reservekopieën en vergrendelingsbestanden uitsluiten"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "recursief in mappen afdalen (standaard)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "niet automatisch afdalen in mappen"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr "Bestandsnaamselectie-opties (voor zowel in- als uitsluitingspatronen):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "patronen komen overeen met begin van bestandsnaam"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
"patronen komen overeen met alles na een '/' (is standaard bij uitsluiting)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "verschil tussen hoofd- en kleine letters negeren"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "hoofdlettergevoelige vergelijking (standaard)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "jokertekens gebruiken (is standaard bij uitsluiting)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "exacte tekenreeksvergelijking"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "jokertekens komen overeen met '/' (is standaard bij uitsluiting)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "jokertekens komen niet overeen met '/'"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"De volgende opties werden gebruikt na non-optie argumenten in aanmaak- of "
+"bijwerkingsmodus. Deze opties zijn positie-afhankelijk en hebben alleen "
+"invloed op de nakomende argumenten. Herschik de opties voor het gewenste "
+"effect."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s heeft geen effect"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s heeft geen effect"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s heeft geen effect"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "opdrachtregel"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: verzochte bestandenlijst uit %s is al gelezen uit %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "kan tekenreeks '%s' niet splitsen: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: gelezen bestandsnaam bevat een NUL-teken"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Bestandsnamen bevatten jokertekens."
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1541,46 +1543,46 @@ msgstr ""
"Gebruik '--wildcards' om patroonovereenkomsten in te schakelen,\n"
"of '--no-wildcards' om deze waarschuwing te onderdrukken."
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Komt niet voor in archief"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Is vereist maar komt niet voor in archief"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Archieflabel komt niet overeen"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Met '--listed-incremental' is '-C' niet toegestaan binnen een bestandenlijst"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Met '--listed-incremental' is slechts één '-C' toegestaan"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Opties '%s' en '%s' willen beide standaardinvoer gebruiken"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Ongeldige archiefindeling"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU-functies gevraagd bij een incompatibele archiefindeling"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1807,7 +1809,7 @@ msgstr "Selecteren van uitvoerkanaal:"
msgid "extract files to standard output"
msgstr "bestanden uitpakken naar standaarduitvoer"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "OPDRACHT"
@@ -1844,7 +1846,7 @@ msgstr "UID's en gebruikersnamen uit BESTAND halen"
msgid "use FILE to map file owner GIDs and names"
msgstr "GID's en groepsnamen uit BESTAND halen"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATUM-OF-BESTAND"
@@ -2059,7 +2061,7 @@ msgstr "doorgaan met lezen tot blok compleet is (voor 4.2BSD-pijpen)"
msgid "Archive format selection:"
msgstr "Archiefindelingskeuze:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "INDELING"
@@ -2143,62 +2145,62 @@ msgstr "PROGRAMMA"
msgid "filter through PROG (must accept -d)"
msgstr "het archief door dit programma filteren (moet '-d' accepteren)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Lokale bestandskeuze:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "in het lokale bestandssysteem blijven bij maken van archief"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "leidende '/' niet uit bestandsnamen verwijderen"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"symbolische koppelingen volgen; de bestanden waar ze naar verwijzen "
"archiveren"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"harde koppelingen volgen; de bestanden waar ze naar verwijzen archiveren"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "LIDNAAM"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "beginnen bij lid LIDNAAM tijdens lezen van het archief"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "alleen bestanden opslaan die nieuwer zijn dan DATUM-OF-BESTAND"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATUM"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "datum en tijd alleen vergelijken wanneer gegevens veranderd zijn"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "MANIER"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "voor verwijdering een reservekopie maken, op de aangegeven MANIER"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "TEKENREEKS"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2207,61 +2209,61 @@ msgstr ""
"(in plaats van '~', die standaard is tenzij door omgevingsvariable "
"SIMPLE_BACKUP_SUFFIX veranderd)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Bestandsnaam-transformaties:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "dit AANTAL leidende componenten uit bestandsnamen verwijderen"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "EXPRESSIE"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
"deze vervangings-EXPRESSIE gebruiken om bestandsnamen met 'sed' te "
"transformeren"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informatieve uitvoer:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "de verwerkte bestanden opsommen"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "SLEUTELWOORD"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "waarschuwingsbeleid"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "voortgangsberichten tonen voor elk AANTALste record (standaard 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "ACTIE"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "bij elk controlepunt deze ACTIE uitvoeren"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "een bericht tonen als niet alle links gearchiveerd werden"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2273,35 +2275,35 @@ msgstr ""
"ontvangen wordt; mogelijke signalen zijn: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 "
"en SIGUSR2; de namen zonder het voorvoegsel SIG worden ook geaccepteerd"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "bestandswijzigingstijden in UTC tonen"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "bestandstijden in volledige resolutie tonen"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "gedetailleerde uitvoer naar BESTAND sturen"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "bloknummer binnen archief tonen bij elk bericht"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "bij elke actie om toestemming vragen"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "standaardinstellingen van 'tar' tonen"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "geldige bereiken tonen voor snapshot-velden"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2309,33 +2311,33 @@ msgstr ""
"bij opsommen of uitpakken: elke map opsommen die niet aan zoekcriteria "
"voldoet"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "bestands- of archiefnamen na transformatie tonen"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STIJL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"aanhalingsstijl voor namen instellen (zie verderop voor geldige waarden van "
"STIJL)"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "ook de tekens in TEKENREEKS aanhalen"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "de tekens in TEKENREEKS niet aanhalen"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Compatibiliteitsopties:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2343,23 +2345,23 @@ msgstr ""
"bij aanmaken hetzelfde als --old-archive; bij uitpakken hetzelfde als --no-"
"same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Andere opties:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr ""
"het gebruik van potentieel gevaarlijke opties of opdrachten uitschakelen"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "optie '%s' gaat niet samen met '%s'"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2367,40 +2369,40 @@ msgstr ""
"Slechts één van de opties '-Acdtrux', '--delete', of '--test-label' is "
"mogelijk"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Conflicterende compressie-opties"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Onbekende signaalnaam: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Voorbeeldbestand voor tijdsstempel niet gevonden"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Onbekende datumopmaak %2$s wordt vervangen door %1$s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Optie %s: datum '%s' wordt begrepen als %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "het archief door '%s' filteren"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Geldige argumenten van de optie '--quoting-style' zijn:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2408,163 +2410,163 @@ msgstr ""
"\n"
"*Deze* tar gebruikt de volgende standaardwaarden:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Ongeldige eigenaar of groeps-ID"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Ongeldige blokkenfactor"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Ongeldige bandlengte"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Onjuiste waarde van incrementeel niveau"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Meerdere drempeldata"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Ongeldig versienummer voor luchtige indeling"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' is op dit platform niet mogelijk"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "Waarde van '--checkpoint' is geen geheel getal"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Ongeldige modus gegeven bij optie"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Ongeldig nummer"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Ongeldige recordgrootte"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Recordgrootte moet een veelvoud zijn van %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Ongeldig aantal elementen"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Slechts één optie '--to-command' is toegestaan"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Ongeldig dichtheidsargument: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Onbekende dichtheid: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Opties '-[0-7][lmh]' worden niet ondersteund door *deze* tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: locatie van de fout"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "fout bij ontleden van %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[BESTAND]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "non-optie argumenten in %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "kan TAR_OPTIONS niet splitsen: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Oude optie '%c' vereist een argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "Optie '--occurrence' betekent niets zonder een bestandenlijst"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Voor meerdere archiefbestanden is de optie '-M' vereist"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "Optie '--level' is betekenisloos zonder '--listed-incremental'"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Deellabel is te lang (grens is %lu byte)"
msgstr[1] "%s: Deellabel is te lang (grens is %lu bytes)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Kan meerdelige archieven niet verifiëren"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Kan ingepakte archieven niet verifiëren"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Kan geen meerdelige ingepakte archieven verwerken"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Kan ingepakte archieven niet samenvoegen"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "Optie '--clamp-mtime' vereist een datum opgegeven via '--mtime'"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "Optie '--pax' kan alleen worden gebruikt bij POSIX-archieven"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "Optie '--acls' kan alleen worden gebruikt bij POSIX-archieven"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "Optie '--selinux' kan alleen worden gebruikt bij POSIX-archieven"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "Optie '--xattrs' kan alleen worden gebruikt bij POSIX-archieven"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2572,83 +2574,92 @@ msgstr ""
"Kan naam van topmap niet achterhalen; zet deze expliciet met '--one-top-"
"level=MAP'"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Deellengte kan niet kleiner zijn dan de recordgrootte"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Een compleet leeg archief wordt niet aangemaakt"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Opties '-Aru' gaan niet samen met '-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"U dient een van de opties '-Acdtrux', '--delete', of '--test-label' op te "
"geven"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Gestopt in fouttoestand vanwege eerdere fouten"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Bestand is gekrompen met %s byte"
msgstr[1] "%s: Bestand is gekrompen met %s bytes"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Sleutelwoord %s is onbekend of nog niet geïmplementeerd"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Tijdsstempel valt buiten toegestaan bereik"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Patroon %s kan niet worden gebruikt"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Sleutelwoord %s kan niet worden overstegen"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Onjuiste uitgebreide kop: ontbrekende lengte"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Lengte %*s van uitgebreide kop valt buiten bereik"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Onjuiste uitgebreide kop: ontbrekende witruimte na de lengte"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Onjuiste uitgebreide kop: ontbrekend isgelijkteken"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Onjuiste uitgebreide kop: ontbrekend regeleinde"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Genegeerd: onbekend sleutelwoord '%s' in uitgebreide kop"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2657,47 +2668,47 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr ""
"Waarde %2$s in uitgebreide kop valt buiten bereik voor %1$s (%3$s..%4$s)"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Onjuiste uitgebreide kop: ongeldige %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Onjuiste uitgebreide kop: overtollige %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Onjuiste uitgebreide kop: ongeldige %s: onverwacht scheidingsteken %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Onjuiste uitgebreide kop: ongeldige %s: oneven aantal waarden"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: ongeldige tijdswaarde"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: onbekende actie voor controlepunt"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "schrijven"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "lezen"
@@ -2705,7 +2716,7 @@ msgstr "lezen"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Schrijfcontrolepunt %u"
@@ -2714,12 +2725,12 @@ msgstr "Schrijfcontrolepunt %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Leescontrolepunt %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2728,99 +2739,103 @@ msgstr ""
"paxutils.\n"
"OPTIES zijn:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Bestandsaanmaak-opties:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "GROOTTE"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "een bestand van de gegeven GROOTTE aanmaken"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "naar het bestand NAAM schrijven i.p.v. naar standaarduitvoer"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "bestandsnamen uit BESTAND lezen"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T leest met NUL afgesloten namen"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"het bestand met het gegeven PATROON vullen; PATROON is 'default' (standaard) "
"of 'zeros' (nullen)"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "blokgrootte voor luchtig bestand"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"luchtig bestand genereren; de rest van de opdrachtregel specificeert de "
"indeling"
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "POSITIE"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "naar deze positie springen alvorens met schrijven te beginnen"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "niet-fatale foutmeldingen onderdrukken"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Bestandsstatistieken-opties:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"voor elk gegeven bestand de inhoud van de struct 'stat' printen; de "
"standaard INDELING is: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Synchrone-uitvoer-opties:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPTIE"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"gegeven ARGUMENTEN uitvoeren; dit is nuttig bij '--checkpoint' samen met één "
"van '--cut', '--append', '--touch', of '--unlink'"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"de gegeven actie uitvoeren (zie verderop) bij bereiken van het AANTALste "
"controlepunt"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "de datum voor de volgende '--touch'"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "de uitgevoerde controlepunten en de afsluitwaarde van OPDRACHT tonen"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2828,7 +2843,7 @@ msgstr ""
"Synchroon uit te voeren acties. Deze worden uitgevoerd bij het bereiken van "
"het controlepunt opgegeven met de optie '--checkpoint'."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2836,129 +2851,129 @@ msgstr ""
"BESTAND afkappen tot de grootte opgegeven met een voorafgaande optie '--"
"length' (of 0 als niet gegeven)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"BESTAND met GROOTTE aantal bytes vergroten; deze GROOTTE is met een "
"voorafgaande optie '--length' opgegeven"
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "de toegangs- en wijzigingstijdsstempels van BESTAND bijwerken"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "OPDRACHT uitvoeren"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "BESTAND verwijderen"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Ongeldige grootte: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Getal valt buiten toegestaan bereik: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negatieve grootte: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
-msgstr "Kan status van %s niet bepalen"
+msgstr "kan status van %s niet bepalen"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "gevraagde bestandslengte is %lu, werkelijke is %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "aangemaakt bestand is niet luchtig"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Fout tijdens getalsontleding, nabij '%s'"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Onbekende datumopmaak"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENTEN]..."
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
-msgstr "Kan '%s' niet openen"
+msgstr "kan '%s' niet openen"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
-msgstr "Kan niet springen"
+msgstr "kan niet springen"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
-msgstr "Bestandsnaam bevat een NUL-teken"
+msgstr "bestandsnaam bevat een NUL-teken"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-"Kan geen luchtige bestanden genereren op standaarduitvoer; gebruik de optie "
+"kan geen luchtige bestanden genereren op standaarduitvoer; gebruik de optie "
"'--file'"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
-msgstr "Onjuist masker (nabij '%s')"
+msgstr "onjuist masker (nabij '%s')"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Onbekend veld '%s'"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
-msgstr "Kan tijdsstempel van '%s' niet zetten"
+msgstr "kan tijdsstempel van '%s' niet zetten"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
-msgstr "Kan '%s' niet afkappen"
+msgstr "kan '%s' niet afkappen"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
-msgstr "Opdracht %s is mislukt"
+msgstr "opdracht %s is mislukt"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "Kan '%s' niet afkappen"
+msgstr "kan status van '%s' niet opvragen"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "Kan tijdsstempel van '%s' niet zetten"
+msgstr "kan map '%s' niet verwijderen"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
-msgstr "Kan '%s' niet verwijderen"
+msgstr "kan '%s' niet verwijderen"
#: tests/genfile.c:918
#, c-format
@@ -2995,6 +3010,9 @@ msgstr "Opdracht is afgebroken\n"
msgid "--stat requires file names"
msgstr "Optie '--stat' vereist bestandsnamen"
+#~ msgid "OPTION"
+#~ msgstr "OPTIE"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: Parameter in ARGP_HELP_FMT moet positief zijn"
diff --git a/po/pl.gmo b/po/pl.gmo
index 0a4211216a4d7592fe5126f49053dff8c4d6ce98..27acc84c37a66ecf6642e949518dc0ee6d1a851f 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 4269e79da4fcf0edc13905c20db244abb2bbaa4d..c992ec8fd1cceffa53a5305608c0cb8219dab083 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,13 +5,13 @@
# Thanks to: Jakub Bogusz for remarks and corrections, 2003, 2004, 2007, 2008, 2010,
# Jan Psota for corrections, 2017.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2017-07-03 03:30+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-19 20:10+0100\n"
"Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"Language: pl\n"
@@ -99,7 +99,7 @@ msgid "give a short usage message"
msgstr "krótka informacja o opcjach"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NAZWA"
@@ -137,29 +137,29 @@ msgid "write error"
msgstr "błąd zapisu"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: opcja „%s” jest niejednoznaczna\n"
+msgstr "%s: opcja „%s%s” jest niejednoznaczna\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: opcja „%s” jest niejednoznaczna; możliwości:"
+msgstr "%s: opcja „%s%s” jest niejednoznaczna; możliwości:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: nierozpoznana opcja „%c%s”\n"
+msgstr "%s: nierozpoznana opcja „%s%s”\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: opcja „%c%s” nie może mieć argumentu\n"
+msgstr "%s: opcja „%s%s” nie może mieć argumentu\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: opcja „--%s” wymaga argumentu\n"
+msgstr "%s: opcja „%s%s” wymaga argumentu\n"
#: gnu/getopt.c:621
#, c-format
@@ -234,12 +234,12 @@ msgstr "^[TtYy].*"
msgid "^[nN]"
msgstr "^[nN].*"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Pakowane przez %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Pakowane przez %s\n"
@@ -247,12 +247,11 @@ msgstr "Pakowane przez %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -262,7 +261,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Licencja GPLv3+: GNU GPL wersja 3 albo późniejsza http://gnu.org/licenses/"
+"Licencja GPLv3+: GNU GPL wersja 3 albo późniejsza https://gnu.org/licenses/"
"gpl.html\n"
"To jest wolne oprogramowanie: możesz je modyfikować i rozpowszechniać.\n"
"Autorzy NIE DAJĄ GWARANCJI w granicach dozwolonych prawem.\n"
@@ -401,15 +400,14 @@ msgid "%s home page: <%s>\n"
msgstr "Strona domowa %s: %s\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Strona domowa %s: http://www.gnu.org/software/%s/\n"
+msgstr "Strona domowa %s: https://www.gnu.org/software/%s/\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Informacje o używaniu oprogramowania GNU: http://www.gnu.org/gethelp/\n"
+"Informacje o używaniu oprogramowania GNU: https://www.gnu.org/gethelp/\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -533,146 +531,146 @@ msgstr "Nie można przekierować plików do zdalnej powłoki"
msgid "Cannot execute remote shell"
msgstr "Nie można uruchomić zdalnej powłoki"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Sposób ustawiania pozycji w pliku spoza zakresu"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Błędny kierunek przesuwania wskaźnika pozycji"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Błędne przesunięcie wskaźnika pozycji"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Pozycja w pliku poza zakresem"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Błędna liczba bajtów"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Liczba bajtów poza zakresem"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Przedwczesny EOF"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Błędny kod operacji"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operacja nie przewidziana"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Nieoczekiwany argumenty"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
"Posługiwanie się napędem taśmowym, przyjmowanie poleceń od zdalnego procesu"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "LICZBA"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "ustawienie poziomu wypisywania informacji diagnostycznych"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "PLIK"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "plik do zapisywania informacji diagnostycznych"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
-msgstr "nie można otworzyć %s"
+msgstr "nie udało się otworzyć %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "za dużo argumentów"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Bezsensowna komenda"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "To nie wygląda jak archiwum tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Liczba przeczytanych bajtów"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Licza zapisanych bajtów"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Liczba skasowanych bajtów"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(pipe)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Odmowa czytania zawartości archiwumn z terminala (brakująca opcja -f?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Odmowa pisania zawartości archiwumn do terminala (brakująca opcja -f?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Błędna wartość record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Nie podana nazwa archiwum"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Nie można zweryfikować archiwum z/do stdin/stdout"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Archiwum jest skompresowane. Należy użyć opcji %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Nie można uaktualnić archiwum skompresowanego"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Na początku taśmy, teraz kończę"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Za dużo błędów, kończę"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
@@ -680,7 +678,7 @@ msgstr[0] "Rozmiar rekordu = %lu blok"
msgstr[1] "Rozmiar rekordu = %lu bloki"
msgstr[2] "Rozmiar rekordu = %lu bloków"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
@@ -688,38 +686,38 @@ msgstr[0] "Nierówny blok (%lu bajt) w archiwum"
msgstr[1] "Nierówny blok (%lu bajty) w archiwum"
msgstr[2] "Nierówny blok (%lu bajtów) w archiwum"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Nie można się cofnąć w pliku archiwum; może nie być czytelny bez -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek nie zatrzymał się na granicy rekordów"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: zawiera błędny numer części"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Przepełnienie numeru części"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Przygotuj część numer %d dla %s i naciśnij return: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "EOF kiedy była oczekiwana odpowiedź użytkownika"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "UWAGA: Archiwum jest niekompletne"
# rare case when `for parts' translates into `części' for both sing. and plural in Polish - rzm
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -730,68 +728,68 @@ msgstr ""
" q Zakończenie programu tar\n"
" y albo Enter Kontynuacja\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Uruchomienie powłoki\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Wypisanie tej listy\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Brak nowej części; zakończenie pracy.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Brak nazwy pliku. Spróbuj jeszcze raz.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr ""
"Błędne dane wejściowe. Wciśnij ? żeby przeczytać informacje pomocnicze\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s polecenie zwróciło błąd"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s nie jest kontynuowany w tej części"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s prawdopodobnie jest kontynuowany w tej części: nagłówek zawiera skróconą "
"nazwę"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s to zły rozmiar (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Ta część nie jest w kolejności (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Etykieta archiwum nie pasuje do %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Część %s nie pasuje do %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -799,11 +797,11 @@ msgstr ""
"%s: nazwa pliku jest za długa do zapisania w nagłówku wieloczęściowego "
"archiwum GNU, zostanie skrócona"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "zapis nie zakończył się na granicy bloków"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
@@ -811,75 +809,75 @@ msgstr[0] "Można było przeczytać tylko %lu z %lu bajtu"
msgstr[1] "Można było przeczytać tylko %lu z %lu bajtów"
msgstr[2] "Można było przeczytać tylko %lu z %lu bajtów"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Zawartości się różnią"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Nieoczekiwany EOF w archiwum"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Różne typy plików"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Uprawnienia się różnią"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid się różni"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid się różni"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Czas modyfikacji się różni"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Rozmiar się różni"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Nie dołączony do %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Łącze symboliczne się różni"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Różnią się numery urządzeń"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Sprawdzanie "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Nieznany typ pliku „%c”, porównywany jako zwykły plik"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Archiwum zawiera nazwy plików bez początkowych elementów ścieżek."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Archiwum zawiera zmienione nazwy plików."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Podczas weryfikacji mogą nie być znalezione pliki lokalne"
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
@@ -887,48 +885,48 @@ msgstr[0] "BŁĄD WERYFIKACJI: wykryto %d błędny nagłówek"
msgstr[1] "BŁĄD WERYFIKACJI: wykryto %d błędne nagłówki"
msgstr[2] "BŁĄD WERYFIKACJI: wykryto %d błędnych nagłówków"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Samotny blok zerowy przy %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: zawiera znacznik katalogu pamięci podręcznej %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "wartość %s z %s poza zakresem %s..%s; podstawione %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "wartość %s z %s poza zakresem %s..%s"
# hm? - rzm
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Tworzenie ujemnych nagłówków ósemkowych"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: nazwa pliku jest za długa (powyżej %d); nie została zapisana"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
"%s: nazwa pliku jest za długa (nie może być podzielona); nie została zapisana"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: nazwa łącza jest za długa; nie została zapisana"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
@@ -936,78 +934,78 @@ msgstr[0] "%s: Plik skurczył się o %s bajt; jest dopełniany zerami"
msgstr[1] "%s: Plik skurczył się o %s bajty; jest dopełniany zerami"
msgstr[2] "%s: Plik skurczył się o %s bajtów; jest dopełniany zerami"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: plik w innym systemie plików; nie został zapisany"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "zawartość nie została zapisana"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Nieznany typ pliku; plik zignorowany"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Brakujące łącza do %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: plik jest niezmieniony; nie został zapisany"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: plik jest w tym archiwum; nie został zapisany"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "katalog nie został zapisany"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: plik zmienił się w trakcie czytania"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: zignorowane gniazdo z nazwą"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: zignorowany plik door"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Przeskoczenie do następnego nagłówka"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Kasowanie z archiwum nie-nagłówka"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: niemożliwie stara data %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: znacznik czasowy %s jest przesunięty o %s s w przyszłość"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Nieoczekiwana niespójność przy zakładaniu katalogu"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: pominięcie istniejącego pliku"
@@ -1030,7 +1028,7 @@ msgstr "Próba odtworzenia łącza symbolicznego jako zwykłego"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Nie można odtworzyć -- plik jest kontynuowany z innej części"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Niespodziewany nagłówek z długą nazwą"
@@ -1047,7 +1045,7 @@ msgstr "Aktualny %s jest nowszy albo w tym samym wieku"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: nazwa elementu zawiera „..”"
#: src/extract.c:1696
#, c-format
@@ -1059,22 +1057,22 @@ msgstr "%s: Nie można było zrobić kopii zapasowej tego pliku"
msgid "Cannot rename %s to %s"
msgstr "Nie można przemianować %s na %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Nazwa katalogu została zmieniona z %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Katalog jest nowy"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: katalog w innym systemie plików; nie został zapisany"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Nazwa katalogu została zmieniona"
@@ -1200,35 +1198,35 @@ msgstr "%s: Usunięcie %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Nie można usunąć"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Pominięty"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** Blok zer **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok: %s: ** Koniec pliku **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Odstępy w nagłówku zamiast spodziewanej wartości numerycznej %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1236,164 +1234,165 @@ msgstr ""
"jak uzupełnienie dwójkowe"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Wartość ósemkowa %.*s w archiwum jest spoza zakresu %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Archiwum zawiera przestarzałe nagłówki base64"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "W archiwum jest łańcuch base64 %s spoza zakresu %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Wartość base256 w archiwum jest spoza zakresu %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Archiwum zawiera %.*s tam gdzie oczekiwana była liczba %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Wartość %s w archiwum jest spoza zakresu %s %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " łącze do %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " nieznany typ pliku %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Długie łącze--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Długa nazwa--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Nagłówek części--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Kontynuacja od bajtu %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Tworzony jest katalog:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Nazwa %s zmieniona na %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Nie można przemianować na %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Nazwa zmieniona z %s z powrotem na %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Plik usunięty zanim został przeczytany"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "proces potomny"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "kanał między procesami"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Wybór lokalnej nazwy pliku:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"dodanie podanego PLIKU do archiwum (przydatne jeżeli jego nazwa startuje od "
"myślnika)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "KATALOG"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "przejście do KATALOGU"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "nazwy plików do rozpakowania lub spakowania z PLIKU"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T czyta nazwy zakończone zerem, włącza --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "wyłączenie efektu użycia opcji --null"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
"usunięcie znaków cytowania z nazwy pliku wejściowego lub plików w archiwum "
"(domyślnie)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
"bez usuwania znaków cytowania z nazwy pliku wejściowego lub plików w archiwum"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "z opcją -T - czytanie nazw plików dosłownie (bez uwzględniania opcji)"
+msgstr ""
+"z opcją -T - czytanie nazw plików dosłownie (bez uwzględniania sekwencji "
+"sterujących ani opcji)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"z opcją -T - traktowanie nazw plików zaczynających się od myślnika jako "
"opcji (domyślnie)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "WZORZEC"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "wykluczenie nazw pasujących do WZORCA"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "wykluczenie nazw pasujących do wzorców w PLIKU"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1401,24 +1400,24 @@ msgstr ""
"wykluczenie katalogów zawierających znacznik pamięci podręcznej CACHEDIR."
"TAG, oprócz samych plików znacznika"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "wykluczenie katalogów zawierających CACHEDIR.TAG i ich podkatalogów"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "wykluczenie katalogów zawierających CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "wykluczenie katalogów zawierających PLIK, ale nie samego PLIKU"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
"czytanie wzorców pomijania dla każdego katalogu z PLIKU, jeżeli istnieje"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1426,120 +1425,123 @@ msgstr ""
"czytanie wzorców pomijania dla każdego katalogu i jego podkatalogów z PLIKU, "
"jeżeli istnieje"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "wykluczenie katalogów zawierających PLIK i ich podkatalogów"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "wykluczenie katalogów zawierających PLIK"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "wykluczenie katalogów systemu administrowania wersjami"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
"czytanie wzorców pomijania z analogicznych plików systemów zarządzania "
"wersjami (VCS)"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "wykluczenie plików kopii zapasowych i rezerwacji zasobów"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "zagłębianie się w podkatalogi (domyślnie)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "bez automatycznego zagłębiania się w katalogi"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Opcje filtracji nazw plików (dotyczą zarówno wzorców wykluczania jak "
"włączania):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "nazwy porównywane od początków nazw plików"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "wzorce odnoszą się do nazw po każdym „/” (domyślnie)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "traktowanie tak samo małych i wielkich liter"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "odróżnianie małych i wielkich liter (domyślnie)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "używanie wildcards (domyślnie dla wykluczania)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "dosłowne porównywanie napisów"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "wildcards są porównywane z „/” (domyślnie dla wykluczania)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "wildcards nie są porównywane z „/”"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Następujące opcje zostały użyte po nieopcjonalnych argumentach w trybie "
+"tworzenia albo aktualizacji archiwum. Te opcje wpływają tylko na argumenty, "
+"które następują po nich. Proszę je odpowiednio uporządkować."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "opcja -C %s nie odniosła skutku"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "opcja --%s %s nie odniosła skutku"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "opcja --%s nie odniosła skutku"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "linia polecenia"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: lista plików żądana z %s już przeczytana z %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "nie można podzielić napisu „%s”: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: przeczytana nazwa pliku zawiera znak NUL"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "W nazwach plików użyto znaków dopasowania wzorców"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1547,47 +1549,47 @@ msgstr ""
"Użyj --wildcards aby włączyć porównywanie wzorców albo --no-wildcards żeby "
"wyłączyć to ostrzeżenie"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Nie znalazłem w archiwum"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Brak podanego wystąpienia pliku w archiwum"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Nie pasująca etykieta archiwum"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Nie jest dozwolone używanie opcji -C wewnątrz listy plików razem z --listed-"
"incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Z --listed-incremental można użyć tylko jednej opcji -C"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Opcje „%s” i „%s” obie chcą dostępu do standardowego wejścia"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Błędny format archiwum"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Próba użycia rozszerzeń GNU z niekompatybilnym formatem archiwum"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1812,7 +1814,7 @@ msgstr "Wybór strumienia wyjściowego"
msgid "extract files to standard output"
msgstr "rozpakowanie plików na standardowe wyjście"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "POLECENIE"
@@ -1850,7 +1852,7 @@ msgid "use FILE to map file owner GIDs and names"
msgstr ""
"użycie PLIKU do konwersji identyfikatorów i nazw grup właścicieli plików"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATA_ALBO_PLIK"
@@ -2068,7 +2070,7 @@ msgstr "podzielenie na bloki przy odczycie (dla pipe 4.2BSD)"
msgid "Archive format selection:"
msgstr "Wybór formatu archiwum:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2153,59 +2155,59 @@ msgstr "PROGRAM"
msgid "filter through PROG (must accept -d)"
msgstr "filtrowanie przez PROGRAM (akceptujący -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Wybór plików lokalnych:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "pozostanie w jednym systemie plików"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "bez usuwania początkowego „/” z nazw plików"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "archiwizacja plików, na które wskazują łącza symboliczne"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "archiwizacja plików, na które wskazują łącza zwykłe"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "NAZWA-PLIKU"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "zaczęcie od pliku NAZWA-PLIKU w czasie czytania archiwum"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "zapisanie tylko plików nowszych niż DATA albo data PLIKU"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATA"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "porównywanie daty i czasu tylko dla zmienionych danych"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "TRYB"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "kopia zapasowa przed usunięciem, wybranie TRYBU zarządzania wersjami"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "NAPIS"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2213,62 +2215,62 @@ msgstr ""
"kopia zapasowa przed usunięciem, zmiana domyślnego przyrostka („~”, jeżeli "
"nie zmieniony przez zmienną środowiska SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Zmiany nazwy plików:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
"ucięcie przed rozpakowaniem LICZBY początkowych elementów ścieżki z nazw "
"plików"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "WYRAŻENIE"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "użycie WYRAŻENIA zamiany sed-a do przekształcenia nazw plików"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informacje:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "wypisywanie szczegółów o przetwarzanych plikach"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "SŁOWO KLUCZOWE"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "sterowanie ostrzeżeniami"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"wypisywanie co ILE rekordów informacji o przetwarzaniu (domyslnie co 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "AKCJA"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "wykonanie AKCJI przy każdym punkcie kontrolnym"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "wypisanie komunikatu jeżeli nie wszytkie łącza zostały zapisane"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SYGNAŁ"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2280,35 +2282,35 @@ msgstr ""
"sygnały: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2; nazwy bez prefiksu SIG "
"są też akceptowane"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "wypisanie czasów modyfikacji plików w UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "wypisanie czasu pliku z pełną dokładnością"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "zapisanie dokładnych informacji w PLIKU"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "pokazanie przy każdym komunikacie numeru bloku w archiwum"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "proszenie o potwierdzenie każdego działania"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "wypisanie domyślnych ustawień tar-a"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "pokazanie zakresów dozwolonych wartości pól danych kopii przyrostowej"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2316,33 +2318,33 @@ msgstr ""
"wypisywanie każdego katalogu nie pasującego do kryteriów szukania przy "
"wypisywaniu albo rozpakowywaniu archiwum"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "pokazanie nazw plików albo archiwów po przeszktałceniu"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STYL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"ustawienie stylu ujmowania nazw w cudzysłowy; poniżej dozwolone wartości "
"STYLU"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "dodatkowe ujmowanie w znaki cytowania znaków z ŁAŃCUCHA"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "wyłączenie ujmowania w znaki cytowania znaków z ŁAŃCUCHA"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Opcje kompatybilności:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2350,22 +2352,22 @@ msgstr ""
"przy tworzeniu: to samo co --old-archive przy odtwarzaniu: to co --no-same-"
"owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Inne opcje:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "wyłączenie używania potencjalnie szkodliwych opcji"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "opcja „%s” nie może być użyta z opcją „%s”"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2373,40 +2375,40 @@ msgstr ""
"Nie można podać więcej niż jednej opcji z „-Acdtrux”, „--delete” albo „--"
"test-label”"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Niezgodne opcje kompresji"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Nieznana nazwa sygnału: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Nie znaleziono pliku z datą"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Postawienie %s w miejscu nieznanego formatu daty %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Opcja %s: Potraktowanie daty „%s” jako %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtrowanie archiwum przez %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Prawidłowe argumenty dla opcji --quoting-style:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2414,120 +2416,120 @@ msgstr ""
"\n"
"*Ten* tar ma domyślne parametry:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Błędny identyfikator właściciela lub grupy"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Błędny współczynnik łączenia w bloki"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Błędna długość taśmy"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Błędny numer poziomu przyrostowej kopii zapasowej"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Więcej niż jedna data graniczna"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Błędna wartość wersji plików rzadkich"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "ten system nie pozwala na użycie --atime-preserve='system'"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "wartość --checkpoint nie jest liczbą całkowitą"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Błędne uprawnienia podane w opcji"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Błędny numer"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Błędna wielkość rekordu"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Rozmiar rekordu musi być wielokrotnością %d"
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Błędna ilość elementów"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Wolno użyć tylko jednej opcji polecenia --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Błędna specyfikacja gęstości: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Nieznana gęstość: „%c”"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Opcje „-[0-7][lmh]” nie są dostępne w *tym* tarze"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: lokalizacja błędu"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "błąd przetwarzania %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[PLIK]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "argumenty nie będące opcjami w %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "nie można rozdzielić TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Stara opcja „%c” wymaga argumentu."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence nie ma znaczenia bez listy plików"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Archiwum składające się z wielu plików wymaga opcji „-M”"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "opcja --level nic nie znaczy bez użycia --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
@@ -2535,43 +2537,43 @@ msgstr[0] "%s: Za długa etykieta części (może mieć do %lu bajtu)"
msgstr[1] "%s: Za długa etykieta części (może mieć do %lu bajtów)"
msgstr[2] "%s: Za długa etykieta części (może mieć do %lu bajtów)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Nie można zweryfikować archiwum wieloczęściowego"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Nie można zweryfikować archiwum skompresowanego"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Nie można używać wieloczęściowego archiwum skompresowanego"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Nie można połączyć skompresowanych archiwów"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime wymaga podania daty przy pomocy --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "Opcja --pax-option może być użyta tylko do archiwów POSIX-owych"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "Opcja --acls może być użyta tylko do archiwów POSIX-owych"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "Opcja --selinux może być użyta tylko do archiwów POSIX-owych"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "Opcja --xattrs może być użyta tylko do archiwów POSIX-owych"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2579,29 +2581,29 @@ msgstr ""
"Nie udało się wydedukować głównego katalogu; proszę ustawić go wprost opcją "
"--one-top-level=KATALOG"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Długość części nie może być mniejsza od wielkości rekordu"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Tchórzliwie odmawiam utworzenia pustego archiwum"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Opcje „-Aru” są niekompatybilne z „-f -”"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Trzeba podać jedną z opcji „-Acdtrux”, „--delete” albo „--test-label”"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Zakończenie w stanie błędu z powodu uprzednich błędów"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
@@ -2609,52 +2611,61 @@ msgstr[0] "%s: Plik skurczył się o %s bajt"
msgstr[1] "%s: Plik skurczył się o %s bajty"
msgstr[2] "%s: Plik skurczył się o %s bajtów"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Słowo kluczowe %s jest nieznane albo jeszcze nie zaimplementowane"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Czas spoza dozwolonego zakresu"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Nie może być użyty wzorzec %s"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Słowo kluczowe %s nie może być zastąpione"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Błędny nagłówek rozszerzony: brakuje długości"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Długośc nagłówka rozszerzonego %*s jest poza zakresem"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Błędny nagłówek rozszerzony: brakuje odstępu po długości"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Błędny nagłówek rozszerzony: brakuje znaku równości"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Błędny nagłówek rozszerzony: brakuje znaku mowej linii"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Zignorowane nieznane słowo kluczowe nagłówka rozszerzonego „%s”"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2663,46 +2674,46 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Nagłówek rozszerzony - %s=%s jest poza zakresem %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Błędny nagłówek rozszerzony: błędny %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Błędny nagłówek rozszerzony: nadmiarowe %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Błędny nagłówek rozszerzony: błędny %s: niespodziewany ogranicznik %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Błędny nagłówek rozszerzony: błędny %s: nieparzysta liczba wartości"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: błędna specyfikacja ograniczenia czasu"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: nieznana akcja przy punkcie kontrolnym"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "zapis"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "odczyt"
@@ -2710,7 +2721,7 @@ msgstr "odczyt"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Punkt kontrolny zapisu %u"
@@ -2719,12 +2730,12 @@ msgstr "Punkt kontrolny zapisu %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Punkt kontrolny odczytu %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2732,94 +2743,98 @@ msgstr ""
"genfile służy do operacji na plikach w ramach zestawu testów GNU paxutils.\n"
"OPCJE:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Opcje tworzenia plików:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "ROZMIAR"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Utworzenie pliku o podanym ROZMIARZE"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Pisanie na pliku NAZWA zamiast na standardowe wyjście"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Czytanie nazw plików z PLIKU"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T czyta nazwy zakończone zerem"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "Wypełnienie pliku podanym WZORCEM. WZORZEC to „default” albo „zeros”"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Rozmiar bloku pliku rzadkiego"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Utworzenie pliku rzadkiego. Reszta argumentów określa mapę pliku."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "POZYCJA"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Ustawienie pozycji zapisu przez zapisem danych"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Pominięcie nie-krytycznych komunikatów diagnostycznych"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Opcje statystyki plików"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Wypisanie zawartości struct stat dla każdego podanego pliku. Domyślny "
"FORMAT: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Opcje równoczesnego wykonywania:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPCJA"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Wykonanie ARGUMENTÓW. Przydatne z --checkpoint i jednym z --cut, --append, --"
"touch albo --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Wykonanie podanej akcji (zobacz niżej) po napotkaniu punktu kontrolnego NUMER"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Ustaw datę następnej opcji --touch"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Wypisanie wykonanych punktów kontrolnych i kodu wyjścia POLECENIA"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2827,7 +2842,7 @@ msgstr ""
"Akcje równoczesnego wykonania. Są podejmowane po osiągnięciu punktu "
"kontrolnego o numerze podanym przez opcję --checkpoint"
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2835,128 +2850,129 @@ msgstr ""
"Obcięcie PLIKU do rozmiaru podanego przez poprzednia opcję --length (albo 0, "
"jeżeli nie został podany)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Dodanie ROZMIAR bajtów do PLIKU. ROZMIAR jak podany przez poprzednią opcję --"
"length."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Uaktualnienie czasów dostepu i modyfikacji PLIKU"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Wykonanie POLECENIA"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Skasowanie PLIKU"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Błędny rozmiar: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Liczba spoza dozwolonego zakresu: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Ujemny rozmiar: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "błąd stat(%s)"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "żądana długość pliku %lu, faktyczna %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "utworzony plik nie jest rzadki"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Błąd przetwarzania liczby blisko „%s”"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENTY...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
-msgstr "nie można otworzyć „%s”"
+msgstr "nie udało się otworzyć „%s”"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
-msgstr "nie można ustawić pozycji"
+msgstr "nie udało się ustawić pozycji"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "nazwa pliku zawiera znak NUL"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-"nie można utworzyć pliku rzadkiego na standardowym wyjściu, użyj opcji --file"
+"nie udało się utworzyć pliku rzadkiego na standardowym wyjściu, użyj opcji --"
+"file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "nieprawidłowa maska (koło „%s”)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr " Nieznane pole „%s”"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
-msgstr "nie można ustawić czasu na „%s”"
+msgstr "nie udało się ustawić czasu na „%s”"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
-msgstr "nie można skrócić „%s”"
+msgstr "nie udało się skrócić „%s”"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "polecenie zwróciło błąd: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "nie można skrócić „%s”"
+msgstr "nie udało się odczytać stanu „%s”"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "nie można ustawić czasu na „%s”"
+msgstr "nie udało się usunąć katalogu „%s”"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
-msgstr "nie można usunąć „%s”"
+msgstr "nie udało się usunąć „%s”"
#: tests/genfile.c:918
#, c-format
@@ -2993,23 +3009,5 @@ msgstr "Polecenie zakończone\n"
msgid "--stat requires file names"
msgstr "--stat wymaga podania nazwy pliku"
-#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-#~ msgstr "%.*s: Parametr ARGP_HELP_FMT musi być dodatni"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: opcja „--%s” nie może mieć argumentu\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: nierozpoznana opcja „--%s”\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: opcja „-W %s” jest niejednoznaczna\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: opcja „-W %s” nie może mieć argumentu\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: opcja „-W %s” wymaga argumentu\n"
-
-#~ msgid "Unlink FILE"
-#~ msgstr "Usunięcie PLIKU"
+#~ msgid "OPTION"
+#~ msgstr "OPCJA"
diff --git a/po/pt.gmo b/po/pt.gmo
index d036707777bf16aefeee9c6abe2996c26287b4b0..65beeb89d031ba0869fa3b194dd0cf8808c24262 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index 844ab4dacd377aae24ac806fc785cedd23cb64b1..439aad4918346cf9f397f27a9fcab98a30b45161 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,189 +1,188 @@
# Portuguese translation of the "tar" messages
-# Copyright (1995) Free Software Foundation, Inc.
-# Ant�nio Jos� Coutinho <ajc@di.uminho.pt>
+# This file is distributed under the same license as the tar package.
+# Copyright (C) 2018 Free Software Foundation, Inc.
+# António José Coutinho <ajc@di.uminho.pt>
+# Pedro Albuquerque <palbuquerque73@gmail.com>, 2018.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.11.9\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 1996-04-20 21:50\n"
-"Last-Translator: Ant�nio Jos� Coutinho <ajc@di.uminho.pt>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-10-02 23:48+0100\n"
+"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
+"Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\\n\n"
+"X-Generator: Gtranslator 2.91.7\n"
#: gnu/argmatch.c:134
-#, fuzzy, c-format
+#, c-format
msgid "invalid argument %s for %s"
-msgstr "Formato de data inv�lido \"%s\""
+msgstr "argumento inválido %s para %s"
#: gnu/argmatch.c:135
#, c-format
msgid "ambiguous argument %s for %s"
-msgstr ""
+msgstr "argumento ambíguo %s para %s"
#: gnu/argmatch.c:154
msgid "Valid arguments are:"
-msgstr ""
+msgstr "Os argumentos válidos são:"
#: gnu/argp-help.c:148
#, c-format
msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
+msgstr "ARGP_HELP_FMT: valor %s é menor ou igual que %s"
#: gnu/argp-help.c:224
#, c-format
msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
+msgstr "%.*s: o parâmetro ARGP_HELP_FMT requer um valor"
#: gnu/argp-help.c:234
#, c-format
msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
+msgstr "%.*s: parâmetro ARGP_HELP_FMT desconhecido"
#: gnu/argp-help.c:247
#, c-format
msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
+msgstr "Lixo em ARGP_HELP_FMT: %s"
#: gnu/argp-help.c:1228
-#, fuzzy
msgid ""
"Mandatory or optional arguments to long options are also mandatory or "
"optional for any corresponding short options."
msgstr ""
-"Os argumentos obrigat�rios ou opcionais para as op��es longas tamb�m\n"
-"s�o obrigat�rios ou opcionais para as correspondentes op��es curtas.\n"
+"Os argumentos obrigatórios ou opcionais para as opções longas também são "
+"obrigatórios ou opcionais para as opções curtas correspondentes."
#: gnu/argp-help.c:1615
msgid "Usage:"
-msgstr ""
+msgstr "Uso:"
#: gnu/argp-help.c:1619
msgid " or: "
-msgstr ""
+msgstr " ou: "
#: gnu/argp-help.c:1631
-#, fuzzy
msgid " [OPTION...]"
-msgstr ""
-"\n"
-"Forma de usar: %s [OP��O]...\n"
+msgstr " [OPÇÃO...]"
#: gnu/argp-help.c:1658
-#, fuzzy, c-format
+#, c-format
msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr "Para mais informa��o, tente \"%s --help\".\n"
+msgstr "Tente \"%s --help\" ou \"%s --usage\" para mais informação.\n"
#: gnu/argp-help.c:1686
#, c-format
msgid "Report bugs to %s.\n"
-msgstr ""
+msgstr "Reportar erros a %s.\n"
#: gnu/argp-help.c:1887 gnu/error.c:195
msgid "Unknown system error"
-msgstr "Erro desconhecido, do sistema"
+msgstr "Erro de sistema desconhecido"
#: gnu/argp-parse.c:81
msgid "give this help list"
-msgstr ""
+msgstr "Mostra esta lista de ajuda"
#: gnu/argp-parse.c:82
msgid "give a short usage message"
-msgstr ""
+msgstr "Mostrar mensagem curta de uso"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
-msgstr ""
+msgstr "NOME"
#: gnu/argp-parse.c:84
msgid "set the program name"
-msgstr ""
+msgstr "define o nome do programa"
#: gnu/argp-parse.c:85
msgid "SECS"
-msgstr ""
+msgstr "SEGS"
#: gnu/argp-parse.c:86
msgid "hang for SECS seconds (default 3600)"
-msgstr ""
+msgstr "espera SEGS segundos (predefinição 3600)"
#: gnu/argp-parse.c:143
msgid "print program version"
-msgstr ""
+msgstr "Mostrar versão do programa"
#: gnu/argp-parse.c:160
msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
+msgstr "(ERRO DO PROGRAMA) Sem versão conhecida!?"
#: gnu/argp-parse.c:613
#, c-format
msgid "%s: Too many arguments\n"
-msgstr ""
+msgstr "%s: demasiados argumentos\n"
#: gnu/argp-parse.c:759
msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
+msgstr "(ERRO DO PROGRAMA) A opção devia ter sido reconhecida!?"
#: gnu/closeout.c:122
-#, fuzzy
msgid "write error"
-msgstr "Escreve-se registo\n"
+msgstr "erro de escrita"
#: gnu/getopt.c:278
#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr ""
+msgstr "%s: a opção \"%s%s\" é ambígua\n"
#: gnu/getopt.c:284
#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr ""
+msgstr "%s: a opção \"%s%s\" é ambígua; possibilidades:"
#: gnu/getopt.c:319
#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr ""
+msgstr "%s: opção \"%s%s\" desconhecida\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "A antiga op��o `%c' exige um argumento."
+msgstr "%s: a opção \"%s%s\" não permite um argumento\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "A antiga op��o `%c' exige um argumento."
+msgstr "\"%s: a opção \"%s%s\" requer um argumento\n"
#: gnu/getopt.c:621
#, c-format
msgid "%s: invalid option -- '%c'\n"
-msgstr ""
+msgstr "%s: opção inválida -- \"%c\"\n"
#: gnu/getopt.c:636 gnu/getopt.c:682
-#, fuzzy, c-format
+#, c-format
msgid "%s: option requires an argument -- '%c'\n"
-msgstr "A antiga op��o `%c' exige um argumento."
+msgstr "%s: a opção requer um argumento -- \"%c\"\n"
#: gnu/obstack.c:338 gnu/obstack.c:340 gnu/xalloc-die.c:34
msgid "memory exhausted"
-msgstr ""
+msgstr "memória esgotada"
#: gnu/openat-die.c:38
-#, fuzzy, c-format
+#, c-format
msgid "unable to record current working directory"
-msgstr "N�o se conseguiu determinar a directoria corrente"
+msgstr "impossível gravar a pasta de trabalho actual"
#: gnu/openat-die.c:57
#, c-format
msgid "failed to return to initial working directory"
-msgstr ""
+msgstr "falha ao voltar à pasta de trabalho inicial"
#. TRANSLATORS:
#. Get translations for open and closing quotation marks.
@@ -208,11 +207,11 @@ msgstr ""
#. and use glyphs suitable for your language.
#: gnu/quotearg.c:362
msgid "`"
-msgstr ""
+msgstr "\""
#: gnu/quotearg.c:363
msgid "'"
-msgstr ""
+msgstr "\""
#. TRANSLATORS: A regular expression testing for an affirmative answer
#. (english: "yes"). Testing the first character may be sufficient.
@@ -222,7 +221,7 @@ msgstr ""
#. locale -k LC_MESSAGES | grep '^yesexpr='
#: gnu/rpmatch.c:150
msgid "^[yY]"
-msgstr ""
+msgstr "^[Ss]"
#. TRANSLATORS: A regular expression testing for a negative answer
#. (english: "no"). Testing the first character may be sufficient.
@@ -232,26 +231,26 @@ msgstr ""
#. locale -k LC_MESSAGES | grep '^noexpr='
#: gnu/rpmatch.c:163
msgid "^[nN]"
-msgstr ""
+msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
-msgstr ""
+msgstr "Empacotado por %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
-msgstr ""
+msgstr "Empacotado por %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
-msgstr ""
+msgstr "(©)"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -260,24 +259,30 @@ msgid ""
"There is NO WARRANTY, to the extent permitted by law.\n"
"\n"
msgstr ""
+"\n"
+"Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl."
+"html>\n"
+"Este é um programa grátis: pode alterá-lo e redistribuí-lo.\n"
+"Não há QUALQUER GARANTIA, até ao limite da Lei.\n"
+"\n"
#. TRANSLATORS: %s denotes an author name.
#: gnu/version-etc.c:102
#, c-format
msgid "Written by %s.\n"
-msgstr ""
+msgstr "Escrito por %s\n"
#. TRANSLATORS: Each %s denotes an author name.
#: gnu/version-etc.c:106
#, c-format
msgid "Written by %s and %s.\n"
-msgstr ""
+msgstr "Escrito por %s e %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#: gnu/version-etc.c:110
#, c-format
msgid "Written by %s, %s, and %s.\n"
-msgstr ""
+msgstr "Escrito por %s, %s e %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -288,6 +293,8 @@ msgid ""
"Written by %s, %s, %s,\n"
"and %s.\n"
msgstr ""
+"Escrito por %s, %s, %s\n"
+"e %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -298,6 +305,8 @@ msgid ""
"Written by %s, %s, %s,\n"
"%s, and %s.\n"
msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s e %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -308,6 +317,8 @@ msgid ""
"Written by %s, %s, %s,\n"
"%s, %s, and %s.\n"
msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s e %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -318,6 +329,8 @@ msgid ""
"Written by %s, %s, %s,\n"
"%s, %s, %s, and %s.\n"
msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s, %s e %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -329,6 +342,9 @@ msgid ""
"%s, %s, %s, %s,\n"
"and %s.\n"
msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"e %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -340,6 +356,9 @@ msgid ""
"%s, %s, %s, %s,\n"
"%s, and %s.\n"
msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s e %s.\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
@@ -351,6 +370,9 @@ msgid ""
"%s, %s, %s, %s,\n"
"%s, %s, and others.\n"
msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s e outros.\n"
#. TRANSLATORS: The placeholder indicates the bug-reporting address
#. for this package. Please add _another line_ saying
@@ -362,34 +384,36 @@ msgid ""
"\n"
"Report bugs to: %s\n"
msgstr ""
+"\n"
+"Reportar erros a: %s\n"
#: gnu/version-etc.c:247
#, c-format
msgid "Report %s bugs to: %s\n"
-msgstr ""
+msgstr "Reportar %s erros a: %s\n"
#: gnu/version-etc.c:251
#, c-format
msgid "%s home page: <%s>\n"
-msgstr ""
+msgstr "Página inicial %s: <%s>\n"
#: gnu/version-etc.c:253
#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr ""
+msgstr "Página inicial %s: <http://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgstr "Ajuda geral para uso de programas GNU: <http://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
#. %s itself is not translated.
#. Translate it as `%s: Function %s failed'.
#: lib/paxerror.c:60 lib/paxerror.c:73
-#, fuzzy, c-format
+#, c-format
msgid "%s: Cannot %s"
-msgstr "N�o se consegue duplicar %s com \"dup\""
+msgstr "%s: função %s falhou"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -398,710 +422,682 @@ msgstr "N
#: lib/paxerror.c:86
#, c-format
msgid "%s: Warning: Cannot %s"
-msgstr ""
+msgstr "%s: aviso: função %s falhou"
#: lib/paxerror.c:95
-#, fuzzy, c-format
+#, c-format
msgid "%s: Cannot change mode to %s"
-msgstr "%s: N�o se pode mudar para o modo para %0.4o"
+msgstr "%s: impossível alterar o modo para %s"
#: lib/paxerror.c:103
-#, fuzzy, c-format
+#, c-format
msgid "%s: Cannot change ownership to uid %lu, gid %lu"
-msgstr "%s: N�o se pode mudar o dono (owner) para \"uid\" %d, \"gid\" %d"
+msgstr "%s: impossível alterar propriedade para uid %lu, gid %lu"
#: lib/paxerror.c:129
-#, fuzzy, c-format
+#, c-format
msgid "%s: Cannot hard link to %s"
-msgstr "N�o se consegue ler a liga��o (\"link\") %s"
+msgstr "%s: impossível ligar rigidamente a %s"
#: lib/paxerror.c:181 lib/paxerror.c:213
-#, fuzzy, c-format
+#, c-format
msgid "%s: Read error at byte %s, while reading %lu byte"
msgid_plural "%s: Read error at byte %s, while reading %lu bytes"
-msgstr[0] ""
-"Erro de leitura no \"byte\" %ld, durante a leitura de %d \"bytes\" do "
-"ficheiro %s"
-msgstr[1] ""
-"Erro de leitura no \"byte\" %ld, durante a leitura de %d \"bytes\" do "
-"ficheiro %s"
+msgstr[0] "%s: erro de leitura no byte %s, ao ler %lu byte"
+msgstr[1] "%s: erro de leitura no byte %s, ao ler %lu bytes"
#: lib/paxerror.c:194
-#, fuzzy, c-format
+#, c-format
msgid "%s: Warning: Read error at byte %s, while reading %lu byte"
msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes"
-msgstr[0] ""
-"Erro de leitura no \"byte\" %ld, durante a leitura de %d \"bytes\" do "
-"ficheiro %s"
-msgstr[1] ""
-"Erro de leitura no \"byte\" %ld, durante a leitura de %d \"bytes\" do "
-"ficheiro %s"
+msgstr[0] "%s: aviso: erro de leitura no byte %s, ao ler %lu byte"
+msgstr[1] "%s: aviso: erro de leitura no byte %s, ao ler %lu bytes"
#: lib/paxerror.c:261
-#, fuzzy, c-format
+#, c-format
msgid "%s: Cannot seek to %s"
-msgstr "N�o se consegue escrever em %s"
+msgstr "%s: impossível ir para %s"
#: lib/paxerror.c:277
#, c-format
msgid "%s: Warning: Cannot seek to %s"
-msgstr ""
+msgstr "%s: aviso: impossível ir para %s"
#: lib/paxerror.c:286
-#, fuzzy, c-format
+#, c-format
msgid "%s: Cannot create symlink to %s"
-msgstr "%s: N�o se conseguiu criar uma liga��o simb�lica (link) para `%s'"
+msgstr "%s: impossível criar ligação simbólica a %s"
#: lib/paxerror.c:351
-#, fuzzy, c-format
+#, c-format
msgid "%s: Wrote only %lu of %lu byte"
msgid_plural "%s: Wrote only %lu of %lu bytes"
-msgstr[0] "%s: Apenas se conseguiu escrever %d de um total de %d bytes"
-msgstr[1] "%s: Apenas se conseguiu escrever %d de um total de %d bytes"
+msgstr[0] "%s: escritos só %lu de %lu byte"
+msgstr[1] "%s: escritos só %lu de %lu bytes"
#: lib/paxnames.c:140
-#, fuzzy, c-format
+#, c-format
msgid "Removing leading `%s' from member names"
-msgstr "Retira-se \"/\" das liga��es (\"links\") absolutas "
+msgstr "A remover \"%s\" iniciais para nomes de membros"
#: lib/paxnames.c:141
-#, fuzzy, c-format
+#, c-format
msgid "Removing leading `%s' from hard link targets"
-msgstr "Retira-se \"/\" das liga��es (\"links\") absolutas "
+msgstr "A remover \"%s\" iniciais de alvos rigidamente ligados"
#: lib/paxnames.c:154
msgid "Substituting `.' for empty member name"
-msgstr ""
+msgstr "A substituir \".\" para nomes de membro vazios"
#: lib/paxnames.c:155
msgid "Substituting `.' for empty hard link target"
-msgstr ""
+msgstr "A substituir \".\" para alvos rigidamente ligados vazios"
#: lib/rtapelib.c:299
#, c-format
msgid "exec/tcp: Service not available"
-msgstr "exec/tcp: Servi�o indispon�vel"
+msgstr "exec/tcp: serviço indisponível"
#: lib/rtapelib.c:303
#, c-format
msgid "stdin"
-msgstr ""
+msgstr "stdin"
#: lib/rtapelib.c:306
#, c-format
msgid "stdout"
-msgstr ""
+msgstr "stdout"
#: lib/rtapelib.c:429
#, c-format
msgid "Cannot connect to %s: resolve failed"
-msgstr ""
+msgstr "Impossível ligar a %s: falha ao resolver"
#: lib/rtapelib.c:502
-#, fuzzy, c-format
+#, c-format
msgid "Cannot redirect files for remote shell"
-msgstr "N�o se consegue executar uma \"shell\" remota"
+msgstr "Impossível redireccionar ficheiros para shell remota"
#: lib/rtapelib.c:516
#, c-format
msgid "Cannot execute remote shell"
-msgstr "N�o se consegue executar uma \"shell\" remota"
+msgstr "Impossível executar shell remota"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
-msgstr ""
+msgstr "Direcção de procura fora de alcance"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
-msgstr ""
+msgstr "Direcção de procura inválida"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
-msgstr ""
+msgstr "Desvio de procura inválido"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
-msgstr ""
+msgstr "Desvio de procura fora de alcance"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
-#, fuzzy
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
-msgstr "Formato de data inv�lido \"%s\""
+msgstr "Contagem de bytes inválida"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
-msgstr ""
+msgstr "Contagem de bytes fora de alcance"
-#: rmt/rmt.c:558
-#, fuzzy
+#: rmt/rmt.c:562
msgid "Premature eof"
-msgstr "rmtd: Fim de ficheiro prematuro\n"
+msgstr "eof prematuro"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
-msgstr ""
+msgstr "Código de operação inválido"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
-msgstr ""
+msgstr "Operação não suportada"
-#: rmt/rmt.c:664
-#, fuzzy
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
-msgstr "Fim de ficheiro inesperado nos nomes truncados"
+msgstr "Argumentos inesperados"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
+"Manipular um dispositivo de fita, aceitando comandos de um processo remoto"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
-msgstr ""
+msgstr "NÚMERO"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
-msgstr ""
+msgstr "definir nível de depuração"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
-msgstr ""
+msgstr "FICHEIRO"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
-msgstr ""
+msgstr "definir nome do ficheiro de saída da depuração"
-#: rmt/rmt.c:715 rmt/rmt.c:783
-#, fuzzy, c-format
+#: rmt/rmt.c:719 rmt/rmt.c:787
+#, c-format
msgid "cannot open %s"
-msgstr "N�o se consegue abrir %s"
+msgstr "impossível abrir %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
-msgstr ""
+msgstr "demasiados argumentos"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
-msgstr "Comando desconhecido"
+msgstr "Comando lixo"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
-msgstr "Isto n�o se parece a um arquivo \"tar\""
+msgstr "Isto não parece ser um arquivo tar"
-#: src/buffer.c:590
-#, fuzzy
+#: src/buffer.c:592
msgid "Total bytes read"
-msgstr "N�mero total de de \"bytes\" escritos: %d\n"
+msgstr "Total de bytes lidos"
-#: src/buffer.c:592
-#, fuzzy
+#: src/buffer.c:594
msgid "Total bytes written"
-msgstr "N�mero total de de \"bytes\" escritos: %d\n"
+msgstr "Total de bytes escritos"
-#: src/buffer.c:593
-#, fuzzy
+#: src/buffer.c:595
msgid "Total bytes deleted"
-msgstr "N�mero total de de \"bytes\" escritos: %d\n"
+msgstr "Total de bytes eliminados"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
-msgstr ""
+msgstr "(túnel)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
+"Recusa de ler o conteúdo do arquivo a partir do terminal (opção -f em falta?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
+"Recusa de escrever o conteúdo do arquivo para o terminal (opção -f em falta?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
-msgstr "Valor inv�lido para tamanho de registo (record_size)"
+msgstr "Valor inválido para tamanho de record_size"
-#: src/buffer.c:714
-#, fuzzy
+#: src/buffer.c:716
msgid "No archive name given"
-msgstr "N�o deram nome de arquivo, que fazer?"
+msgstr "Sem nome de arquivo"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
-msgstr "N�o se pode de verificar arquivos stdin ou stdout"
+msgstr "Impossível verificar arquivos stdin/stdout"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
-msgstr ""
+msgstr "Arquivo comprimido. Use a opção %s"
-#: src/buffer.c:828 src/tar.c:2455
-#, fuzzy
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
-msgstr "N�o se pode actualizar o verificar um arquivo comprimido"
+msgstr "Impossível actualizar arquivos comprimidos"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
-msgstr "No princ�pio da fita, p�ra-se imediatamente"
+msgstr "No princípio da fita, a sair agora"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
-msgstr "Erros de mais: termina-se"
+msgstr "Demasiados erros, a sair"
-#: src/buffer.c:967
-#, fuzzy, c-format
+#: src/buffer.c:969
+#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
-msgstr[0] "Tamanho de bloco (blocksize) = blocos de %d"
-msgstr[1] "Tamanho de bloco (blocksize) = blocos de %d"
+msgstr[0] "Tamanho do registo = %lu bloco"
+msgstr[1] "Tamanho do registo = %lu blocos"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bloco desalinhado (%lu byte) no arquivo"
+msgstr[1] "Bloco desalinhado (%lu bytes) no arquivo"
-#: src/buffer.c:1075
-#, fuzzy
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
-msgstr "N�o se conseguiu recuar o arquivo; pode ser ileg�vel sem -i"
+msgstr "Impossível recuar o arquivo; pode ser ilegível sem -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
-msgstr ""
+msgstr "rmtlseek não parado num limite de registo"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
-msgstr ""
+msgstr "%s: contém um número de volume inválido"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
-msgstr ""
+msgstr "Transporte de número de volume"
-#: src/buffer.c:1218
-#, fuzzy, c-format
+#: src/buffer.c:1220
+#, c-format
msgid "Prepare volume #%d for %s and hit return: "
-msgstr "\aPreparar o volume no. %d para %s e premir \"Return\": "
+msgstr "Preparar volume nº %d para %s e premir Enter: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
-msgstr ""
+msgstr "EOF onde era esperada resposta do utilizador"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
-msgstr "ATEN��O: O arquivo est� incompleto"
+msgstr "AVISO: o arquivo está incompleto"
-#: src/buffer.c:1243
-#, fuzzy, c-format
+#: src/buffer.c:1245
+#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
" q Abort tar\n"
" y or newline Continue operation\n"
msgstr ""
-" n [nome] Dar um novo nome para o pr�ximo (e seguintes) volume(s)\n"
-" q Cancelar o tar\n"
-" ! Criar uma \"sub-shell\" (interpretador de comandos)\n"
-" ? Escrever esta lista\n"
+" n nome Dar um novo nome ao próximo volume (e seguintes)\n"
+" q Abortar o tar\n"
+" y ou newline Continuar operação\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
-msgstr ""
+msgstr " ! Gerar uma sub-shell\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
-msgstr ""
+msgstr " ? Mostra esta lista\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
-msgstr "N�o h� novo volume; termina-se. \n"
+msgstr "Não há novo volume; a sair.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
-msgstr ""
+msgstr "Sem nome de ficheiro. Tente novamente.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
-msgstr ""
+msgstr "Entrada inválida. Digite ? para ajuda.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
-msgstr ""
+msgstr "O comando %s falhou"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
-msgstr "%s n�o tem continuidade neste volume"
+msgstr "%s não tem continuidade neste volume"
-#: src/buffer.c:1541
-#, fuzzy, c-format
+#: src/buffer.c:1543
+#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
-msgstr "%s n�o tem continuidade neste volume"
+msgstr ""
+"%s possivelmente é continuado neste volume: o cabeçalho contém um nome "
+"truncado"
-#: src/buffer.c:1559
-#, fuzzy, c-format
+#: src/buffer.c:1561
+#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
-msgstr "%s n�o � a dimens�o correcta (%ld != %ld + %ld)"
+msgstr "%s tem um tamanho errado (%s != %s + %s)"
-#: src/buffer.c:1574
-#, fuzzy, c-format
+#: src/buffer.c:1576
+#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
-msgstr "Este volume est� fora da sequ�ncia"
+msgstr "Este volume está fora da sequência (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
-#, fuzzy, c-format
+#: src/buffer.c:1654 src/buffer.c:1672
+#, c-format
msgid "Archive not labeled to match %s"
-msgstr "O arquivo n�o tem etiqueta e n�o condiz com %s"
+msgstr "O arquivo não rotulado para corresponder a %s"
-#: src/buffer.c:1682
-#, fuzzy, c-format
+#: src/buffer.c:1676
+#, c-format
msgid "Volume %s does not match %s"
-msgstr "O volume n�o condiz! %s!=%s"
+msgstr "Volume %s não corresponde a %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
+"%s: nome de ficheiro muito grande para um cabeçalho GNU multi-volume, "
+"truncado"
-#: src/buffer.c:1965
-#, fuzzy
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
-msgstr ""
-"O fim-de-ficheiro do arquivo %s n�o se encontra na fronteira de um bloco"
+msgstr "escrita não acabou num limite de bloco"
-#: src/compare.c:98
-#, fuzzy, c-format
+#: src/compare.c:97
+#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
-msgstr[0] "%s: S� se p�de ler %d de um total de %ld \"bytes\"\n"
-msgstr[1] "%s: S� se p�de ler %d de um total de %ld \"bytes\"\n"
+msgstr[0] "Lido só %lu de %lu byte"
+msgstr[1] "Lidos só %lu de %lu bytes"
-#: src/compare.c:108 src/compare.c:398
-#, fuzzy
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
-msgstr "Tempo de modifica��o"
+msgstr "Conteúdo diferente"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
-msgstr "Fim de ficheiro inesperado no arquivo"
+msgstr "EOF inesperado no arquivo"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
-#, fuzzy
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
-msgstr "%s: Liga��o (\"link\") simb�lica � diferente\n"
+msgstr "Tipo de ficheiro diferente"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
-msgstr ""
+msgstr "Modo diferente"
-#: src/compare.c:208
-#, fuzzy
+#: src/compare.c:207
msgid "Uid differs"
-msgstr "%s: %s diferente\n"
+msgstr "Uid diferente"
-#: src/compare.c:210
-#, fuzzy
+#: src/compare.c:209
msgid "Gid differs"
-msgstr "%s: %s diferente\n"
+msgstr "Gid diferente"
-#: src/compare.c:214
-#, fuzzy
+#: src/compare.c:213
msgid "Mod time differs"
-msgstr "Tempo de modifica��o"
+msgstr "Tempo de modificação diferente"
-#: src/compare.c:218 src/compare.c:432
-#, fuzzy
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
-msgstr "%s: Liga��o (\"link\") simb�lica � diferente\n"
+msgstr "Tamanho diferente"
-#: src/compare.c:267
-#, fuzzy, c-format
+#: src/compare.c:266
+#, c-format
msgid "Not linked to %s"
-msgstr "%s: N�o est� ligado a %s\n"
+msgstr "Não ligado a %s"
-#: src/compare.c:293
-#, fuzzy
+#: src/compare.c:292
msgid "Symlink differs"
-msgstr "%s: Liga��o (\"link\") simb�lica � diferente\n"
+msgstr "Ligação simbólica diferente"
-#: src/compare.c:325
-#, fuzzy
+#: src/compare.c:324
msgid "Device number differs"
-msgstr "%s: Os n�meros do perif�rico mudaram\n"
+msgstr "Número de dispositivo diferente"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
-msgstr "Verifica��o"
+msgstr "Verificar"
-#: src/compare.c:480
-#, fuzzy, c-format
+#: src/compare.c:479
+#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
-"Tipo de ficheiro \"%c\" desconhecido para %s; comparado como um ficheiro "
-"normal"
+"%s: tipo de ficheiro \"%c\" desconhecido, comparado como ficheiro normal"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
-msgstr ""
+msgstr "O arquivo contém nomes de ficheiro com prefixos iniciais removidos."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
-msgstr ""
+msgstr "O arquivo contém nomes de ficheiro transformados."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
-msgstr ""
+msgstr "A verificação pode não localizar os ficheiros originais."
-#: src/compare.c:620
-#, fuzzy, c-format
+#: src/compare.c:619
+#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
-msgstr[0] "ERRO DE VERIFICA��O: Encontraram-se %d cabe�alhos inv�lidos"
-msgstr[1] "ERRO DE VERIFICA��O: Encontraram-se %d cabe�alhos inv�lidos"
+msgstr[0] "ERRO DE VERIFICA��O: Encontraram-se %d cabe�alhos inv�lidos"
+msgstr[1] "ERRO DE VERIFICAÇÃO: %d cabeçalhos inválidos detectados"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
-msgstr ""
+msgstr "Um bloco zero sozinho em %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
-msgstr ""
+msgstr "%s: contém uma etiqueta de pasta cache %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
-msgstr ""
+msgstr "valor %s fora de %s alcance %s..%s; a substituir %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
-msgstr ""
+msgstr "valor %s fora de %s alcance %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
-msgstr ""
+msgstr "A gerar cabeçalhos octais negativos"
-#: src/create.c:606 src/create.c:669
-#, fuzzy, c-format
+#: src/create.c:605 src/create.c:668
+#, c-format
msgid "%s: file name is too long (max %d); not dumped"
-msgstr "%s: n�o foi modificado; n�o ser� arquivado"
+msgstr "%s: nome de ficheiro muito longo (máx. %d); não despejado"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
+"%s: nome de ficheiro muito longo (não pode ser separado); não despejado"
-#: src/create.c:643
-#, fuzzy, c-format
+#: src/create.c:642
+#, c-format
msgid "%s: link name is too long; not dumped"
-msgstr "%s: n�o foi modificado; n�o ser� arquivado"
+msgstr "%s: nome da ligação muito longo; não despejado"
-#: src/create.c:1106
-#, fuzzy, c-format
+#: src/create.c:1105
+#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
-msgstr[0] "O ficheiro %s diminuiu em %d \"bytes\", ser� completado com zeros"
-msgstr[1] "O ficheiro %s diminuiu em %d \"bytes\", ser� completado com zeros"
+msgstr[0] "%s: ficheiro encolhido %s byte; a preencher com zeros"
+msgstr[1] "%s: ficheiro encolhido em %s bytes; a preencher com zeros"
-#: src/create.c:1204
-#, fuzzy, c-format
+#: src/create.c:1203
+#, c-format
msgid "%s: file is on a different filesystem; not dumped"
-msgstr "%s: Est� num outro sistema de ficheiros; n�o ser� arquivado"
+msgstr "%s: ficheiro num sistema de ficheiros diferente; não despejado"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
-#, fuzzy
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
-msgstr " (imagem da mem�ria despejada \"core dumped\")"
+msgstr "conteúdo não despejado"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
-msgstr "%s: Tipo de ficheiro desconhecido; ficheiro ignorado"
+msgstr "%s: tipo de ficheiro desconhecido; ficheiro ignorado"
-#: src/create.c:1576
-#, fuzzy, c-format
+#: src/create.c:1575
+#, c-format
msgid "Missing links to %s."
-msgstr " liga��o para %s\n"
+msgstr "Ligações a %s em falta."
-#: src/create.c:1737
-#, fuzzy, c-format
+#: src/create.c:1736
+#, c-format
msgid "%s: file is unchanged; not dumped"
-msgstr "%s: n�o foi modificado; n�o ser� arquivado"
+msgstr "%s: ficheiro não alterado; não despejado"
-#: src/create.c:1746
-#, fuzzy, c-format
+#: src/create.c:1745
+#, c-format
msgid "%s: file is the archive; not dumped"
-msgstr "%s � o arquivo; n�o ser� arquivado"
+msgstr "%s o ficheiro é o arquivo; não despejado"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
-msgstr ""
+msgstr "pasta não despejada"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
-msgstr ""
+msgstr "%s: ficheiro alterado durante a leitura"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
-msgstr ""
+msgstr "%s: socket ignorada"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
-msgstr ""
+msgstr "%s: porta ignorada"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
-msgstr "Salta para pr�ximo cabe�alho"
+msgstr "Saltar para cabeçalho seguinte"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
-msgstr "Apaga-se do arquivo um n�o-cabe�alho"
+msgstr "Eliminar não-cabeçalho do arquivo"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
-msgstr ""
+msgstr "%s: carimbo implausivelmente antigo %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
-msgstr ""
+msgstr "%s: carimbo %s está %s s no futuro"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
-msgstr ""
+msgstr "%s: inconsistência inesperada ao fazer a pasta"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
-msgstr ""
+msgstr "%s: a saltar ficheiro existente"
#: src/extract.c:901
#, c-format
msgid "%s: Directory renamed before its status could be extracted"
-msgstr ""
+msgstr "%s: pasta renomeada antes que o seu estado pudesse ser extraído"
#: src/extract.c:1086
msgid "Extracting contiguous files as regular files"
-msgstr "Est�o-se a extrair ficheiros cont�guos como sendo ficheiros normais"
+msgstr "A extrair ficheiros contíguos como ficheiros regulares"
#: src/extract.c:1433
msgid "Attempting extraction of symbolic links as hard links"
-msgstr ""
-"Est�-se a tentar extrair liga��es simb�licas (sym. links) como liga��es "
-"f�sicas (hard links)"
+msgstr "A tentar extrair ligações simbólicas como ligações rígidas"
#: src/extract.c:1596
-#, fuzzy, c-format
+#, c-format
msgid "%s: Cannot extract -- file is continued from another volume"
-msgstr ""
-"N�o se pode extra�r `%s' -- � a continua��o de um ficheiro de outro volume"
+msgstr "%s: impossível extrair -- ficheiro continuado de outro volume"
-#: src/extract.c:1603 src/list.c:1167
-#, fuzzy
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
-msgstr "Fim de ficheiro inesperado no ficheiro de arquivo"
+msgstr "Nome longo de cabeçalho inesperado"
#: src/extract.c:1610
-#, fuzzy, c-format
+#, c-format
msgid "%s: Unknown file type '%c', extracted as normal file"
msgstr ""
-"Tipo \"%c\" do ficheiro \"%s\" desconhecido; extrai-se como um ficheiro "
-"normal"
+"%s: tipo de ficheiro \"%c\" desconhecido, extraído como ficheiro normal"
#: src/extract.c:1636
#, c-format
msgid "Current %s is newer or same age"
-msgstr ""
+msgstr "%s actual é mais recente ou da mesma idade"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: nome de membro contém \"..\""
#: src/extract.c:1696
#, c-format
msgid "%s: Was unable to backup this file"
-msgstr ""
+msgstr "%s: impossível fazer seguranças deste ficheiro"
#: src/extract.c:1845
#, c-format
msgid "Cannot rename %s to %s"
-msgstr "N�o se consegue mudar o nome de %s para %s"
+msgstr "Impossível renomear %s para %s"
-#: src/incremen.c:494 src/incremen.c:536
-#, fuzzy, c-format
+#: src/incremen.c:493 src/incremen.c:535
+#, c-format
msgid "%s: Directory has been renamed from %s"
-msgstr "Mudou-se o nome do directoria %s"
+msgstr "%s: a pasta foi renomeada de %s"
-#: src/incremen.c:549
-#, fuzzy, c-format
+#: src/incremen.c:548
+#, c-format
msgid "%s: Directory is new"
-msgstr "O directoria %s � novo"
+msgstr "%s: a pasta é nova"
-#: src/incremen.c:566
-#, fuzzy, c-format
+#: src/incremen.c:565
+#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
-msgstr "%s: Est� num outro sistema de ficheiros; n�o ser� arquivado"
+msgstr "%s: pasta num sistema de ficheiros diferente; não despejada"
-#: src/incremen.c:587
-#, fuzzy, c-format
+#: src/incremen.c:586
+#, c-format
msgid "%s: Directory has been renamed"
-msgstr "Mudou-se o nome do directoria %s"
+msgstr "%s: a pasta foi renomeada"
#: src/incremen.c:1003 src/incremen.c:1018
msgid "Invalid time stamp"
-msgstr ""
+msgstr "Carimbo inválido"
#: src/incremen.c:1047
msgid "Invalid modification time"
-msgstr ""
+msgstr "Hora de modificação inválida"
#: src/incremen.c:1057
msgid "Invalid modification time (nanoseconds)"
-msgstr ""
+msgstr "Hora de modificação inválida (nano-segundos)"
#: src/incremen.c:1073
msgid "Invalid device number"
-msgstr ""
+msgstr "Número de dispositivo inválido"
#: src/incremen.c:1081
msgid "Invalid inode number"
-msgstr ""
+msgstr "Número inode inválido"
#: src/incremen.c:1137
#, c-format
msgid "%s: byte %s: %s %.*s... too long"
-msgstr ""
+msgstr "%s: byte %s: %s %.*s... muito longo"
#: src/incremen.c:1153 src/incremen.c:1211 src/incremen.c:1273
-#, fuzzy
msgid "Unexpected EOF in snapshot file"
-msgstr "Fim de ficheiro inesperado no ficheiro de arquivo"
+msgstr "EOF inesperado em ficheiro instantâneo"
#: src/incremen.c:1161
#, c-format
msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x"
-msgstr ""
+msgstr "%s: byte %s: %s %s seguido de byte 0x%02x inválido"
#: src/incremen.c:1174
#, c-format
@@ -1109,456 +1105,477 @@ msgid ""
"%s: byte %s: (valid range %s..%s)\n"
"\t%s %s"
msgstr ""
+"%s: byte %s: (intervalo válido %s..%s)\n"
+"\t%s %s"
#: src/incremen.c:1181
#, c-format
msgid "%s: byte %s: %s %s"
-msgstr ""
+msgstr "%s: byte %s: %s %s"
#: src/incremen.c:1262
#, c-format
msgid "%s: byte %s: %s"
-msgstr ""
+msgstr "%s: byte %s: %s"
#: src/incremen.c:1265
msgid "Missing record terminator"
-msgstr ""
+msgstr "Terminador de registo em falta"
#: src/incremen.c:1371 src/incremen.c:1374
msgid "Bad incremental file format"
-msgstr ""
+msgstr "Formato de ficheiro incremental errado"
#: src/incremen.c:1393
#, c-format
msgid "Unsupported incremental format version: %<PRIuMAX>"
-msgstr ""
+msgstr "Versão de formato incremental não suportada: %<PRIuMAX>"
#: src/incremen.c:1549
#, c-format
msgid "Malformed dumpdir: expected '%c' but found %#3o"
-msgstr ""
+msgstr "dumpdir mal formado: esperado \"%c\", obtido %#3o"
#: src/incremen.c:1559
msgid "Malformed dumpdir: 'X' duplicated"
-msgstr ""
+msgstr "dumpdir mal formado: \"X\" duplicado"
#: src/incremen.c:1572
msgid "Malformed dumpdir: empty name in 'R'"
-msgstr ""
+msgstr "dumpdir mal formado: nome vazio em \"R\""
#: src/incremen.c:1585
msgid "Malformed dumpdir: 'T' not preceded by 'R'"
-msgstr ""
+msgstr "dumpdir mal formado: \"T\" não precedido de \"R\""
#: src/incremen.c:1591
msgid "Malformed dumpdir: empty name in 'T'"
-msgstr ""
+msgstr "dumpdir mal formado: nome vazio em \"T\""
#: src/incremen.c:1611
#, c-format
msgid "Malformed dumpdir: expected '%c' but found end of data"
-msgstr ""
+msgstr "dumpdir formado: esperado \"%c\", obtido fim de dados"
#: src/incremen.c:1618
msgid "Malformed dumpdir: 'X' never used"
-msgstr ""
+msgstr "dumpdir formado: \"X\" nunca usado"
#: src/incremen.c:1662
-#, fuzzy, c-format
+#, c-format
msgid "Cannot create temporary directory using template %s"
-msgstr "N�o se pode mudar para a directoria %s"
+msgstr "Impossível criar pasta temporária usando o modelo %s"
#: src/incremen.c:1723
#, c-format
msgid "%s: Not purging directory: unable to stat"
-msgstr ""
+msgstr "%s: sem purgar a pasta: impossível obter informações"
#: src/incremen.c:1736
#, c-format
msgid "%s: directory is on a different device: not purging"
-msgstr ""
+msgstr "%s: a pasta está num dispositivo diferente: sem purgar"
#: src/incremen.c:1744
#, c-format
msgid "%s: Deleting %s\n"
-msgstr "%s: Apaga-se %s\n"
+msgstr "%s: a eliminar %s\n"
#: src/incremen.c:1749
-#, fuzzy, c-format
+#, c-format
msgid "%s: Cannot remove"
-msgstr "N�o se consegue apagar %s"
+msgstr "%s: impossível remover"
-#: src/list.c:219
-#, fuzzy, c-format
+#: src/list.c:218
+#, c-format
msgid "%s: Omitting"
-msgstr "Omite-se %s"
+msgstr "%s: a omitir"
-#: src/list.c:237
-#, fuzzy, c-format
+#: src/list.c:236
+#, c-format
msgid "block %s: ** Block of NULs **\n"
-msgstr "bloco %10ld: ** Bloco de NULs **\n"
+msgstr "bloco %s: ** Bloco de NULs **\n"
-#: src/list.c:263
-#, fuzzy, c-format
+#: src/list.c:262
+#, c-format
msgid "block %s: ** End of File **\n"
-msgstr "bloco %10ld: ** Fim-de-ficheiro **\n"
+msgstr "bloco %s: ** Fim-de-ficheiro **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
-#, fuzzy, c-format
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
+#, c-format
msgid "block %s: "
-msgstr "bloco %10ld: "
+msgstr "bloco %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
-msgstr ""
+msgstr "Espaços no cabeçalho onde era esperado um valor numérico %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
+"O valor octal do arquivo %.*s está fora do alcance %s; a assumir o "
+"complemento de dois"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
-msgstr ""
+msgstr "O valor octal do arquivo %.*s está fora do alcance %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
-msgstr ""
+msgstr "O arquivo contém cabeçalhos de base 64 obsoletos"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
-msgstr ""
+msgstr "Cadeia %s assinada de base 64 do arquivo fora do alcance %s"
-#: src/list.c:883
-#, fuzzy, c-format
+#: src/list.c:884
+#, c-format
msgid "Archive base-256 value is out of %s range"
-msgstr "Este volume est� fora da sequ�ncia"
+msgstr "Valor de base 256 do arquivo fora do alcance %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
-msgstr ""
+msgstr "O arquivo contém %.*s onde era esperado um valor numérico %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
-msgstr ""
+msgstr "O valor %s do arquivo está fora de alcance %s, %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
-msgstr " liga��o para %s\n"
+msgstr " ligar a %s\n"
-#: src/list.c:1280
-#, fuzzy, c-format
+#: src/list.c:1277
+#, c-format
msgid " unknown file type %s\n"
-msgstr " tipo de ficheiro desconhecido \"%c\"\n"
+msgstr " tipo de ficheiro desconhecido %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
-msgstr ""
+msgstr "--Ligação longa--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
-msgstr ""
+msgstr "--Nome longo--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
-msgstr "--Cabe�alho de volume--\n"
+msgstr "--Cabeçalho de volume--\n"
-#: src/list.c:1314
-#, fuzzy, c-format
+#: src/list.c:1311
+#, c-format
msgid "--Continued at byte %s--\n"
-msgstr "--Continua no \"byte\" %ld--\n"
+msgstr "--Continua no byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
-msgstr "Cria��o de directoria::"
+msgstr "A criar pasta:"
-#: src/misc.c:738
-#, fuzzy, c-format
+#: src/misc.c:751
+#, c-format
msgid "Renaming %s to %s\n"
-msgstr "Mudou-se o nome %s para %s"
+msgstr "A renomear %s para %s\n"
-#: src/misc.c:747 src/misc.c:766
-#, fuzzy, c-format
+#: src/misc.c:760 src/misc.c:779
+#, c-format
msgid "%s: Cannot rename to %s"
-msgstr "N�o se consegue mudar o nome de %s para %s"
+msgstr "%s: impossível renomear %s"
-#: src/misc.c:771
-#, fuzzy, c-format
+#: src/misc.c:784
+#, c-format
msgid "Renaming %s back to %s\n"
-msgstr "Mudou-se o nome %s para %s"
+msgstr "A renomear %s para %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
-msgstr ""
+msgstr "%s: ficheiro removido antes de ser lido"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
-msgstr ""
+msgstr "processo filho"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
-msgstr ""
+msgstr "canal inter-processos"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
-msgstr ""
+msgstr "Selecção de nome de ficheiro local:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
+"adicionar FICHEIRO dado ao arquivo (útil se o nome começa por um hífen)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
-msgstr ""
+msgstr "PASTA"
-#: src/names.c:74
-#, fuzzy
+#: src/names.c:73
msgid "change to directory DIR"
-msgstr "N�o se pode mudar para a directoria %s"
+msgstr "mudar para a pasta PASTA"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
-msgstr ""
+msgstr "obter nomes a extrair ou criar de FICHEIRO"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
-msgstr ""
+msgstr "-T lê nomes terminados em null; implica --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
-msgstr ""
+msgstr "desactiva o efeito da opção --null anterior"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
+"tirar aspas do ficheiro de entrada ou de nomes de membro (predefinição)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
-msgstr ""
+msgstr "não tirar aspas do ficheiro de entrada ou de nomes de membro"
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr ""
+msgstr "-T lê nomes de ficheiro literalmente (sem escape ou gestão de opções)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
+"-T trata nomes de ficheiro começados com hífen como opções (predefinição)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
-msgstr ""
+msgstr "PADRÃO"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
-msgstr ""
+msgstr "exclui ficheiros, dados como PADRÃO"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
-msgstr ""
+msgstr "exclui padrões listados no FICHEIRO"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr ""
+"exclui conteúdos de pastas contendo CACHEDIR.TAG, excepto o próprio ficheiro "
+"etiqueta"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
-msgstr ""
+msgstr "exclui tudo em pastas que contenham CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
-msgstr ""
+msgstr "exclui pastas que contenham CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
+"exclui conteúdo de pastas que contenham FICHEIRO, excepto o próprio FICHEIRO"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
-msgstr ""
+msgstr "lê padrões de exclusão para cada pasta de FICHEIRO, se existir"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
+"lê padrões de exclusão para cada pasta e suas sub-pastas de FICHEIRO, se "
+"existir"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
-msgstr ""
+msgstr "exclui tudo em pastas que contenham FICHEIRO"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
-msgstr ""
+msgstr "exclui pastas que contenham FICHEIRO"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
-msgstr ""
+msgstr "exclui pastas do sistema de controlo de versões"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
-msgstr ""
+msgstr "ler padrões de exclusão dos ficheiros \"ignore\" dos VCS"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
-msgstr ""
+msgstr "exclui ficheiros de seguranças e bloqueio"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
-msgstr ""
+msgstr "recursivo em pastas (predefinição)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
-msgstr ""
+msgstr "evita descer automaticamente nas pastas"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
+"Opções de comparação de nomes de ficheiro (afecta padrões de exclusão e "
+"inclusão):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
-msgstr ""
+msgstr "padrões coincidem com o início do nome de ficheiro"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
-msgstr ""
+msgstr "padrões coincidem após qualquer \"/\" (predefinição para exclusão)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
-msgstr ""
+msgstr "ignorar maiúsculas"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
-msgstr ""
+msgstr "Sensível a maiúsculas (predefinição)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
-msgstr ""
+msgstr "usar caracteres universais (predefinição para exclusão)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
-msgstr ""
+msgstr "comparação literal de cadeias"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
-msgstr ""
+msgstr "caracteres universais coincidem com \"/\" (predefinição para exclusão)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
-msgstr ""
+msgstr "caracteres universais não coincidem com \"/\""
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"As opções seguintes foram usadas após qualquer argumento não-opcional em "
+"modo de criação ou actualização de arquivo. Estas opções são posicionais e "
+"só afectam argumentos a seguir. Por favor, reordene-as apropriadamente."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s não tem qualquer efeito"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s não tem qualquer efeito"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s não tem qualquer efeito"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
-msgstr ""
+msgstr "linha de comandos"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
-msgstr ""
+msgstr "%s: lista de ficheiros pedida de %s já lida de %s"
-#: src/names.c:978 src/checkpoint.c:274
-#, fuzzy, c-format
+#: src/names.c:977 src/checkpoint.c:308
+#, c-format
msgid "cannot split string '%s': %s"
-msgstr "N�o se pode criar uma liga��o (\"link\") simb�lica de %s para %s"
+msgstr "impossível dividir a cadeia \"%s\": %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
-msgstr ""
+msgstr "%s: nome de ficheiro lido contém um carácter nulo"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
-msgstr ""
+msgstr "Padrão coincidente com caracteres usados em nomes de ficheiro"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr ""
+"Use --wildcards para activar a comparação com padrões ou --no-wildcards para "
+"suprimir este aviso"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
-msgstr "%s: N�o foi encontrado no arquivo"
+msgstr "%s: não encontrado no arquivo"
-#: src/names.c:1379
-#, fuzzy, c-format
+#: src/names.c:1409
+#, c-format
msgid "%s: Required occurrence not found in archive"
-msgstr "%s: N�o foi encontrado no arquivo"
+msgstr "%s: ocorrência requerida não encontrada no arquivo"
-#: src/names.c:1413
-#, fuzzy, c-format
+#: src/names.c:1443
+#, c-format
msgid "Archive label mismatch"
-msgstr "O arquivo n�o tem etiqueta e n�o condiz com %s"
+msgstr "Etiqueta de arquivo trocada"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
+"Não pode usar a opção -C dentro da lista de ficheiros com --listed-"
+"incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
-msgstr ""
+msgstr "Só é permitida uma opção -C com --listed-incremental"
-#: src/tar.c:88
-#, fuzzy, c-format
+#: src/tar.c:87
+#, c-format
msgid "Options '%s' and '%s' both want standard input"
-msgstr "Ambas as op��es `-%s' e `-%s' precisam do \"standard input\""
+msgstr "Ambas as opções \"%s\" e \"%s\" querem a entrada padrão"
-#: src/tar.c:165
-#, fuzzy, c-format
+#: src/tar.c:164
+#, c-format
msgid "%s: Invalid archive format"
-msgstr "Formato de data inv�lido \"%s\""
+msgstr "%s: formato de arquivo inválido"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
-msgstr ""
-"Est�o-se a querer propriedades GNU num arquivo com formato incompat�vel"
+msgstr "Desejadas funcionalidades GNU em formato de arquivo incompatível"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
msgstr ""
+"Estilo de aspas \"%s\" desconhecido. Tente \"%s --quoting-style=help\" para "
+"obter uma lista."
#: src/tar.c:354
msgid ""
@@ -1570,6 +1587,14 @@ msgid ""
" tar -tvf archive.tar # List all files in archive.tar verbosely.\n"
" tar -xf archive.tar # Extract all files from archive.tar.\n"
msgstr ""
+"O GNU \"tar\" grava muitos ficheiros juntos numa só fita magnética ou num "
+"disco e pode restaurar ficheiros individuais desse arquivo.\n"
+"\n"
+"Exemplos:\n"
+" tar -cf arquivo.tar foo bar # Cria arquivo.tar a partir de foo e bar.\n"
+" tar -tvf arquivo.tar # Lista todos os ficheiros em arquivo.tar "
+"extensamente.\n"
+" tar -xf arquivo.tar # Extrai todos os ficheiros em arquivo.tar.\n"
#: src/tar.c:363
msgid ""
@@ -1582,87 +1607,96 @@ msgid ""
" nil, existing numbered if numbered backups exist, simple otherwise\n"
" never, simple always make simple backups\n"
msgstr ""
+"O sufixo da segurança é \"~\", a menos que definido por --suffix ou "
+"SIMPLE_BACKUP_SUFFIX.\n"
+"O controlo de versão pode ser definido com --backup ou VERSION_CONTROL, os "
+"valores são:\n"
+"\n"
+" none, off nunca fazer seguranças\n"
+" t, numbered fazer seguranças numeradas\n"
+" nil, existing numeradas se existirem seguranças numeradas, senão "
+"simples\n"
+" never, simple fazer sempre seguranças simples\n"
#: src/tar.c:393
msgid "Main operation mode:"
-msgstr ""
+msgstr "Modo de operação principal:"
#: src/tar.c:396
msgid "list the contents of an archive"
-msgstr ""
+msgstr "lista o conteúdo de um arquivo"
#: src/tar.c:398
msgid "extract files from an archive"
-msgstr ""
+msgstr "extrai ficheiros de um arquivo"
#: src/tar.c:401
-#, fuzzy
msgid "create a new archive"
-msgstr "Fim de ficheiro inesperado no arquivo"
+msgstr "cria um novo arquivo"
#: src/tar.c:403
msgid "find differences between archive and file system"
-msgstr ""
+msgstr "encontra diferenças entre o arquivo e o sistema de ficheiros"
#: src/tar.c:406
msgid "append files to the end of an archive"
-msgstr ""
+msgstr "anexa ficheiros ao fim de um arquivo"
#: src/tar.c:408
msgid "only append files newer than copy in archive"
-msgstr ""
+msgstr "anexa só ficheiros mais recentes que a cópia no arquivo"
#: src/tar.c:410
msgid "append tar files to an archive"
-msgstr ""
+msgstr "anexa ficheiros tar a um arquivo"
#: src/tar.c:413
msgid "delete from the archive (not on mag tapes!)"
-msgstr ""
+msgstr "elimina do arquivo (não em fitas magnéticas)"
#: src/tar.c:415
msgid "test the archive volume label and exit"
-msgstr ""
+msgstr "testa a etiqueta de volume do arquivo e sai"
#: src/tar.c:420
msgid "Operation modifiers:"
-msgstr ""
+msgstr "Modificadores de operação:"
#: src/tar.c:423
msgid "handle sparse files efficiently"
-msgstr ""
+msgstr "gere ficheiros dispersos eficazmente"
#: src/tar.c:424
msgid "TYPE"
-msgstr ""
+msgstr "TIPO"
#: src/tar.c:425
msgid "technique to detect holes"
-msgstr ""
+msgstr "técnica para detectar buracos"
#: src/tar.c:426
msgid "MAJOR[.MINOR]"
-msgstr ""
+msgstr "PRINCIPAL[.MENOR]"
#: src/tar.c:427
msgid "set version of the sparse format to use (implies --sparse)"
-msgstr ""
+msgstr "define a versão do formato disperso a usar (implica --sparse)"
#: src/tar.c:429
msgid "handle old GNU-format incremental backup"
-msgstr ""
+msgstr "gere o formato GNU antigo de segurança incremental"
#: src/tar.c:431
msgid "handle new GNU-format incremental backup"
-msgstr ""
+msgstr "gere o formato GNU novo de segurança incremental"
#: src/tar.c:433
msgid "dump level for created listed-incremental archive"
-msgstr ""
+msgstr "nível de despejo para arquivos incrementais listados criados"
#: src/tar.c:435
msgid "do not exit with nonzero on unreadable files"
-msgstr ""
+msgstr "não sair com ficheiros não-zero ou ilegíveis"
#: src/tar.c:437
msgid ""
@@ -1671,144 +1705,152 @@ msgid ""
"diff, --extract or --list and when a list of files is given either on the "
"command line or via the -T option; NUMBER defaults to 1"
msgstr ""
+"processa só a ocorrência NÚMERO de cada ficheiro no arquivo; esta opção é "
+"válida só em conjunto com um dos sub-comandos --delete, --diff, --extract ou "
+"--list e quando uma lista de ficheiros é dada via linha de comandos ou pela "
+"opção -T; A predefinição de NÚMERO é 1"
#: src/tar.c:443
msgid "archive is seekable"
-msgstr ""
+msgstr "o arquivo pode ser procurado"
#: src/tar.c:445
msgid "archive is not seekable"
-msgstr ""
+msgstr "o arquivo não pode ser procurado"
#: src/tar.c:447
msgid "do not check device numbers when creating incremental archives"
-msgstr ""
+msgstr "não verificar números de dispositivo ao criar arquivos incrementais"
#: src/tar.c:450
msgid "check device numbers when creating incremental archives (default)"
msgstr ""
+"verificar números de dispositivo ao criar arquivos incrementais "
+"(predefinição)"
#: src/tar.c:456
msgid "Overwrite control:"
-msgstr ""
+msgstr "Controlo de sobreposição:"
#: src/tar.c:459
msgid "attempt to verify the archive after writing it"
-msgstr ""
+msgstr "tenta verificar o arquivo após a escrita"
#: src/tar.c:461
-#, fuzzy
msgid "remove files after adding them to the archive"
-msgstr "Retira-se a especifica��o do \"drive\" aos nomes no arquivo"
+msgstr "remove os ficheiros após os adicionar ao arquivo"
#: src/tar.c:463
msgid "don't replace existing files when extracting, treat them as errors"
-msgstr ""
+msgstr "não substitui ficheiros existentes ao extrair, trata-os como erros"
#: src/tar.c:466
msgid "don't replace existing files when extracting, silently skip over them"
msgstr ""
+"não substitui ficheiros existentes ao extrair, salta-os silenciosamente"
#: src/tar.c:469
msgid "don't replace existing files that are newer than their archive copies"
msgstr ""
+"não substitui ficheiros existentes mais recentes que as cópias no arquivo"
#: src/tar.c:471
msgid "overwrite existing files when extracting"
-msgstr ""
+msgstr "sobrescreve ficheiros existentes ao extrair"
#: src/tar.c:473
msgid "remove each file prior to extracting over it"
-msgstr ""
+msgstr "remove cada ficheiro antes de extrair por cima"
#: src/tar.c:475
msgid "empty hierarchies prior to extracting directory"
-msgstr ""
+msgstr "esvazia hierarquias antes de extrair a pasta"
#: src/tar.c:477
msgid "preserve metadata of existing directories"
-msgstr ""
+msgstr "preserva meta-dados de pastas existentes"
#: src/tar.c:479
msgid "overwrite metadata of existing directories when extracting (default)"
-msgstr ""
+msgstr "sobrescreve meta-dados de pastas existentes ao extrair (predefinição)"
#: src/tar.c:482
msgid "preserve existing symlinks to directories when extracting"
-msgstr ""
+msgstr "preserva ligações simbólicas a pastas ao extrair"
#: src/tar.c:485
msgid "create a subdirectory to avoid having loose files extracted"
-msgstr ""
+msgstr "cria uma sub-pasta para evitar ter ficheiros soltos extraídos"
#: src/tar.c:491
msgid "Select output stream:"
-msgstr ""
+msgstr "Seleccione o fluxo de saída:"
#: src/tar.c:494
msgid "extract files to standard output"
-msgstr ""
+msgstr "extrair ficheiros para a saída padrão"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
-msgstr ""
+msgstr "COMANDO"
#: src/tar.c:496
msgid "pipe extracted files to another program"
-msgstr ""
+msgstr "encaminha ficheiros extraídos para outro programa"
#: src/tar.c:498
msgid "ignore exit codes of children"
-msgstr ""
+msgstr "ignora códigos de saída dos filhos"
#: src/tar.c:500
msgid "treat non-zero exit codes of children as error"
-msgstr ""
+msgstr "trata códigos de saída não-zero dos filhos como erro"
#: src/tar.c:505
msgid "Handling of file attributes:"
-msgstr ""
+msgstr "Gestão de atributos de ficheiro:"
#: src/tar.c:508
msgid "force NAME as owner for added files"
-msgstr ""
+msgstr "força NOME como dono para ficheiros adicionados"
#: src/tar.c:510
msgid "force NAME as group for added files"
-msgstr ""
+msgstr "força NOME como grupo para ficheiros adicionados"
#: src/tar.c:512
msgid "use FILE to map file owner UIDs and names"
-msgstr ""
+msgstr "usa FICHEIRO para mapear UIDs e nomes do dono"
#: src/tar.c:514
msgid "use FILE to map file owner GIDs and names"
-msgstr ""
+msgstr "usa FICHEIRO para mapear GIDs e nomes do dono"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
-msgstr ""
+msgstr "DATA-OU-FICHEIRO"
#: src/tar.c:516
msgid "set mtime for added files from DATE-OR-FILE"
-msgstr ""
+msgstr "define mtime para ficheiros adicionados de DATA-OU-FICHEIRO"
#: src/tar.c:518
msgid ""
"only set time when the file is more recent than what was given with --mtime"
msgstr ""
+"definir hora só se o ficheiro for mais recente que a que foi dada com --mtime"
#: src/tar.c:519
msgid "CHANGES"
-msgstr ""
+msgstr "ALTERAÇÕES"
#: src/tar.c:520
msgid "force (symbolic) mode CHANGES for added files"
-msgstr ""
+msgstr "força (simbolicamente) o modo ALTERAÇÕES para ficheiros adicionados"
#: src/tar.c:522
msgid "METHOD"
-msgstr ""
+msgstr "MÉTODO"
#: src/tar.c:523
msgid ""
@@ -1816,1093 +1858,1142 @@ msgid ""
"reading (METHOD='replace'; default) or by not setting the times in the first "
"place (METHOD='system')"
msgstr ""
+"preserva horas de acesso em ficheiros despejados, seja restaurando as horas "
+"após leitura (MÉTODO=\"replace\": predefinição), seja não definindo horas "
+"(MÉTODO=\"system\")"
#: src/tar.c:527
msgid "don't extract file modified time"
-msgstr ""
+msgstr "não extrai hora modificada do ficheiro"
#: src/tar.c:529
msgid ""
"try extracting files with the same ownership as exists in the archive "
"(default for superuser)"
msgstr ""
+"tenta extrair ficheiros com o mesmo dono que existe no arquivo (predefinição "
+"para super-utilizador)"
#: src/tar.c:531
msgid "extract files as yourself (default for ordinary users)"
-msgstr ""
+msgstr "extrai ficheiros como você mesmo (predefinição para utilizador normal)"
#: src/tar.c:533
msgid "always use numbers for user/group names"
-msgstr ""
+msgstr "usa sempre números para nomes de utilizador/grupo"
#: src/tar.c:535
msgid "extract information about file permissions (default for superuser)"
msgstr ""
+"extrai informação sobre permissões de ficheiro (predefinição para super-"
+"utilizador)"
#: src/tar.c:539
msgid ""
"apply the user's umask when extracting permissions from the archive (default "
"for ordinary users)"
msgstr ""
+"aplicar umask de utilizador ao extrair permissões do arquivo (predefinição "
+"para utilizador norma)"
#: src/tar.c:541
msgid ""
"member arguments are listed in the same order as the files in the archive"
msgstr ""
+"argumentos de membro são listados na mesma ordem que os ficheiros no arquivo"
#: src/tar.c:545
msgid ""
"delay setting modification times and permissions of extracted directories "
"until the end of extraction"
msgstr ""
+"atrasa a definição de horas de modificação e permissões de pastas extraídas "
+"até à conclusão da extração"
#: src/tar.c:548
msgid "cancel the effect of --delay-directory-restore option"
-msgstr ""
+msgstr "cancela o efeito da opção --delay-directory-restore"
#: src/tar.c:549
msgid "ORDER"
-msgstr ""
+msgstr "ORDEM"
#: src/tar.c:551
msgid "directory sorting order: none (default), name or inode"
-msgstr ""
+msgstr "ordem das pastas: nenhuma (predefinição), nome ou inode"
#: src/tar.c:553
msgid "directory sorting order: none (default) or name"
-msgstr ""
+msgstr "ordem das pastas: nenhuma (predefinição) ou nome"
#: src/tar.c:560
msgid "Handling of extended file attributes:"
-msgstr ""
+msgstr "Gestão de atributos de ficheiro estendidos:"
#: src/tar.c:563
msgid "Enable extended attributes support"
-msgstr ""
+msgstr "Activar suporte a atributos estendidos"
#: src/tar.c:565
msgid "Disable extended attributes support"
-msgstr ""
+msgstr "Desactivar suporte a atributos estendidos"
#: src/tar.c:566 src/tar.c:568
msgid "MASK"
-msgstr ""
+msgstr "MÁSCARA"
#: src/tar.c:567
msgid "specify the include pattern for xattr keys"
-msgstr ""
+msgstr "especifica o padrão de inclusão para chaves xattr"
#: src/tar.c:569
msgid "specify the exclude pattern for xattr keys"
-msgstr ""
+msgstr "especifica o padrão de exclusão para chaves xattr"
#: src/tar.c:571
msgid "Enable the SELinux context support"
-msgstr ""
+msgstr "Activar suporte a contexto SELinux"
#: src/tar.c:573
msgid "Disable the SELinux context support"
-msgstr ""
+msgstr "Desactivar suporte a contexto SELinux"
#: src/tar.c:575
msgid "Enable the POSIX ACLs support"
-msgstr ""
+msgstr "Activar suporte a POSIX ACLs"
#: src/tar.c:577
msgid "Disable the POSIX ACLs support"
-msgstr ""
+msgstr "Desactivar suporte a POSIX ACLs"
#: src/tar.c:582
msgid "Device selection and switching:"
-msgstr ""
+msgstr "Selecção e troca de dispositivo:"
#: src/tar.c:584
msgid "ARCHIVE"
-msgstr ""
+msgstr "ARQUIVO"
#: src/tar.c:585
msgid "use archive file or device ARCHIVE"
-msgstr ""
+msgstr "usa o ficheiro de arquivo ou o dispositivo ARQUIVO"
#: src/tar.c:587
msgid "archive file is local even if it has a colon"
-msgstr ""
+msgstr "o ficheiro arquivo é local, mesmo que tenha dois pontos"
#: src/tar.c:589
msgid "use given rmt COMMAND instead of rmt"
-msgstr ""
+msgstr "usa COMANDO rmt em vez de rmt"
#: src/tar.c:591
msgid "use remote COMMAND instead of rsh"
-msgstr ""
+msgstr "usa COMANDO remoto em vez de rsh"
#: src/tar.c:595
msgid "specify drive and density"
-msgstr ""
+msgstr "especifica unidade e densidade"
#: src/tar.c:609
-#, fuzzy
msgid "create/list/extract multi-volume archive"
-msgstr "N�o se pode verificar arquivos multi-volume"
+msgstr "cria/lista/extrai arquivos multi-volume"
#: src/tar.c:611
msgid "change tape after writing NUMBER x 1024 bytes"
-msgstr ""
+msgstr "muda a fita após escrever NÚMERO x 1024 bytes"
#: src/tar.c:613
msgid "run script at end of each tape (implies -M)"
-msgstr ""
+msgstr "executa o script no fim de cada fita (implica -M)"
#: src/tar.c:616
msgid "use/update the volume number in FILE"
-msgstr ""
+msgstr "usa/actualiza o número do volume em FICHEIRO"
#: src/tar.c:621
msgid "Device blocking:"
-msgstr ""
+msgstr "Bloqueio de dispositivo:"
#: src/tar.c:623
msgid "BLOCKS"
-msgstr ""
+msgstr "BLOCOS"
#: src/tar.c:624
msgid "BLOCKS x 512 bytes per record"
-msgstr ""
+msgstr "BLOCOS x 512 bytes por registo"
#: src/tar.c:626
msgid "NUMBER of bytes per record, multiple of 512"
-msgstr ""
+msgstr "NÚMERO de bytes por registo, múltiplo de 512"
#: src/tar.c:628
msgid "ignore zeroed blocks in archive (means EOF)"
-msgstr ""
+msgstr "ignora blocos a zero no arquivo (significa EOF)"
#: src/tar.c:630
msgid "reblock as we read (for 4.2BSD pipes)"
-msgstr ""
+msgstr "rebloqueia à medida que lê (para túneis 4.2BSD)"
#: src/tar.c:635
-#, fuzzy
msgid "Archive format selection:"
-msgstr "Arquivo para stdin"
+msgstr "Selecção de formato do arquivo:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
-msgstr ""
+msgstr "FORMATO"
#: src/tar.c:638
msgid "create archive of the given format"
-msgstr ""
+msgstr "cria arquivo no formato indicado"
#: src/tar.c:640
msgid "FORMAT is one of the following:"
-msgstr ""
+msgstr "FORMATO é um dos seguintes:"
#: src/tar.c:641
msgid "old V7 tar format"
-msgstr ""
+msgstr "formato V7 tar antigo"
#: src/tar.c:644
msgid "GNU format as per tar <= 1.12"
-msgstr ""
+msgstr "formato GNU se tar <= 1.12"
#: src/tar.c:646
msgid "GNU tar 1.13.x format"
-msgstr ""
+msgstr "formato GNU tar 1.13.x"
#: src/tar.c:648
msgid "POSIX 1003.1-1988 (ustar) format"
-msgstr ""
+msgstr "formato POSIX 1003.1-1988 (ustar)"
#: src/tar.c:650
msgid "POSIX 1003.1-2001 (pax) format"
-msgstr ""
+msgstr "formato POSIX 1003.1-2001 (pax)"
#: src/tar.c:651
msgid "same as pax"
-msgstr ""
+msgstr "igual a pax"
#: src/tar.c:654
msgid "same as --format=v7"
-msgstr ""
+msgstr "igual a --format=v7"
#: src/tar.c:657
msgid "same as --format=posix"
-msgstr ""
+msgstr "igual a --format=posix"
#: src/tar.c:658
msgid "keyword[[:]=value][,keyword[[:]=value]]..."
-msgstr ""
+msgstr "palavra-chave[[:]=valor][,palavra-chave[[:]=valor]]..."
#: src/tar.c:659
msgid "control pax keywords"
-msgstr ""
+msgstr "controla palavras-chave pax"
#: src/tar.c:660
msgid "TEXT"
-msgstr ""
+msgstr "TEXTO"
#: src/tar.c:661
msgid ""
"create archive with volume name TEXT; at list/extract time, use TEXT as a "
"globbing pattern for volume name"
msgstr ""
+"cria arquivo com nome de volume TEXTO; à hora de listagem/extracção, usa "
+"TEXTO como padrão para nome de volume"
#: src/tar.c:666
-#, fuzzy
msgid "Compression options:"
-msgstr "H� conflitos entre as op��es de compress�o"
+msgstr "Opções de compressão:"
#: src/tar.c:668
-#, fuzzy
msgid "use archive suffix to determine the compression program"
-msgstr "N�o se consegue escrever para o programa de compress�o"
+msgstr "usa o sufixo do arquivo para determinar o programa de compressão"
#: src/tar.c:670
-#, fuzzy
msgid "do not use archive suffix to determine the compression program"
-msgstr "N�o se consegue escrever para o programa de compress�o"
+msgstr "não usa o sufixo do arquivo para determinar o programa de compressão"
#: src/tar.c:672
msgid "PROG"
-msgstr ""
+msgstr "PROG"
#: src/tar.c:673
msgid "filter through PROG (must accept -d)"
-msgstr ""
+msgstr "filtro por PROG (tem de aceitar -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
-msgstr ""
+msgstr "Selecção de ficheiro local:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
-msgstr ""
+msgstr "fica no sistema de ficheiros local ao criar o arquivo"
-#: src/tar.c:693
-#, fuzzy
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
-msgstr "Retira-se \"/\" das liga��es (\"links\") absolutas "
+msgstr "não remover \"/\" iniciais dos nomes de ficheiro"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
+"seguir ligações simbólicas; arquiva e despeja os ficheiros para onde elas "
+"apontam"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
+"seguir ligações rígidas; arquiva e despeja os ficheiros a que elas se referem"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
-msgstr ""
+msgstr "NOME-MEMBRO"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
-msgstr ""
+msgstr "começa no membro NOME-MEMBRO ao ler o arquivo"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
-msgstr ""
+msgstr "armazenar só ficheiros mais recentes que DATA-OU-FICHEIRO"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
-msgstr ""
+msgstr "DATA"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
-msgstr ""
+msgstr "compara data e hora quando só os dados mudarem"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
-msgstr ""
+msgstr "CONTROLO"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
-msgstr ""
+msgstr "segurança antes de remover, escolha o CONTROLO de versão"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
-msgstr ""
+msgstr "CADEIA"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
+"segurança antes de remover, ignorar o sufixo habitual(\"~\" excepto se "
+"sobreposto pela variável de ambiente SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
-msgstr ""
+msgstr "Transformação de nome de ficheiro:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
-msgstr ""
+msgstr "remove NÚMERO componentes iniciais de nomes de ficheiro ao extrair"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
-msgstr ""
+msgstr "EXPRESSÃO"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
-msgstr ""
+msgstr "usa EXPRESSÃO sed de substituição para transformar nomes de ficheiro"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
-msgstr ""
+msgstr "Saída informativa:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
-msgstr ""
+msgstr "lista verbosamente os ficheiros processados"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
-msgstr ""
+msgstr "PALAVRA-CHAVE"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
-msgstr ""
+msgstr "controlo de aviso"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
+"mostra mensagens de progresso a cada NÚMERO registos (predefinição - 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
-msgstr ""
+msgstr "ACÇÃO"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
-msgstr ""
+msgstr "executa ACÇÃO a cada ponto de controlo"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
-msgstr ""
+msgstr "mostra uma mensagem se nem todas as ligações forem despejadas"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
-msgstr ""
+msgstr "SINAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
"SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; the names without SIG prefix are also "
"accepted"
msgstr ""
+"mostra o total de bytes após processar o arquivo; com um argumento - mostra "
+"o total de bytes quando este SINAL for entregue; Os sinais permitidos são: "
+"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 e SIGUSR2; os nomes sem o prefixo SIG "
+"também são aceites"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
-msgstr ""
+msgstr "mostra horas de modificação de ficheiros em UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
-msgstr ""
+msgstr "mostra hora do ficheiro em resolução completa"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
-msgstr ""
+msgstr "envia saída verbosa para FICHEIRO"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
-msgstr ""
+msgstr "mostra número de bloco dentro do arquivo com cada mensagem"
-#: src/tar.c:752
-#, fuzzy
+#: src/tar.c:753
msgid "ask for confirmation for every action"
-msgstr "N�o se consegue obter confirma��o, do utilizador"
+msgstr "pedir confirmação para cada acção"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
-msgstr ""
+msgstr "mostra predefinições tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
-msgstr ""
+msgstr "mostra intervalos válidos para campos de ficheiro-snapshot"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
+"ao listar ou extrair, lista cada pasta que não cumpre o critério de procura"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
-msgstr ""
+msgstr "mostra nomes de ficheiro ou arquivo após a transformação"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
-msgstr ""
+msgstr "ESTILO"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
-msgstr ""
+msgstr "define o estilo de aspas; veja abaixo os valores de ESTILO válidos"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
-msgstr ""
+msgstr "adicionalmente, pôr aspas em caracteres de CADEIA"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
-msgstr ""
+msgstr "desactivar aspas para caracteres de CADEIA"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
-msgstr ""
+msgstr "Opções de compatibilidade:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
-msgstr ""
+msgstr "ao criar, igual a --old-archive; ao extrair, igual a --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
-msgstr ""
+msgstr "Outras opções:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
-msgstr ""
+msgstr "desactivar uso de opções potencialmente perigosas"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
-msgstr ""
+msgstr "\"%s\" não pode ser usada com \"%s\""
-#: src/tar.c:933
-#, fuzzy
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
-msgstr "N�o se pode especificar mais do que uma das op��es \"-Acdtrux\""
+msgstr ""
+"Não pode especificar mais de uma das opções \"-Acdtrux\", \"--delete\" ou "
+"\"--test-label\""
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
-msgstr "H� conflitos entre as op��es de compress�o"
+msgstr "Há conflitos nas opções de compressão"
-#: src/tar.c:1004
-#, fuzzy, c-format
+#: src/tar.c:1000
+#, c-format
msgid "Unknown signal name: %s"
-msgstr "Op��o \"%c\" desconhecida"
+msgstr "Nome de sinal desconhecido: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
-msgstr ""
+msgstr "Ficheiro amostra de data não encontrado"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
-msgstr ""
+msgstr "A substituir %s por formato de data %s desconhecido"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
-msgstr ""
+msgstr "Opção %s: a tratar data \"%s\" como %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
-msgstr ""
+msgstr "filtrar o arquivo por %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
-msgstr ""
+msgstr "Argumentos válidos para a opção --quoting-style option:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
msgstr ""
+"\n"
+"Predefinições *deste* tar:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
-msgstr ""
+msgstr "ID de dono ou grupo inválida"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
-msgstr ""
+msgstr "Factor de bloqueio inválido"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
-msgstr ""
+msgstr "Tamanho de fita inválido"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
-msgstr ""
+msgstr "Valor de nível incremental inválido"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
-msgstr ""
+msgstr "Mais de uma data limite"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
-msgstr ""
+msgstr "Valor de versão dispersa inválido"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr ""
+"--atime-preserve=\"system\" não é suportado nesta plataforma plataforma"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
-msgstr ""
+msgstr "valor de --checkpoint não é um inteiro"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
-msgstr ""
+msgstr "Modo inválido indicado na opção"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
-msgstr ""
+msgstr "Número inválido"
-#: src/tar.c:1861
-#, fuzzy
+#: src/tar.c:1870
msgid "Invalid record size"
-msgstr "Valor inv�lido para tamanho de registo (record_size)"
+msgstr "Tamanho de registo inválido"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
-msgstr "O tamanho dos registos tem que ser m�ltiplo de %d."
+msgstr "O tamanho dos registos tem de ser múltiplo de %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
-msgstr ""
+msgstr "Número de elementos inválidos"
-#: src/tar.c:1935
-#, fuzzy
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
-msgstr "S� se permite uma op��o de compress�o"
+msgstr "Só é permitida uma opção --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
-msgstr ""
+msgstr "Argumento de densidade mal formado: %s"
-#: src/tar.c:2049
-#, fuzzy, c-format
+#: src/tar.c:2058
+#, c-format
msgid "Unknown density: '%c'"
-msgstr "Op��o \"%c\" desconhecida"
+msgstr "Densidade desconhecida: \"%c\""
-#: src/tar.c:2066
-#, fuzzy, c-format
+#: src/tar.c:2075
+#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
-msgstr "As op��es \"-[0-7][lmh]\" n�o s�o suportadas por *este* tar"
+msgstr "Opções \"-[0-7][lmh]\" não suportada *neste* tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
-msgstr ""
+msgstr "%s:%lu: localização do erro"
-#: src/tar.c:2076
-#, fuzzy, c-format
+#: src/tar.c:2085
+#, c-format
msgid "error parsing %s"
-msgstr "Erro durante o fecho de %s"
+msgstr "Erro ao analisar %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
-msgstr ""
+msgstr "[FICHEIRO]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
-msgstr ""
+msgstr "argumentos não-opção em %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
-msgstr ""
+msgstr "impossível dividir TAR_OPTIONS: %s"
-#: src/tar.c:2291
-#, fuzzy, c-format
+#: src/tar.c:2300
+#, c-format
msgid "Old option '%c' requires an argument."
-msgstr "A antiga op��o `%c' exige um argumento."
+msgstr "A opção antiga \"%c\" requer um argumento."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
-msgstr ""
+msgstr "--occurrence não faz sentido sem uma lista de ficheiros"
-#: src/tar.c:2390
-#, fuzzy
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
-msgstr "Para usar v�rios arquivos � necess�ria a op��o \"-M\""
+msgstr "Múltiplos ficheiros de arquivo requerem a opção \"-M\""
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
-msgstr ""
+msgstr "--level não faz sentido sem --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s: rótulo de volume muito longo (o limite é %lu byte)"
+msgstr[1] "%s: rótulo de volume muito longo (o limite é %lu bytes)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
-msgstr "N�o se pode verificar arquivos multi-volume"
+msgstr "Impossível verificar arquivos multi-volume"
-#: src/tar.c:2439
-#, fuzzy
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
-msgstr "N�o se pode actualizar o verificar um arquivo comprimido"
+msgstr "Impossível verificar arquivos comprimidos"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
-msgstr "N�o se pode de usar arquivos multi-volume comprimidos"
+msgstr "Impossível usar arquivos multi-volume comprimidos"
-#: src/tar.c:2457
-#, fuzzy
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
-msgstr "N�o se pode actualizar o verificar um arquivo comprimido"
+msgstr "Impossível concatenar arquivos comprimidos"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
-msgstr ""
+msgstr "--clamp-mtime precisa de uma data especificada com --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
-msgstr ""
+msgstr "--pax-option só pode ser usada em arquivos POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
-msgstr ""
+msgstr "--acls só pode ser usado em arquivos POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
-msgstr ""
+msgstr "--selinux só pode ser usado em arquivos POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
-msgstr ""
+msgstr "--xattrs só pode ser usado em arquivos POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
+"Impossível deduzir o nome da pasta de topo; por favor, defina-o "
+"explicitamente com --one-top-level=PASTA"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
-msgstr ""
+msgstr "Tamanho do volume não pode ser inferior ao tamanho do registo"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
-msgstr "Recusa-se, covardemente, a criar um arquivo vazio"
+msgstr "Recusa cobardemente a criação um arquivo vazio"
-#: src/tar.c:2623
-#, fuzzy
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
-msgstr "As op��es \"-Aru\" s�o imcompat�veis com \"-f -\""
+msgstr "Opções \"-Aru\" são incompatíveis com \"-f -\""
-#: src/tar.c:2711
-#, fuzzy
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
-msgstr "Tem que se especificar uma das op��es \"-Acdtrux\""
+msgstr ""
+"Tem de especificar uma opção de \"-Acdtrux\", \"--delete\" ou \"--test-label"
+"\""
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
-msgstr ""
+msgstr "A sair com estado de falha devido a erros prévios"
-#: src/update.c:87
-#, fuzzy, c-format
+#: src/update.c:86
+#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
-msgstr[0] "%s: O ficheiro diminui em %d bytes, (desgra�a!)"
-msgstr[1] "%s: O ficheiro diminui em %d bytes, (desgra�a!)"
+msgstr[0] "%s: ficheiro encolhido em %s byte"
+msgstr[1] "%s: ficheiro encolhido em %s bytes"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
-msgstr ""
+msgstr "Palavra-chave %s desconhecida ou ainda não implementada"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
+msgstr "Carimbo fora do alcance permitido"
+
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
msgstr ""
-#: src/xheader.c:205
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
-msgstr ""
+msgstr "Não pode usar o padrão %s"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
+msgstr "Não pode ignorar a palavra-chave %s"
+
+#: src/xheader.c:476
+msgid "can't update global extended header record"
msgstr ""
-#: src/xheader.c:668
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
-msgstr ""
+msgstr "Cabeçalho estendido mal formado: tamanho em falta"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
-msgstr ""
+msgstr "Tamanho de cabeçalho estendido %*s fora de alcance"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
-msgstr ""
+msgstr "Cabeçalho estendido mal formado: espaço em falta após tamanho"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
-msgstr ""
+msgstr "Cabeçalho estendido mal formado: sinal de igual em falta"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
-msgstr ""
+msgstr "Cabeçalho estendido mal formado: newline em falta"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
-msgstr ""
+msgstr "A ignorar palavra-chave de cabeçalho estendido \"%s\" desconhecida"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
+"Par palavra-chave/valor gerado muito longo (palavra-chave=%s, tamanho=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
-msgstr ""
+msgstr "Cabeçalho estendido %s=%s fora de alcance %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
-msgstr ""
+msgstr "Cabeçalho estendido mal formado: %s=%s inválido"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
-msgstr ""
+msgstr "Malformed extended header: %s=%s excessivo"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
+"Cabeçalho estendido mal formado: %s inválido: delimitador %c inesperado"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
-msgstr ""
+msgstr "Cabeçalho estendido mal formado: %s inválido: número ímpar de valores"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
-msgstr ""
+msgstr "%s: não é um valor de expiração válido"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
-msgstr ""
+msgstr "%s: acção de ponto de controlo desconhecida"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
-msgstr ""
+msgstr "escrever"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
-msgstr ""
+msgstr "ler"
#. TRANSLATORS: This is a "checkpoint of write operation",
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
-#, fuzzy, c-format
+#: src/checkpoint.c:252
+#, c-format
msgid "Write checkpoint %u"
-msgstr "Escreve-se o ponto de verifica��o %d"
+msgstr "Ponto de controlo de escrita %u"
#. TRANSLATORS: This is a "checkpoint of read operation",
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
-#, fuzzy, c-format
+#: src/checkpoint.c:258
+#, c-format
msgid "Read checkpoint %u"
-msgstr "Leu-se o ponto de verifica��o %d"
+msgstr "Ponto de controlo de leitura %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr ""
+"genfile manipula ficheiros de dados para o conjunto de teste GNU paxutils.\n"
+"As OPÇÕES são:\n"
-#: tests/genfile.c:131
-#, fuzzy
+#: tests/genfile.c:126
msgid "File creation options:"
-msgstr "H� conflitos entre as op��es de compress�o"
+msgstr "Opções de criação de ficheiros:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
-msgstr ""
+msgstr "TAMANHO"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
-msgstr ""
+msgstr "Cria ficheiro do TAMANHO indicado"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
-msgstr ""
+msgstr "Escrever em NOME, em vez da saída padrão"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
-msgstr ""
+msgstr "Ler nomes de ficheiro de FICHEIRO"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
-msgstr ""
+msgstr "-T lê nomes terminados em nulo"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
+"Encher o ficheiro com o PADRÃO indicado. PADRÃO é \"default\" ou \"zeros\""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
-msgstr ""
+msgstr "Tamanho do bloco para ficheiro disperso"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
+"Gerar ficheiro disperso. O resto da linha de comandos dá o mapa do ficheiro."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
-msgstr ""
+msgstr "DESVIO"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
-msgstr ""
+msgstr "Ir para o desvio dado antes de escrever dados"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
-msgstr ""
+msgstr "Suprimir mensagens de diagnóstico não-fatais"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
-msgstr ""
+msgstr "Opções de estatísticas de ficheiros"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
+"Mostrar conteúdo de estrutura para cada ficheiro indicado. O FORMATO "
+"predefinido é: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
-msgstr ""
+msgstr "Opções de execução síncrona:"
-#: tests/genfile.c:168
-msgid "OPTION"
+#: tests/genfile.c:163
+msgid "N"
msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
+"Executar ARGUMENTOSS. Útil com --checkpoint e uma de --cut, --append, --"
+"touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
+"Realizar a acção indicada (ver abaixo) ao atingir o ponto de controlo NÚMERO"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
-msgstr ""
+msgstr "Definir data para a opção--touch seguinte"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
-msgstr ""
+msgstr "Mostrar pontos de controlo executados e estado de saída de COMANDO"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
+"Acções de execução síncrona. São executadas quando o número do ponto de "
+"controlo dado por --checkpoint é atingido."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
+"Truncar FICHEIRO para o tamanho especificado pela opção --length anterior "
+"(ou 0, se não foi indicado)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
+"Anexar TAMANHO bytes a FICHEIRO. TAMANHO é dado pela opção --length anterior."
-#: tests/genfile.c:193
-#, fuzzy
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
-msgstr "N�o se conseguiu modificar os tempos de acesso e modifica��o de %s"
+msgstr "Actualizar o acesso e horas de modificação de FICHEIRO"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
-msgstr ""
+msgstr "Executar COMANDO"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Eliminar FICHEIRO"
-#: tests/genfile.c:250
-#, fuzzy, c-format
+#: tests/genfile.c:245
+#, c-format
msgid "Invalid size: %s"
-msgstr "Formato de data inv�lido \"%s\""
+msgstr "Tamanho inválido: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
-msgstr ""
+msgstr "Nº fora do alcance permitido: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
-msgstr ""
+msgstr "Tamanho negativo: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
-msgstr ""
+msgstr "stat(%s) falhou"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
-msgstr ""
+msgstr "tamanho de ficheiro pedido %lu, actual %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
-msgstr ""
+msgstr "o ficheiro criado não é disperso"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
-msgstr ""
+msgstr "Erro ao analisar nº perto de \"%s\""
-#: tests/genfile.c:381
-#, fuzzy, c-format
+#: tests/genfile.c:372
+#, c-format
msgid "Unknown date format"
-msgstr "Erro desconhecido, do sistema"
+msgstr "Formato de data desconhecido"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
-msgstr ""
+msgstr "[ARGUMENTOS...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
-#, fuzzy, c-format
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
+#, c-format
msgid "cannot open `%s'"
-msgstr "N�o se consegue abrir %s"
+msgstr "Impossível abrir %s"
-#: tests/genfile.c:448
-#, fuzzy
+#: tests/genfile.c:439
msgid "cannot seek"
-msgstr "N�o se consegue executar %s"
+msgstr "impossível ir para"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
-msgstr ""
+msgstr "nome de ficheiro contém carácter nulo"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
+"impossível gerar ficheiros dispersos na saída padrão, use a opção --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
-msgstr ""
+msgstr "máscara incorrecta (perto de \"%s\")"
-#: tests/genfile.c:675 tests/genfile.c:708
-#, fuzzy, c-format
+#: tests/genfile.c:666 tests/genfile.c:699
+#, c-format
msgid "Unknown field `%s'"
-msgstr "Op��o \"%c\" desconhecida"
+msgstr "Campo desconhecido \"%s\""
-#: tests/genfile.c:735
-#, fuzzy, c-format
+#: tests/genfile.c:726
+#, c-format
msgid "cannot set time on `%s'"
-msgstr "N�o se consegue executar \"stat\" para o ficheiro %s"
+msgstr "impossível definir hora em \"%s\""
-#: tests/genfile.c:765
-#, fuzzy, c-format
+#: tests/genfile.c:756
+#, c-format
msgid "cannot truncate `%s'"
-msgstr "N�o se consegue executar \"stat\" para %s"
+msgstr "impossível truncar \"%s\""
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
-msgstr ""
+msgstr "o comando falhou: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "N�o se consegue executar \"stat\" para %s"
+msgstr "impossível obter informação para \"%s\""
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "N�o se consegue abrir a directoria %s"
+msgstr "impossível remover a pasta \"%s\""
-#: tests/genfile.c:788
-#, fuzzy, c-format
+#: tests/genfile.c:779
+#, c-format
msgid "cannot unlink `%s'"
-msgstr "N�o se consegue ler a liga��o (\"link\") %s"
+msgstr "impossível desligar \"%s\""
#: tests/genfile.c:918
#, c-format
msgid "Command exited successfully\n"
-msgstr ""
+msgstr "O comando saiu com sucesso\n"
#: tests/genfile.c:920
#, c-format
msgid "Command failed with status %d\n"
-msgstr ""
+msgstr "O comando falhou com estado %d\n"
#: tests/genfile.c:924
#, c-format
msgid "Command terminated on signal %d\n"
-msgstr ""
+msgstr "O comando terminou ao sinal %d\n"
#: tests/genfile.c:926
#, c-format
msgid "Command stopped on signal %d\n"
-msgstr ""
+msgstr "O comando parou ao sinal %d\n"
#: tests/genfile.c:929
#, c-format
msgid "Command dumped core\n"
-msgstr ""
+msgstr "O comando despejou o núcleo\n"
#: tests/genfile.c:932
#, c-format
msgid "Command terminated\n"
-msgstr ""
+msgstr "O comando terminou\n"
#: tests/genfile.c:964
-#, fuzzy, c-format
+#, c-format
msgid "--stat requires file names"
-msgstr "--Nomes de ficheiros truncados--\n"
+msgstr "--stat requer nomes de ficheiro"
+
+#~ msgid "OPTION"
+#~ msgstr "OPÇÃO"
#~ msgid "Cannot close file #%d"
-#~ msgstr "N�o se consegue fechar o ficheiro #%d"
+#~ msgstr "N�o se consegue fechar o ficheiro #%d"
#~ msgid "Cannot close descriptor %d"
-#~ msgstr "N�o se consegue fechar o ficheiro de descritor %d"
+#~ msgstr "N�o se consegue fechar o ficheiro de descritor %d"
#, fuzzy
#~ msgid "Cannot properly duplicate %s"
-#~ msgstr "N�o se consegue redireccionar %s"
+#~ msgstr "N�o se consegue redireccionar %s"
#~ msgid "Cannot use compressed or remote archives"
-#~ msgstr "N�o se pode usar arquivos comprimidos ou remotos"
+#~ msgstr "N�o se pode usar arquivos comprimidos ou remotos"
#~ msgid "Cannot open pipe"
-#~ msgstr "N�o se consegue abrir \"pipe\""
+#~ msgstr "N�o se consegue abrir \"pipe\""
#~ msgid "Cannot fork"
-#~ msgstr "N�o se consegue criar processo ( \"fork\" )"
+#~ msgstr "N�o se consegue criar processo ( \"fork\" )"
#~ msgid "tar (child)"
#~ msgstr "tar (filho)"
@@ -2911,13 +3002,13 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "(filho) \"pipe\" para \"stdin\""
#~ msgid "Cannot open archive %s"
-#~ msgstr "N�o se consegue abrir o arquivo %s"
+#~ msgstr "N�o se consegue abrir o arquivo %s"
#~ msgid "Archive to stdout"
#~ msgstr "Arquivo para stdout"
#~ msgid "Child cannot fork"
-#~ msgstr "Processo filho n�o consegue executar \"fork\""
+#~ msgstr "Processo filho n�o consegue executar \"fork\""
#~ msgid "((child)) Pipe to stdout"
#~ msgstr "((filho)) \"pipe\" para \"stdout\""
@@ -2929,7 +3020,7 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "(neto) \"Pipe\" para \"stdout\""
#~ msgid "Cannot read from compression program"
-#~ msgstr "N�o se consegue ler do programa de compress�o"
+#~ msgstr "N�o se consegue ler do programa de compress�o"
#~ msgid "(child) Pipe to stdout"
#~ msgstr "(filho) \"pipe\" para \"stdout\""
@@ -2941,13 +3032,13 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "(neto) \"Pipe\" para \"stdout\""
#~ msgid "Write to compression program short %d bytes"
-#~ msgstr "Faltam %d bytes no que se escreveu para o programa de compress�o"
+#~ msgstr "Faltam %d bytes no que se escreveu para o programa de compress�o"
#~ msgid "Could not allocate memory for blocking factor %d"
-#~ msgstr "N�o se conseguiu reservar mem�ria para um factor de bloco %d"
+#~ msgstr "N�o se conseguiu reservar mem�ria para um factor de bloco %d"
#~ msgid "Only wrote %u of %u bytes to %s"
-#~ msgstr "S� se escreveram %u \"bytes\" de um total de %u em %s"
+#~ msgstr "S� se escreveram %u \"bytes\" de um total de %u em %s"
#~ msgid "Read error on %s"
#~ msgstr "Erro de leitura sobre %s"
@@ -2956,13 +3047,13 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "Leitura de %s\n"
#~ msgid "WARNING: No volume header"
-#~ msgstr "ATEN��O: N�o h� cabe�alho de volume"
+#~ msgstr "ATEN��O: N�o h� cabe�alho de volume"
#~ msgid "Only read %d bytes from archive %s"
-#~ msgstr "S� se leram %d \"bytes\" do arquivo %s"
+#~ msgstr "S� se leram %d \"bytes\" do arquivo %s"
#~ msgid "WARNING: Cannot close %s (%d, %d)"
-#~ msgstr "ATEN��O: N�o se consegue fechar %s (%d, %d)"
+#~ msgstr "ATEN��O: N�o se consegue fechar %s (%d, %d)"
#~ msgid "Child died with signal %d%s"
#~ msgstr "Processo filho morreu com o sinal %d%s"
@@ -2971,10 +3062,10 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "Processo filho terminou com estado %d"
#~ msgid "Cannot fork!"
-#~ msgstr "N�o se consegue criar processo! ( \"fork\" )"
+#~ msgstr "N�o se consegue criar processo! ( \"fork\" )"
#~ msgid "Cannot exec a shell %s"
-#~ msgstr "N�o se consegue executar uma \"shell\" %s"
+#~ msgstr "N�o se consegue executar uma \"shell\" %s"
#, fuzzy
#~ msgid "Removing leading `/' from absolute path names in the archive"
@@ -2989,81 +3080,81 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ "ficheiro %s"
#~ msgid "Amount actually written is (I hope) %d.\n"
-#~ msgstr "A quantidade realmente escrita � %d (esperemos!).\n"
+#~ msgstr "A quantidade realmente escrita � %d (esperemos!).\n"
#~ msgid "Cannot add file %s"
-#~ msgstr "N�o � poss�vel acrescentar o ficheiro %s"
+#~ msgstr "N�o � poss�vel acrescentar o ficheiro %s"
#, fuzzy
#~ msgid "Cannot add directory %s"
-#~ msgstr "N�o se consegue abrir a directoria %s"
+#~ msgstr "N�o se consegue abrir a directoria %s"
#~ msgid "File name %s%s too long"
#~ msgstr "Nome de ficheiro %s%s longo demais"
#~ msgid "Could not allocate memory for diff buffer of %d bytes"
#~ msgstr ""
-#~ "N�o se conseguiu reservar mem�ria para um \"buffer\" de compara��o, de %d "
+#~ "N�o se conseguiu reservar mem�ria para um \"buffer\" de compara��o, de %d "
#~ "\"bytes\""
#~ msgid "Cannot read %s"
-#~ msgstr "N�o se consegue ler %s"
+#~ msgstr "N�o se consegue ler %s"
#, fuzzy
#~ msgid "Data differs"
-#~ msgstr "%s: Os dados s�o diferentes\n"
+#~ msgstr "%s: Os dados s�o diferentes\n"
#, fuzzy
#~ msgid "File does not exist"
-#~ msgstr "%s: N�o existe\n"
+#~ msgstr "%s: N�o existe\n"
#, fuzzy
#~ msgid "Not a regular file"
-#~ msgstr "%s: N�o � um ficheiro normal\n"
+#~ msgstr "%s: N�o � um ficheiro normal\n"
#, fuzzy
#~ msgid "Does not exist"
-#~ msgstr "%s: N�o existe\n"
+#~ msgstr "%s: N�o existe\n"
#, fuzzy
#~ msgid "No such file or directory"
-#~ msgstr "%s: Ficheiro, ou directoria, n�o existe\n"
+#~ msgstr "%s: Ficheiro, ou directoria, n�o existe\n"
#, fuzzy
#~ msgid "Mode or device-type changed"
-#~ msgstr "%s: O modo ou o tipo de perif�rico mudou\n"
+#~ msgstr "%s: O modo ou o tipo de perif�rico mudou\n"
#, fuzzy
#~ msgid "No longer a directory"
-#~ msgstr "%s: J� n�o � uma directoria\n"
+#~ msgstr "%s: J� n�o � uma directoria\n"
#~ msgid "Cannot open file %s"
-#~ msgstr "N�o se consegue abrir o ficheiro %s"
+#~ msgstr "N�o se consegue abrir o ficheiro %s"
#~ msgid "Cannot seek to %ld in file %s"
-#~ msgstr "N�o se consegue mudar (\"seek\") para a posi��o %ld do ficheiro %s"
+#~ msgstr "N�o se consegue mudar (\"seek\") para a posi��o %ld do ficheiro %s"
#~ msgid "Could not rewind archive file for verify"
-#~ msgstr "N�o se conseguiu rebobinar o arquivo para verifica��o"
+#~ msgstr "N�o se conseguiu rebobinar o arquivo para verifica��o"
#~ msgid "Could not re-position archive file"
-#~ msgstr "N�o se conseguiu reposicionar o ficheiro arquivo"
+#~ msgstr "N�o se conseguiu reposicionar o ficheiro arquivo"
#~ msgid "%s: Could not change access and modification times"
-#~ msgstr "%s: N�o se conseguiu mudar os tempos de acesso e modifica��o"
+#~ msgstr "%s: N�o se conseguiu mudar os tempos de acesso e modifica��o"
#, fuzzy
#~ msgid "%s: Cannot lchown to uid %d gid %d"
-#~ msgstr "%s: N�o se pode fazer \"chown\" para \"uid\" %d \"gid\" %d"
+#~ msgstr "%s: N�o se pode fazer \"chown\" para \"uid\" %d \"gid\" %d"
#~ msgid "%s: Cannot chown to uid %d gid %d"
-#~ msgstr "%s: N�o se pode fazer \"chown\" para \"uid\" %d \"gid\" %d"
+#~ msgstr "%s: N�o se pode fazer \"chown\" para \"uid\" %d \"gid\" %d"
#~ msgid "%s: Could not write to file"
-#~ msgstr "%s: N�o se conseguiu escrever para o ficheiro"
+#~ msgstr "%s: N�o se conseguiu escrever para o ficheiro"
#~ msgid "%s: Could not create file"
-#~ msgstr "%s: N�o foi poss�vel criar o ficheiro"
+#~ msgstr "%s: N�o foi poss�vel criar o ficheiro"
#~ msgid "%d at %d\n"
#~ msgstr "%d em %d\n"
@@ -3072,47 +3163,47 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "%s: Erro ao fechar"
#~ msgid "%s: Could not link to `%s'"
-#~ msgstr "%s: N�o se p�de fazer liga��o (link) para `%s'"
+#~ msgstr "%s: N�o se p�de fazer liga��o (link) para `%s'"
#~ msgid "%s: Could not make node"
-#~ msgstr "%s: N�o se p�de criar um nodo"
+#~ msgstr "%s: N�o se p�de criar um nodo"
#~ msgid "%s: Could not make fifo"
-#~ msgstr "%s: N�o se p�de criar um \"fifo\""
+#~ msgstr "%s: N�o se p�de criar um \"fifo\""
#~ msgid "%s: Could not create directory"
-#~ msgstr "%s: N�o se p�de criar uma directoria"
+#~ msgstr "%s: N�o se p�de criar uma directoria"
#~ msgid "Added write and execute permission to directory %s"
-#~ msgstr "Acrescentaram-se permiss�es de escrita e de leitura � directoria %s"
+#~ msgstr "Acrescentaram-se permiss�es de escrita e de leitura � directoria %s"
#~ msgid "Visible long name error"
#~ msgstr "Erro evidente num nome longo"
#~ msgid "Could not get current directory: %s"
-#~ msgstr "N�o se conseguiu determinar a directoria corrente: %s"
+#~ msgstr "N�o se conseguiu determinar a directoria corrente: %s"
#, fuzzy
#~ msgid "File name %s/%s too long"
#~ msgstr "Nome de ficheiro %s%s longo demais"
#~ msgid "Cannot chdir to %s"
-#~ msgstr "N�o se pode mudar para a directoria %s"
+#~ msgstr "N�o se pode mudar para a directoria %s"
#~ msgid "Error while deleting %s"
#~ msgstr "Erro quando se apagava %s"
#~ msgid "Hmm, this doesn't look like a tar archive"
-#~ msgstr "Pois �..., isto n�o parece ser um arquivo \"tar\""
+#~ msgstr "Pois �..., isto n�o parece ser um arquivo \"tar\""
#~ msgid "Skipping to next file header"
-#~ msgstr "Salta para o pr�ximo cabe�alho de ficheiro"
+#~ msgstr "Salta para o pr�ximo cabe�alho de ficheiro"
#~ msgid "EOF in archive file"
#~ msgstr "Fim-de-ficheiro no arquivo"
#~ msgid "Only wrote %ld of %ld bytes to file %s"
-#~ msgstr "S� se escreveram %ld \"bytes\" de um total de %ld no ficheiro %s"
+#~ msgstr "S� se escreveram %ld \"bytes\" de um total de %ld no ficheiro %s"
#~ msgid "Visible longname error"
#~ msgstr "Erro evidente num nome longo"
@@ -3124,25 +3215,25 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "Comando desconhecido \"%s\" para decifrar os nomes truncados"
#~ msgid "Missing file name after -C"
-#~ msgstr "Falta um nome de ficheiro ap�s \"-C\""
+#~ msgstr "Falta um nome de ficheiro ap�s \"-C\""
#~ msgid "rmtd: Cannot allocate buffer space\n"
-#~ msgstr "rmtd: N�o se consegue reservar espa�o tempor�rio (\"buffers\")\n"
+#~ msgstr "rmtd: N�o se consegue reservar espa�o tempor�rio (\"buffers\")\n"
#~ msgid "Cannot allocate buffer space"
-#~ msgstr "N�o se consegue reservar espa�o tempor�rio (\"buffer\")"
+#~ msgstr "N�o se consegue reservar espa�o tempor�rio (\"buffer\")"
#~ msgid "Premature end of file"
#~ msgstr "Fim-de-ficheiro prematuro"
#~ msgid "rmtd: Garbage command %c\n"
-#~ msgstr "rmtd: Comando \"%c\" n�o faz sentido\n"
+#~ msgstr "rmtd: Comando \"%c\" n�o faz sentido\n"
#, fuzzy
#~ msgid ""
#~ "\n"
#~ "Usage: %s [OPTION]... [FILE]...\n"
-#~ msgstr "Utiliza��o: %s [OP��O]... [FICHEIRO]...\n"
+#~ msgstr "Utiliza��o: %s [OP��O]... [FICHEIRO]...\n"
#~ msgid ""
#~ "\n"
@@ -3160,17 +3251,17 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr ""
#~ "\n"
#~ "Principal modo de funcionamento:\n"
-#~ " -t, --list invent�rio do arquivo\n"
+#~ " -t, --list invent�rio do arquivo\n"
#~ " -x, --extract, --get extrair ficheiros do arquivo\n"
#~ " -c, --create criar um novo arquivo\n"
#~ " -d, --diff, --compare comparar o arquivo com os actuais ficheiros \n"
#~ " -r, --append acrescentar os ficheiros no fim do arquivo\n"
-#~ " -u, --update s� acrescentar os ficheiros mais novos do que "
-#~ "as vers�es presentes no arquivo\n"
+#~ " -u, --update s� acrescentar os ficheiros mais novos do que "
+#~ "as vers�es presentes no arquivo\n"
#~ " -A, --catenate juntar outros arquivos \"tar\" ao arquivo\n"
#~ " --concatenate o mesmo que \"-A\"\n"
#~ " --delete apagar no arquivo (excepto para fitas "
-#~ "magn�ticas!)\n"
+#~ "magn�ticas!)\n"
#, fuzzy
#~ msgid ""
@@ -3199,18 +3290,18 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ "escrever\n"
#~ " --remove-files apagar os ficheiros depois de serem "
#~ "guardados no arquivo\n"
-#~ " -k, --keep-old-files na extrac��o, n�o destruir nenhum ficheiro\n"
+#~ " -k, --keep-old-files na extrac��o, n�o destruir nenhum ficheiro\n"
#~ " -U, --unlink-first remove cada ficheiro antes de extrair para "
#~ "cima dele\n"
-#~ "\t\t\t (aparecendo duas vezes, at� apaga directorias completas\n"
+#~ "\t\t\t (aparecendo duas vezes, at� apaga directorias completas\n"
#~ " -S, --sparse tratar eficientemente ficheiros dispersos \n"
-#~ " (os que t�m buracos) \n"
+#~ " (os que t�m buracos) \n"
#~ " -O, --to-stdout extrair os ficheiros para o \"stdout\" \n"
#~ " -G, --incremental tratar um arquivo no velho formato "
#~ "incremental GNU\n"
#~ " -g, --listed-incremental tratar arquivo no novo formato incremental "
#~ "GNU\n"
-#~ " --ignore-failed-read ignorar os ficheiros que n�o se consegue "
+#~ " --ignore-failed-read ignorar os ficheiros que n�o se consegue "
#~ "ler.\n"
#~ "\n"
@@ -3235,16 +3326,16 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr ""
#~ "\n"
#~ "Tratamento dos atributos dos ficheiros:\n"
-#~ " --atime-preserve n�o alterar as datas de acesso dos "
+#~ " --atime-preserve n�o alterar as datas de acesso dos "
#~ "ficheiros\n"
-#~ " -m, --modification-time n�o extrair a data de modifica��o dos "
+#~ " -m, --modification-time n�o extrair a data de modifica��o dos "
#~ "ficheiros\n"
#~ " --same-owner extrair os ficheiros tentando manter o "
#~ "mesmo \n"
#~ " dono (owner)\n"
-#~ " --numeric-owner usar sempre n�meros para os nomes de \n"
+#~ " --numeric-owner usar sempre n�meros para os nomes de \n"
#~ " utilizador/grupo \n"
-#~ " -p, --same-permissions na extrac��o, manter as protec��es do "
+#~ " -p, --same-permissions na extrac��o, manter as protec��es do "
#~ "ficheiros\n"
#~ " --preserve-permissions o mesmo que -p\n"
#~ " -s, --same-order ordernar os nomes a extrair segundo a sua "
@@ -3272,18 +3363,18 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ " --volno-file=FILE use/update the volume number in FILE\n"
#~ msgstr ""
#~ "\n"
-#~ "Escolha do perif�rico e mudan�as de fita magn�tica:\n"
-#~ " -f, --file=ARQ tratar o arquivo, ou perif�rico ARQ\n"
-#~ " --force-local o arquivo � local, mesmo que tenha \":\"\n"
+#~ "Escolha do perif�rico e mudan�as de fita magn�tica:\n"
+#~ " -f, --file=ARQ tratar o arquivo, ou perif�rico ARQ\n"
+#~ " --force-local o arquivo � local, mesmo que tenha \":\"\n"
#~ " --rsh-command=COM usar o comando remoto COM, em vez de \"rsh"
#~ "\"\n"
-#~ " -[0-7][lmh] escolher o perif�rico e a densidade\n"
+#~ " -[0-7][lmh] escolher o perif�rico e a densidade\n"
#~ " -M, --multi-volume tratar arquivos multi-volume\n"
#~ " -L, --tape-length=NUM tratar NUM x 1024 \"bytes\" por fita "
-#~ "magn�tica\n"
-#~ " -F, --info-script=FICH executar FICH nas mudan�as de fita "
-#~ "magn�tica\n"
-#~ " (for�a a escolha de \"-M\")\n"
+#~ "magn�tica\n"
+#~ " -F, --info-script=FICH executar FICH nas mudan�as de fita "
+#~ "magn�tica\n"
+#~ " (for�a a escolha de \"-M\")\n"
#~ " --new-volume-script=FICH o mesmo que \"-F FICH\"\n"
#~ msgid ""
@@ -3296,10 +3387,10 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ " -B, --read-full-records reblock as we read (for 4.2BSD pipes)\n"
#~ msgstr ""
#~ "\n"
-#~ "Caracter�sticas dos blocos no perif�rico (device):\n"
+#~ "Caracter�sticas dos blocos no perif�rico (device):\n"
#~ " -b, --blocking-factor=BLOCOS BLOCOS x 512 \"bytes\" por registo\n"
-#~ " --record-size=DIM DIM bytes por registo, m�ltiplo de 512\n"
-#~ " -i, --ignore-zeros ignorar os blocos constitu�dos por "
+#~ " --record-size=DIM DIM bytes por registo, m�ltiplo de 512\n"
+#~ " -i, --ignore-zeros ignorar os blocos constitu�dos por "
#~ "zeros\n"
#~ " (implicam fim-de-ficheiro)\n"
#~ " -B, --read-full-records dividir a leitura em blocos \n"
@@ -3321,20 +3412,20 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ "d)\n"
#~ msgstr ""
#~ "\n"
-#~ "Selec��o do formato do arquivo:\n"
+#~ "Selec��o do formato do arquivo:\n"
#~ " -V, --label=NOME cria um aruivo com volume de nome "
#~ "NOME\n"
-#~ " REGEXP ao extrair/listar, o nome � uma "
-#~ "express�o\n"
+#~ " REGEXP ao extrair/listar, o nome � uma "
+#~ "express�o\n"
#~ " regular\n"
#~ " -o, --old-archive, --portability escreve um arquivo no formato V7\n"
#~ " --posix escreve um arquivo conforme com "
#~ "POSIX\n"
-#~ " -z, --gzip, --ungzip filtra o arquivo atrav�s de \"gzip"
+#~ " -z, --gzip, --ungzip filtra o arquivo atrav�s de \"gzip"
#~ "\"\n"
-#~ " -Z, --compress, --uncompress filtra o arquivo atrav�s de "
+#~ " -Z, --compress, --uncompress filtra o arquivo atrav�s de "
#~ "\"compress\"\n"
-#~ " --use-compress-program=PROG filtra o arquivo atrav�s de PROG \n"
+#~ " --use-compress-program=PROG filtra o arquivo atrav�s de PROG \n"
#~ "\t\t\t\t (este tem que aceitar -d)\n"
#, fuzzy
@@ -3358,28 +3449,28 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ " -K, --starting-file=NAME begin at file NAME in the archive\n"
#~ msgstr ""
#~ "\n"
-#~ "Selec��o local de ficheiros:\n"
+#~ "Selec��o local de ficheiros:\n"
#~ " -C, --directory DIR mudar para a directoria DIR\n"
#~ " -T, --files-from=NOME obter do ficheiro NOME a lista de ficheiros "
#~ "a \n"
#~ " criar ou extrair\n"
#~ " --null faz com que \"-T\" leia nomes terminados por "
#~ "NULO,\n"
-#~ " tamb�m inibe \"-C\"\n"
-#~ " --exclude=PADR�O excluir os ficheiros descritos pelo PADR�O\n"
-#~ " -X, --exclude-from=FICH excluir ficheiros, segundo os padr�es "
+#~ " tamb�m inibe \"-C\"\n"
+#~ " --exclude=PADR�O excluir os ficheiros descritos pelo PADR�O\n"
+#~ " -X, --exclude-from=FICH excluir ficheiros, segundo os padr�es "
#~ "guardados em\n"
#~ "\t\t\t FICH\n"
#~ " -P, --absolute-names preservar os \"\\\" iniciais nos nomes dos "
#~ "ficheiros\n"
-#~ " -h, --dereference usar os pr�prios ficheiros, em lugar das "
-#~ "liga��es\n"
-#~ " simb�licas (symlinks) que os referenciam\n"
-#~ " --no-recurse n�o descer pela �rvore de directorias\n"
-#~ " -l, --one-file-system n�o sair do sistema local de ficheiros, ao "
+#~ " -h, --dereference usar os pr�prios ficheiros, em lugar das "
+#~ "liga��es\n"
+#~ " simb�licas (symlinks) que os referenciam\n"
+#~ " --no-recurse n�o descer pela �rvore de directorias\n"
+#~ " -l, --one-file-system n�o sair do sistema local de ficheiros, ao "
#~ "criar o\n"
#~ " arquivo\n"
-#~ " -K, --starting-file=NOME come�ar pelo ficheiro NOME, no arquivo\n"
+#~ " -K, --starting-file=NOME come�ar pelo ficheiro NOME, no arquivo\n"
#, fuzzy
#~ msgid ""
@@ -3388,9 +3479,9 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ "only\n"
#~ " --after-date=DATE same as -N\n"
#~ msgstr ""
-#~ " -N, --newer=DATA s� guardar ficheiros mais recentes do que "
+#~ " -N, --newer=DATA s� guardar ficheiros mais recentes do que "
#~ "DATA\n"
-#~ " --newer-mtime s� comparar data e hora quando os dados "
+#~ " --newer-mtime s� comparar data e hora quando os dados "
#~ "mudarem\n"
#~ " --after-date=DATA o mesmo que \"-N\"\n"
#~ "),"
@@ -3409,18 +3500,18 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ " --confirmation same as -w\n"
#~ msgstr ""
#~ "\n"
-#~ "Presta��o de informa��es:\n"
+#~ "Presta��o de informa��es:\n"
#~ " --help mostrar esta mensagem de ajuda e terminar\n"
-#~ " --version indicar a vers�o do programa \"tar\" e terminar\n"
+#~ " --version indicar a vers�o do programa \"tar\" e terminar\n"
#~ " -v, --verbose escrever a lista dos ficheiros tratados\n"
#~ " --checkpoint indicar os nomes das directorias durante a "
#~ "leitura\n"
-#~ " --totals indicar o n�mero de \"bytes\" escritos durante a "
-#~ "cria��o\n"
+#~ " --totals indicar o n�mero de \"bytes\" escritos durante a "
+#~ "cria��o\n"
#~ " do arquivo\n"
-#~ " -R, --block-number escrever o n�mero de bloco, dentro do arquivo, \n"
+#~ " -R, --block-number escrever o n�mero de bloco, dentro do arquivo, \n"
#~ " em cada mensagem\n"
-#~ " -w, --interactive pedir confirma��o para todas as ac��es\n"
+#~ " -w, --interactive pedir confirma��o para todas as ac��es\n"
#~ " --confirmation o mesmo que \"-w\"\n"
#~ "\n"
@@ -3434,45 +3525,45 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ "or a device. *This* `tar' defaults to `-f%s -b%d'.\n"
#~ msgstr ""
#~ "\n"
-#~ "O programa tar GNU anterior � vers�o 1.12 n�o consegue ler arquivos \"--"
+#~ "O programa tar GNU anterior � vers�o 1.12 n�o consegue ler arquivos \"--"
#~ "posix\".\n"
-#~ "Se a vari�vel POSIXLY_CORRECT estiver definida no ambiente, as extens�es "
+#~ "Se a vari�vel POSIXLY_CORRECT estiver definida no ambiente, as extens�es "
#~ "GNU\n"
-#~ "s�o inibidas com \"--posix\". O suporte para POSIX est� apenas "
+#~ "s�o inibidas com \"--posix\". O suporte para POSIX est� apenas "
#~ "parcialmente \n"
-#~ "implementado, pelo que n�o se fiem muito nele, por agora.\n"
+#~ "implementado, pelo que n�o se fiem muito nele, por agora.\n"
#~ "ARQUIVO pode ser FICHEIRO, HOST:FICHEIRO ou UTILIZADOR@HOST:FICHEIRO; e \n"
-#~ "FICHEIRO pode ser um ficheiro ou um perif�rico.\n"
+#~ "FICHEIRO pode ser um ficheiro ou um perif�rico.\n"
#~ "*Este* tar assume, por defeito, \"-f%s -b %d\".\n"
#~ msgid "Obsolete option, now implied by --blocking-factor"
-#~ msgstr "Op��o obsoleta, � agora \"-blocking-factor\" implica-a"
+#~ msgstr "Op��o obsoleta, � agora \"-blocking-factor\" implica-a"
#~ msgid "Obsolete option name replaced by --blocking-factor"
-#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--blocking-factor\""
+#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--blocking-factor\""
#~ msgid "Obsolete option name replaced by --read-full-records"
-#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--read-full-records\""
+#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--read-full-records\""
#~ msgid "Obsolete option name replaced by --touch"
-#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--touch\""
+#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--touch\""
#~ msgid "Conflicting archive format options"
-#~ msgstr "H� conflitos entre as op��es de formato do arquivo"
+#~ msgstr "H� conflitos entre as op��es de formato do arquivo"
#~ msgid "Obsolete option name replaced by --absolute-names"
-#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--absolute-names\""
+#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--absolute-names\""
#~ msgid "Obsolete option name replaced by --block-number"
-#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--block-number\""
+#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--block-number\""
#, fuzzy
#~ msgid "Obsolete option name replaced by --backup"
-#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--touch\""
+#~ msgstr "Nome de op��o obsoleto, foi substitu�do por \"--touch\""
#, fuzzy
#~ msgid "Error exit delayed from previous errors"
-#~ msgstr "Erro s� assinalado no fim da execu��o"
+#~ msgstr "Erro s� assinalado no fim da execu��o"
#, fuzzy
#~ msgid ""
@@ -3484,11 +3575,11 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ " --help display this help and exit\n"
#~ " --version output version information and exit\n"
#~ msgstr ""
-#~ "Os argumentos obrigat�rios para as op��es longas tamb�m o s�o para as "
+#~ "Os argumentos obrigat�rios para as op��es longas tamb�m o s�o para as "
#~ "curtas.\n"
#~ "\n"
-#~ " --help mostra esta informa��o e termina\n"
-#~ " --version identifica a vers�o e termina\n"
+#~ " --help mostra esta informa��o e termina\n"
+#~ " --version identifica a vers�o e termina\n"
#~ msgid "EOF? What does that mean?"
#~ msgstr "Fim-de-ficheiro? Que significa isto?"
@@ -3506,13 +3597,13 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "Tamanho"
#~ msgid "Missing filename after -C"
-#~ msgstr "Falta um nome de ficheiro ap�s \"-C\""
+#~ msgstr "Falta um nome de ficheiro ap�s \"-C\""
#~ msgid "Invalid date format in `-N %s'"
-#~ msgstr "Formato inv�lido para data em \"-N %s\""
+#~ msgstr "Formato inv�lido para data em \"-N %s\""
#~ msgid "Bad regular expression: %s"
-#~ msgstr "Express�o regular errada: %s"
+#~ msgstr "Express�o regular errada: %s"
#~ msgid "File %s\n"
#~ msgstr "Ficheiro %s\n"
@@ -3530,13 +3621,13 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "Fora do primeiro ciclo\n"
#~ msgid "Saved %d blocks, need %d more\n"
-#~ msgstr "Guardaram-se %d blocos, ainda s�o precisos %d\n"
+#~ msgstr "Guardaram-se %d blocos, ainda s�o precisos %d\n"
#~ msgid "New record\n"
#~ msgstr "Novo registo\n"
#~ msgid "Header type %d\n"
-#~ msgstr "Tipo de cabe�alho %d\n"
+#~ msgstr "Tipo de cabe�alho %d\n"
#~ msgid "File %s "
#~ msgstr "Ficheiro %s"
@@ -3568,7 +3659,7 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgid "Now new %d need %d keep %d keep_in %d block %d/%d\n"
#~ msgstr ""
#~ "Novos agora %d precisa %d mantem %d mantem dentro %d bloco %d/%d\n"
-#~ "(N.T. Isto tamb�m � incompreens�vel em Ingl�s)\n"
+#~ "(N.T. Isto tamb�m � incompreens�vel em Ingl�s)\n"
#, fuzzy
#~ msgid "Fore to %x\n"
@@ -3578,68 +3669,68 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ msgstr "Escreve-se o bloco\n"
#~ msgid "Could not make %s"
-#~ msgstr "N�o se conseguiu fazer %s"
+#~ msgstr "N�o se conseguiu fazer %s"
#~ msgid "Options [0-7][lmh] not supported by *this* tar"
-#~ msgstr "As op��es [0-7][lmh] n�o funcionam neste \"tar\""
+#~ msgstr "As op��es [0-7][lmh] n�o funcionam neste \"tar\""
#~ msgid "Cannot allocate %d bytes for restore"
-#~ msgstr "N�o se consegue reservar %d bytes para a recupera��o"
+#~ msgstr "N�o se consegue reservar %d bytes para a recupera��o"
#~ msgid "Saved %d recs, need %d more\n"
-#~ msgstr "Guardaram-se %d registos, ainda s�o precisos %d\n"
+#~ msgstr "Guardaram-se %d registos, ainda s�o precisos %d\n"
#~ msgid "Could not link %s to %s"
-#~ msgstr "N�o se conseguiu ligar %s a %s"
+#~ msgstr "N�o se conseguiu ligar %s a %s"
#~ msgid "%c: Argument missing"
#~ msgstr "%c: Falta argumento"
#~ msgid "Could not create directory %s"
-#~ msgstr "N�o se conseguiu criar a directoria %s"
+#~ msgstr "N�o se conseguiu criar a directoria %s"
#~ msgid "Cannot change to directory %d"
-#~ msgstr "N�o se pode mudar para a directoria %d"
+#~ msgstr "N�o se pode mudar para a directoria %d"
#~ msgid "rec %10ld: "
#~ msgstr "reg %10ld: "
#~ msgid "Flushing %d recs from %s\n"
-#~ msgstr "Est�o-se a esvaziar %d registos de um total de %s\n"
+#~ msgstr "Est�o-se a esvaziar %d registos de um total de %s\n"
#~ msgid "Multiple archive files requires --multi-volume"
-#~ msgstr "M�ltiplos ficheiros de arquivo exigem \"--multi-volume\""
+#~ msgstr "M�ltiplos ficheiros de arquivo exigem \"--multi-volume\""
#~ msgid "Cannot change directory to %d"
-#~ msgstr "N�o se pode mudar de directoria para %d"
+#~ msgstr "N�o se pode mudar de directoria para %d"
#~ msgid "[child] Pipe to stdin"
#~ msgstr "[filho] \"Pipe\" para o stdin"
#~ msgid "Cannot change owner of %s to uid %d gid %d"
-#~ msgstr "N�o se pode mudar o dono de %s para \"uid\" %d \"gid\" %d"
+#~ msgstr "N�o se pode mudar o dono de %s para \"uid\" %d \"gid\" %d"
#~ msgid "Cannot change mode of file %s to %lo"
-#~ msgstr "N�o se pode mudar o modo do ficheiro %s para %lo"
+#~ msgstr "N�o se pode mudar o modo do ficheiro %s para %lo"
#~ msgid "[child] Pipe to stdout"
#~ msgstr "[filho] \"Pipe\" para o stdout"
#~ msgid "Could not write to file %s"
-#~ msgstr "N�o se conseguiu escrever no ficheiro %s"
+#~ msgstr "N�o se conseguiu escrever no ficheiro %s"
#~ msgid "Blocksize = %d records"
#~ msgstr "Tamanho do bloco = %d registos"
#~ msgid "%s: %s: Cannot link to %s, copying instead\n"
#~ msgstr ""
-#~ "%s: %s: N�o � poss�vel fazer liga��o para %s, em vez disso, copia-se\n"
+#~ "%s: %s: N�o � poss�vel fazer liga��o para %s, em vez disso, copia-se\n"
#~ msgid "Cannot close a file #%d"
-#~ msgstr "N�o se consegue fechar o ficheiro de descritor %d"
+#~ msgstr "N�o se consegue fechar o ficheiro de descritor %d"
#~ msgid "Could not create symlink to %s"
-#~ msgstr "N�o se conseguiu criar uma liga��o (\"link\") simb�lica para %s"
+#~ msgstr "N�o se conseguiu criar uma liga��o (\"link\") simb�lica para %s"
#~ msgid "Now new %d need %d keep %d keep_in %d rec %d/%d\n"
#~ msgstr ""
@@ -3647,29 +3738,29 @@ msgstr "--Nomes de ficheiros truncados--\n"
#~ " (FIXME)"
#~ msgid "Too many args with -T option"
-#~ msgstr "Argumentos demais para a op��o \"-T\""
+#~ msgstr "Argumentos demais para a op��o \"-T\""
#~ msgid "New block\n"
#~ msgstr "Novo bloco\n"
#~ msgid "Invalid value for blocksize"
-#~ msgstr "Valor inv�lido para o tamanho do bloco"
+#~ msgstr "Valor inv�lido para o tamanho do bloco"
#~ msgid "Cannot chown file %s to uid %d gid %d"
-#~ msgstr "N�o se pode mudar o dono de %s para \"uid\" %d \"gid\" %d"
+#~ msgstr "N�o se pode mudar o dono de %s para \"uid\" %d \"gid\" %d"
#~ msgid "Cannot open a pipe"
-#~ msgstr "N�o se consegue abrir um \"pipe\""
+#~ msgstr "N�o se consegue abrir um \"pipe\""
#~ msgid "Could only write %d of %d bytes to file %s"
#~ msgstr ""
-#~ "S� se conseguiu escrever %d \"bytes\" de um total de %d, no ficheiro %s"
+#~ "S� se conseguiu escrever %d \"bytes\" de um total de %d, no ficheiro %s"
#~ msgid "Could not create file %s"
-#~ msgstr "N�o se conseguiu criar o ficheiro %s"
+#~ msgstr "N�o se conseguiu criar o ficheiro %s"
#~ msgid "Cannot keep old files on this system"
-#~ msgstr "N�o se consegue manter os ficheiros antigos neste sistema"
+#~ msgstr "N�o se consegue manter os ficheiros antigos neste sistema"
#~ msgid ""
#~ "Skip %ld\n"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 3ac45e370e3535c459cb6c443195161497134c75..3cede3eafe22be12af4a60a0dbd2b754aa81f616 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b4bb8610fb05aa4877208938fc0a58f49d46444c..8ed0f2f40c913edf9a36ded3cc0e3e44f0dab511 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,15 +12,15 @@
# based on the translation to Portuguese (pt) by
# António José Coutinho <ajc@di.uminho.pt>, 1996.
# Marcus Moreira de Souza <marcusms@frb.br>
-# Rafael Fontenelle <rffontenelle@gmail.com>, 2017.
-#: src/create.c:1599
+# Rafael Fontenelle <rafaelff@gnome.org>, 2017.
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2017-01-25 16:29-0200\n"
-"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-18 10:19-0200\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
"net>\n"
"Language: pt_BR\n"
@@ -108,7 +108,7 @@ msgid "give a short usage message"
msgstr "fornece uma mensagem de uso curta"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NOME"
@@ -146,29 +146,29 @@ msgid "write error"
msgstr "erro de escrita"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: a opção \"%s\" é ambígua\n"
+msgstr "%s: a opção \"%s%s\" é ambígua\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: a opção \"%s\" é ambígua; possibilidades:"
+msgstr "%s: a opção \"%s%s\" é ambígua; possibilidades:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: opção desconhecida \"%c%s\"\n"
+msgstr "%s: opção desconhecida \"%s%s\"\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: a opção \"%c%s\" não permite um argumento\n"
+msgstr "%s: a opção \"%s%s\" não permite um argumento\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: a opção \"--%s\" exige um argumento\n"
+msgstr "%s: a opção \"%s%s\" exige um argumento\n"
#: gnu/getopt.c:621
#, c-format
@@ -243,12 +243,12 @@ msgstr "^[+1SsyY]"
msgid "^[nN]"
msgstr "^[-0nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Empacotado por %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Empacotado por %s\n"
@@ -256,12 +256,11 @@ msgstr "Empacotado por %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -271,7 +270,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl."
+"Licença GPLv3+: GNU GPL versão 3 ou posterior <https://gnu.org/licenses/gpl."
"html>\n"
"Este é um software livre: você é livre para alterá-lo e redistribuí-lo.\n"
"NÃO HÁ QUALQUER GARANTIA, na máxima extensão permitida em lei.\n"
@@ -411,14 +410,13 @@ msgid "%s home page: <%s>\n"
msgstr "Página do %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Página do %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "Página do %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
-msgstr "Ajuda para uso de softwares GNU: <http://www.gnu.org/gethelp/>\n"
+msgstr "Ajuda para uso de softwares GNU: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -537,195 +535,195 @@ msgstr "Não foi possível redirecionar arquivos para o shell remoto"
msgid "Cannot execute remote shell"
msgstr "Não foi possível executar um shell remoto"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Direção de salto fora da faixa"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Direção de salto inválido"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Deslocamento de salto inválido"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Deslocamento de salto fora da faixa"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Contagem de byte inválida"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Contagem de byte fora de faixa"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Fim de arquivo (eof) prematuro"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Código de operação inválido"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Sem suporte à operação"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Argumentos inesperados"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Manipula uma unidade de fita, aceitando comandos de um processo remoto"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NUMERO"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "define nível de depuração"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "ARQUIVO"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "define nome do arquivo de saída do depuração"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "não foi possível abrir %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "número excessivo de argumentos"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Comando sem sentido"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Este não parece ser um arquivo-tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Total de bytes lidos"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Total de bytes escritos"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Total de bytes apagados"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(pipe)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Recusando a ler conteúdo do arquivo-tar a partir do terminal (faltando a "
"opção -f ?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"Recusando a escrever conteúdo do arquivo-tar para o terminal (faltando a "
"opção -f ?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Valor inválido para \"record_size\""
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Nome de arquivo-tar não informado"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr ""
"Não foi possível verificar arquivos-tar de entrada/saída padrão (stdin/"
"stdout)"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "O arquivo-tar está compactado. Use a opção %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Não foi possível atualizar arquivos-tar compactados"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "No início da fita, encerrando agora"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Muitos erros, encerrando"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Tamanho de registro = %lu bloco"
msgstr[1] "Tamanho de registro = %lu blocos"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Bloco desalinhado (%lu byte) no arquivo-tar"
msgstr[1] "Bloco desalinhado (%lu bytes) no arquivo-tar"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Não foi possível recuar no arquivo-tar; pode estar ilegível sem -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek não está parado numa fronteira de registro"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: contém um número de volume inválido"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Sobrecarga de número de volumes"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Prepare o volume #%d para %s e tecle Enter: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Fim de arquivo onde era esperado resposta do usuário"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "AVISO: O arquivo-tar está incompleto"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -737,67 +735,67 @@ msgstr ""
" q Aborta tar\n"
" y ou nova linha Continua operação\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Cria um subshell\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Mostra esta lista\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Nenhum volume novo; encerrando.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Nome de arquivo não foi especificado. Tente novamente.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Entrada inválida. Digite ? para ajuda.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "comando %s falhou"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s não é continuado neste volume"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s possivelmente é continuado neste volume: o cabeçalho contém o nome "
"truncado"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s é o tamanho errado (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Este volume está fora de sequência (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arquivo-tar não rotulado para casar com %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "O volume %s não casa com %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -805,214 +803,214 @@ msgstr ""
"%s: nome de arquivo muito longo para ser armazenado num cabeçalho GNU "
"multivolume, truncado"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "escrita não acabou numa fronteira de bloco"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Só foi possível ler %lu de %lu byte"
msgstr[1] "Só foi possível ler %lu de %lu bytes"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "O conteúdo é diferente"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Fim de arquivo inesperado no arquivo-tar"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "O tipo de arquivo é diferente"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Os modos são diferentes"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Os uid são diferentes"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Os gid são diferentes"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Os horários de modificação são diferentes"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Os tamanhos são diferentes"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Sem link para %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "O link simbólico é diferente"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "O número de dispositivo é diferente"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verificar "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
"%s: Tipo de arquivo \"%c\" desconhecido, comparado como um arquivo normal"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "O arquivo-tar contém nomes de arquivos com os prefixos removidos."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "O arquivo-tar contém nomes de arquivos transformados."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "A verificação pode falhar em localizar os arquivos originais."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "ERRO DE VERIFICAÇÃO: detectado %d cabeçalho inválido"
msgstr[1] "ERRO DE VERIFICAÇÃO: detectados %d cabeçalhos inválidos"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Bloco de zero isolado em %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: contém um rótulo %s de diretório cache; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "valor %s fora da faixa %s: %s..%s; substituindo %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "valor %s fora da faixa %s: %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Gerando cabeçalhos octais negativos"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: nome de arquivo é grande demais (máximo de %d); não será arquivado"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
"%s: nome de arquivo é grande demais (não pode ser dividido); não será "
"arquivado"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: nome de link grande demais; não será arquivado"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: O arquivo diminuiu %s byte; completando com zeros"
msgstr[1] "%s: O arquivo diminuiu %s bytes; completando com zeros"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: arquivo está em outro sistema de arquivos; não será arquivado"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "conteúdos não despejado"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Tipo de arquivo desconhecido; arquivo ignorado"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Faltando links para %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: arquivo sem alterações; não será arquivado"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: arquivo é o arquivo-tar; não será arquivado"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "diretório não arquivado"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: arquivo alterado enquanto estava sendo lido"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: soquete ignorado"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: porta ignorada"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Pulando para o próximo cabeçalho"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Removendo um não-cabeçalho do arquivo-tar"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: carimbo de data/hora implausivelmente velho %s"
# O "s" solitário refere-se a segundos. Não remover -- Rafael
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: o carimbo de data/hora %s está %s s no futuro"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Inconsistência inesperada ao criar diretório"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: ignorando arquivo existente"
@@ -1036,7 +1034,7 @@ msgid "%s: Cannot extract -- file is continued from another volume"
msgstr ""
"%s: Não foi possível extrair -- arquivo é a continuação de outro volume"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Nome longo de cabeçalho inesperado"
@@ -1051,9 +1049,9 @@ msgid "Current %s is newer or same age"
msgstr "%s atual é mais novo ou tem a mesma idade"
#: src/extract.c:1664
-#, fuzzy, c-format
+#, c-format
msgid "%s: Member name contains '..'"
-msgstr "%s: O nome do membro contém `..'"
+msgstr "%s: O nome do membro contém \"..\""
#: src/extract.c:1696
#, c-format
@@ -1065,22 +1063,22 @@ msgstr "%s: Não foi possível fazer backup deste arquivo"
msgid "Cannot rename %s to %s"
msgstr "Não foi possível renomear %s para %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: O diretório foi renomeado de %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: O diretório é novo"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: O diretório está em outro sistema de arquivos; não será arquivado"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: O diretório foi renomeado"
@@ -1208,35 +1206,35 @@ msgstr "%s: Removendo %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Não foi possível remover"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Omitindo"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "bloco %s: ** Bloco de NULOs **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "bloco %s: ** Fim de arquivo **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "bloco %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Espaço em branco no cabeçalho onde valor numérico %s era esperado"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1244,160 +1242,160 @@ msgstr ""
"complemento de dois"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "O valor octal do arquivo-tar %.*s está fora de faixa %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "O arquivo-tar contém cabeçalhos base-64 obsoletos"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "A string base-64 assinada do arquivo-tar %s está fora de faixa %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "O valor base-256 de arquivo-tar está fora da faixa %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "O arquivo-tar contém %.*s onde valor numérico %s era esperado"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "O valor do arquivo-tar %s está fora da faixa %s: %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " link para %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " tipo de arquivo \"%s\" desconhecido\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Link Longo--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Nome Longo--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Cabeçalho de volume--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Continua no byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Criando de diretório:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renomeando %s para %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Não foi possível renomear para %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Renomeando %s de volta para %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Arquivo removido antes de ser lido"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "processo filho"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "canal interprocesso"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Seleção de nome de arquivo local:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"adiciona ARQUIVO dado ao arquivo-tar (útil se seu nome se inicia com um "
"traço)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "muda para o diretório DIR"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "obtém nomes para extrair ou criar a partir de ARQUIVO"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T lê nomes de terminação nula, implica em --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "desabilita o efeito da opção --null anterior"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "remove citação de nomes de membros ou arquivos de entrada (padrão)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "não remove citação de nomes de membros ou arquivos de entrada"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T lê nomes de arquivos literalmente (sem tratamento de opção)"
+msgstr ""
+"-T lê nomes de arquivos literalmente (sem escape ou tratamento de opção)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "-T trata nomes de arquivos iniciando com traço como opções (padrão)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "PADRÃO"
# espaço adicionado para corrigir alinhamento da descrição da opção -- Rafael
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr " exclui arquivos, dados como um PADRÃO"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "exclui padrões listados em ARQUIVO"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1405,24 +1403,24 @@ msgstr ""
"exclui conteúdos de diretórios contendo CACHEDIR.TAG, exceto pela própria "
"etiqueta de arquivo"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "exclui tudo sob diretórios contendo CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "exclui diretórios contendo CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"exclui conteúdo dos diretórios contendo ARQUIVO, exceto o próprio ARQUIVO"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "lê padrões de exclusão para cada diretório de ARQUIVO, se ele existir"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1430,118 +1428,122 @@ msgstr ""
"lê padrões de exclusão para cada diretório e seus subdiretórios de ARQUIVO, "
"se ele existir"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "exclui tudo sob diretórios contendo ARQUIVO"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "exclui diretórios contendo ARQUIVO"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "exclui diretórios de sistema de controle de versão"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "lê padrões de exclusão de arquivos \"ignore\" de VCS"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "exclui arquivos de backup e de trava"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "age recursivamente na árvore de diretórios (padrão)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "não desce pela árvore de diretórios"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Opções de correspondência de nome de arquivo (afeta ambos padrões de "
"exclusão e inclusão):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "padrões combinam com início do nome do arquivo"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "padrões combinam depois de qualquer \"/\" (padrão para exclusão)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "ignora maiúsculas/minúsculas"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "diferencia maiúsculas/minúsculas (padrão)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "usam coringas (padrão para exclusão)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "casa com o conteúdo exato da string"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "coringas combinam com \"/\" (padrão para exclusão)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "coringas não combinam com \"/\""
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"As seguintes opções foram usadas após qualquer argumento não opcional no "
+"modo de criação ou atualização de arquivo. Essas opções são posicionais e "
+"afetam apenas os argumentos que os seguem. Por favor, reorganize-os "
+"adequadamente."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s possui nenhum efeito"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s possui nenhum efeito"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s possui nenhum efeito"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "linha de comando"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: a lista de arquivos requisitada de %s já foi lida de %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "não foi possível dividir a string \"%s\": %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: nome de arquivo lido contém caractere nulo"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Padrão correspondente a caracteres usados em nomes de arquivos"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1549,47 +1551,47 @@ msgstr ""
"Use --wildcards para habilitar casamento de padrão, ou --no-wildcards para "
"suprimir este aviso"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Não foi encontrado no arquivo-tar"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Ocorrência pedida não foi encontrada no arquivo-tar"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Arquivo-tar não rotulado para casar"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Usar a opção -C dentro de lista de arquivos não é permitido com --listed-"
"incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Somente uma opção -C é permitida com --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Ambas as opções \"%s\" e \"%s\" exigem a entrada padrão"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Formato de arquivo inválido"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Desejadas características GNU num arquivo-tar com formato incompatível"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1813,7 +1815,7 @@ msgstr "Seleção de fluxo de saída:"
msgid "extract files to standard output"
msgstr "extrai arquivos para a saída padrão"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "COMANDO"
@@ -1849,7 +1851,7 @@ msgstr "usa ARQUIVO para mapear UIDs e nomes de donos de arquivos"
msgid "use FILE to map file owner GIDs and names"
msgstr "usa ARQUIVO para mapear GIDs e nomes de donos de arquivos"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATA-OU-ARQUIVO"
@@ -2069,7 +2071,7 @@ msgstr "refaz blocos na medida em que os lê (para redirecionamentos de 4.2BSD)"
msgid "Archive format selection:"
msgstr "Seleção do formato de arquivo-tar:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMATO"
@@ -2155,63 +2157,63 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "filtra através de PROG (deve aceitar -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Seleção de arquivo local:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr ""
"permanece no sistema de arquivos local durante a criação de arquivo-tar"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "preserva \"/\"s iniciais nos nomes dos arquivos"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"segue links simbólicos; arquiva e despeja os arquivos aos quais eles apontam"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"segue links absolutos; arquiva e despeja os arquivos aos quais eles fazem "
"referência"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "NOME-MEMBRO"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "inicia em NOME-MEMBRO membro ao ler o arquivo-tar"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "armazena apenas arquivos mais novos que DATA-OU-ARQUIVO"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATA"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "compara data e hora apenas quando os dados mudarem"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "CONTROLE"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "efetua backup antes da remoção, escolhe versão CONTROLE"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "STRING"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2219,60 +2221,60 @@ msgstr ""
"cria backup antes da remoção, sobrescreve sufixo usual (\"~\" a menos que "
"sobrescrito pela variável de ambiente SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Transformações de nome de arquivo:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
"remove NUMERO no início de componentes de nomes de arquivos na extração"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "EXPRESSÃO"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "usa a substituição sed EXPRESSÃO para transformar nomes de arquivos"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Saída informativa:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "lista verbosamente os arquivos processados"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "PALAVRA-CHAVE"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "controle de aviso"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "exibe mensagens de progresso a cada NUMERO-ésima gravação (padrão 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "AÇÃO"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "executa AÇÃO em cada ponto de verificação"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "exibe uma mensagem se nem todos links forem arquivados"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SINAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2284,35 +2286,35 @@ msgstr ""
"SIGQUIT, SIGINT, SIGUSR1 e SIGUSR2; os nomes sem o prefixo SIG também são "
"aceitos"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "exibe tempos de modificação de arquivo em UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "exibe tempo do arquivo em sua resolução máxima"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "envia saída verbosa para ARQUIVO"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "mostra número de bloco dentro de arquivo-tar com cada mensagem"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "solicita confirmação para cada ação"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "mostra padrões do tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "mostra intervalos válidos para campos de arquivo instantâneo"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2320,55 +2322,55 @@ msgstr ""
"ao listar ou extrair, lista cada diretório que não casa com os critérios de "
"pesquisa"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "mostra nomes de arquivo ou arquivo-tar após transformação"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "ESTILO"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"define o estilo de citação de nome; veja abaixo por valores válidos para "
"ESTILO"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "adicionalmente, cita caracteres de STRING"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "desabilita citação para caracteres de STRING"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Opções de compatibilidade:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
"ao criar, mesmo que --old-archive; ao extrair, mesmo que --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Outras opções:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "desabilita o uso de algumas opções potencialmente nocivas"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" não pode ser usada com \"%s\""
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2376,40 +2378,40 @@ msgstr ""
"Você não pode especificar mais do que uma das opções \"-Acdtrux\", \"--delete"
"\" ou \"--test-label\""
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Opções de compressão conflitantes"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Nome de sinal desconhecido: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Arquivo de datas não localizado"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Substituindo %s pelo formato de data desconhecido %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Opção %s: Tratando data \"%s\" como %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtra o arquivo-tar por meio de %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Argumentos válidos para a opção --quoting-style são:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2417,165 +2419,165 @@ msgstr ""
"\n"
"*Esse* tar utiliza como padrão:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "ID de dono ou grupo inválido"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Fator de blocagem inválido"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Tamanho da fita inválido"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Valor inválido de nível de incrementação"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Mais do que uma data limite"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Valor inválido de versão esparsa"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "Sem suporte a --atime-preserve=\"system\" nesta plataforma"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "Valor de --checkpoint não é um inteiro"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Modo inválido dado na opção"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Número inválido"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Tamanho de registro inválido"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "O tamanho dos registros tem que ser múltiplo de %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Número de elementos inválido"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Somente uma opção --to-command permitida"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Argumento de densidade malformado: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Densidade desconhecida: \"%c\""
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Sem suporte às opções \"-[0-7][lmh]\" por *este* tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: localização do erro"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "erro ao analisar \"%s\""
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[ARQUIVO]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "argumentos de não-opção em %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "não foi possível dividir TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "A opção antiga \"%c\" exige um argumento."
# "--occurrence" é opção de linha de comando -- Rafael
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence não tem sentido sem uma lista de arquivos"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Múltiplos arquivos-tar exigem a opção \"-M\""
# "--level" e "--listed-incremental" são opções de linha de comando -- Rafael
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level não tem sentido sem --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: O rótulo do volume é longo demais (o limite é %lu byte)"
msgstr[1] "%s: O rótulo do volume é longo demais (o limite é %lu bytes)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Não foi possível verificar arquivos-tar multivolume"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Não foi possível verificar arquivos-tar compactados"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Não foi possível usar arquivos-tar multivolume compactados"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Não foi possível concatenar arquivos-tar compactados"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime precisa que uma data seja especificada usando --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option pode ser usada apenas em arquivos-tar POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls pode ser usada apenas em arquivos-tar POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux pode ser usada apenas em arquivos-tar POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs pode ser usada apenas em arquivos-tar POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2583,129 +2585,138 @@ msgstr ""
"Não foi possível deduzir nome de arquivo topo de nível; por favor defina-o "
"explicitamente com --one-top-level=DIR"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Tamanho do volume não pode ser menor que o tamanho do registro"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Recusando a criar um arquivo-tar vazio"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "As opções \"-Aru\" são incompatíveis com \"-f -\""
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Você deve especificar uma das opções \"-Acdtrux\", \"--delete\" ou \"--test-"
"label\""
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Saindo com status de falha em razão de erros anteriores"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: O arquivo encolheu %s byte"
msgstr[1] "%s: O arquivo encolheu %s bytes"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Palavra-chave %s não é conhecida ou ainda não está implementada"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Carimbo de data/hora fora da faixa permitida"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "O padrão %s não pode ser usado"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "A palavra-chave %s não pode ser sobrescrita"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Cabeçalho estendido malformado: falta o tamanho"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "O tamanho do cabeçalho estendido %*s está fora da faixa"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Cabeçalho estendido malformado: falta espaço após o tamanho"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Cabeçalho estendido malformado: falta sinal de igual"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Cabeçalho estendido malformado: falta nova-linha"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ignorando chave \"%s\" desconhecida do cabeçalho estendido"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Par de chave/valor gerado é muito longo (chave=%s, tamanho=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Cabeçalho estendido %s=%s está fora da faixa %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Cabeçalho estendido malformado: %s=%s inválido"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Cabeçalho estendido malformado: excesso %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Cabeçalho estendido malformado: %s inválido: delimitador %c inesperado"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Cabeçalho estendido malformado: %s inválido: número ímpar de valores"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: não é um limite de tempo válido"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: ação do ponto de verificação desconhecida"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "escreva"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "leia"
@@ -2713,7 +2724,7 @@ msgstr "leia"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Ponto de verificação de escrita %u"
@@ -2722,13 +2733,13 @@ msgstr "Ponto de verificação de escrita %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Ponto de verificação de leitura %u"
# genfile é o nome do programa; não traduzir -- Rafael
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2737,96 +2748,100 @@ msgstr ""
"GNU.\n"
"OPÇÕES são:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Opções de criação do arquivo:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "TAM"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Cria arquivo com tamanho TAM"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Escreve no arquivo NOME ao invés da saída padrão"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Lê nomes de arquivos a partir de ARQUIVO"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T lê nomes com terminação nula"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Preenche o arquivo com o PADRÃO dado. PADRÃO é \"default\" ou \"zeros\""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Tamanho de um bloco para arquivo esparso"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Gera arquivo esparso. O resto da linha de comando dá o mapa de arquivos."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "POSIÇÃO"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Procura pela posição dada antes de escrever os dados"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Suprime mensagens diagnóstico não-fatais"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Opções de estatísticas do arquivo:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Exibe conteúdos de estado de estrutura para cada arquivo dado. FORMATO "
"padrão é: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Opções de execução síncrona:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPÇÃO"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Executa ARGS. Útil com --checkpoint e um entre --cut, --append, --touch e --"
"unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Executa a ação dada (ver abaixo) ao atingir o ponto de verificação NUMERO"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Define a data para a próxima opção --touch"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Exibe pontos de verificação executados e status de saída de COMANDO"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2834,7 +2849,7 @@ msgstr ""
"Ações síncronas de execução. Estas são executadas quando o número de ponto "
"de verificação informado pela opção --checkpoint é atingido."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2842,125 +2857,125 @@ msgstr ""
"Trunca ARQUIVO para o tamanho especificado pela opção --length anterior (ou "
"0, se não for informado)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Adiciona TAM bytes ao arquivo ARQUIVO. O TAM é informado pela opção --length "
"anterior."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Atualiza os tempos de modificação e de acesso do ARQUIVO"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Executa COMANDO"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Exclui ARQUIVO"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Tamanho inválido: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Número fora do alcance permitido: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Tamanho negativo: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) falhou"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "tamanho de arquivo requisitado %lu, de fato %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "o arquivo criado não é esparso"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Erro ao analisar o número próximo a \"%s\""
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGS...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "não foi possível abrir \"%s\""
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "não foi possível saltar"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "o nome de arquivo contém caractere nulo"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"não foi possível gerar arquivos esparsos na saída padrão, use a opção --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "máscara incorreta (próximo a \"%s\")"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Campo \"%s\" desconhecido"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "não foi possível definir tempo em \"%s\""
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "não foi possível truncar \"%s\""
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "o comando falhou: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "não foi possível truncar \"%s\""
+msgstr "não foi possível obter status de \"%s\""
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "não foi possível definir tempo em \"%s\""
+msgstr "não foi possível remover diretório \"%s\""
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "não foi possível desfazer link simbólico \"%s\""
@@ -3000,6 +3015,9 @@ msgstr "Comando terminado\n"
msgid "--stat requires file names"
msgstr "--stat exige nomes de arquivos"
+#~ msgid "OPTION"
+#~ msgstr "OPÇÃO"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: O parâmetro ARGP_HELP_FMT deve ser positivo"
diff --git a/po/ro.gmo b/po/ro.gmo
index 27894dff70dc75ecc09b2936bd4b82271444744e..03dab73323f29ba4757e328a2d0d932897520108 100644
Binary files a/po/ro.gmo and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
index d54b7363a761c2d51c59a475a6af4f543ec6cb61..7f0ee385cf73cd72964f22fb1a017925e9c4b5c8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,12 +3,12 @@
# Laurentiu Buzdugan <lbuz@rolix.org>>, 2005.
#
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar 1.15.1\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2005-07-15 12:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -99,7 +99,7 @@ msgid "give a short usage message"
msgstr "Afi�eaz� un scurt mesaj despre folosire"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NUME"
@@ -235,12 +235,12 @@ msgstr ""
msgid "^[nN]"
msgstr ""
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr ""
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr ""
@@ -248,11 +248,11 @@ msgstr ""
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr ""
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -500,54 +500,54 @@ msgstr "Nu pot executa shell remote"
msgid "Cannot execute remote shell"
msgstr "Nu pot executa shell remote"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Direc�ie c�utare (seek direction) �n afara domeniului"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
#, fuzzy
msgid "Invalid seek direction"
msgstr "Mod invalid furnizat ca op�iune"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
#, fuzzy
msgid "Invalid seek offset"
msgstr "�nregistrare timp invalid�"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Decalaj c�utare (seek offset) �n afara domeniului"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
#, fuzzy
msgid "Invalid byte count"
msgstr "Lungime de band� invalid�"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
#, fuzzy
msgid "Byte count out of range"
msgstr "Decalaj c�utare (seek offset) �n afara domeniului"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
#, fuzzy
msgid "Premature eof"
msgstr "rmtd: eof prematur\n"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
#, fuzzy
msgid "Invalid operation code"
msgstr "Mod de operare principal:"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr ""
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
#, fuzzy
msgid "Unexpected arguments"
msgstr "EOF nea�teptat �n numele amestecate"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
#, fuzzy
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
@@ -557,147 +557,147 @@ msgstr ""
" --version Afi�eaz� informa�ii versiune.\n"
" --help Afi�eaz� acest mesaj.\n"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NUM�R"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr ""
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FI�IER"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr ""
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr ""
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr ""
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Comand� gunoi"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Aceasta nu pare a fi o arhiv� tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr ""
-#: src/buffer.c:592
+#: src/buffer.c:594
#, fuzzy
msgid "Total bytes written"
msgstr "Num�r total octe�i scri�i: %s (%s, %s/s)\n"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr ""
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(pipe)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Valoare invalid� pentru record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Nume arhiv� nu a fost furnizat"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Nu pot verifica arhive atdin/stdout"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Arhiva este compresat�. Folosi�i op�iunea %s."
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Nu pot actualiza arhive comprimate"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "La �nceputul benzii, ie�im acum"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Prea multe erori, ie�im"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Dimensiune �nregistrare = %lu bloc"
msgstr[1] "Dimensiune �nregistrare = %lu blocuri"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Bloc ne-aliniat (%lu octet) �n arhiv�"
msgstr[1] "Bloc ne-aliniat (%lu octe�i) �n arhiv�"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Nu pot backspace fi�ierul arhiv�; acesta ar putea fi de necitit f�r� -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek nu s-a oprit la limita unei �nregistr�ri"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: con�ine num�r volum invalid"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Dep�ire domeniu num�r volum"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Prepar� volum #%d pentru %s �i apas� tasta return: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "EOF unde era a�teptat r�spunsul utilizatorului"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "AVERTISMENT: Arhiva este incomplet�"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, fuzzy, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -709,279 +709,279 @@ msgstr ""
" ! Lanseaz� un subshell\n"
" ? Afi�eaz� aceast� list� de op�iuni\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr ""
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr ""
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Nici un volum nou; termin�m.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr ""
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr ""
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, fuzzy, c-format
msgid "%s command failed"
msgstr "`%s' comanda a e�uat"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s nu este continuat pe acest volum"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, fuzzy, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s nu este continuat pe acest volum"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s este de dimensiune gre�it� (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, fuzzy, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Acest volum este �n afara secven�ei"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arhiva nu este etichetat� s� se potriveasc� cu %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Volumul %s nu se potrive�te cu %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, fuzzy, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
"%s: nume fi�ier prea lung pentru a fi storat �ntr-un antet GNU multivolum"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
#, fuzzy
msgid "write did not end on a block boundary"
msgstr "rmtlseek nu s-a oprit la limita unei �nregistr�ri"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Am putut citi doar %lu din %lu octet"
msgstr[1] "Am putut citi doar %lu din %lu octe�i"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Con�inuturile difer�"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "EOF nea�teptat �n arhiv�"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Tipul fi�ierelor difer�"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Modurile difer�"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid difer�"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid difer�"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Timp modificare difer�"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Dimensiunea difer�"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Nu este link-at c�tre %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symlink difer�"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Num�r dispozitiv difer�"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verific� "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
"%s: Tip de fi�ier necunoscut '%c', folosesc diff ca pentru un fi�ier normal"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Arhiva con�ine nume de fi�iere cu prefixele �ndep�rtate."
-#: src/compare.c:541
+#: src/compare.c:540
#, fuzzy
msgid "Archive contains transformed file names."
msgstr "Arhiva con�ine antete �n baza-64 dep�ite"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Verificare ar putea e�ua s� g�seasc� fi�ierele originale."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "VERIFIC� E�EC: detectat %d antet invalid"
msgstr[1] "VERIFIC� E�EC: detectat %d antete invalide"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Un bloc zero singuratic la %s"
-#: src/create.c:74
+#: src/create.c:73
#, fuzzy, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: con�ine o etichet� de director cache; nimic generat"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "valoarea %s �n afara %s intervalului %s..%s; �nlocuiesc %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "valoarea %s �n afara %s intervalului %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Generez antete octale negative"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: numele fi�ierul este prea lung (maxim %d); nimic generat"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: numele fi�ierul este prea lung (nu poate fi spart); nimic generat"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: numele link-ului este prea lung; nimic generat"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Fi�ier scurtat cu %s octet; completat cu zerouri"
msgstr[1] "%s: Fi�ier scurtat cu %s octe�i; completat cu zerouri"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: fi�ierul este pe un sistem de fi�iere diferit; nimic generat"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr ""
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Tip de fi�ier necunoscut; fi�ier ignorat"
-#: src/create.c:1576
+#: src/create.c:1575
#, fuzzy, c-format
msgid "Missing links to %s."
msgstr "Link lips� c�tre '%s'.\n"
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: fi�ierul este neschimbat; nimic generat"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: fi�ierul este �n arhiv�; nimic generat"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
#, fuzzy
msgid "directory not dumped"
msgstr "%s: con�ine o etichet� de director cache; nimic generat"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: fi�ier schimbat �n timp ce �l citeam"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: socket ignorat"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: u�� ignorat�"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "S�rim la urm�torul antet"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "�tergem non-antet din arhiv�"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: �nregistrare de timp neverosimil� %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, fuzzy, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: �nregistrare timp %s este %lu sec �n viitor"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Inconsisten�� nea�teptat� c�nd cream directorul"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr ""
@@ -1004,7 +1004,7 @@ msgstr "
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Nu pot extrage -- fi�ierul este continuat din alt� arhiv�"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
#, fuzzy
msgid "Unexpected long name header"
msgstr "EOF nea�teptat �n numele amestecate"
@@ -1034,22 +1034,22 @@ msgstr "%s: Nu am putut arhiva (backup) acest fi
msgid "Cannot rename %s to %s"
msgstr "%s: Nu pot redenumi ca %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, fuzzy, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Directorul a fost redenumit"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Directorul este nou"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, fuzzy, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: fi�ierul este pe un sistem de fi�iere diferit; nimic generat"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Directorul a fost redenumit"
@@ -1177,35 +1177,35 @@ msgstr "%s:
msgid "%s: Cannot remove"
msgstr "%s: Nu pot �terge"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Omis"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "bloc %s: ** Bloc de NUL-uri **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "bloc %s: ** Sf�r�it de fi�ier **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "bloc %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Spa�ii libere �n antet unde valoare %s numeric� a�teptat�"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1213,354 +1213,354 @@ msgstr ""
"lui doi"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Valoare octal� arhiv� %.*s este �n afara %s intervalului"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arhiva con�ine antete �n baza-64 dep�ite"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "�ir �n baza-64 (semn�tura arhivei) %s este �n afara %s intervalului"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Valoare baza-256 a arhivei este �n afara %s intervalului"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arhiva con�ine %.*s unde valoare %s numeric� a�teptat�"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, fuzzy, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Valoare arhiv� %s este �n afara %s intervalului %s.%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " link c�tre %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " tip fi�ier necunoscut %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Link Lung--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Nume Lung--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Antet Volum--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Continuat la octet %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Creez director:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Redenumesc %s ca %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Nu pot redenumi ca %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Redenumesc %s �napoi ca %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Fi�ier �ters �nainte de a-l putea citi"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "proces copil"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "canal �ntre-procese"
-#: src/names.c:69
+#: src/names.c:68
#, fuzzy
msgid "Local file name selection:"
msgstr "Selec�ie fi�ier local:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "schimb� �n directorul DIR"
-#: src/names.c:76
+#: src/names.c:75
#, fuzzy
msgid "get names to extract or create from FILE"
msgstr "ob�ine numele de extras sau creat din fi�ierul NUME"
-#: src/names.c:78
+#: src/names.c:77
#, fuzzy
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T cite�te nume terminate cu null, deactiveaz� cu -C"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr ""
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "PATTERN"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "exclude fi�iere, date ca un PATTERN"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "pattern-urile de excludere sunt listate �n FI�IER"
-#: src/names.c:96
+#: src/names.c:95
#, fuzzy
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr "exclude directoarele ce con�in o etichet� cache"
-#: src/names.c:99
+#: src/names.c:98
#, fuzzy
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "exclude directoarele ce con�in o etichet� cache"
-#: src/names.c:102
+#: src/names.c:101
#, fuzzy
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "exclude directoarele ce con�in o etichet� cache"
-#: src/names.c:104
+#: src/names.c:103
#, fuzzy
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "exclude directoarele ce con�in o etichet� cache"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-#: src/names.c:113
+#: src/names.c:112
#, fuzzy
msgid "exclude everything under directories containing FILE"
msgstr "exclude directoarele ce con�in o etichet� cache"
-#: src/names.c:115
+#: src/names.c:114
#, fuzzy
msgid "exclude directories containing FILE"
msgstr "exclude directoarele ce con�in o etichet� cache"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr ""
-#: src/names.c:119
+#: src/names.c:118
#, fuzzy
msgid "read exclude patterns from the VCS ignore files"
msgstr "pattern-urile de excludere sunt �iruri simple"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr ""
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "coboar� recursiv �n directoare (implicit)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "evit� cobor�rea automat� �n directoare"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
-#: src/names.c:133
+#: src/names.c:132
#, fuzzy
msgid "patterns match file name start"
msgstr "pattern-urile de excludere potrivesc �nceputul numelor de fi�iere"
-#: src/names.c:135
+#: src/names.c:134
#, fuzzy
msgid "patterns match after any '/' (default for exclusion)"
msgstr "pattern-urile de excludere potrivesc dup� orice / (implicit)"
-#: src/names.c:137
+#: src/names.c:136
#, fuzzy
msgid "ignore case"
msgstr "�n excluderi ignor� cazul caracterelor (minuscule/majuscule)"
-#: src/names.c:139
+#: src/names.c:138
#, fuzzy
msgid "case sensitive matching (default)"
msgstr "excluderea depinde de caz (minuscule/majuscule) (implicit)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr ""
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr ""
-#: src/names.c:145
+#: src/names.c:144
#, fuzzy
msgid "wildcards match '/' (default for exclusion)"
msgstr "wildcard-urile din pattern-urile de excludere potrivesc '/' (implicit)"
-#: src/names.c:147
+#: src/names.c:146
#, fuzzy
msgid "wildcards do not match '/'"
msgstr "wildcard-urile �n pattern-urile de excludere nu potrivesc '/'"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
#, fuzzy
msgid "command line"
msgstr "`%s' comanda a e�uat"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr ""
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr ""
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr ""
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr ""
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Nu a fost g�sit �n arhiv�"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Lucrul cerut nu a fost g�sit �n arhiv�"
-#: src/names.c:1413
+#: src/names.c:1443
#, fuzzy, c-format
msgid "Archive label mismatch"
msgstr "Arhiva nu este etichetat� s� se potriveasc� cu %s"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
-#: src/tar.c:88
+#: src/tar.c:87
#, fuzzy, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Op�iunile `-%s' �i `-%s' vor am�ndou� intrarea standard"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Format arhiv� invalid"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Capabilit��i GNU cerute pentru un format de arhiv� incompatibil"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1800,7 +1800,7 @@ msgstr ""
msgid "extract files to standard output"
msgstr "extrage fi�ierele la ie�irea standard"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "COMAND�"
@@ -1837,7 +1837,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATA-FI�IERULUI"
@@ -2042,7 +2042,7 @@ msgstr "redimensioneaz
msgid "Archive format selection:"
msgstr "Selec�ie format arhiv�:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2131,61 +2131,61 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "filtreaz� prin PROG (trebuie s� accepte -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Selec�ie fi�ier local:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "stai �n sistemul de fi�ire local la creare arhivei"
-#: src/tar.c:693
+#: src/tar.c:694
#, fuzzy
msgid "don't strip leading '/'s from file names"
msgstr "nu elimina primul `/' din numele fi�ierelor"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "NUME-MEMBRU"
-#: src/tar.c:699
+#: src/tar.c:700
#, fuzzy
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "�ncepe la membrul NUME-MEMBRU �n arhiv�"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "stocheaz� numai fi�iere mai noi dec�t DATA-FI�IERULUI"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATA"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "compar� data �i timpul numai c�nd a fost schimbat� data"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "CONTROL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "f� backup �nainte de �tergere, alege CONTROL pentru versiuni"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "�IR"
-#: src/tar.c:708
+#: src/tar.c:709
#, fuzzy
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
@@ -2194,61 +2194,61 @@ msgstr ""
"f� backup �nainte de �tergere, �nlocuie�te prefixul normal ('~' �n afar� de "
"cazul c�nd este determinat de variabila de mediu SIMPLE_BACKUP_SUFFIX"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr ""
-#: src/tar.c:715
+#: src/tar.c:716
#, fuzzy
msgid "strip NUMBER leading components from file names on extraction"
msgstr "elimin� NUM�R componente de la �nceputul numelor fi�ierelor"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr ""
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Ie�ire informativ�:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "listeaz� cu am�nunte fi�ierele procesate"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr ""
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr ""
-#: src/tar.c:731
+#: src/tar.c:732
#, fuzzy
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "afi�eaz� mesaje despre progres la fiecare al 10-a �nregistrare"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr ""
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr ""
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "afi�eaz� un mesaj dac� nu toate link-urile sunt prelucrate"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr ""
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2256,37 +2256,37 @@ msgid ""
"accepted"
msgstr ""
-#: src/tar.c:744
+#: src/tar.c:745
#, fuzzy
msgid "print file modification times in UTC"
msgstr "afi�eaz� datele de modificare a fi�ierelor �n UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr ""
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "trimite ie�ire detaliat� �n FI�IER"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "arat� num�rul blocului din arhiv� pentru fiecare mesaj"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "cere confirmare pentru fiecare ac�iune"
-#: src/tar.c:755
+#: src/tar.c:756
#, fuzzy
msgid "show tar defaults"
msgstr "Arat� valorire implicite folosite de tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
-#: src/tar.c:759
+#: src/tar.c:760
#, fuzzy
msgid ""
"when listing or extracting, list each directory that does not match search "
@@ -2295,94 +2295,94 @@ msgstr ""
"La listare sau extragere, listeaz� fiecare director care nu se potrive�te cu "
"criteriile de c�utare"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr ""
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr ""
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr ""
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr ""
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Op�iuni compatibilitate:"
-#: src/tar.c:777
+#: src/tar.c:778
#, fuzzy
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr "la creare, ca �i --old-archive. La extragere, ca �i --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Alte op�iuni:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr ""
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, fuzzy, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s: Nu pot c�uta (seek) c�tre %s"
-#: src/tar.c:933
+#: src/tar.c:934
#, fuzzy
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "Nu pute�i specifica mai mult de una dintre op�iunile `-Acdtrux'"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Op�iunile de compresie sunt �n conflict"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, fuzzy, c-format
msgid "Unknown signal name: %s"
msgstr " tip fi�ier necunoscut %s\n"
-#: src/tar.c:1028
+#: src/tar.c:1030
#, fuzzy
msgid "Date sample file not found"
msgstr "Fi�ier date nu a fost g�sit"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "�nlocuim %s pentru format de dat� necunoscut %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, fuzzy, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Tratez data `%s' ca %s + %ld nanosecund�"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, fuzzy, c-format
msgid "filter the archive through %s"
msgstr "filtreaz� arhiva prin gzip"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr ""
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2390,302 +2390,311 @@ msgstr ""
"\n"
"*Acest* tar folose�te implicit:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
#, fuzzy
msgid "Invalid owner or group ID"
msgstr "Proprietar invalid"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Factor blocuri invalid"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Lungime de band� invalid�"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr ""
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Mai mult de o singur� dat� limit�"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr ""
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr ""
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr ""
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Mod invalid furnizat ca op�iune"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Num�r invalid"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Dimensiune �nregistrare invalid�"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Dimensiune �nregistrare trebuie s� fie un multiplu de %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Num�r invalid de elemente"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr ""
-#: src/tar.c:2023
+#: src/tar.c:2032
#, fuzzy, c-format
msgid "Malformed density argument: %s"
msgstr "Argument densitate malformat: '%s'"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Densitate necunoscut�: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, fuzzy, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Op�iunile `-[0-7][lmh]' nu sunt suportate de *acest* tar"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr ""
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FI�IER]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "argument invalid %s pentru %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr ""
-#: src/tar.c:2291
+#: src/tar.c:2300
#, fuzzy, c-format
msgid "Old option '%c' requires an argument."
msgstr "Vechea op�iune `%c' necesit� un argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence n-are sens f�r� o list� de fi�iere"
-#: src/tar.c:2390
+#: src/tar.c:2399
#, fuzzy
msgid "Multiple archive files require '-M' option"
msgstr "Fi�iere de arhiv� multiple necesit� op�iunea `-M'"
-#: src/tar.c:2407
+#: src/tar.c:2416
#, fuzzy
msgid "--level is meaningless without --listed-incremental"
msgstr "--occurrence n-are sens f�r� o list� de fi�iere"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Eticheta volumului este prea lung� (limita este %lu octet)"
msgstr[1] "%s: Eticheta volumului este prea lung� (limita este %lu octe�i)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Nu pot verifica arhive pe volume multiple"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Nu pot verifica arhive comprimate"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Nu pot folosi arhive comprimate pe volume multiple"
-#: src/tar.c:2457
+#: src/tar.c:2466
#, fuzzy
msgid "Cannot concatenate compressed archives"
msgstr "Nu pot actualiza arhive comprimate"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option poate fi folosit numai pentru arhive POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
#, fuzzy
msgid "--acls can be used only on POSIX archives"
msgstr "--pax-option poate fi folosit numai pentru arhive POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
#, fuzzy
msgid "--selinux can be used only on POSIX archives"
msgstr "--pax-option poate fi folosit numai pentru arhive POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
#, fuzzy
msgid "--xattrs can be used only on POSIX archives"
msgstr "--pax-option poate fi folosit numai pentru arhive POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Refuz categoric s� creez o arhiv� goal�"
-#: src/tar.c:2623
+#: src/tar.c:2632
#, fuzzy
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Op�iunile `-Aru' sunt incompatibile cu `-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
#, fuzzy
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Trebuie s� specifica�i una din op�iunile `-Acdtrux'"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr ""
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Fi�ier scurtat cu %s octet"
msgstr[1] "%s: Fi�ier scurtat cu %s octe�i"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, fuzzy, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Cuv�nt_cheie %s necunoscut sau �nc� neimplementat"
-#: src/xheader.c:174
+#: src/xheader.c:173
#, fuzzy
msgid "Time stamp is out of allowed range"
msgstr "�nregistrare timp �n afara domeniului"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Pattern-ul %s nu poate fi folosit"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Cuv�nt_cheie %s nu poate fi �nlocuit (overridden)"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
#, fuzzy
msgid "Malformed extended header: missing length"
msgstr "Antet extins malformat: lipse�te semnul egal"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, fuzzy, c-format
msgid "Extended header length %*s is out of range"
msgstr "�ir �n baza-64 (semn�tura arhivei) %s este �n afara %s intervalului"
-#: src/xheader.c:689
+#: src/xheader.c:707
#, fuzzy
msgid "Malformed extended header: missing blank after length"
msgstr "Antet extins malformat: lipse�te spa�iu liber dup� lungime"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Antet extins malformat: lipse�te semnul egal"
-#: src/xheader.c:703
+#: src/xheader.c:721
#, fuzzy
msgid "Malformed extended header: missing newline"
msgstr "Antet extins malformat: lipse�te semnul egal"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, fuzzy, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Valoare arhiv� %s este �n afara %s intervalului %s.%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, fuzzy, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Antet extins malformat: lipse�te semnul egal"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, fuzzy, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Antet extins malformat: lipse�te semnul egal"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, fuzzy, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Antet extins malformat: lipse�te semnul egal"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, fuzzy, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Antet extins malformat: lipse�te semnul egal"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, fuzzy, c-format
msgid "%s: not a valid timeout"
msgstr "%s: Grup invalid"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr ""
@@ -2693,7 +2702,7 @@ msgstr ""
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, fuzzy, c-format
msgid "Write checkpoint %u"
msgstr "Scrie punct de verificare %d"
@@ -2702,236 +2711,235 @@ msgstr "Scrie punct de verificare %d"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, fuzzy, c-format
msgid "Read checkpoint %u"
msgstr "Cite�te punct de verificare %d"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr ""
-#: tests/genfile.c:131
+#: tests/genfile.c:126
#, fuzzy
msgid "File creation options:"
msgstr "Alte op�iuni:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr ""
-#: tests/genfile.c:133
+#: tests/genfile.c:128
#, fuzzy
msgid "Create file of the given SIZE"
msgstr "creaz� arhiva de formatul dat."
-#: tests/genfile.c:135
+#: tests/genfile.c:130
#, fuzzy
msgid "Write to file NAME, instead of standard output"
msgstr "extrage fi�ierele la ie�irea standard"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
#, fuzzy
msgid "Read file names from FILE"
msgstr "Am citit %s octe�i de la %s"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
#, fuzzy
msgid "-T reads null-terminated names"
msgstr "-T cite�te nume terminate cu null, deactiveaz� cu -C"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr ""
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr ""
-#: tests/genfile.c:149
+#: tests/genfile.c:144
#, fuzzy
msgid "Seek to the given offset before writing data"
msgstr "�ncearc� s� verifici arhiva dup� scrierea sa"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr ""
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr ""
-#: tests/genfile.c:168
-#, fuzzy
-msgid "OPTION"
-msgstr " [OP�IUNE...]"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr ""
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr ""
-#: tests/genfile.c:196
+#: tests/genfile.c:191
#, fuzzy
msgid "Execute COMMAND"
msgstr "COMAND�"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, fuzzy, c-format
msgid "Invalid size: %s"
msgstr "�nregistrare timp invalid�"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, fuzzy, c-format
msgid "Number out of allowed range: %s"
msgstr "Num�r inode �n afara intervalului"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr ""
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr ""
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr ""
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr ""
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr ""
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, fuzzy, c-format
msgid "Unknown date format"
msgstr "Eroare sistem necunoscut�"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr ""
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr ""
-#: tests/genfile.c:448
+#: tests/genfile.c:439
#, fuzzy
msgid "cannot seek"
msgstr "%s: Nu pot c�uta (seek) c�tre %s"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr ""
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr ""
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, fuzzy, c-format
msgid "Unknown field `%s'"
msgstr " tip fi�ier necunoscut %s\n"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, fuzzy, c-format
msgid "cannot set time on `%s'"
msgstr "%s: Nu pot c�uta (seek) c�tre %s"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, fuzzy, c-format
msgid "cannot truncate `%s'"
msgstr "%s: Nu pot redenumi ca %s"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, fuzzy, c-format
msgid "command failed: %s"
msgstr "`%s' comanda a e�uat"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, c-format
msgid "cannot stat `%s'"
msgstr ""
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "Nu pot salva directorul �n care lucrez"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, fuzzy, c-format
msgid "cannot unlink `%s'"
msgstr "%s: Nu pot crea symlink c�tre %s"
@@ -2971,6 +2979,10 @@ msgstr ""
msgid "--stat requires file names"
msgstr "--Amestecat numele fi�ierelor--\n"
+#, fuzzy
+#~ msgid "OPTION"
+#~ msgstr " [OP�IUNE...]"
+
#~ msgid "%s: option `--%s' doesn't allow an argument\n"
#~ msgstr "%s: op�iunea `--%s' nu permite un argument\n"
diff --git a/po/ru.gmo b/po/ru.gmo
index 6651453cb8ae93b76ad1fa95a23a13f05eec44fd..a3da05c0719dead703b8ffa175094d7e46ec9851 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index a9a7ff7f4198733f2f36e8f18800d2c151463bbc..7d235e41a69289fd6a99d9795673af0e4cdd2960 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,15 +4,15 @@
#
# Const Kaplinsky <const@ce.cctpu.edu.ru>, 1998, 1999.
# Pavel Maryanov <acid_jack@ukr.net>, 2004, 2006, 2008.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2013, 2014, 2016.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2013, 2014, 2016, 2018.
# Pavel Maryanov <acid@jack.kiev.ua>, 2010, 2014.
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-18 19:02+0300\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-03-11 08:35+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@d07.ru>\n"
"Language: ru\n"
@@ -22,7 +22,7 @@ msgstr ""
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
#: gnu/argmatch.c:134
#, c-format
@@ -104,7 +104,7 @@ msgid "give a short usage message"
msgstr "вывод короткого сообщения об использовании"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "ИМЯ"
@@ -142,29 +142,29 @@ msgid "write error"
msgstr "ошибка записи"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: двусмысленный параметр «%s»\n"
+msgstr "%s: двусмысленный параметр «%s%s»\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: двусмысленный параметр «%s»; возможные варианты:"
+msgstr "%s: двусмысленный параметр «%s%s»; возможные варианты:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: нераспознанный параметр «%c%s»\n"
+msgstr "%s: нераспознанный параметр «%s%s»\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: с параметром «%c%s» нельзя использовать аргумент\n"
+msgstr "%s: для параметра «%s%s» нельзя использовать аргумент\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: для параметра «--%s» требуется аргумент\n"
+msgstr "%s: для параметра «%s%s» требуется аргумент\n"
#: gnu/getopt.c:621
#, c-format
@@ -239,12 +239,12 @@ msgstr "^[yY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Упакован %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Упакован %s\n"
@@ -252,12 +252,11 @@ msgstr "Упакован %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -267,9 +266,9 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl."
+"Лицензия GPLv3+: GNU GPL версии 3 или новее <https://gnu.org/licenses/gpl."
"html>\n"
-"Это свободное ПО: вы можете продавать и распространять его.\n"
+"Это свободное ПО: вы можете изменять и распространять его.\n"
"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
"\n"
@@ -405,14 +404,13 @@ msgid "%s home page: <%s>\n"
msgstr "Домашняя страница %s: %s\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Домашняя страница %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "Домашняя страница %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
-msgstr "Справка по работе с ПО GNU: <http://www.gnu.org/gethelp/>\n"
+msgstr "Справка по работе с программами GNU: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -534,147 +532,147 @@ msgstr "Не удалось перенаправить файлы для уда
msgid "Cannot execute remote shell"
msgstr "Не удаётся запустить удалённый командный процессор"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Направление поиска за пределами диапазона"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Недопустимое направление поиска"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Недопустимое смещение поиска"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Смещение поиска за пределами диапазона"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Недопустимое число байт"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Число байт за пределами диапазона"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Неожиданный конец файла"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Недопустимый код операции"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Операция не поддерживается"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Неожиданные аргументы"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
"Работа с накопителем на магнитной ленте с приёмом команд от удалённого "
"процесса"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "N"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "задайте уровень отладки"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "ФАЙЛ"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "задайте имя выходного файла отладки"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "не удаётся открыть %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "слишком много аргументов"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Неверная команда"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Это не похоже на tar-архив"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Всего прочитано байт"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Всего записано байт"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Всего удалено байт"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(канал)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Отказ чтения содержимого архива с терминала (пропущен параметр -f?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Отказ записи содержимого архива в терминал (пропущен параметр -f?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Недопустимое значение для record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Не указано имя архива"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Не удаётся проверить архив на stdin/stdout"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Архив сжат. Используйте параметр %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Не удаётся обновить сжатые архивы"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Начало ленты, завершение работы"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Слишком много ошибок, завершение работы"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
@@ -682,7 +680,7 @@ msgstr[0] "Размер записи = %lu блок"
msgstr[1] "Размер записи = %lu блока"
msgstr[2] "Размер записи = %lu блоков"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
@@ -690,39 +688,39 @@ msgstr[0] "Невыровненный блок (%lu байт) в архиве"
msgstr[1] "Невыровненный блок (%lu байта) в архиве"
msgstr[2] "Невыровненный блок (%lu байт) в архиве"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Невозможно вернуться назад на один архивный файл; он может быть нечитаемым "
"без -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek не остановился на границе записи"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: содержит неверный номер тома"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Переполнение номера тома"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Приготовьте том Номер %d для %s и нажмите Enter: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Конец файла вместо ожидаемого ответа пользователя"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Архив не полный"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -734,66 +732,66 @@ msgstr ""
" q Выход из tar\n"
" y или [нов.строка] Продолжение операции\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Порождение подпроцесса командного процессора\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Вывод этого списка\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Нет нового тома, завершение работы.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Не указано имя имя файла. Попробуйте ещё раз.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Неверные входные данные. Наберите ? для получения справки.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "Сбой команды %s"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s не продолжается на этом томе"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s, возможно, продолжается на этом томе - в заголовке находится усечённое имя"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s является неверным размером (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Этот том вне последовательности (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Метка архива не соответствует %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Том %s не соответствует %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -801,11 +799,11 @@ msgstr ""
"%s: слишком длинное имя файла для сохранения в многотомном заголовке GNU; "
"обрезано"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "запись не остановилась на границе блока"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
@@ -813,75 +811,75 @@ msgstr[0] "Можно было прочитать только %lu байт из
msgstr[1] "Можно было прочитать только %lu байта из %lu"
msgstr[2] "Можно было прочитать только %lu байт из %lu"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Содержимое различно"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Неожиданный конец файла в архиве"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Типы файлов отличаются"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Права доступа отличаются"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid отличаются"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid отличаются"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Время изменения отличается"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Размеры отличаются"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Не ссылается на %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Символические ссылки отличаются"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Номера устройств отличаются"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Проверка "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Неизвестный тип файла «%c», сравнён как обычный файл"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Архив содержит файлы с именами, из которых удалены префиксы."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Архив содержит преобразованные имена файлов."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "При проверке оригинальные файлы могут быть не найдены."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
@@ -889,46 +887,46 @@ msgstr[0] "СБОЙ ПРОВЕРКИ: обнаружен %d неверный з
msgstr[1] "СБОЙ ПРОВЕРКИ: обнаружено %d неверных заголовка"
msgstr[2] "СБОЙ ПРОВЕРКИ: обнаружено %d неверных заголовков"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Нулевой блок в %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: содержит каталог с кэшем тегов %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "значение %s за пределами %s диапазона %s..%s; заменяется на %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "значение %s за пределами %s диапазона %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Создаются отрицательные восьмеричные заголовки"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: имя файла слишком длинное (максимум %d); не сброшено"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: имя файла слишком длинное (не может быть разделено); не сброшено"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: имя ссылки слишком длинное; не сброшено"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
@@ -936,78 +934,78 @@ msgstr[0] "%s: Файл урезан на %s байт; дополнен нуля
msgstr[1] "%s: Файл урезан на %s байта; дополнен нулями"
msgstr[2] "%s: Файл урезан на %s байт; дополнен нулями"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: файл находится на другой файловой системе; не сброшен"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "содержимое не сброшено"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Неизвестный тип файла; файл проигнорирован"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Отсутствуют ссылки на %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: файл не изменён; не сброшен"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: файл является архивом; не сброшен"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "каталог не сброшен"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: файл изменился во время чтения"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: сокет проигнорирован"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: door проигнорирован"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Пропускается до следующего заголовка"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Удаляется не-заголовок из архива"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: невероятно старая временная метка %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: временная метка %s - %s с в будущем "
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Неожиданная противоречивость при создании каталога"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: пропускается существующий файл"
@@ -1030,7 +1028,7 @@ msgstr "Выполняется попытка извлечь символиче
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Невозможно извлечь -- файл продолжается с другого тома"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Непредвиденный длинный заголовок имени"
@@ -1047,7 +1045,7 @@ msgstr "Текущий %s более новый или такого же воз
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: в имени содержится «..»"
#: src/extract.c:1696
#, c-format
@@ -1059,22 +1057,22 @@ msgstr "%s: Невозможно было выполнить резервное
msgid "Cannot rename %s to %s"
msgstr "Невозможно переименовать %s в %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Каталог был переименован из %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Каталог новый"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: каталог находится на другой файловой системе; не сброшен"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Каталог был переименован"
@@ -1200,35 +1198,35 @@ msgstr "%s: Удаляется %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Невозможно удалить"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Пропускается"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "блок %s: ** Блок нулей **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "блок %s: ** Конец файла **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "блок %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "В заголовке пустое поле вместо ожидаемого числового значения %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1236,160 +1234,160 @@ msgstr ""
"дополнение до двух"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Восьмеричное значение архива %.*s за пределами диапазона %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Архив содержит устаревающие заголовки base-64"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Архив подписан строкой base-64 %s за пределами диапазона %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Значение base-256 архива за пределами диапазона %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Заголовок содержит %.*s вместо ожидаемого числового значения %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Значение архива %s за пределами %s диапазона %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " ссылка на %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " неизвестный тип файла %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Длинная ссылка--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Длинное имя--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Заголовок тома--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Продолжение с позиции %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Создание каталога:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "%s переименован в %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Невозможно переименовать в %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "%s переименовывается назад в %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Файла удален до его считывания"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "дочерний процесс"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "межпроцессорный канал"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Имя выбранного локального файла:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"добавить указанный ФАЙЛ в архив (полезно, если имя начинается с дефиса)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "КАТАЛОГ"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "перейти в КАТАЛОГ"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "загрузить из ФАЙЛА имена для извлечения или создания"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
"-T читает строки, оканчивающиеся null; подразумевается --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "выключить воздействие предыдущей опции --null"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "убрать кавычки в имени входного файла или членов (по умолчанию)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "не убирать кавычки в имени входного файла или членов (по умолчанию)"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T читает имена файлов буквально (не считаются параметрами)"
+msgstr ""
+"-T читает имена файлов буквально (не экранируются или считаются параметрами)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T считает имена файлов, начинающихся с переноса, параметрами (по умолчанию)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "ШАБЛОН"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "исключать файлы, определённые ШАБЛОНОМ"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "исключать шаблоны, перечисленных в ФАЙЛЕ"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1397,24 +1395,24 @@ msgstr ""
"исключать содержимое каталогов с файлом CACHEDIR.TAG за исключением самого "
"файла с тегами"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "исключать всё содержимое каталогов, содержащих файл CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "исключать каталоги, содержащие файл CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "исключать каталоги, содержащие ФАЙЛ, за исключением самого ФАЙЛА"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
"читать шаблоны исключения для каждого каталога из ФАЙЛА, если он существует"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1422,118 +1420,121 @@ msgstr ""
"читать шаблоны исключения для каждого каталога и его подкаталогов из ФАЙЛА, "
"если он существует"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "исключать всё содержимое каталогов, содержащих ФАЙЛ"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "исключать каталоги с ФАЙЛОМ"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "исключать каталоги CVS"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "читать шаблоны исключения из файлов игнорирования VCS"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "исключать резервные файлы и файлы блокировки"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "рекурсивный спуск по каталогам (по умолчанию)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "отключить автоматический спуск в каталоги"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Опции шаблонов подстановки для имён файлов (влияют на шаблоны включения и "
"исключения):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "шаблоны начала имени файла"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "шаблоны совпадают после любого «/» (по умолчанию для исключаемых)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "игнорировать регистр"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "с учётом регистра (по умолчанию)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "использовать маски (по умолчанию для исключаемых)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "точное соответствие строке"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "маски соответствуют «/» (по умолчанию для исключаемых)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "маски не соответствуют «/»"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Следующие параметры используются после обязательных аргументов в режиме "
+"создания или обновления архива. Эти параметры зависят от места и влияют "
+"только на аргументы, после которых указываются. Размещайте их правильно."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s не учитывается"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s не учитывается"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s не учитывается"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "командная строка"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: список файлов, запрошенный из %s, уже прочитан из %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "невозможно разделить строку «%s»: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: в прочитанном имени файла присутствует пустой символ"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "В именах файлов используются символы подстановки"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1541,48 +1542,48 @@ msgstr ""
"Используйте --wildcards, чтобы задействовать эти символы, или --no-"
"wildcards, чтобы убрать это предупреждение"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Не найден в архиве"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Требуемое вхождение не найдено в архиве"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Несоответствие метки архива"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Параметра -C в списке файлов нельзя Использовать с параметром --listed-"
"incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
"С параметром --listed-incremental можно использовать только параметр -C"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Для обоих параметров «%s» и «%s» требуется стандартный ввод"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Неверный формат архива"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Запрошены расширения GNU для несовместимого формата архива"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1804,7 +1805,7 @@ msgstr "Выбор выходного потока:"
msgid "extract files to standard output"
msgstr "извлекать файлы на стандартный вывод"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "КОМАНДА"
@@ -1842,7 +1843,7 @@ msgstr "использовать ФАЙЛ для сопоставления UID
msgid "use FILE to map file owner GIDs and names"
msgstr "использовать ФАЙЛ для сопоставления GID владельцев файла и имён"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "ДАТА-ИЛИ-ФАЙЛ"
@@ -2056,7 +2057,7 @@ msgstr "заново разбивать на блоки при чтении (д
msgid "Archive format selection:"
msgstr "Формата архива:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "ФОРМАТ"
@@ -2140,61 +2141,61 @@ msgstr "ПРОГ"
msgid "filter through PROG (must accept -d)"
msgstr "пропустить архив через ПРОГ (должна поддерживать -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Выбор локальных файлов:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "оставаться в локальной файловой системе при создании архива"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "не удалять начальные «/» из имён файлов"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"следовать по символьным ссылкам и сохранять файлы, на которые они указывают"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"следовать по жёстким ссылкам и сохранять файлы, на которые они указывают"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "ИМЯ-ЧЛЕНА"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "начинать с члена ИМЯ-ЧЛЕНА при чтении архива"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "сохранять только те файлы, которые новее ДАТЫ-ИЛИ-ФАЙЛА"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "ДАТА"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "сравнивать дату и время, только если изменены данные"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "УПРАВЛЕНИЕ"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "делать копию перед удалением, УПРАВЛЕНИЕ выбора версий"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "СТРОКА"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2202,63 +2203,63 @@ msgstr ""
"делать копию перед удалением, переопределяет обычный суффикс ('~', если "
"только он не переопределён переменной окружения SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Преобразование имён файлов:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
"удалять указанное ЧИСЛО начальных компонентов из имён файлов перед "
"извлечением"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "РАСШИРЕНИЕ"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "использовать замену РАСШИРЕНИЯ sed'ом для преобразования имён файлов"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Вывод информации:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "подробный листинг обрабатываемых файлов"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "КЛЮЧЕВОЕ СЛОВО"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "управление предупреждением"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"вывод сообщений о ходе выполнения через каждые ЧИСЛО записей (по умолчанию "
"10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "ДЕЙСТВИЕ"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "выполнять ДЕЙСТВИЕ на каждой контрольной точке"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "вывод сообщений, если сохранены не все ссылки"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "СИГНАЛ"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2270,35 +2271,35 @@ msgstr ""
"SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2. Также разрешается использовать имена без "
"префикса SIG"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "вывод времени изменения файла в формате UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "вывод имени файла и его полного разрешения"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "отправить подробный вывод данных в FILE"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "выводить номера блоков архива в каждом сообщении"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "запрашивать подтверждение для каждого действия"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "показать значения tar по умолчанию"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "показать допустимые диапазоны для полей snapshot-файла"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2306,31 +2307,31 @@ msgstr ""
"при выводе листинга или извлечении показывать все каталоги, не "
"соответствующем условию поиска"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "показывать имена файлов или архивов после преобразования"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "СТИЛЬ"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "установить стиль цитирования имён. Значения для СТИЛЯ см. ниже"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "дополнительно цитировать символы из СТРОКИ"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "отключить цитирование символов из СТРОКИ"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Опции совместимости:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2338,22 +2339,22 @@ msgstr ""
"при создании, эквивалент --old-archive; при извлечении, эквивалент --no-same-"
"owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Другие опции:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "отключить использование некоторых потенциально опасных опций"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» не может быть использован с «%s»"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2361,40 +2362,40 @@ msgstr ""
"Указать можно только один из параметров «-Acdtrux», «--delete» или «--test-"
"label»"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Конфликт опций сжатия"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Неизвестное название сигнала: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Файл с образцом даты не найден"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "%s заменяется на неизвестный формат даты %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Опция %s: дата «%s» рассматривается как %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "пропустить архив через %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Допустимые аргументы для параметра --quoting-style:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2402,120 +2403,120 @@ msgstr ""
"\n"
"Значения по умолчанию *этого* tar:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Неверный владелец или группа"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Неверный размер ёмкости блока"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Неверная длина ленты"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Недопустимое значение добавочного уровня"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Больше одной пороговой даты"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Неверное значение версии разрежения"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' не поддерживается на этой платформе"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "значение --checkpoint не является целым числом"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "В опции указан неверный режим доступа"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Неверное число"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Неверный размер записи"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Размер записи должен быть кратен %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Неверное число элементов"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Разрешается использовать только одну опцию --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Неверно сформирован аргумент плотности: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Неизвестная плотность: «%c»"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Опции «-[0-7][lmh]» не поддерживаются *этим* tar-ом"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: место ошибки"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "ошибка разбора %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[ФАЙЛ]…"
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "аргументы, не являющиеся параметрами, в %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "невозможно разделить TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Для старой опции «%c» нужно указать аргумент."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence бесполезна без списка файлов"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Для нескольких файлов архивов требуется опция «-M»"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "параметр --level не имеет смыла без --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
@@ -2523,43 +2524,43 @@ msgstr[0] "%s: Метка тома слишком длинная (максиму
msgstr[1] "%s: Метка тома слишком длинная (максимум %lu байта)"
msgstr[2] "%s: Метка тома слишком длинная (максимум %lu байт)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Невозможно проверить многотомные архивы"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Невозможно проверить сжатые архивы"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Невозможно использовать многотомные сжатые архивы"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Невозможно объединить сжатые архивы"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime требуется дата, задаваемая через --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option может быть использована только с архивами POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls может быть использована только с архивами POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux может быть использована только с архивами POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs может быть использована только с архивами POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2567,86 +2568,95 @@ msgstr ""
"Невозможно определить имя каталога верхнего уровня; укажите его явно с "
"помощью --one-top-level=КАТАЛОГ"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Размер тома не может быть меньше размера записи"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Робкий отказ от создания пустого архива"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Параметры «-Aru» не совместимы с «-f -»"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Необходимо указать один из параметров «-Acdtrux», «--delete» или «--test-"
"label»"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Завершение работы с состоянием неисправности из-за возникших ошибок"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Файл урезан на %s байт"
msgstr[1] "%s: Файл урезан на %s байта"
-msgstr[2] "%s: Файл урезан на %s байтов"
+msgstr[2] "%s: Файл урезан на %s байт"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Неизвестное или ещё не реализованное ключевое слово %s"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Метка времени за пределами допустимого диапазона"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Шаблон %s не может быть использован"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Ключевое слово %s не может быть перекрыто"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Неверно сформирован расширенный заголовок: отсутствует длина"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Длина расширенного заголовка %*s за пределами допустимого диапазона"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr ""
"Неверно сформирован расширенный заголовок: после длины отсутствует пробел"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
-msgstr "Неверно сформирован расширенный заголовок: отсутствует знак равенства "
+msgstr "Неверно сформирован расширенный заголовок: отсутствует знак равенства"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr ""
"Неверно сформирован расширенный заголовок: отсутствует знак новой строки"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Игнорируется неизвестное ключевое слово расширенного заголовка «%s»"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
@@ -2655,50 +2665,50 @@ msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Расширенный заголовок %s=%s за пределами диапазона %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Неверно сформирован расширенный заголовок: неверный %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Неверно сформирован расширенный заголовок: превышен %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
"Неверно сформирован расширенный заголовок: неверный %s: непредвиденный "
"разделитель %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
"Неверно сформирован расширенный заголовок: неверный %s: нечётное число "
"значений"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: недопустимое время ожидания"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: неизвестное действие контрольной точки"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "запись"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "чтение"
@@ -2706,7 +2716,7 @@ msgstr "чтение"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Контрольная точка записи %u"
@@ -2715,12 +2725,12 @@ msgstr "Контрольная точка записи %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Контрольная точка чтения %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2729,96 +2739,100 @@ msgstr ""
"от GNU.\n"
"ОПЦИИ:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Опции создания файла:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "РАЗМЕР"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Создание файла указанного РАЗМЕРА"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Запись в файл с ИМЕНЕМ, а не на стандартный вывод"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Чтение имён файла из ФАЙЛА"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T читает строки, оканчивающиеся нулём"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "Заполнение файла заданным ШАБЛОНОМ. ШАБЛОН - это 'default' или 'zeros'"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Размер блока для разрежённого файла"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Создание разрежённого файла. Остальная часть команды определяет карту файла."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "СМЕЩЕНИЕ"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Искать до указанного смещения перед записью данных"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Подавлять некритичные диагностические сообщения"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Параметры статистики по файлам:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Вывод содержимого структуры stat для всех указанных файлов. ФОРМАТ по "
"умолчанию:"
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Параметры синхронного выполнения:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "ПАРАМЕТР"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Выполнение АРГУМЕНТОВ. Полезно с параметром --checkpoint и одним из --cut, --"
"append или --touch"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Выполнение указанного действия (см. ниже) до достижения контрольной точки с "
"заданным НОМЕРОМ"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Указание даты для следующего параметра --touch"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Показать выполненные контрольные точки и статус выхода КОМАНДЫ"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2826,7 +2840,7 @@ msgstr ""
"Синхронное выполнение действий. Они выполняются при достижении контрольной "
"точки с номером, определённым опцией --checkpoint."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2834,125 +2848,125 @@ msgstr ""
"Усечь ФАЙЛ до размера, определённого предыдущей опцией --length (или 0, если "
"не указан)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Добавить РАЗМЕР байт к ФАЙЛУ. РАЗМЕР определяется предыдущей опцией --length."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Обновить время последнего доступа и изменения ФАЙЛА."
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Выполнить КОМАНДУ"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Удалить ФАЙЛ"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Недопустимый размер: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Число за пределами допустимого диапазона: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Отрицательный размер: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "Сбой stat(%s)"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "запрошенная длина файла %lu, реальная %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "созданный файл не является разреженным"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
-msgstr "Ошибка разбора числа возле `%s'"
+msgstr "Ошибка разбора числа возле «%s»"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Неизвестный формат даты"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
-msgstr "[АРГУМЕНТЫ...]"
+msgstr "[АРГУМЕНТЫ…]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
-msgstr "невозможно открыть `%s'"
+msgstr "невозможно открыть «%s»"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "невозможно найти"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "в имени файла присутствует пустой символ"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"невозможно вывести разрежённые файлы на стандартный вывод; используйте опцию "
"--file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "неверная маска (возле `%s')"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
-msgstr "Неизвестное поле `%s'"
+msgstr "Неизвестное поле «%s»"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
-msgstr "невозможно установить время в `%s'"
+msgstr "невозможно установить время в «%s»"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "не удалось обрезать «%s»"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "сбой команды: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "не удалось обрезать «%s»"
+msgstr "не удалось выполнить stat для «%s»"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "невозможно установить время в `%s'"
+msgstr "не удалось удалить каталог «%s»"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "не удалось удалить «%s»"
@@ -2992,6 +3006,9 @@ msgstr "Команда завершена\n"
msgid "--stat requires file names"
msgstr "для опции --stat нужны имена файлов"
+#~ msgid "OPTION"
+#~ msgstr "ПАРАМЕТР"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: Параметра ARGP_HELP_FMT должен быть положительным"
diff --git a/po/sk.gmo b/po/sk.gmo
index c9ab16b21445567a36d2cde1fd3216de37f90227..8182d63011a0d743e29bca37b249a4c3a5ac1544 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index bd17e34d951483d1ebf88410a91c98b4142ca968..6e5ba755db4fcaad104016de9607c6d6f67799c8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,12 +2,12 @@
# Copyright (C) 1997 Free Software Foundation, Inc.
# Martin Lacko <lacko@host.sk>, 2001.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar- \n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2002-02-10 12:00CEST\n"
"Last-Translator: Martin Lacko <lacko@host.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -100,7 +100,7 @@ msgid "give a short usage message"
msgstr ""
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr ""
@@ -235,12 +235,12 @@ msgstr ""
msgid "^[nN]"
msgstr ""
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr ""
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr ""
@@ -248,11 +248,11 @@ msgstr ""
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr ""
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -505,54 +505,54 @@ msgstr "Vzdialen
msgid "Cannot execute remote shell"
msgstr "Vzdialen� shell nie je mo�n� spusti�"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Smer posunu v s�bore je mimo rozsah"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
#, fuzzy
msgid "Invalid seek direction"
msgstr "Zad�n� chybn� pr�va"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
#, fuzzy
msgid "Invalid seek offset"
msgstr "Neplatn� �as s�boru"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Ve�kos� poz�cie v s�bore je mimo rozsah"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
#, fuzzy
msgid "Invalid byte count"
msgstr "Neplatn� d�ka p�sky"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
#, fuzzy
msgid "Byte count out of range"
msgstr "Ve�kos� poz�cie v s�bore je mimo rozsah"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
#, fuzzy
msgid "Premature eof"
msgstr "rmtd: Pred�asn� koniec s�boru\n"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
#, fuzzy
msgid "Invalid operation code"
msgstr "%s: nezn�my prep�na� -- %c\n"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr ""
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
#, fuzzy
msgid "Unexpected arguments"
msgstr "Neo�ak�van� koniec v rozsekanom mene"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
#, fuzzy
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
@@ -562,146 +562,146 @@ msgstr ""
" --version Vyp��e ozna�enie verzie\n"
" --help Vyp��e t�to n�povedu\n"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr ""
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr ""
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr ""
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr ""
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, fuzzy, c-format
msgid "cannot open %s"
msgstr "Ned� sa zatvori�"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr ""
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Nezn�my pr�kaz"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Toto pravdepodobne nie je tar archiv"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr ""
-#: src/buffer.c:592
+#: src/buffer.c:594
#, fuzzy
msgid "Total bytes written"
msgstr "Celkom zap�san� bajtov: %s (%sB, %sB/s)\n"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr ""
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(r�ra)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Chybn� hodnota pre ve�kos� z�znamu"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Meno arch�vu nebolo zadan�"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Stdin/Stdout arch�v nie je mo�n� otvori�"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr ""
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Komprimovan� arch�v nie je mo�n� aktualizova�"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "P�ska na za�iatku, kon��m"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Pr�li� mnoho ch�b, kon��m"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, fuzzy, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Ve�kos� z�znamu = %lu blokov"
msgstr[1] "Ve�kos� z�znamu = %lu blokov"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, fuzzy, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Nezarovnan� blok (%lu bajtov) v arch�ve"
msgstr[1] "Nezarovnan� blok (%lu bajtov) v arch�ve"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "V arch�ve sa nie je mo�n� vr�ti�, bez -i m��e by� ne�itate�n�"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr ""
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: vracia chybn� ��slo zv�zku"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "��slo zv�zku prete�en�"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Pripravte zv�zok #%d pre arch�v %s a stla�te return:"
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Namiesto u��vate�skej odpovede bol zadan� koniec s�boru"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "VAROVANIE: Archiv je nekompletn�"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, fuzzy, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -713,275 +713,275 @@ msgstr ""
" ! Vytvorenie podshellu\n"
" ? Vyp�sanie tejto n�povedy\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr ""
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr ""
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Nie je nov� zv�zok; kon��m.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr ""
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr ""
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, fuzzy, c-format
msgid "%s command failed"
msgstr "'%s' pr�kaz zlyhal"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s nepokra�uje na tomto zv�zku"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, fuzzy, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s nepokra�uje na tomto zv�zku"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s je chybnej d�ky (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, fuzzy, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Tento zv�zok nie je n�sledn�kem predch�dzaj�ceho"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Pre vyhodnotenie vzorky `%s' mus� by� arch�v pomenovan�"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Zv�zok %s nezodpoved� vzorke %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr ""
-#: src/compare.c:98
+#: src/compare.c:97
#, fuzzy, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "D� sa ��ta� iba %lu z %lu bajtov"
msgstr[1] "D� sa ��ta� iba %lu z %lu bajtov"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Obsah sa l��i"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Neo�ek�van� koniec arch�vu"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Typ s�boru sa l��i"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Pr�va sa l��ia"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid sa l��i"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid sa l��i"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "�as poslednej �pravy sa l��i"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Ve�kos� sa l��i"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Nie je odkazom na %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symbolick� odkaz sa l��i"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "��slo zariadenia sa l��i"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Overujem "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Nezn�my typ s�boru '%c', porovn�van� ako norm�lny s�bor"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr ""
-#: src/compare.c:541
+#: src/compare.c:540
#, fuzzy
msgid "Archive contains transformed file names."
msgstr "Arch�v obsahuje zastaral� base-64 hlavi�ky"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr ""
-#: src/compare.c:620
+#: src/compare.c:619
#, fuzzy, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "CHYBN� OVERENIE: n�jden�ch chybn�ch hlavi�iek: %d"
msgstr[1] "CHYBN� OVERENIE: n�jden�ch chybn�ch hlavi�iek: %d"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr ""
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr ""
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "hodnota %s typu %s je mimo rozsah %s..%s; nahradzujem za %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "hodnota %s typu %s je mimo rozsah %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Generujem z�porn� osmi�kov� hlavi�ky"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, fuzzy, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: s�bor nie je zmenen�; neaktualizovan�"
-#: src/create.c:616
+#: src/create.c:615
#, fuzzy, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: s�bor nie je zmenen�; neaktualizovan�"
-#: src/create.c:643
+#: src/create.c:642
#, fuzzy, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: s�bor nie je zmenen�; neaktualizovan�"
-#: src/create.c:1106
+#: src/create.c:1105
#, fuzzy, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: S�bor je krat�� o : %s bajtov; Dopl�ujem nulami."
msgstr[1] "%s: S�bor je krat�� o : %s bajtov; Dopl�ujem nulami."
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: s�bor je na inom s�borovom syst�me; nearchivovan�"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr ""
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Nezn�my typ s�boru; s�bor ignorovan�"
-#: src/create.c:1576
+#: src/create.c:1575
#, fuzzy, c-format
msgid "Missing links to %s."
msgstr " odkaz na %s\n"
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: s�bor nie je zmenen�; neaktualizovan�"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: s�bor je archiv; nearchivovan�"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr ""
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: s�bor bol po�as ��tania zmenen�"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: soket ignorovan�"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: dvere ignorovan�"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Preskakujem na �al�iu hlavi�ku"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Z arch�vu je mazan� to, �o nie je hlavi�ka"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr ""
-#: src/extract.c:320
+#: src/extract.c:319
#, fuzzy, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: �asov� n�lepka %s je %lu z d�tumu bud�cnosti"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Neo�ak�van� nekonzistencia, pri vytv�ren� adres�ra"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr ""
@@ -1005,7 +1005,7 @@ msgstr "Sk
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Ned� sa rozbali� -- s�bor je pokra�ovan�m in�ho zv�zku"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
#, fuzzy
msgid "Unexpected long name header"
msgstr "Neo�ak�van� koniec v rozsekanom mene"
@@ -1035,22 +1035,22 @@ msgstr "%s: Tento s
msgid "Cannot rename %s to %s"
msgstr "%s: nie je mo�n� premenova� na %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, fuzzy, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Adres�r bol premenovan�"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Adres�r je nov�"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, fuzzy, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: s�bor je na inom s�borovom syst�me; nearchivovan�"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Adres�r bol premenovan�"
@@ -1176,35 +1176,35 @@ msgstr "%s: Ma
msgid "%s: Cannot remove"
msgstr "%s: Ned� sa zmaza�"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Vynech�vam"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** Blok NUL **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok %s: ** Konec s�boru **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Medzery v hlavi�ke na mieste, kde je o�ak�van� ��seln� hodnota typu %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1212,340 +1212,340 @@ msgstr ""
"complement"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Osmi�kov� hodnota %.*s typu %s je mimo rozsah"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arch�v obsahuje zastaral� base-64 hlavi�ky"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Hodnota base-64 typu %s je mimo %s rozsah"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Hodnota base-256 typu %s je mimo rozsah"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arch�v obsahuje %.*s tam, kde je o�akav�n� ��saln� hodnota typu %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Hodnota %s typu %s je mimo rozsah %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " odkaz na %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " nezn�my typ s�boru %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr ""
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr ""
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Hlavi�ka zv�zku--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Pokra�ovan� od %s bajtu--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Vytv�ram adres�r:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Premenov�vam %s na %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: nie je mo�n� premenova� na %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Premenov�v�m %s sp� na %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: S�bor zmazan� sk�r ako mohl by� ��tan�"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "potomok"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "meziprocesov� kan�l"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr ""
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr ""
-#: src/names.c:74
+#: src/names.c:73
#, fuzzy
msgid "change to directory DIR"
msgstr "Pracovn� adres�r nie je mo�n� zmeni�"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr ""
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr ""
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr ""
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr ""
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr ""
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr ""
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr ""
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr ""
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr ""
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr ""
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr ""
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr ""
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr ""
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr ""
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr ""
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr ""
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr ""
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr ""
-#: src/names.c:147
+#: src/names.c:146
#, fuzzy
msgid "wildcards do not match '/'"
msgstr "Zv�zok %s nezodpoved� vzorke %s"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
#, fuzzy
msgid "command line"
msgstr "'%s' pr�kaz zlyhal"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr ""
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr ""
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr ""
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr ""
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: V arch�ve nen�jden�"
-#: src/names.c:1379
+#: src/names.c:1409
#, fuzzy, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: V arch�ve nen�jden�"
-#: src/names.c:1413
+#: src/names.c:1443
#, fuzzy, c-format
msgid "Archive label mismatch"
msgstr "Pre vyhodnotenie vzorky `%s' mus� by� arch�v pomenovan�"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
-#: src/tar.c:88
+#: src/tar.c:87
#, fuzzy, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Prep�na�e `-%s' a `-%s' vy�aduj� �tandardn� vstup"
-#: src/tar.c:165
+#: src/tar.c:164
#, fuzzy, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Chybn� skupina"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU roz��renia po�adovan� na nekompatibilnom form�te arch�vu"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1762,7 +1762,7 @@ msgstr ""
msgid "extract files to standard output"
msgstr "Chyba pri z�pise na �tandardn� v�stup"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr ""
@@ -1798,7 +1798,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr ""
@@ -1999,7 +1999,7 @@ msgstr ""
msgid "Archive format selection:"
msgstr "Odporuj�ce si arch�vne form�ty"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr ""
@@ -2082,118 +2082,118 @@ msgstr ""
msgid "filter through PROG (must accept -d)"
msgstr ""
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr ""
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr ""
-#: src/tar.c:693
+#: src/tar.c:694
#, fuzzy
msgid "don't strip leading '/'s from file names"
msgstr "Odstra�ujem �vodn� `%.*s' z n�zvov s�borov"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr ""
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr ""
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr ""
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr ""
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr ""
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr ""
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr ""
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr ""
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr ""
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr ""
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr ""
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr ""
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr ""
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr ""
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr ""
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr ""
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr ""
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr ""
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2201,423 +2201,432 @@ msgid ""
"accepted"
msgstr ""
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr ""
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr ""
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr ""
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr ""
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr ""
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr ""
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr ""
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr ""
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr ""
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr ""
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr ""
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr ""
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr ""
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, fuzzy, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s: Ned� sa zmeni� poz�cia v s�bore na %s"
-#: src/tar.c:933
+#: src/tar.c:934
#, fuzzy
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "Viac ako jeden prep�na� `-Acdtrux' nem��e by� zadan�ch"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Odporuj�ce si kompresn� prep�na�e"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, fuzzy, c-format
msgid "Unknown signal name: %s"
msgstr " nezn�my typ s�boru %s\n"
-#: src/tar.c:1028
+#: src/tar.c:1030
#, fuzzy
msgid "Date sample file not found"
msgstr "D�tumov� s�bor nebol n�jden�"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Zamie�am %s za nezn�my d�tumov� form�t %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr ""
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr ""
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr ""
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
msgstr ""
-#: src/tar.c:1253
+#: src/tar.c:1259
#, fuzzy
msgid "Invalid owner or group ID"
msgstr "Neplatn� vlastn�k"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Neplatn� po�et bajtov na z�znam"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Neplatn� d�ka p�sky"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr ""
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Viac ako jeden po�iato�n� d�tum"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr ""
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr ""
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr ""
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Zad�n� chybn� pr�va"
-#: src/tar.c:1797
+#: src/tar.c:1806
#, fuzzy
msgid "Invalid number"
msgstr "Neplatn� ��slo i-uzlu"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Chybn� ve�kos� z�znamu"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Ve�kos� z�znamu mus� by� n�sobok %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
#, fuzzy
msgid "Invalid number of elements"
msgstr "Neplatn� d�ka p�sky"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr ""
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr ""
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr ""
-#: src/tar.c:2066
+#: src/tar.c:2075
#, fuzzy, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Prep�na� `-[0-7][lmh]' nie je podporovan� t�mto tarom"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr ""
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr ""
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "argument %s je pre %s neplatn�"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr ""
-#: src/tar.c:2291
+#: src/tar.c:2300
#, fuzzy, c-format
msgid "Old option '%c' requires an argument."
msgstr "Prep�na� `%c' vy�aduje argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr ""
-#: src/tar.c:2390
+#: src/tar.c:2399
#, fuzzy
msgid "Multiple archive files require '-M' option"
msgstr "Viac archiva�n�ch s�borov vy�aduje prep�na� `-M'"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr ""
-#: src/tar.c:2424
+#: src/tar.c:2433
#, fuzzy, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Meno zv�zku je pr�li� dlh� (limit je %lu bajtov)"
msgstr[1] "%s: Meno zv�zku je pr�li� dlh� (limit je %lu bajtov)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "V�czv�zkov� arch�v nie je mo�n� otvori�"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Komprimovan� arch�v nie je mo�n� otvori�"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Viaczv�zkov� komprimovan� arch�v nie je mo�n� vytvori�"
-#: src/tar.c:2457
+#: src/tar.c:2466
#, fuzzy
msgid "Cannot concatenate compressed archives"
msgstr "Komprimovan� arch�v nie je mo�n� aktualizova�"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Vytvorenie pr�zdneho arch�vu odmietnut�."
-#: src/tar.c:2623
+#: src/tar.c:2632
#, fuzzy
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Prep�na�e `-Aru' a `--delete' s� nezl��ite�n� s prep�na�om `-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
#, fuzzy
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Mus�te zada� jeden z prep�na�ov `-Acdtrux'"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr ""
-#: src/update.c:87
+#: src/update.c:86
#, fuzzy, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: S�bor skr�ten� o bajtov: %s"
msgstr[1] "%s: S�bor skr�ten� o bajtov: %s"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr ""
-#: src/xheader.c:174
+#: src/xheader.c:173
#, fuzzy
msgid "Time stamp is out of allowed range"
msgstr "�as s�boru mimo rozsah"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr ""
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr ""
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr ""
-#: src/xheader.c:677
+#: src/xheader.c:695
#, fuzzy, c-format
msgid "Extended header length %*s is out of range"
msgstr "Hodnota base-64 typu %s je mimo %s rozsah"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr ""
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr ""
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr ""
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, fuzzy, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Hodnota %s typu %s je mimo rozsah %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr ""
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr ""
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, fuzzy, c-format
msgid "%s: not a valid timeout"
msgstr "%s: Chybn� skupina"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr ""
@@ -2625,7 +2634,7 @@ msgstr ""
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, fuzzy, c-format
msgid "Write checkpoint %u"
msgstr "Zapisujem testovac� bod %d"
@@ -2634,231 +2643,231 @@ msgstr "Zapisujem testovac
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, fuzzy, c-format
msgid "Read checkpoint %u"
msgstr "��tanie testovacieho bodu %d"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
#, fuzzy
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr "Generujem datov� s�bory pre testovanie GNU taru.\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
#, fuzzy
msgid "File creation options:"
msgstr "Odporuj�ce si kompresn� prep�na�e"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr ""
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr ""
-#: tests/genfile.c:135
+#: tests/genfile.c:130
#, fuzzy
msgid "Write to file NAME, instead of standard output"
msgstr "Chyba pri z�pise na �tandardn� v�stup"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr ""
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr ""
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr ""
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr ""
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr ""
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr ""
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr ""
-#: tests/genfile.c:168
-msgid "OPTION"
+#: tests/genfile.c:163
+msgid "N"
msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr ""
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr ""
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr ""
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, fuzzy, c-format
msgid "Invalid size: %s"
msgstr "Neplatn� �as s�boru"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, fuzzy, c-format
msgid "Number out of allowed range: %s"
msgstr "��slo i-uzlu mimo rozsah"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr ""
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr ""
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr ""
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr ""
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr ""
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, fuzzy, c-format
msgid "Unknown date format"
msgstr "Nezn�ma syst�mov� chyba"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr ""
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr ""
-#: tests/genfile.c:448
+#: tests/genfile.c:439
#, fuzzy
msgid "cannot seek"
msgstr "Ned� sa zatvori�"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr ""
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr ""
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, fuzzy, c-format
msgid "Unknown field `%s'"
msgstr " nezn�my typ s�boru %s\n"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, fuzzy, c-format
msgid "cannot set time on `%s'"
msgstr "%s: Ned� sa zmeni� poz�cia v s�bore na %s"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, fuzzy, c-format
msgid "cannot truncate `%s'"
msgstr "%s: nie je mo�n� premenova� na %s"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, fuzzy, c-format
msgid "command failed: %s"
msgstr "'%s' pr�kaz zlyhal"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, c-format
msgid "cannot stat `%s'"
msgstr ""
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "Pracovn� adres�r nie je mo�n� uchova�"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, fuzzy, c-format
msgid "cannot unlink `%s'"
msgstr "%s: Odkaz na `%s' nie je mo�n� vytvori�"
diff --git a/po/sl.gmo b/po/sl.gmo
index 91a8e834434889df865baf39e1ae5937114ff72c..34d8c3b0f48dce462de1e9bc5f80cc593ebc528d 100644
Binary files a/po/sl.gmo and b/po/sl.gmo differ
diff --git a/po/sl.po b/po/sl.po
index 2c1aa64158b98ad8492f3ea3d3bc02391231474d..5508e2d85ede3f48e9a941deead333267df5f30e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,12 +4,12 @@
# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999, 2000, 2001, 2005, 2006, 2007, 2009, 2011, 2013, 2014.
#
# $Id: tar-1.28.sl.po,v 1.2 2014/11/16 20:25:23 peterlin Exp $
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar 1.28\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2014-11-16 21:24+0100\n"
"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -98,7 +98,7 @@ msgid "give a short usage message"
msgstr "poda kratka navodila za uporabo"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "IME"
@@ -233,12 +233,12 @@ msgstr "^[dDjJ]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Priprava paketa: %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Priprava paketa: %s\n"
@@ -246,11 +246,11 @@ msgstr "Priprava paketa: %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
#, fuzzy
msgid ""
"\n"
@@ -535,147 +535,147 @@ msgstr "Ni mogoče preusmerjati datotek za nelokalno ukazno lupino"
msgid "Cannot execute remote shell"
msgstr "Ni mogoče pognati nelokalne ukazne lupine"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Smer iskanja izven obsega"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Neveljavna smer iskanja"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Neveljaven odmik pri seek"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Odmik pri seek izven obsega"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Neveljaven števec bajtov"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Prekoračitev števca bajtov"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Predčasen znak za konec datoteke"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Neveljavna koda operacije"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operacija ni podprta"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Nepričakovani argumenti"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Nadzor tračne enote, ki bere ukaze iz drugega procesa"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "N"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "nastavi raven iskanja napak"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "DATOTEKA"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "določi datoteko za izpis iskanja napak"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "ni mogoče odpreti %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "preveč argumentov"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Neveljaven ukaz"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "To ne deluje kot arhiv ,tar'"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Skupno prebranih bajtov"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Skupno zapisanih bajtov"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Skupno izbrisanih bajtov"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(cev)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Zavrnjena zahteva za branje arhivske vsebine s terminala (manjkajoči f?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"Zavrnjena zahteva za pisanje arhivske vsebine na terminal (manjkajoči -f?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Neveljavna vrednost za dolžino zapisa (record_size)"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Ime arhiva ni podano"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Arhivov na stdin/stdout ni mogoče preveriti"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Arhiv je stisnjen. Uporabite izbiro %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Stisnjenega arhiva ni mogoče ažurirati"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Na začetku traku, končujem"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Preveč napak, končujem"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
@@ -684,7 +684,7 @@ msgstr[1] "Dolžina zapisa = %lu blok"
msgstr[2] "Dolžina zapisa = %lu bloka"
msgstr[3] "Dolžina zapisa = %lu bloki"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
@@ -693,37 +693,37 @@ msgstr[1] "Neporavnan blok (%lu bajt) v arhivu"
msgstr[2] "Neporavnan blok (%lu bajta) v arhivu"
msgstr[3] "Neporavnan blok (%lu bajti) v arhivu"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Nazaj po arhivu ne gre, morda ni berljiv brez izbire -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek se ni ustavil na meji zapisa"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: vsebuje neveljavno številko dela"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Prekoračitev številke dela"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Pripravite del #%d za %s in pritisnite Return: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Znak EOF na mestu, kjer se pričakuje odgovor uporabnika"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "POZOR: Arhiv nepopoln"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -734,65 +734,65 @@ msgstr ""
" q Končamo tar\n"
" y, newline Nadaljujemo z delovanjem\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Poženemo ukazno podlupino\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Ta seznam uzazov\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Novega dela ni, konec.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Ime datoteke ni določeno. Poskusite znova.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Neveljaven vnos. Vtipkajte ? za pomoč.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "ukaz %s neuspešen"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s se ne nadaljuje v tem delu"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s se morda nadaljuje v tem delu: zaglavje vsebuje porezano ime"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s je napačne velikosti (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Ta del ne sodi v zaporedje (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arhiv ni označen skladno z %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Del %s ne ustreza %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -800,11 +800,11 @@ msgstr ""
"%s: ime datoteke je predolgo za zapis v zaglavje GNU večdelnega arhiva; "
"porezano"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "pisanje se ni končalo s koncem bloka"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
@@ -813,75 +813,75 @@ msgstr[1] "Prebrati je bilo moč samo %lu od %lu bajta"
msgstr[2] "Prebrati je bilo moč samo %lu od %lu bajtov"
msgstr[3] "Prebrati je bilo moč samo %lu od %lu bajtov"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Vsebina se razlikuje"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Nepričakovan znak za konec datoteke v arhivu"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Zvrst datoteke se razlikuje"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Način se razlikuje"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Številka uporabnika (UID) se razlikuje"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Številka skupine (GID) se razlikuje"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Čas zadnje spremembe se razlikuje"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Velikost se razlikuje"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Ni povezana z %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Simbolna povezava se razlikuje"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Številka enote se razlikuje"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Preverjanje "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Neznana vrsta datoteke »%c«, diff kot na navadni datoteki"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Arhiv vsebuje imena datotek z odstranjenimi vodilnimi predponami."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Arhiv vsebuje transformirana imena datotek."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Verifikacija morda ne bo uspela locirati izvornih datotek."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
@@ -890,46 +890,46 @@ msgstr[1] "NAPAKA PRI PREVERJANJU: najdena %d neveljavna glava"
msgstr[2] "NAPAKA PRI PREVERJANJU: najdeni %d neveljavni glavi"
msgstr[3] "NAPAKA PRI PREVERJANJU: najdene %d neveljavne glave"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Osamljeni ničelni blok pri %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: vsebuje značko medpomnilniškega imenika %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "vrednost %s od %s obseg %s..%s; zamenjano %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "vrednost %s od %s obseg %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Ustvarjanje negativnih osmiških glav"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: ime datoteke je predolgo (največ %d); brez iznosa"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: ime datoteke je predolgo (ni mogoče deliti); brez iznosa"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: ime povezave je predolgo; brez iznosa"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
@@ -938,79 +938,79 @@ msgstr[1] "%s: Datoteka skrčena za %s bajt; dopolnjeno z ničlami"
msgstr[2] "%s: Datoteka skrčena za %s bajta; dopolnjeno z ničlami"
msgstr[3] "%s: Datoteka skrčena za %s bajte; dopolnjeno z ničlami"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: datoteka je na drugem datotečnem sistemu; brez iznosa"
# POZOR Imamo za to kak izraz?
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "vsebina ni iznešena"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Neznan tip datoteke; datoteka ignorirana"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Manjkajo povezave na %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: datoteka je nespremenjena; brez iznosa"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: datoteka je arhiv; brez iznosa"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "imenik ni iznešen"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: Datoteka je bila spremenjena med branjem"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: vtičnica ignorirana"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: vrata ignorirana"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Preskok na naslednjo glavo"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Brisanje ne-glave iz arhiva"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: neverjetno stara časovna oznaka %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: oznaka časa %s je %s s v prihodnosti"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Nepričakovana neskladnost pri ustvarjanju imenika"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: obstoječa datoteka se preskoči"
@@ -1036,7 +1036,7 @@ msgstr "Simbolne povezave poskusimo dearhivirati kot trde"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Dearhivacija ni mogoča - datoteka se nadaljuje iz prejšnjega dela"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Nepričakovano zaglavje z dolgim imenom"
@@ -1065,22 +1065,22 @@ msgstr "%s: Varnostne kopije te datoteke ni moč napraviti"
msgid "Cannot rename %s to %s"
msgstr "Preimenovanje %s v %s ni mogoče"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Imenik je bil preimenovan z %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Imenik je nov"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: imenik je na drugem datotečnem sistemu; brez iznosa"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Imenik je bil preimenovan"
@@ -1210,219 +1210,219 @@ msgstr "%s: Brisanje %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Odstranitev ni mogoča"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Izpuščeno"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** Blok znakov NUL **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok %s: ** Konec datoteke **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr ""
"Na mestu v glavi, kjer se pričakuje številčno vrednost %s, so presledki"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
"Osmiška vrednost arhiva %.*s izven obsega %s; privzema se dvojiški komplement"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Osmiška vrednost arhiva %.*s izven obsega %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arhiv vsebuje zastarele glave oblike base-64"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Podpis %s oblike base-64 v arhivu je izven obsega %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Vrednost base-256 v arhivu izven obsega %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arhiv vsebuje %.*s na mestu, kjer se pričakuje številčno vrednost %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Vrednost arhiva %s je izven obsega %s: %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " povezava na %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " neznan tip datoteke %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Dolga povezava--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Dolgo ime--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Glava dela--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Nadaljevanje pri bajtu %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Ustvarja se imenik:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Preimenovanje %s v %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Preimenovanje v %s ni mogoče"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Preimenovanje %s nazaj v %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Datoteka je bila odstranjena, preden jo je bilo mogoče prebrati"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "proces naslednik"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "medprocesni kanal"
-#: src/names.c:69
+#: src/names.c:68
#, fuzzy
msgid "Local file name selection:"
msgstr "Izbira lokalne datoteke:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"dodaj navedeno DATOTEKO v arhiv (za imena datotek, ki se začnejo z »-«)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "IMENIK"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "pomik v navedeni IMENIK"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "preberi seznam datotek z navedene DATOTEKE"
-#: src/names.c:78
+#: src/names.c:77
#, fuzzy
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T prebere z \\000 terminirana imena; onemogoči -C"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "prekliči učinek prejšnje izbire --null"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "odstrani narekovaje iz imen elementov (privzeto)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "ne odstrani narekovajev iz imen elementov"
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "VZOREC"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "brez datotek, ki jih opisuje VZOREC"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "brez datotek, ustrezajočim vzorcem, prebranih z DATOTEKE"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr ""
"brez vsebine imenikov, ki vsebujejo značko CACHEDIR.TAG, razen značke same"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr ""
"brez imenikov, ki vsebujejo značko CACHEDIR.TAG, in vseh njihovih podimenikov"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "brez imenikov, ki vsebujejo značko CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "brez vsebine imenikov, ki vsebujejo DATOTEKO, razen DATOTEKE same"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "preberi izključitvene vzorce za vsak imenik iz DATOTEKE, če ta obstaja"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1430,119 +1430,119 @@ msgstr ""
"preberi izključitvene vzorce za vsak imenik in njegove podimenike iz "
"DATOTEKE, če ta obstaja"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "brez imenikov, ki vsebujejo DATOTEKO, in vseh njihovih podimenikov"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "brez imenikov, ki vsebujejo DATOTEKO"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "brez imenikov sistema za nadzor različic"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "preberi izključitvene vzorce iz izključitvenih datotek VCS"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "brez varnostnih kopij in zaklepnih datotek"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "rekurzivno vključi vse podimenike"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "podimenikov se ne vključuje samodejno"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Izbire ujemanja imen datotek (vpliva tako na vključitvene kot na "
"izključitvene vzorce):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "vzorci se ujemajo z začetkom imena datoteke"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
"vzorci se ujemajo od kateregakoli znaka »/« dalje (privzeto pri izključitvi)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "brez razlike med malimi in velikimi črkami"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "pri ujemanje se razlikuje med malimi in velikimi črkami (privzeto)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "uporabi nadomestne znake (privzeto za izključitvi)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "dobesedno ujemanje nizov"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "nadomestni znaki se ujemajo z »/« (privzeto pri izključitvi)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "nadomestni znaki se ne ujemajo z »/«"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "ukazna vrstica"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: seznam datotek, ki ga zahteva %s, je že prebran iz %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "ni mogoče razcepiti niza »%s«: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: prebrano ime datoteke vsebuje znak \\0"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Z vzorcem ujemajoči se znaki, uporabljeni v imenih datotek"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1550,46 +1550,46 @@ msgstr ""
"Uporabite --wildcards, da bi omogočili ujemanje vzorcev, ali --no-wildcards, "
"da izklopite to opozorilo"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Ni najdeno v arhivu"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Zahtevane pojavitve ni moč najti v arhivu"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Neskladje v oznaki arhiva"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Izbira -C znotraj seznama datotek pri --listed-incremential ni dovoljena"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Samo ena izbira -C je dovoljena pri --listed-incremential"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Izbiri »%s« in »%s« obe zahtevata standardni vhod"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Neveljavna oblika arhiva"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Razširitve GNU izbrane na nezdružljivem formatu arhiva"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1815,7 +1815,7 @@ msgstr "Izbira izhodnega toka:"
msgid "extract files to standard output"
msgstr "datoteke restavriraj na standardni izhod"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "UKAZ"
@@ -1851,7 +1851,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATUM-ČAS"
@@ -2064,7 +2064,7 @@ msgstr "razdeli na bloke ob branju (cevovodi 4.2BSD)"
msgid "Archive format selection:"
msgstr "Izbira oblike arhiva:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "OBLIKA"
@@ -2148,60 +2148,60 @@ msgstr "PROGRAM"
msgid "filter through PROG (must accept -d)"
msgstr "filtriraj skozi PROGRAM (sprejemati mora izbiro -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Izbira lokalne datoteke:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "pri arhiviranju izpusti datoteke na nelokalnih datotečnih sistemih"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "ne odstrani vodilnih »/« iz imen datotek"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "sledi simbolnim povezavam; arhiviraj/iznesi ciljne datoteke"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "sledi trdim povezavam; arhiviraj/iznesi ciljne datoteke"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "IME"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "začni z navedenim IMENOM ob branju arhiva"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "shrani le datoteke, novejše od DATUM-ČAS"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATUM"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "primerjaj datum in uro le, kadar se podatki spremenijo"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "TIP"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr ""
"varnostna kopija pred brisanjem, z možnostjo izbire TIPA varnostne kopije"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "NIZ"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2209,59 +2209,59 @@ msgstr ""
"varnostna kopija pred brisanjem; prekličemo običajno PRIPONO (»~«, razen če "
"lupinska spremenljivka SIMPLE_BACKUP_SUFFIX določa drugače)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Pretvorbe imen datotek:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "pri restavriranju poreži ŠTEVILO vodilnih komponent iz imen datotek"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "IZRAZ"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "uporabi nadomestitveni IZRAZ programa sed za pretvorbo imen datotek"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informativni izpisi:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "z izčrpnim izpisom obdelanih datotek"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "KLJUČ"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "nadzor opozorila"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "izpiši poročilo o napredku pri vsakem N-tem zapisu (privzeto 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "DEJANJE"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "na vsaki kontrolni točki izvedi DEJANJE"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "izpiši sporočilo, če niso zapisane vse povezave"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2273,35 +2273,35 @@ msgstr ""
"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 in SIGUSR2, prepoznana so tudi imena "
"signalov brez predpone SIG-"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "izpiši čase sprememb datotek v UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "izpiši čas datoteke v polni ločljivosti"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "zapiši izčrpno poročilo v DATOTEKO"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "z izpisom zaporednega bloka v arhivu ob vsakem sporočilu"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "vprašaj za potrditev pri vsakem koraku"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "prikaži privzete nastavitve"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "prikaži veljavne razpone za polja snapshot-file"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2309,31 +2309,31 @@ msgstr ""
"pri izpisu seznama ali restavriranju izpiši vsak imenik, ki ne ustreza "
"iskalnim pogojem"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "prikaži imena datotek ali arhivov po pretvorbi"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "SLOG"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "nastavi slog navajanja imen; glej spodaj za veljavne SLOGE"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "dodatno navedi znake iz NIZA"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "onemogoči navajanje znakov iz NIZA"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Združljivostne izbire:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2341,61 +2341,61 @@ msgstr ""
"ob ustvarjanju arhiva isto kot --old-archive; ob restavriranju isto kot --no-"
"same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Druge izbire:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "onemogoči rabo nekaterih potencialno škodljivih izbir"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "»%s« ni mogoče uporabiti obenem z »%s«"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "Podate lahko največ eno od izbir »-Acdtrux« ali »--test-label«"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Nasprotujoče si izbire glede stiskanja arhiva"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Neznano ime signala: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Datoteke z vzorcem datuma ni najti"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Nadomešča se %s za neznan format datuma %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Izbira %s: Datum »%s« se obravnava kot %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtriraj arhiv skozi %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Veljavni argumenti pri izbiri --quoting-style so:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2403,120 +2403,120 @@ msgstr ""
"\n"
"Privzete vrednosti *tega* programa tar:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Neveljaven ID lastnika ali skupine"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Neveljaven faktor blokiranja"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Neveljavna dolžina traku"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Okvarjena vrednost inkrementalne ravni"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Več kot en pražni podatek"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Neveljavna vrednost razpršene različice"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "izbira --atime-preserve='system' na tem sistemu ni podprta"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "vrednost --checkpoint ni celo število"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Podana zaščita ni veljavna"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Neveljavno število"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Neveljavna dolžina zapisa"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Dolžina zapisa mora biti večkratnik %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Neveljavno število elementov"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Dovoljena je le ena izbira --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Okvarjen argument gostote: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Neznana gostota: »%c«"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "*Ta* izvedba tar ne podpira izbir »-[0-7][lmh]«"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, fuzzy, c-format
msgid "error parsing %s"
msgstr "Napaka pri razčlembi števila pri »%s«"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[DATOTEKA]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, fuzzy, c-format
msgid "non-option arguments in %s"
msgstr "neveljaven argument %s za %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, fuzzy, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "ni mogoče razcepiti niza »%s«: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Stara izbira »%c« zahteva argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence nima pomena brez seznama datotek"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Več arhivskih datotek zahteva izbiro »-M«"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "Izbira --level je brez pomena brez izbire --listed-incremential"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
@@ -2525,43 +2525,43 @@ msgstr[1] "%s: Oznaka dela je predolga (omejitev je %lu bajt)"
msgstr[2] "%s: Oznaka dela je predolga (omejitev je %lu bajta)"
msgstr[3] "%s: Oznaka dela je predolga (omejitev je %lu bajti)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Arhivov v več delih ni mogoče preveriti"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Stisnjenega arhiva ni mogoče preveriti"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Stisnjeni arhivi v več delih niso mogoči"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Stisnjenega arhiva ni mogoče združevati"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "izbira --pax-option je mogoča le na arhivih POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "izbira --acls je mogoča le na arhivih POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "izbira --selinux je mogoča le na arhivih POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "izbira --xattrs je mogoča le na arhivih POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2569,29 +2569,29 @@ msgstr ""
"Vrhnjega imenika ni mogoče ugotoviti; prosimo nastavite ga izrecno z --one-"
"top-level=IMENIK"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Dolžina dela ne more biti manjša od velikosti zapisa"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Zahteva po odprtju praznega arhiva bojazljivo zavrnjena"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Izbire »-Aru« so nezdružljive z »-f -«"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "Ena od izbir »-Acdtrux«, »--delete« ali »--test-label« je obvezna"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Zaradi predhodnih napak zaključujemo s statusom napake"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
@@ -2600,99 +2600,108 @@ msgstr[1] "%s: Datoteka skrčena za %s bajt"
msgstr[2] "%s: Datoteka skrčena za %s bajta"
msgstr[3] "%s: Datoteka skrčena za %s bajte"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Ključ %s je bodisi neznan, bodisi še ni izveden"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Oznaka časa izven obsega"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Vzorca %s ni mogoče uporabiti"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Ključa %s ni mogoče preklicati"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Poškodovana razširjena glava: manjka dolžina"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Dolžina razširjene glave %*s je izven dovoljenega obsega"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Poškodovana razširjena glava: za dolžino manjka presledek"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Poškodovana razširjena glava: manjka enačaj"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Poškodovana razširjena glava: manjka znak za novo vrstico"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ne upošteva se neznanega ključa razširjene glave »%s«"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Ustvarjeni par ključ/vrednost je predolg (ključ=%s, dolžina=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Par %s=%s v razširjeni glavi je izven obsega %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Poškodovana razširjena glava: neveljavni %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Poškodovana razširjena glava: odvečni %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
"Poškodovana razširjena glava: neveljavni %s: nepričakovani razmejilnik %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Poškodovana razširjena glava: neveljavni %s: liho število vrednosti"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: neveljaven čas preteka"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: neznano dejanje za kontrolno točko"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "zapiši"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "preberi"
@@ -2701,7 +2710,7 @@ msgstr "preberi"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Oznaka pisanja %u"
@@ -2711,12 +2720,12 @@ msgstr "Oznaka pisanja %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Oznaka branja %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2724,94 +2733,98 @@ msgstr ""
"genfile pripravi datoteke za testno zbirko GNU paxutils.\n"
"IZBIRE so:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Izbire ustvarjenja datotek:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "VELIKOST"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Ustvari arhiv z navedeno VELIKOSTJO"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Zapiši na podano DATOTEKO namesto na standardni izhod"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Preberi imena datotek iz podane DATOTEKE"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T prebere z \\000 terminirana imena"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "Zapiše v datoteko dani VZOREC. VZOREC je lahko 'default' ali 'zeros'"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Velikost bloka za razpršeno datoteko"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Ustvari razpršeno datoteko. Preostanek ukazne vrstice podaja preslikavo "
"datoteke."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "ODMIK"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "pomakni se na dani odmik pred pisanjem podatkov"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Izbire statistike datotek:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Izpiši vsebino strukture stat za vsako od datotek. Privzeti FORMAT je: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Izbire za sinhrono izvajanje:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "IZBIRA"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Izvedi ARGUMENTE. Uporabno z izbiro --checkpoint in eno od naslednjih izbir: "
"--cut, --append, --touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Ob dosegu kontrolne točke N izvedi dano dejanje (glejte spodaj)"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Nastavi datum za naslednjo izbiro --touch"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Izpiši izvedene kontrolne točke in izhodni status UKAZA"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2819,7 +2832,7 @@ msgstr ""
"Dejanja sinhronega izvajanja. Izvedejo se, ko je dosežena ena od kontrolnih "
"točk, podana z izbiro --checkpoint."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2827,126 +2840,126 @@ msgstr ""
"Skrajšaj DATOTEKO na dolžino, določeno s prejšnjo izbiro --length (ali 0, če "
"ta ni podana)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Dodaj VELIKOST bajtov DATOTEKI. VELIKOST je podana s prejšnjo izbiro --"
"length."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Posodobi čas dostopa in spremembe za DATOTEKO"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Izvedi UKAZ"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Neveljavna velikost: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Številka izven dovoljenega obsega: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negativna velikost: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "klic stat(%s) ni uspel"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "zahtevana dolžina datoteke %lu, dejanska %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "ustvarjena datoteka ni razpršena"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Napaka pri razčlembi števila pri »%s«"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Neznana format datuma"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENT...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "ni mogoče odpreti »%s«"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "klic seek() ni mogoč"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "datoteka vsebuje znak NUL"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"razpršenih datotek ni mogoče ustvariti na standardnem izhodu, uporabite "
"izbiro --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "nepravilna maska (pri »%s«)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Neznano polje »%s«"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "ni mogoče nastaviti časa za »%s«"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "ni mogoče okrajšati »%s«"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "ukaz neuspešen: %s"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "ni mogoče okrajšati »%s«"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "Ni mogoče odpreti imenika %s"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "ni mogoče odstraniti »%s«"
@@ -2987,6 +3000,9 @@ msgstr "Ukaz je bil prekinjen\n"
msgid "--stat requires file names"
msgstr "--stat zahteva imena datotek"
+#~ msgid "OPTION"
+#~ msgstr "IZBIRA"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: vrednost parametra ARGP_HELP_FMT mora biti pozitivna"
diff --git a/po/sr.gmo b/po/sr.gmo
index 6380c513765c231334154b054c627056e969ee30..1fa3994c4caa8c875d4ca7fb236a02f6d7f93465 100644
Binary files a/po/sr.gmo and b/po/sr.gmo differ
diff --git a/po/sr.po b/po/sr.po
index 8d23713b7d19fc542d83660b83f4ae4509e71043..a515bfa1e3b1278a2b1172ff35d05135cdd23ca8 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,12 +2,12 @@
# Copyright (C) 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014—2016.
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar-1.29\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2016-06-02 05:18+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
@@ -97,7 +97,7 @@ msgid "give a short usage message"
msgstr "приказује кратку поруку коришћења"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "НАЗИВ"
@@ -232,12 +232,12 @@ msgstr "^[yY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Запаковао је %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Запаковао је %s\n"
@@ -245,11 +245,11 @@ msgstr "Запаковао је %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
#, fuzzy
msgid ""
"\n"
@@ -528,147 +528,147 @@ msgstr "Не могу да преусмерим датотеке за удаље
msgid "Cannot execute remote shell"
msgstr "Не могу да извршим удаљену шкољку"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Смер премотавања је изван опсега"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Неисправан смер премотавања"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Неисправан померај премотавања"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Померај премотавања је изван опсега"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Неисправан број бајта"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Број бајта је изван опсега"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Прерани крај датотеке"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Неисправна шифра радње"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Радња није подржана"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Неочекивани аргументи"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Управља уређајем траке, прихватајући наредбе од удаљеног процеса"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "БРОЈ"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "поставља ниво прочишћавања"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "ДАТОТЕКА"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "поставља назив излазне датотеке прочишћавања"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "не могу да отворим „%s“"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "превише аргумената"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Наредба за ђубре"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Ово не изгледа као тар архива"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Укупно прочитаних бајтова"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Укупно уписаних бајтова"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Укупно обрисаних бајтова"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(спојка)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Одбијам да читам садржаје архиве из терминала (да ли недостаје опција „-f“?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
" Одбијам да пишем садржаје архиве на терминал (да ли недостаје опција „-f“?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Неисправна вредност за величину_снимка"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Није дат назив архиве"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Не могу да проверим архиву стандарног улаза/излаза"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Архива је запакована. Користите опцију „%s“"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Не могу да освежим запаковане архиве"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "На почетку сам траке, прекидам"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Превише грешака, прекидам"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
@@ -676,7 +676,7 @@ msgstr[0] "Величина снимања = %lu блок"
msgstr[1] "Величина снимања = %lu блока"
msgstr[2] "Величина снимања = %lu блокова"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
@@ -684,37 +684,37 @@ msgstr[0] "Непоравнат блок (%lu бајт) у архиви"
msgstr[1] "Непоравнат блок (%lu бајта) у архиви"
msgstr[2] "Непоравнат блок (%lu бајтова) у архиви"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Не могу да померим уназад датотеку архиве; може бити нечитка без „-i“"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "„rmtlseek“ није заустављен на граници снимања"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: садржи погрешан број диска"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Прекорачење броја диска"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Припремите диск #%d за „%s“ и притисните врати: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "крај датотеке где се очекивао одговор корисника"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "УПОЗОРЕЊЕ: Архива није потпуна"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -726,66 +726,66 @@ msgstr ""
" y или newline Наставља радњу\n"
# проверити и питати
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Израђа подшкољку\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Испсиује овај списак\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Нема новог диска; излазим.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Нисте навели назив датотеке. Покушајте поново.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Неисправан улаз. Укуцајте ? за помоћ.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "Није успела наредба „%s“"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "„%s“ није наставио на овом диску"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"„%s“ је вероватно наставио на овом диску: заглавље садржи скраћени назив"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s је погрешне величине (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Овај диск је ван низа (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Архива није обележена да поклопи „%s“"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Диск „%s“ не поклапа „%s“"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -793,11 +793,11 @@ msgstr ""
"%s: назив датотеке је предуг да би се сачувао у заглављу Гнуовог вишедика, "
"скраћено"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "писање није завршило на граници блока"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
@@ -805,75 +805,75 @@ msgstr[0] "Могу да прочитам само %lu од %lu бајта"
msgstr[1] "Могу да прочитам само %lu од %lu бајта"
msgstr[2] "Могу да прочитам само %lu од %lu бајтова"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Садржаји се разликују"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Неочекиван крај датотеке у архиви"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Врста датотеке се разликује"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Режим се разликује"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Јиб се разликује"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Гиб се разликује"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Време калупа се разликује"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Величина се разликује"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Није повезан са „%s“"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Симболичка веза се разликује"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Број уређаја се разликује"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Провери "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Непозната врста датотеке „%c“, другачија је од обичне датотеке"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Архива садржи називе датотека са уклоњеним водећим префиксима."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Архива садржи преиначене називе датотека."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Провера можда не успе да пронађе изворне датотеке."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
@@ -881,46 +881,46 @@ msgstr[0] "НЕУСПЕЛА ПРОВЕРА: откривено је %d неис
msgstr[1] "НЕУСПЕЛА ПРОВЕРА: откривена су %d неисправна заглавља"
msgstr[2] "НЕУСПЕЛА ПРОВЕРА: откривено је %d неисправних заглавља"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Усамљени нулти блок на „%s“"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: садржи ознаку директоријума оставе „%s“; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "вредност „%s“ је ван „%s“ опсега %s..%s; замењујем са „%s“"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "вредност „%s“ је ван „%s“ опсега %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Стварам негативна октална заглавља"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: назив датотеке је предуг (највише %d); није изнет"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: назив датотеке је предуг (не могу да га поделим); није изнет"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: назив везе је предуг; није изнет"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
@@ -928,78 +928,78 @@ msgstr[0] "%s: Датотека је смањена за %s бајт, допуњ
msgstr[1] "%s: Датотека је смањена за %s бајта, допуњена нулама"
msgstr[2] "%s: Датотека је смањена за %s бајтова, допуњена нулама"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: датотека је на другачијем систему датотека; није изнета"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "садржај није изнет"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Непозната врста датотеке; датотека је занемарена"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Недостаје веза на „%s“."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: датотека је непромењена; није изнета"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: датотека је архива; није изнета"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "директоријум није изнет"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: датотека је промењена у току читања"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: прикључница је занемарена"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: врата су занемарена"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Прелазим на следеће заглавље"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Бришем не-заглавља из архиве"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: неприхватљива стара временска ознака „%s“"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: временска ознака „%s“ је %s сек. у будућности"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Неочекивана недоследност приликом прављења директоријума"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: прескачем постојећу датотеку"
@@ -1024,7 +1024,7 @@ msgstr "Покушавам да извучем симболичке везе к
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Не могу да извучем — датотека је наставак са другог диска"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Неочекивано дуго заглавље назива"
@@ -1053,22 +1053,22 @@ msgstr "%s: Нисам могао да направим резерву ове д
msgid "Cannot rename %s to %s"
msgstr "Не могу да преименујем „%s“ у „%s“"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Директоријуму је промењен назив са „%s“"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Директоријум је нов"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: директоријум је на другачијем систему датотека; није изнет"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Директоријум је преименован"
@@ -1194,35 +1194,35 @@ msgstr "%s: Бришем „%s“\n"
msgid "%s: Cannot remove"
msgstr "%s: Не могу да уклоним"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Пропуштам"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "блок %s: ** Блок НИШТАВНИХ вредности **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "блок %s: ** Крај датотеке **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "блок %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Празнине у заглављу где је очекивана бројевна „%s“ вредност"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1230,157 +1230,157 @@ msgstr ""
"двојке"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Октална вредност архиве „%.*s“ је ван „%s“ опсега"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Архива садржи застарела заглавља основе-64"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Архивом потписана ниска основе-64 „%s“ је ван „%s“ опсега"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Вредност основе-256 архиве је ван „%s“ опсега"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Архива садржи „%.*s“ где је очекивана бројевна „%s“ вредност"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Вредност архиве „%s“ је ван „%s“ опсега %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " веза до „%s“\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " непозната врста датотеке „%s“\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "—Дуга веза—\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "—Дуг назив—\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "—Заглавље диска—\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "—Настављен на бајту %s—\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Стварам директоријум:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Преименујем „%s“ у „%s“\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Не могу да преименујем у „%s“"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Преименујем „%s“ назад на „%s“\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Датотека је уклоњена пре него што је прочитана"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "проистекли процес"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "канал међупроцеса"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Избор назива месне датотеке:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "додаје дату ДАТОТЕКУ у архиву (корисно ако њен назив почиње цртицом)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "ДИР"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr " прелази у директоријум ДИР"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "добавља називе да извуче или створи из ДАТОТЕКЕ"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "„-T“ чита нулом завршене називе; подразумева „--verbatim-files-from“"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "искључује дејство претходне опције „--null“"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "уклања наводнике улазне датотеке или назива чланова (основно)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "не уклања наводнике улазне датотеке или назива чланова"
-#: src/names.c:87
+#: src/names.c:86
#, fuzzy
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr "„-T“ чита дословност назива датотека (без рада са опцијама)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "„-T“ називе датотека који почињу цртицом сматра за опције (основно)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "ШАБЛОН"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr " искључује датотеке, дате као ШАБЛОН"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "искључује шаблоне исписане у ДАТОТЕЦИ"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1388,24 +1388,24 @@ msgstr ""
"искључује садржај директоријума који садрже „CACHEDIR.TAG“, осим за саму ту "
"ознаку датотеке"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "искључује све под директоријумима који садрже „CACHEDIR.TAG“"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "искључује директоријуме који садрже „CACHEDIR.TAG“"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"искључује садржај директоријума који садрже ДАТОТЕКУ, осим за саму ДАТОТЕКУ"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "чита шаблоне изузећа за сваки директоријум из ДАТОТЕКЕ, ако постоје"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1413,118 +1413,118 @@ msgstr ""
"чита шаблоне изузећа за сваки директоријум и њихове поддиректоријуме из "
"ДАТОТЕКЕ, ако постоје"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "искључује све испод директоријума који садрже ДАТОТЕКУ"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "искључује директоријуме који садрже ДАТОТЕКУ"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "искључује директоријуме система управљања издањем"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "чита шаблоне изузећа из ВЦС датотека занемаривања"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "искључује датотеке резерве и закључавања"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "дубачи у директоријумима (основно)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "избегава опадање самостално у директоријима"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Опције поклапања назива датотека (утиче и на шаблоне укључивања и "
"искључивања):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "шаблон се поклапа са почетком назива датотеке"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "шаблони се поклапају након сваке / (основно за искључивања)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "занемарује величину слова"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "поклапање величине слова (основно)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "користи џокере (основно за искључивања)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "дословно поклапање ниске"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "џокери се поклапају са / (основно за искључивања)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "џокери се не поклапају са /"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "линија наредби"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: списак датотека затражен са „%s“ већ је прочитан са „%s“"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "не могу да поделим ниску „%s“: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: прочитан назив датотеке садржи ништаван знак"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Знаци поклапања шаблона су коришћени у називима датотека"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1532,47 +1532,47 @@ msgstr ""
"Користите „--wildcards“ да укључите поклапање шаблона, или „--no-wildcards“ "
"да потиснете ово упозорење"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Нисам нашао у архиви"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Нисам нашао у архиви захтевану појаву"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Натпис архиве не одговара"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Употреба опције „-C“ унутар списка датотека није допуштена са „--listed-"
"incremental“"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Само једна опција „-C“ је допуштена са „--listed-incremental“"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Обе опције „%s“ и „%s“ желе стандардни улаз"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Неисправан запис архиве"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Гнуове функције се траже на несагласном запису архиве"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1793,7 +1793,7 @@ msgstr "Бирање излазног тока:"
msgid "extract files to standard output"
msgstr "извлачи датотеке на стандардни излаз"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "НАРЕДБА"
@@ -1829,7 +1829,7 @@ msgstr " користи ДАТОТЕКА да мапира УИД-е вла
msgid "use FILE to map file owner GIDs and names"
msgstr " користи ДАТОТЕКА да мапира ГИД-е власника датотека и називе"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "ДАТУМ-ИЛИ-ДАТОТЕКА"
@@ -2039,7 +2039,7 @@ msgstr "уређује блокове током читања (за 4.2БСД с
msgid "Archive format selection:"
msgstr "Избор записа архиве:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "ЗАПИС"
@@ -2123,59 +2123,59 @@ msgstr "ПРОГРАМ"
msgid "filter through PROG (must accept -d)"
msgstr "издваја кроз ПРОГРАМ (мора да прихвати „-d“)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Избор месне датотеке:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "остаје у месном датотека систему када ствара архиву"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "не уклања водеће / из назива датотека"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "прати симболичке везе; архивира и износи датотеке на које показују"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "прати чврсте везе; архивира и износи датотеке на које упућују"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "НАЗИВ-ЧЛАНА"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "почиње од члана НАЗИВ-ЧЛАНА када чита архиву"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "чува само датотеке које су новије од ДАТУМ-ИЛИ-ДАТОТЕКА"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "ДАТУМ"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr " упоређује датум и време када се промени само податак"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "УПРАВЉАЊЕ"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "прави резерву пре уклањања, бира УПРАВЉАЊЕ издањем"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "НИСКА"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2183,59 +2183,59 @@ msgstr ""
" прави резерву пре уклањања, преписује уобичајени суфикс („~“ уколико "
"није преписан променљивом окружења „SIMPLE_BACKUP_SUFFIX“)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Преображавање назива датотеке:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "одсеца БРОЈ водећих састојака из назива датотека приликом извлачења"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "ИЗРАЗ"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "користи седов ИЗРАЗ замене за преображај назива датотека"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Обавештајни излаз:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "опширно исписује обрађене датотеке"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "КЉУЧНА РЕЧ"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "управља упозорењем"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr " приказује поруке напредовања сваког снимања бр. БРОЈ (основно је 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "РАДЊА"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "извршава РАДЊУ на свакој тачки провере"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "исписује поруку ако све везе нису изнете"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "СИГНАЛ"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2247,35 +2247,35 @@ msgstr ""
"SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2“; називи без префикса „SIG“ се такође "
"прихватају"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "исписује времена измена датотеке у КУВ-у"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "исписује време датотеке у његовом потпуном простирању"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "шаље опширан излаз у ДАТОТЕКУ"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "приказује број блока унутар архиве са сваком поруком"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "пита за потврду за сваку радњу"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "приказује основности тара"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "показује исправне опсеге за поља датотеке снимка"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2283,31 +2283,31 @@ msgstr ""
"када исписује или извлачи, исписује сваки директоријум који се не поклапа са "
"условом претраге"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "показује називе датотека или архива након преображаја"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "СТИЛ"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "поставља стил цитирања назива; видите испод исправне вредности СТИЛА"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr " додатно цитира знакове из НИСКЕ"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "искључује цитирање за знакове из НИСКЕ"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Опције сагласности:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2315,22 +2315,22 @@ msgstr ""
"када ствара, исто као „--old-archive“; када извлачи, исто као „--no-same-"
"owner“"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Остале опције:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "искључује употребу неких потенцијално штетних опција"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "„%s“ не може бити коришћена са „%s“"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2338,40 +2338,40 @@ msgstr ""
"Не можете навести више од једне опције „-Acdtrux“, „--delete“ или „--test-"
"label“"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Сукобљавајуће опције сажимања"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Непознат назив сигнала: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Нисам нашао датотеку примерка датума"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Замењујем „%s“ за непознати запис датума „%s“"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Опција „%s“: Сматрам датум „%s“ за „%s“"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "издваја архиву кроз „%s“"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Исправни аргументи за опцију „--quoting-style“ су:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2379,120 +2379,120 @@ msgstr ""
"\n"
"*Овај* тар подразумева опције:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Неисправан власник или ИБ групе"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Неисправан блокирајући чинилац"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Неисправна дужина траке"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Неисправна увећавајућа вредност нивоа"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Више од једног датума помака"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Неисправна вредност разређеног издања"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "„--atime-preserve='system'“ није подржана на овој платформи"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "вредност „--checkpoint“ није цео број"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Неисправан режим је дат на опцији"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Неисправан број"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Неисправна величина записа"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Величина снимања мора да буде вишеструка од %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Неисправан број елемената"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Дозвољена је само једна опција „--to-command“"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Лош аргумент густине: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Непозната густина: „%c“"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Опције „-[0-7][lmh]“ нису подржане *овим* таром"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: место грешке"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "грешка обрађивања „%s“"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[ДАТОТЕКА]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "не-опциони аргументи у „%s“"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "не могу да поделим „TAR_OPTIONS“: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Стара опција „%c“ захтева аргумент."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "„--occurrence“ нема значење без списка датотека"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Више датотека архиве захтева опцију „-M“"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "„--level“ нема значења без „--listed-incremental“"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
@@ -2500,43 +2500,43 @@ msgstr[0] "%s: Натпис диска је предуг (ограничење
msgstr[1] "%s: Натпис диска је предуг (ограничење је %lu бајта)"
msgstr[2] "%s: Натпис диска је предуг (ограничење је %lu бајтова)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Не могу да проверим архиве више дискова"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Не могу да проверим сажете архиве"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Не могу да користим сажете архиве више дискова"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Не могу да спојим сажете архиве"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "„--clamp-mtime“ треба датум наведен опцијом „--mtime“"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "„--pax-option“ може бити коришћена само на ПОСИКС архивама"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "„--acls“ може бити коришћена само на ПОСИКС архивама"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "„--selinux“ може бити коришћена само на ПОСИКС архивама"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "„--xattrs“ може бити коришћена само на ПОСИКС архивама"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2544,30 +2544,30 @@ msgstr ""
"Не могу да докучим назив директоријума највишег нивоа; поставите га изричито "
"са „--one-top-level=ДИР“"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Величина диска не може бити мања од величине снимка"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Кукавички одбијам да направим празну архиву"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Опције „-Aru“ су несагласне са „-f -“"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Можете навести једну од опција „-Acdtrux“, „--delete“ или „--test-label“"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Излазим са стањем неуспеха услед претходних грешака"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
@@ -2575,98 +2575,107 @@ msgstr[0] "%s: Датотека је скупљена за %s бајт"
msgstr[1] "%s: Датотека је скупљена за %s бајта"
msgstr[2] "%s: Датотека је скупљена за %s бајтова"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Кључна реч „%s“ је непозната или још није примењена"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Временска ознака је ван допуштеног опсега"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Шаблон „%s“ не може бити коришћен"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Кључна реч „%s“ не може бити преписана"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Лоше проширено заглавље: недостаје дужина"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Дужина проширеног заглавља „%*s“ је ван опсега"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Лоше проширено заглавље: недостаје празнина након дужине"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Лоше проширено заглавље: недостаје знак једнакости"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Лоше проширено заглавље: недостаје нови ред"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Занемарујем непознату кључну реч „%s“ проширеног заглавља"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Створени пар кључна реч/вредност је предуг (кључна реч=%s, дужина=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Проширено заглавље „%s=%s“ је ван опсега %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Лоше проширено заглавље: неисправно је „%s=%s“"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Лоше проширено заглавље: премашује „%s=%s“"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Лоше проширено заглавље: неисправно „%s“: неочекивани разделник „%c“"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Лоше проширено заглавље: неисправно „%s“: непаран број вредности"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: није исправан истек времена"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: непозната радња тачке провере"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "писање"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "читање"
@@ -2674,7 +2683,7 @@ msgstr "читање"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Тачка провере радње писања „%u“"
@@ -2683,12 +2692,12 @@ msgstr "Тачка провере радње писања „%u“"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Тачка провере радње читања „%u“"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2697,94 +2706,98 @@ msgstr ""
"Гнуовог помагала пакета (GNU paxutils).\n"
"Опције су:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Опције стварања датотеке:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "ВЕЛИЧИНА"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Прави датотеку задате ВЕЛИЧИНЕ"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Пише у НАЗИВ датотеке, уместо на стандардни излаз"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Чита називе датотека из ДАТОТЕКЕ"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "„-T“ чита нулом заврешене називе"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Испуњава датотеку задатим ШАБЛОНОМ. ШАБЛОН је „default“ (основно) или "
"„zeros“ (нуле)"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Величина блока за проређену датотеку"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Ствара проређену датотеку. Остатак линије наредби даје мапу датотеке."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "ПОМЕРАЈ"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Премотава на задати померај пре записивања података"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Потискује дијагностичке поруке које нису кобне"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Опције статистичке датотеке:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Исписује садржаје стања структуре за сваку дату датотеку. Основни ЗАПИС је:"
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Опције усаглашеног извршавања:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "ОПЦИЈА"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Извршава АРГУМЕНТЕ. Корисно уз „--checkpoint“ и уз једну од „--cut“, „--"
"append“, „--touch“, „--unlink“"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Обавља задату радњу (видите испод) након достизања БРОЈА тачке провере"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Поставља датум за следећу опцију „--touch“"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Приказује извршене тачке провере и износи стање НАРЕДБЕ"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2792,7 +2805,7 @@ msgstr ""
"Радње усаглашеног извршавања. Извршавају се када је достигнут број тачке "
"провере задат опцијом „--checkpoint“."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2800,126 +2813,126 @@ msgstr ""
"Скраћује ДАТОТЕКУ на величину наведену претходном опцијом „--length“ (или 0, "
"ако није дата)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Придодаје ВЕЛИЧИНА бајтова ДАТОТЕЦИ. ВЕЛИЧИНА је дата претходном опцијом „--"
"length“"
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Освежава времена приступа и промена ДАТОТЕКЕ"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Извршава НАРЕДБУ"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Неисправна величина: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Број је изван дозвољеног опсега: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Негативна величина: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "није успело добављање података за „%s“"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "затражена величина датотеке је %lu, а тренутна је %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "створена датотека није проређена"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Грешка анализе броја близу „%s“"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Непознат запис датума"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[АРГУМЕНТИ...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "не могу да отворим „%s“"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "не могу да премотам"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "назив датотеке садржи ништаван знак"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"не могу да створим проређену датотеку на стандардном излазу, користите "
"опцију „--file“"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "неисправна маска (близу „%s“)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Непознато поље „%s“"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "не могу да подесим време на „%s“"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "не могу да скратим „%s“"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "наредба није успела: %s"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "не могу да скратим „%s“"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "не могу да подесим време на „%s“"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "не могу да развежем „%s“"
@@ -2959,6 +2972,9 @@ msgstr "Наредба је окончана\n"
msgid "--stat requires file names"
msgstr "„--stat“ захтева називе датотека"
+#~ msgid "OPTION"
+#~ msgstr "ОПЦИЈА"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: „ARGP_HELP_FMT“ параметар мора бити позитиван"
diff --git a/po/sv.gmo b/po/sv.gmo
index babcb8257702edf2079b21530e2d25a9d6b5e1f6..ccbb889dd295cc89141692a1e749c335be14c19a 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 605fced1c9df1812cdb9818861f2c4c5626e33c6..0e8b6aa7cb23fa7d8a724c0b2f41bcf37c7a0ab6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,16 +1,16 @@
# Swedish messages for tar
-# Copyright © 1996, 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2016 Free Software Foundation, Inc.
+# Copyright © 1996, 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2016, 2017 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
# Jan Djärv <jan.h.d@swipnet.se>, 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016, 2017
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-16 21:45+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-19 18:15+0100\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.0.5\n"
#: gnu/argmatch.c:134
#, c-format
@@ -101,7 +101,7 @@ msgid "give a short usage message"
msgstr "ge ett kort hjälpmeddelande"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "NAMN"
@@ -139,29 +139,29 @@ msgid "write error"
msgstr "skrivfel"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: flaggan ”%s” är tvetydig\n"
+msgstr "%s: flaggan ”%s%s” är tvetydig\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: flaggan ”%s” är tvetydig, alternativ:"
+msgstr "%s: flaggan ”%s%s” är tvetydig, alternativ:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: okänd flagga ”%c%s”\n"
+msgstr "%s: okänd flagga ”%s%s”\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”%c%s” tar inget argument\n"
+msgstr "%s: flaggan ”%s%s” tar inget argument\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: flaggan ”--%s” kräver ett argument\n"
+msgstr "%s: flaggan ”%s%s” kräver ett argument\n"
#: gnu/getopt.c:621
#, c-format
@@ -236,12 +236,12 @@ msgstr "^[yYjJ]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Paketerad av %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Paketerad av %s\n"
@@ -249,12 +249,11 @@ msgstr "Paketerad av %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -264,7 +263,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Licens GPLv3+: GNU GPL version 3 eller senare <http://gnu.org/licenses/gpl."
+"Licens GPLv3+: GNU GPL version 3 eller senare <https://gnu.org/licenses/gpl."
"html>.\n"
"Detta program är fri programvara. Du kan modifiera och distribuera den.\n"
"Det finns inte NÅGON SOM HELST GARANTI, till den grad som lagen tillåter.\n"
@@ -407,15 +406,14 @@ msgid "%s home page: <%s>\n"
msgstr "hemsida för %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "%s hemsida: <http://www.gnu.org/software/%s/>.\n"
+msgstr "Webbsida för %s: <https://www.gnu.org/software/%s/>.\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Allmän användarhjälp för GNU-programvara: <http://www.gnu.org/gethelp/>.\n"
+"Allmän användarhjälp för GNU-programvara: <https://www.gnu.org/gethelp/>.\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -534,189 +532,189 @@ msgstr "Kan inte omdirigera filer för fjärrskal"
msgid "Cannot execute remote shell"
msgstr "Kan inte exekvera fjärrskal"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Positioneringsriktning har ogiltigt värde"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Ogiltig sökriktning"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Ogiltigt positioneringsvärde"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Positioneringsvärde är utanför giltigt intervall"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Ogiltigt byte-antal"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Byte-antal är utanför giltigt intervall"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "För tidigt filslut"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Felaktig operationskod"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Operationsläge stöds inte"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Oväntade argument"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Styr en bandstation, acceptera kommandon från en fjärrprocess"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NUMMER"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "sätt felsökningsnivå"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FIL"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "sätt felsökningsfilnamn"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
-msgstr "kan inte öppna ”%s”"
+msgstr "kan inte öppna %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "för många argument"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Okänt kommando"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Det här ser inte ut som ett tar-arkiv"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Summa lästa byte"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Summa skrivna byte"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Summa borttagna byte"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(rör)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Vägrar att läsa arkivinnehåll från terminal (saknad -f-flagga?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Vägrar att skriva arkivinnehåll till terminal (saknad -f-flagga?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Ogiltigt värde på record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Arkivnamn saknas"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Kan inte verifiera standard in/ut-arkiv"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Arkivet är komprimerat. Använd flaggan %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Komprimerade arkiv kan inte uppdateras"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Vid bandets början, avslutar nu"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "För många fel, avslutar"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Poststorlek = %lu block"
msgstr[1] "Poststorlek = %lu block"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Block ej vid blockgräns (%lu byte) i arkivet"
msgstr[1] "Block ej vid blockgräns (%lu byte) i arkivet"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Kunde inte söka bakåt i arkivfilen, den kan vara oläsbar utan -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek stannade inte på en postgräns"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: innehåller ogiltigt volymnummer"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Volymnummer flödade över"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Gör i ordning volym nummer %d för %s och tryck vagnretur: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Filslut vid förväntat användarsvar"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "VARNING: Arkivet är ofullständigt"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -727,66 +725,66 @@ msgstr ""
" q Avsluta programmet\n"
" y eller nyrad Fortsätt\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Starta ett underskal\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Skriv denna lista\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Ingen ny volym; avslutar.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Filnamn inte angivet, försök igen.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Ogiltig indata. Skriv ? för hjälp.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "kommandot ”%s” misslyckades"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s fortsätter inte i denna volym"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s fortsätter möjligen i denna volym: huvudet innehåller ett trunkerat namn"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s har fel storlek (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Denna volym kommer inte i rätt ordning (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arkivet är inte märkt för att stämma med %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Volym %s överensstämmer inte med %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -794,210 +792,210 @@ msgstr ""
"%s: filnamnet är för långt för att lagras i huvudet för ett GNU "
"flervolymsarkiv, trunkerat"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "skrivning stannade inte på en blockgräns"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Kunde bara läsa %lu av %lu byte"
msgstr[1] "Kunde bara läsa %lu av %lu byte"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Innehållet är olika"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Oväntat filslut i arkivet"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Filtyper är olika"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Rättigheterna är olika"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid är olika"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid är olika"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Modifieringstiderna är olika"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Storlekarna är olika"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Inte länkad till %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Symboliska länkar är olika"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Enhetsnummer är olika"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Verifierar "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: Okänd filtyp ”%c” jämförd som en normal fil"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Arkivet innehåller filnamn med inledande prefix borttaget."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Arkivet innehåller konverterade filnamn."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Verifiering kan misslyckas med att hitta originalfiler."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "VERIFIKATIONSFEL: %d felaktigt arkivhuvud upptäckt"
msgstr[1] "VERIFIKATIONSFEL: %d felaktiga arkivhuvuden upptäckta"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Ett ensamt nollblock vid %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: innehåller en cachekatalog-tagg %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "%s är utanför intervallet för %s: %s..%s, byter till %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "%s är utanför intervallet för %s: %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Genererar negativa oktala värden i arkivhuvudet"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: filnamnet är för långt (max %d); inte arkiverad"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: filnamnet är för långt (kan ej delas); inte arkiverad"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: länknamn är för långt; inte arkiverad"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Fil krympte med %s byte, fyller ut med nolltecken"
msgstr[1] "%s: Fil krympte med %s byte, fyller ut med nolltecken"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: filen finns på ett annat filsystem; inte arkiverad"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "innehållet inte arkiverat"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Okänd filtyp; filen ignorerad"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Det fattas länkar till %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: filen är oförändrad; inte arkiverad"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: filen är själva arkivet; inte arkiverad"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "katalog inte arkiverad"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: fil ändrades under tiden vi läste den"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: socketfil ignorerad"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: door-fil ignorerad"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Hoppar till nästa filhuvud"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Tar bort icke-huvuddata från arkivet"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: orimligt gammal tidsstämpel %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: tidsvärde %s är %s sekunder i framtiden"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Oväntad inkonsistens när katalog skapades"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: hoppar över existerande fil"
@@ -1020,7 +1018,7 @@ msgstr "Försöker extrahera symboliska länkar som hårda länkar"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Kan inte extrahera -- filen fortsätter från en annan volym"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Oväntat huvud för långt filnamn"
@@ -1037,7 +1035,7 @@ msgstr "Nuvarande ”%s” är nyare eller lika gammal"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: Medlemsnamn innehåller ”..”"
#: src/extract.c:1696
#, c-format
@@ -1049,22 +1047,22 @@ msgstr "%s: Kunde inte säkerhetskopiera denna fil"
msgid "Cannot rename %s to %s"
msgstr "Kan inte byta namn på %s till %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Katalogen har bytt namn från %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Katalogen är ny"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: katalogen finns på ett annat filsystem; inte arkiverad"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Katalogen har bytt namn"
@@ -1191,35 +1189,35 @@ msgstr "%s: Tar bort %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Kan inte ta bort"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Utelämnad"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "block %s: ** Block av nolltecken **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "block %s: ** Filslut **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "block %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Blanka i huvud där numeriskt värde av typ %s förväntades"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1227,159 +1225,160 @@ msgstr ""
"komplement"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Arkivets oktala värde %.*s är utanför intervallet för %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arkivet innehåller föråldrade ”base-64”-huvuden"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Arkivets ”base-64”-sträng ”%s” är utanför intervallet för %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Arkivets ”base-256”-värde är utanför intervallet för %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arkivet innehåller %.*s där ett numeriskt värde av typ %s förväntades"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Arkivets värde %s är utanför intervallet för %s: %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " länk till %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " okänd filtyp ”%s”\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Lång länk--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Långt namn--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Volymhuvud--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Fortsätter vid byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Skapar katalog:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Kan inte byta namn till %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Byter namn på %s tillbaka till %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Fil borttagen innan vi läste den"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "barnprocess"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "interprocesskanal"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Lokalt filnamnsval:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "lägg till angiven FIL till arkivet (användbart om FIL börjar med ”-”)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "KATALOG"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "byt katalog till KATALOG"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "hämta namn att extrahera eller skapa från FIL"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
"-T läser namn åtskilda med nolltecken; implicerar --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "ta bort effekten av föregående --null-flagga"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "avcitera infil eller namnen i arkivet (standardvärde)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "avcitera inte infil eller namnen i arkivet"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T läser filnamn ordagrant (ingen flagghantering)"
+msgstr ""
+"-T läser filnamn ordagrant (ingen hantering av kontrollsekvenser eller "
+"flaggor)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T behandlar filnamn som startar med bindestreck som flaggor (standard)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "MÖNSTER"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "utelämna filer som matchar MÖNSTER"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "utelämna filer som matchar mönster i FIL"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1387,23 +1386,23 @@ msgstr ""
"utelämna innehållet i kataloger som innehåller CACHEDIR.TAG, förutom "
"CACHEDIR.TAG själv"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "utelämna allt i kataloger som innehåller CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "utelämna kataloger som innehåller CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "utelämna innehållet i kataloger som innehåller FIL, förutom FIL själv"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "läs exkluderingsmönster för varje katalog från FIL om den finns"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1411,118 +1410,121 @@ msgstr ""
"läs exkluderingsmönster för varje katalog och dess underkataloger från FIL "
"om den finns"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "utelämna allting i kataloger som innehåller FIL"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "utelämna kataloger som innehåller FIL"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "utelämna kataloger från versionshanteringssystem"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "läs exkluderingsmönster från versionkontrollsystemets ”ignore”-filer"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "utelämna säkerhetskopior och låsfiler"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "gå rekursivt ned i kataloger (standardvärde)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "gå inte automatiskt ned i kataloger"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Flaggor för filnamnsmatchning (påverkar både uteslutnings- och "
"inkluderingsmönster):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "mönster måste matcha i början på filnamn"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "mönster matchas efter ”/” i filnamn (standardvärde vid uteslutning)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "matcha gemener och versaler lika"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "matcha gemener och versaler olika (standardvärde)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "använd jokertecken (standardvärde för uteslutning)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "ordagrann strängjämförelse"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "jokertecken matchar ”/” (standardvärde för uteslutning)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "jokertecken matchar inte ”/”"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Följande flaggor användes efter något obligatoriskt argument i läge för "
+"skapande eller uppdatering av arkiv. Dessa flaggor är positionsberoende och "
+"påverkar endast efterföljande argument. Arrangera dem i rätt ordning."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s har ingen effekt"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s har ingen effekt"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s har ingen effekt"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "kommandorad"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: fillista begärd från %s redan läst från %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "kan inte dela sträng ”%s”: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: filnamnet som lästes innehåller nolltecken"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Mönstermatchningstecken används i filnamn"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1530,45 +1532,45 @@ msgstr ""
"Använd --wildcards för att slå på mönstermatchning, eller --no-wildcards för "
"att undertrycka denna varning"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Fanns inte i arkivet"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Nödvändig förekomst hittades inte i arkivet"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Arkivmärkning stämmer inte överens"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr "Att används -C i en fillista är inte tillåtet med --listed-incremental"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Bara en -C-flagga är tillåtet med --listed-incremental"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Flaggorna ”%s” och ”%s” vill båda läsa från standard in"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Ogiltigt arkivformat"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU-tillägg önskade i ett inkompatibelt arkivformat"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1786,7 +1788,7 @@ msgstr "Välj utdataström:"
msgid "extract files to standard output"
msgstr "extrahera filer till standard ut"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "KOMMANDO"
@@ -1822,7 +1824,7 @@ msgstr "använd FIL för att mappa filägares UID och namn"
msgid "use FILE to map file owner GIDs and names"
msgstr "använd FIL för att mappa filägares GID och namn"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATUM-ELLER-FIL"
@@ -1902,7 +1904,7 @@ msgid ""
"until the end of extraction"
msgstr ""
"fördröj sättandet av modifikationstider och rättigheter på extraherade "
-"kataloger till slutet på arkivextraheringen."
+"kataloger till slutet på arkivextraheringen"
#: src/tar.c:548
msgid "cancel the effect of --delay-directory-restore option"
@@ -2032,7 +2034,7 @@ msgstr "omblocka vid läsning (för 4.2BSD-rör)"
msgid "Archive format selection:"
msgstr "Val av arkivformat:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -2116,59 +2118,59 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "filtrera genom PROG (måste förstå -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Filval:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "byt inte filsystem när arkivet skapas"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "tag inte bort inledande ”/” från namn"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "följ symboliska länkar, arkivera filerna de pekar på"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "följ hårda länkar, arkivera filerna de pekar på"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "NAMN"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "börja med fil NAMN när arkivet läses"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "arkivera bara filer nyare än DATUM-ELLER-FIL"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATUM"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "jämför datum och tid endast för dataändringar"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "KONTROLL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "gör säkerhetskopior före borttagning, välj typ av versionshantering"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "STRÄNG"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2177,61 +2179,61 @@ msgstr ""
"säkerhetskopieändelsen (”~” om inte ändrad med miljövariabeln "
"SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Filnamnstransformationer:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
"ta bort NUMMER stycken inledande komponenter från filnamn före extrahering"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "UTTRYCK"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "använd seds ersättnings-UTTRYCK för att transformera filnamn"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Informativ utskrift:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "visa namn på alla filer som behandlas"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "NYCKELORD"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "varningskontroll"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
"visa förloppsmeddelande efter varje grupp om NUMMER poster (standardvärde 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "ÅTGÄRD"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "utför ÅTGÄRD vid varje kontrollpunkt"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "visa ett meddelande om inte alla länkar arkiverats"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2240,37 +2242,37 @@ msgid ""
msgstr ""
"skriv totalt antal byte efter arkivet hanterats. Med ett argument skrivs "
"totalt antal byte när SIGNAL levereras. Tillåta signaler är: SIGHUP, "
-"SIGQUIT, SIGINT, SIGUSR1 och SIGUSR2. Namn utan SIG-prefix accepteras också."
+"SIGQUIT, SIGINT, SIGUSR1 och SIGUSR2. Namn utan SIG-prefix accepteras också"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "visa filers modifieringstid i UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "visa full upplösning på filtider"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "skicka informativa meddelanden till FIL"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "visa blocknummer inom arkivet för varje meddelande"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "fråga efter bekräftelse för varje steg"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "visa standardvärden för ”tar”"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "visa giltiga intervall för fält i ögonblicksfil"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2278,31 +2280,31 @@ msgstr ""
"vid visning eller extrahering, visa varje katalog som inte matchar "
"sökkriterium"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "visa fil- eller arkivnamn efter transformering"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STIL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
-msgstr "sätt citatstil för namn. Se nedan för giltiga värden på STIL."
+msgstr "sätt citatstil för namn. Se nedan för giltiga värden på STIL"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "citera även tecken i STRÄNG"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "citera inte tecken i STRÄNG"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Kompatibilitetsflaggor:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2310,62 +2312,62 @@ msgstr ""
"vid skapande, samma som --old-archive. Vid extrahering, samma som --no-same-"
"owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Andra flaggor:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "begränsa användningen av eventuellt farliga flaggor"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "flaggan ”%s” kan inte användas med ”%s”"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr ""
"Du kan endast ange en av flaggorna ”-Acdtrux, ”--delete” eller ”--test-label”"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Motstridiga komprimeringsflaggor"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Okänt signalnamn: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Tidsfil hittades inte"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Använder %s istället för okänt datumformat %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Flagga %s: Tolkar tidsangivelse ”%s” som %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "filtrera arkivet genom %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Giltiga argument till flaggan --quoting-style är:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2373,163 +2375,163 @@ msgstr ""
"\n"
"*Denna* tar har standardvärdena:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Ogiltig ägare eller grupp-id"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Ogiltig blockfaktor"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Ogiltig bandlängd"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Felaktigt värde för inkrementell nivå"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Mer än en datumgräns"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Ogiltig version för filer med hål"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve=\"system\" stöds inte på denna plattform"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint-värdet är inte ett heltal"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Ogiltiga rättigheter givna för flagga"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Ogiltigt nummer"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Ogiltig poststorlek"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Poststorlek måste vara en multipel av %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Ogiltigt antal element"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Endast en --to-command flagga tillåten"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Ogiltig densitetsangivelse: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Okänd densitet: ”%c”"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Flaggorna ”-[0-7][lmh]” stöds inte av *detta* tar-program"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: plats för felet"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "fel vid parsning av %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FIL]…"
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "argument som ej är flagga i %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "kan inte dela TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Gammal flagga ”%c” kräver ett argument."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence är meningslöst utan en fillista"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Multipla arkivfiler kräver ”-M” flaggan"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level är meningslös utan --listed-incremental"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Volymnamn är för långt (maxlängd är %lu byte)"
msgstr[1] "%s: Volymnamn är för långt (maxlängd är %lu byte)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Flervolymsarkiv kan inte verifieras"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Komprimerade arkiv kan inte verifieras"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Kan inte använda komprimerade flervolymsarkiv"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Komprimerade arkiv kan inte slås samman"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime behöver ett datum angivet med --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option kan bara användas på POSIX-arkiv"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls kan bara användas på POSIX-arkiv"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux kan bara användas på POSIX-arkiv"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs kan bara användas på POSIX-arkiv"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2537,128 +2539,137 @@ msgstr ""
"Kan inte lista ut namnet på toppkatalogen, sätt det explicit med --one-top-"
"level=KATALOG"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Volymlängden kan inte vara mindre än poststorleken"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Vägrar fegt att skapa ett tomt arkiv"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Flaggorna ”-Aru” är inkompatibla med ”-f -”"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Du måste ange en av flaggorna ”-Acdtrux”, ”--delete” eller ”--test-label”"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Avslutar med felstatus på grund av tidigare fel"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Filen krympte med %s byte"
msgstr[1] "%s: Filen krympte med %s byte"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Nyckelordet %s är okänt eller inte ännu implementerat"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Tidsstämpel är utanför giltigt intervall"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Mönster %s kan inte användas"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Nyckelord %s kan inte ersättas"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Felaktigt utökat huvud: längd saknas"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Längd %.*s på utökat huvud är utanför giltigt intervall"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Felaktigt utökat huvud: blanktecken efter längdangivelse saknas"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Felaktigt utökat huvud: likamedtecken saknas"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Felaktigt utökat huvud: nyrad saknas"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ignorerar nyckelord ”%s” i utökat huvud"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Genererat nyckel/värde-par är för långt (nyckel=%s, längd=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Utökat huvud %s=%s är utanför intervallet %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Felaktigt utökat huvud: ogiltig %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Felaktigt utökat huvud: för många %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Felaktigt utökat huvud: ogiltigt %s: oväntad avskiljare %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Felaktigt utökat huvud: ogiltigt %s: udda antal värden"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: ogiltig timeout"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: okänd kontrollpunktsåtgärd"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "skriv"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "läs"
@@ -2666,7 +2677,7 @@ msgstr "läs"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Kontrollpunkt för skrivning %u"
@@ -2675,12 +2686,12 @@ msgstr "Kontrollpunkt för skrivning %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Kontrollpunkt för läsning %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2688,93 +2699,97 @@ msgstr ""
"genfile bearbetar datafiler i testsviten för GNU paxutils.\n"
"FLAGGOR är:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Flaggor för filskapande:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "STORLEK"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Skapa ett arkiv med given STORLEK"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Skriv till NAMN istället för till standard ut"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Läs filnamn från FIL"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T läser namn åtskilda med nolltecken"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "Fyll filen med givet MÖNSTER. MÖNSTER är \"default\" eller \"zeros\""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Storlek för ett block för filer med hål"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Generera fil med hål. Resten av kommandoraden ger filmappningen."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "POSITION"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Flytta till given position innan data skrivs"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Undertryck icke-ödesdigra diagnostiska meddelanden"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Flaggor för filstatistik:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Skriv innehållet i ”struct stat” för varje given fil. Standardvärde på "
"FORMAT är: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Flaggor för synkron exekvering:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "FLAGGA"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Kör ARGUMENT. Användbart med --checkpoint och en av --cut, --append, --"
"touch, --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Utför angiven åtgärd (se nedan) när kontrollpunkt NUMMER nås"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Sätt datum för nästa --touch"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Visa exekverade kontrollpunkter och slutstatus på KOMMANDO"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2782,7 +2797,7 @@ msgstr ""
"Synkront exekverade åtgärder. Dessa exekveras när kontrollpunktsnumret givet "
"av flaggan --checkpoint nås."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2790,124 +2805,124 @@ msgstr ""
"Trunkera FIL till storleken given av föregående flaggan --length (eller 0 om "
"den inte är given)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Lägg till STORLEK byte till FIL. STORLEK är given av föregående flagga --"
"length."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Uppdatera access- och modifikationstider för FIL"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Exekvera KOMMANDO"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Ta bort FIL"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Ogiltigt storlek: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Nummer utanför giltigt intervall: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negativ storlek: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "status (stat) kunde ej tas på %s"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "begärd fillängd %lu, verklig %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "skapad fil har inte hål"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Fel vid parsning av tal nära ”%s”"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Okänt datumformat"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGUMENT…]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "kan inte öppna ”%s”"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "kan inte flytta (seek)"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "filnamnet innehåller nolltecken"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr "kan inte skapa filer med hål till standard ut, använd flaggan --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "felaktig mask (nära ”%s”)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Okänt fält ”%s”"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "kan inte sätta tid på ”%s”"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "kan inte trunkera ”%s”"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "kommando misslyckades: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "kan inte trunkera ”%s”"
+msgstr "kan inte ta status på ”%s”"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "kan inte sätta tid på ”%s”"
+msgstr "kan inte ta bort katalogen ”%s”"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "kan inte ta bort ”%s”"
@@ -2947,6 +2962,9 @@ msgstr "Kommandot avslutade\n"
msgid "--stat requires file names"
msgstr "--stat kräver filnamn"
+#~ msgid "OPTION"
+#~ msgstr "FLAGGA"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: Parameter från ARGP_HELP_FMT måste vara positiv"
diff --git a/po/tar.pot b/po/tar.pot
index 1201c8e1e7cc5c2df1aaaaf45447d88ad475f80b..25d2a36926f1174e9064766947eb84a1ab5dedbe 100644
--- a/po/tar.pot
+++ b/po/tar.pot
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the GNU tar package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#: src/create.c:1599
+#: src/create.c:1598
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: GNU tar 1.30\n"
+"Project-Id-Version: GNU tar 1.32\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,7 +94,7 @@ msgid "give a short usage message"
msgstr ""
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr ""
@@ -229,12 +229,12 @@ msgstr ""
msgid "^[nN]"
msgstr ""
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr ""
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr ""
@@ -242,11 +242,11 @@ msgstr ""
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr ""
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -494,189 +494,189 @@ msgstr ""
msgid "Cannot execute remote shell"
msgstr ""
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr ""
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr ""
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr ""
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr ""
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr ""
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr ""
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr ""
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr ""
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr ""
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr ""
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr ""
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr ""
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr ""
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr ""
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr ""
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr ""
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr ""
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr ""
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr ""
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr ""
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr ""
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr ""
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr ""
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr ""
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr ""
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr ""
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr ""
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr ""
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr ""
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr ""
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] ""
msgstr[1] ""
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] ""
msgstr[1] ""
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr ""
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr ""
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr ""
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr ""
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr ""
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr ""
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -684,274 +684,274 @@ msgid ""
" y or newline Continue operation\n"
msgstr ""
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr ""
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr ""
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr ""
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr ""
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr ""
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr ""
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr ""
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr ""
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr ""
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr ""
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr ""
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr ""
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] ""
msgstr[1] ""
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr ""
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr ""
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr ""
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr ""
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr ""
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr ""
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr ""
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr ""
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr ""
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr ""
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr ""
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr ""
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr ""
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr ""
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr ""
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] ""
msgstr[1] ""
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr ""
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr ""
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr ""
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr ""
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr ""
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr ""
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr ""
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr ""
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] ""
msgstr[1] ""
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr ""
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr ""
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr ""
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr ""
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr ""
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr ""
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr ""
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr ""
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr ""
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr ""
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr ""
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr ""
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr ""
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr ""
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr ""
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr ""
@@ -974,7 +974,7 @@ msgstr ""
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr ""
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr ""
@@ -1003,22 +1003,22 @@ msgstr ""
msgid "Cannot rename %s to %s"
msgstr ""
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr ""
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr ""
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr ""
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr ""
@@ -1142,371 +1142,371 @@ msgstr ""
msgid "%s: Cannot remove"
msgstr ""
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr ""
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr ""
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr ""
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr ""
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr ""
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr ""
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr ""
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr ""
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr ""
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr ""
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr ""
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr ""
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr ""
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr ""
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr ""
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr ""
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr ""
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr ""
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr ""
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr ""
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr ""
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr ""
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr ""
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr ""
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr ""
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr ""
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr ""
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr ""
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr ""
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr ""
-#: src/names.c:87
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr ""
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr ""
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr ""
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr ""
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr ""
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr ""
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr ""
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr ""
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr ""
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr ""
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr ""
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr ""
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr ""
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr ""
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr ""
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr ""
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr ""
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr ""
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr ""
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr ""
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr ""
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr ""
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr ""
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr ""
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr ""
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr ""
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr ""
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr ""
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr ""
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr ""
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr ""
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1699,7 +1699,7 @@ msgstr ""
msgid "extract files to standard output"
msgstr ""
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr ""
@@ -1735,7 +1735,7 @@ msgstr ""
msgid "use FILE to map file owner GIDs and names"
msgstr ""
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr ""
@@ -1934,7 +1934,7 @@ msgstr ""
msgid "Archive format selection:"
msgstr ""
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr ""
@@ -2016,117 +2016,117 @@ msgstr ""
msgid "filter through PROG (must accept -d)"
msgstr ""
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr ""
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr ""
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr ""
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr ""
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr ""
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr ""
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr ""
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr ""
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr ""
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr ""
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr ""
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr ""
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr ""
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr ""
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr ""
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr ""
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr ""
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr ""
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr ""
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr ""
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr ""
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr ""
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr ""
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr ""
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2134,413 +2134,422 @@ msgid ""
"accepted"
msgstr ""
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr ""
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr ""
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr ""
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr ""
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr ""
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr ""
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr ""
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr ""
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr ""
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr ""
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr ""
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr ""
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr ""
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr ""
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr ""
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr ""
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr ""
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr ""
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr ""
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr ""
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr ""
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr ""
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
msgstr ""
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr ""
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr ""
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr ""
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr ""
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr ""
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr ""
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr ""
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr ""
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr ""
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr ""
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr ""
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr ""
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr ""
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr ""
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr ""
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr ""
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr ""
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr ""
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr ""
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr ""
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr ""
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr ""
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr ""
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr ""
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr ""
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr ""
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] ""
msgstr[1] ""
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr ""
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr ""
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr ""
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr ""
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr ""
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr ""
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr ""
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr ""
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr ""
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr ""
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr ""
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] ""
msgstr[1] ""
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr ""
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr ""
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr ""
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr ""
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr ""
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr ""
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr ""
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr ""
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr ""
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr ""
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr ""
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr ""
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr ""
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr ""
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr ""
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr ""
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr ""
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr ""
@@ -2548,7 +2557,7 @@ msgstr ""
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr ""
@@ -2557,227 +2566,227 @@ msgstr ""
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr ""
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
msgstr ""
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr ""
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr ""
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr ""
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr ""
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr ""
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr ""
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr ""
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr ""
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr ""
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr ""
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr ""
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr ""
-#: tests/genfile.c:168
-msgid "OPTION"
+#: tests/genfile.c:163
+msgid "N"
msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr ""
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr ""
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
msgstr ""
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr ""
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr ""
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr ""
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr ""
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr ""
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr ""
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr ""
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr ""
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr ""
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr ""
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr ""
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr ""
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr ""
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr ""
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr ""
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr ""
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr ""
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr ""
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr ""
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, c-format
msgid "cannot stat `%s'"
msgstr ""
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, c-format
msgid "cannot remove directory `%s'"
msgstr ""
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr ""
diff --git a/po/tr.gmo b/po/tr.gmo
index c6be36e356fc8ea409a555d23d0e4a23b25e8aca..7caf2e82b5d9dde18e2e4375b6d90471f8b803e9 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 020d7755eb96939ab5bddcce6b6a63528f7462ec..b7eb55396b4c307f7d046faea1f85e1404b7e909 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,12 +3,12 @@
# This file is distributed under the same license as the tar package.
# Nilgün Belma Bugüner <nilgun@buguner.name.tr>, 2001,..., 2007.
# Volkan Gezer <vlkngzr@gmail.com>, 2013, 2017.
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
"Project-Id-Version: tar 1.29\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
"PO-Revision-Date: 2017-04-28 15:25+0100\n"
"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -99,7 +99,7 @@ msgid "give a short usage message"
msgstr "kısa bir kullanım iletisi gösterilir"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "İSİM"
@@ -234,12 +234,12 @@ msgstr "^[eEyY]"
msgid "^[nN]"
msgstr "^[hHnN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "%s (%s) tarafından paketlenmiş\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "%s tarafından paketlenmiş\n"
@@ -247,11 +247,11 @@ msgstr "%s tarafından paketlenmiş\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
+#: gnu/version-etc.c:85
#, fuzzy
msgid ""
"\n"
@@ -529,189 +529,189 @@ msgstr "Uzak kabuk için dosyalar yönlendirilemiyor"
msgid "Cannot execute remote shell"
msgstr "Uzak kabuk çalıştırılamıyor"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Arama yönü kapsamdışı"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Geçersiz arama yönü"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Geçersiz arama başlangıcı"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Arama başlangıcı kapsamdışı"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Geçersiz bayt sayısı"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Bayt aralığı aralık dışında"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Erken dosya sonu"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Geçersiz işlem kodu"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "İşlem desteklenmiyor"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Beklenmeyen argümanlar"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Uzak bir işlem komutları kabul eden, bir kaset sürücüsü değiştir"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "SAYI"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "hata ayıklama seviyesini ayarla"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "DOSYA"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "hata ayıklama çıktı dosyasının adını ayarla"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "%s açılamıyor"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "argüman sayısı çok fazla"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Bozuk komut"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Bu bir tar arşivi gibi görünmüyor"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Okunan toplam bayt"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Yazılan toplam bayt"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Silinen toplam bayt"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(boru)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Uçbirimden arşiv içeriğini okuma reddediliyor (-f seçeneği eksik?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Uçbirime arşiv içeriğini yazma reddediliyor (-f seçeneği eksik?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "record_size için geçersiz değer"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Arşiv ismi verilmemiş"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "stdG/stdÇ arşivi doğrulanamaz"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Aeşiv sıkıştırılmış. %s seçeneğini kullanın"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Sıkıştırılmış arşivler güncellenemez"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Bandın başlangıcında, şimdilik çıkıyor"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Çok hata var, çıkıyor"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Kayıt uzunluğu = %lu blok"
msgstr[1] "Kayıt uzunluğu = %lu blok"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Arşivde hizalanmamış blok (%lu bayt)"
msgstr[1] "Arşivde hizalanmamış blok (%lu bayt)"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "Arşiv dosyası geri alınamaz; -i olmaksızın okunamayabilir"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek bir kaydın sınırında durmadı"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: geçersiz bölüm numarası içeriyor"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Bölüm numarası kapsamdışı"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "#%d. bölümü %s için hazırlamak istiyorsanız return tuşuna basınız: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Kullanıcı cevabı beklenirken dosya sonuna gelindi"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "UYARI: Arşiv eksik"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -722,276 +722,276 @@ msgstr ""
" q Uygulama sonlandırılır\n"
" y veya <enter> İşlem sürdürülür\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! bir alt kabuk açılır\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Bu listeyi basar\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Yeni bölüm yok; çıkıyor.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Dosya ismi belirtilmemiş. Tekrar deneyin.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Girdi geçersiz, Yardım için ? yazın.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s komutu başarısız"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s bu bölümde devam etmiyor"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s belki de bu bölümde devam ediyor: başlıktaki isim kırpılmış"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s yanlış uzunluk (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Bu hacim sıranın dışında (% s -% s =% s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Arşiv etiketi %s ile eşleşmiyor"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "%s bölümü %s ile eşleşmiyor"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr ""
"%s: dosya ismi GNU çoklu bölüm başlığında saklanamayacak kadar uzun, kırpıldı"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "yazma bir blok sınırında bitmiyor"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Sadece %2$lu baytın %1$lu baytı okunabildi"
msgstr[1] "Sadece %2$lu baytın %1$lu baytı okunabildi"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "İçerikler farklı"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Arşivde beklenmeyen dosya sonu"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Dosya türleri farklı"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Kipleri farklı"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Kullanıcı-kimlikler farklı"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Grup-kimlikler farklı"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Değişiklik zamanları farklı"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Uzunlukları farklı"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "%s'e bağlı değil"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Sembolik bağlar farklı"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Aygıt numaraları farklı"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Doğrulama "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: '%c' dosya türü bilinmiyor, normal dosya olarak karşılaştırıldı"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Arşivdeki dosya isimleri dosya yolu içermiyor."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Arşiv dönüştürülmüş dosya adları içeriyor."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Doğrulama, özgün dosyaların konumlanmasında başarısız olabilir."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "DOĞRULAMA BAŞARISIZ: %d geçersiz başlık saptandı"
msgstr[1] "DOĞRULAMA BAŞARISIZ: %d geçersiz başlık saptandı"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "%s de tek başına sıfır bloğu"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: %s arabellekleme dizini yaftasını içeriyor; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr ""
"%1$s değeri, %3$s..%4$s aralığının %2$s dışında; yerine %5$s kullanılıyor"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "%1$s değeri, %3$s..%4$s aralığının %2$s dışında"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Negatif sekizlik başlık üretiliyor"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: dosya ismi çok uzun (en çok %d olabilir); dökümlenmedi"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: dosya ismi çok uzun (parçalanamıyor); dökümlenmedi"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: bağ ismi çok uzun; dökümlenmedi"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Dosya %s baytta kaldı; sıfırlarla dolduruluyor"
msgstr[1] "%s: Dosya %s baytta kaldı; sıfırlarla dolduruluyor"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: dosya farklı bir dosya sisteminde; dökümlenmedi"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "içerik dökümlenmedi"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Bilinmeyen dosya türü; dosya yoksayıldı"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "%s için bağlar kayıp."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: dosya değişmedi; dökümlenmedi"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: dosya arşivdir; dökümlenmedi"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "dizin dökümlenmedi"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: dosya okundu olarak imlendi"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: soket yoksayıldı"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: kapı yoksayıldı"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Sonraki başlığa atlanıyor"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Arşivden başlık-olmayan siliniyor"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: makul olmayan eski tarih damgası %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: zaman damgası %s %s s gelecekte"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Dizin oluşturulurken anlaşılamayan uyumsuzluk"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: varolan dosya atlanıyor"
@@ -1014,7 +1014,7 @@ msgstr "Sembolik bağlar, sabit bağlar olarak çıkarılmaya çalışılıyor"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Dosya çıkarılamaz -- dosyanın başı diğer bölümde"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Umulmadık uzun isim başlığı"
@@ -1043,22 +1043,22 @@ msgstr "%s: Bu dosyayı yedeklemek mümkün olmadı"
msgid "Cannot rename %s to %s"
msgstr "%s ismi %s olarak değiştirilemez"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Dizinin eski adı %s idi"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Dizin yeni"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: dizin farklı bir dosya sisteminde; dökümlenmedi"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Dizin adı değiştirilmişti"
@@ -1184,35 +1184,35 @@ msgstr "%s: %s siliniyor\n"
msgid "%s: Cannot remove"
msgstr "%s: Kaldırılamaz"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Geçiliyor"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "blok %s: ** NUL bloku **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "blok %s: ** Dosya Sonu **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "blok %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Sayısal %s değeri beklenirken başlıkta boşluklar bulundu"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1220,303 +1220,303 @@ msgstr ""
"ediliyor"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Arşiv sekizlik değeri %.*s aralığın %s dışında"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Arşiv atıl base-64 başlıklar içeriyor"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Arşiv imzalı base-64 dizge %s, %s aralığının dışında"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Arşiv base-256 değeri %s aralığının dışında"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Arşiv %.*s içeriyor, halbuki orada sayısal %s değeri bekleniyor"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Arşiv değeri %s %s türünün %s..%s aralığının dışında"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " bağı -> %s \n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " bilinmeyen dosya türü %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Uzun Bağ--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Uzun İsim--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Bölüm Başlığı--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Devamı bayt %s de--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Oluşturulan dizin:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "%s %s olarak değiştiriliyor\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: İsmi %s olarak değiştirilemez"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Gerisin geriye %s %s olarak değiştiriliyor\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Dosya okunamadan kaldırıldı"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "alt süreç"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "süreçlerarası kanal"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Yerel dosya adı seçimi:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"belirtilen DOSYA arşive eklenir (isim bir tire ile başlıyorsa kullanışlıdır)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DİZİN"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "DİZİN dizinine geçilir"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "çıkarılacak ya da oluşturulacak isimler DOSYAdan alınır"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
"-T boş karakter sonlandırmalı isimleri okur, --verbatim-files-from anlamına "
"gelir"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "önceki --null seçeneği etkisini devre dışı bırak"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "girdi dosyası veya üye adlarında tırnakları kaldır (varsayılan)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "girdi dosyası veya üye adlarında tırnakları kaldırma"
-#: src/names.c:87
+#: src/names.c:86
#, fuzzy
msgid "-T reads file names verbatim (no escape or option handling)"
msgstr "-T dosya adlarını harfiyen okur (seçenek işleme yok)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T çizgi ile başlayan dosya adlarını seçenek olarak kabul eder (varsayılan)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "ŞABLON"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "belirtilen ŞABLONa uyan dosyalar hariç tutulur"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "DOSYAdaki şablonlara uyan isimler hariç tutulur"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr "yafta dosyası hariç, CACHEDIR.TAG içeren dizinler dışlanır"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "CACHEDIR.TAG içeren dizinlerin altındaki herşey hariç tutulur"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "CACHEDIR.TAG içeren dizinler hariç tutulur"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"DOSYA'nın kendisi hariç, DOSYA içeren dizinlerin içerikleri hariç tutulur"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "mevcutsa, DOSYAdan her dizin için dışta tutulma kalıbını oku"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr ""
"mevcutsa, DOSYAdan her dizin ve alt dizini için dışta tutulma kalıbını oku"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "DOSYA içeren dizinlerin altındaki herşey hariç tutulur"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "DOSYA içeren dizinler hariç tutulur"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "sürüm denetimi sistem dizinlerini hariç tut"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "VCS yoksayma dosyalarından dışta tutma kalıplarını oku"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "yedek ve kilit dosyalarını hariç tut"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "dizinlerin alt dizinlerine inilir (öntanımlı)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "dizinlerde özdevinimli olarak azalan sıralamadan kaçınılır"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Dosya ismi eşleştirme seçenekleri\n"
"(içerme ve dışlama kalıplarının her ikisi de etkili):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "dosya isminin başlangıcına uyan kalıplar"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr ""
"bir '/' işaretinden sonra şablonla eşleşen kalıplar (dışlama için öntanımlı)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "harf büyüklükleri önemsenmez"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "harf büyüklüklerine duyarlı eşleşme (öntanımlı)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "genelleme kalıpları kullanılır (dışlama için öntanımlı)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "birebir dizge eşleme"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "'/' ile eşleşen genelleme kalıpları (dışlama için öntanımlı)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "'/' ile eşleşmeyen genelleme kalıpları"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr ""
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr ""
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr ""
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "komut satırı"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: %s dosyasından istenen dosya listesi zaten %s dosyasından okundu"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "'%s' dizgesi ayrılamıyor: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: okunan dosya ismi boş karakter içeriyor"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Kalıp eşleme karakterleri dosya isimlerinde kullanılmış"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1524,48 +1524,48 @@ msgstr ""
"Lütfen ya kalıp eşlemeyi etkin kılmak için --wildcards ya da bu uyarıyı "
"yoksaymak için --no-wildcards kullanın."
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Arşivde yok"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Arşivde bulunması gerekirken yok"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Arşiv etiketi uyumsuzluğu"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Bir dosya listesi içerisinde --listed-incremental ile -C seçeneği kullanmaya "
"izin verilmiyor"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
"--listed-incremental seçeneği ile sadece bir -C seçeneği kullanılabilir"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "'-%s' ve '-%s' seçeneklerinin ikisi de standart girdi istiyor"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Geçersiz arşiv biçimi"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "GNU özellikleri ile uyumsuz arşiv biçimi"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1782,7 +1782,7 @@ msgstr "Çıktı akımını seçiniz:"
msgid "extract files to standard output"
msgstr "dosyalar standart çıktıya çıkarılır"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "KOMUT"
@@ -1818,7 +1818,7 @@ msgstr "sahip kullanıcı kimliği ve adlarını eşlemek için DOSYA kullan"
msgid "use FILE to map file owner GIDs and names"
msgstr "sahip grup kimliği ve adlarını eşlemek için DOSYA kullan"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DOSYA-TARİHİ"
@@ -2030,7 +2030,7 @@ msgstr "okunmuş olarak yeniden bloklanır (4.2 BSD boruları için)"
msgid "Archive format selection:"
msgstr "Arşiv biçimi seçimi:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "BİÇİM"
@@ -2114,62 +2114,62 @@ msgstr "UYG"
msgid "filter through PROG (must accept -d)"
msgstr "arşivi UYG üzerinden geçirir (UYG -d kabul etmeli)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Yerel dosya seçimi:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "arşiv oluşturulurken yerel dosya sisteminde kalınır"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "dosya isimlerinin başındaki '/' işaretlerini ayıklama"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr ""
"sembolik bağlar izlenir; hedeflerindeki dosyalar arşivlenir ve dökümlenir"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr ""
"sembolik bağları izle; hedeflerindeki dosyaları arşivle ve şuraya atıfta "
"bulunan dosyaları dökümle"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "ÜYE-İSMİ"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "arşivi okurken üye MEMBER-NAME ile başla"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "sadece DOSYA-TARİHİnden daha yeni dosyalar saklanır"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "TARİH"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "sadece veri değişecekse tarih ve saat karşılaştırılır"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "DENETİM"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "kaldırılmadan önce DENETİM sürümü seçilerek yedeklenir"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "DİZGE"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2177,59 +2177,59 @@ msgstr ""
"kaldırmadan önce uygun sonekle yedekleme yapılır (SIMPLE_BACKUP_SUFFIX ortam "
"değişkeni ile belirlenmemişse sonek olarak '~' kullanılır"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Dosya ismi dönüşümleri:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "çıkarılırken dosya isimlerinden baştaki SAYI bileşen ayrılır"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "İFADE"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "dosya isimleri dönüştürülürken sed değiştirme İFADEsi kullanılır"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Bilgilendirme çıktısı:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "işlenen dosyalar ayrıntılı listelenir"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "ANAHTAR SÖZCÜK"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "uyarı denetimi"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "her SAYIncı kayıtta gelişim iletisi gösterilir (öntanımlı: 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "İŞLEM"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "her kontrol noktasında İŞLEM çalıştır"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "tüm bağlar dökümlenmezse bir ileti basılır"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SiNYAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2240,87 +2240,87 @@ msgstr ""
"alındığında bayt toplamını basar; İzin verilen sinyaller: SIGHUP, SIGQUIT, "
"SIGINT, SIGUSR1 ve SIGUSR2; SIG ile başlamayanları da kabul edilir"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "dosya değişiklik zamanlarını UTC'ye göre bas"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "tüm çözünürlüğü kullanarak dosya zamanını bas"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "ayrıntılı çıktı DOSYAya gönderilir"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "her iletide arşiv içindeki blok sayısı gösterilir"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "her eylemden önce doğrulama istenir"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "tar öntanımlıları gösterilir"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "Anlık görüntü dosyası alanları için geçerli aralıkları göster"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr ""
"listeleme ya da çıkarma sırasında arama koşuluna uymayan dizinler listelenir"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "dönüşümden sonra dosya ve arşiv isimlerini gösterir"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "ŞEKİL"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "sarmalama şeklinin ismi; geçerli ŞEKİL değerleri için aşağıya bakınız"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "DİZGEdeki sarmalama karakterlerine ek olarak"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "DİZGEdeki karakterler için sarmalamayı iptal eder"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Uyumluluk seçenekleri:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr "oluştururken --old-archive ile, çıkarırken --no-same-owner ile aynı"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Diğer seçenekler:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "bozuculuk olasılığı olan bazı seçeneklerin kullanımı iptal edilir"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s', '%s' ile kullanılamaz"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2328,40 +2328,40 @@ msgstr ""
"Birden fazla '-Acdtrux', '--delete' veya '--test-label' seçeneği "
"belirtemezsiniz"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Sıkıştırma seçenekleri çelişiyor"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Bilinmeyen sinyal ismi: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Tarih örnekleri dosyası bulunamadı"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Bilinmeyen tarih biçemi %2$s yerine %1$s kullanılıyor"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Seçenek %s: '%s' tarihi %s olarak ele alınıyor"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "arşivi %s üzerinden filtrele"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "--quoting-style seçeneği için geçerli argümanlar:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2369,163 +2369,163 @@ msgstr ""
"\n"
"*Bu* tar için öntanımlılar:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Geçersiz kullanıcı veya grup kimliği"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Bloklama çarpanı geçersiz"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Kayıt ortamının uzunluğu geçersiz"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Geçersiz arttırımlı seviye değeri"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Birden fazla eşik tarihi"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Seyrek sürüm değeri geçersiz"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' seçeneği bu platformda desteklenmiyor"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint değeri bir tamsayı değil"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Seçenekte verilen kip geçersiz"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Sayı geçersiz"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Kayıt uzunluğu geçersiz"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Kayıt uzunluğu %d nin katları olmalı"
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Elemen sayısı geçersiz"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Sadece tek bir --to-command seçeneği kullanılabilir"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Hatalı yoğunluk argümanı: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Bilinmeyen yoğunluk: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "'-[0-7][lmh]' seçeneği *bu* tar ile desteklenmiyor"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: dosya konum hatası"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "%s ayrıştırılırken hata oluştu"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[DOSYA]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "%s içinde seçenek olmayan argümanlar"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "TAR_OPTIONS parçalanamıyor: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Eski seçenek '%c' bir argümanla kullanılır."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "--occurrence bir dosya listesi olmaksızın anlamlı değil"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Çok sayıda arşiv dosyası '-M' seçeneği gerektirir"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--listed-incremental olmadan --level anlamsızdır"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Bölüm etiketi çok uzun (sınır: %lu bayt)"
msgstr[1] "%s: Bölüm etiketi çok uzun (sınır: %lu bayt)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Çok sayıda bölüm içeren arşivler doğrulanamaz"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Sıkıştırılmış arşivler doğrulanamaz"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Çok sayıda bölüm içeren sıkıştırılmış arşivler kullanılamıyor"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Sıkıştırılmış arşivler birleştirilemez"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime, --mtime ile belirtilmiş bir tarihe ihtiyaç duyuyor"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option sadece POSIX arşivlerinde kullanılabilir"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls sadece POSIX arşivlerinde kullanılabilir"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux sadece POSIX arşivlerinde kullanılabilir"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs sadece POSIX arşivlerinde kullanılabilir"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2533,129 +2533,138 @@ msgstr ""
"Üst düzey dizin adı çıkarılamıyor; lütfen açıkça --one-top-level=DİZİN ile "
"ayarlayın"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Hacim uzunluğu kayıt boyutundan daha az olamaz"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Bir boş arşivin oluşturulması ister istemez reddediliyor"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "'-Aru' seçenekleri '-f -' ile uyumsuz"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Aynı anda '-Acdtrux', '--delete' veya '--test-label' seçeneklerinin sadece "
"birini kullanmalısınız"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Önceki hatalar nedeniyle başarısız durumla çıkılıyor"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Dosya %s baytta kırpılmış"
msgstr[1] "%s: Dosya %s baytta kırpılmış"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "%s anahtar sözcüğü ya bilinmiyor ya da henüz gerçeklenmemiş"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Zaman damgası izin verilen aralığın dışında"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "%s şablonu kullanılamıyor"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "%s anahtar sözcüğü çakıştırılamaz"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Ek başlık bozuk: uzunluk eksik"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Ek başlık uzunluğu %*s aralık dışında"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Ek başlık bozuk: uzunluktan sonra boşluk yok"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Ek başlık bozuk: eşit işareti eksik"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Ek başlık bozuk: satırsonu eksik"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Bilinmeyen ek başlık anahtar sözcüğü '%s' yoksayılıyor"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Üretilen isim/değer çifti çok uzun (isim=%s, uzunluk=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Ek başlık %s=%s, %s..%s aralığının dışında"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Ek başlık bozuk: %s=%s geçersiz"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Ek başlık bozuk: %s=%s aşırıya kaçmış"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Ek başlık bozuk: %s geçersiz: umulmadık %c ayracı"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Ek başlık bozuk: %s geçersiz: değerler tek sayıda"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: geçerli bir zaman çıktısı değil"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: bilinmeyen kontrol noktası işlemi"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "yazma"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "okuma"
@@ -2663,7 +2672,7 @@ msgstr "okuma"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Yazma sınama yeri %u"
@@ -2672,12 +2681,12 @@ msgstr "Yazma sınama yeri %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Okuma sınaması yeri %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2685,94 +2694,98 @@ msgstr ""
"genfile, GNU paxutils deneme araçları için veri dosyalarını işleme sokar.\n"
"SEÇENEKLER:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Dosya oluşturma seçenekleri:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "BOYUT"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Dosya belirtilen BOYUTta oluşturulur"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Dosyalar standart çıktı yerine İSİM dosyasına yazılır"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Dosya isimleri DOSYAdan okunur"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T boş karakter sonlandırmalı isimleri okur"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Dosyayı belirtilen ŞABLON ile doldurur. ŞABLON 'default' veya 'zeros' "
"olabilir"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Seyrek dosyalar için blok boyu"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Seyrek dosya üretilir. Komut satırının kalanı dosya eşlemini verir."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "KONUM"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Veriyi yazmadan önce belirtilen konuma gider"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Ölümcül olmayan tanı mesajlarını gizle"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Dosya istatistikleri seçenekleri:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"Belirtilen her dosya için stat yapısının içeriğini basar. Öntanımlı BİÇİM: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "İcra eşzamanlama seçenekleri:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "SEÇENEK"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Belirtilen ARGları çalıştır. --checkpoint ile ve --cut, --append, --touch "
"seçeneklerinden biri ile birlikte kullanışlıdır"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Sınama SAYIsı aşıldığında belirtilen eylem uygulanır (aşağıya bakınız)"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Sonraki --touch seçeneği için tarih ayarlanır"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "İcra edilen sınamalar ve KOMUTun çıkış durumu gösterilir"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2780,131 +2793,131 @@ msgstr ""
"Çalıştırma eylemlerini eşzamanlar. Bunlar --checkpoint seçeneği ile "
"belirtilen sayı aşıldığında çalıştırılırlar."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr ""
"DOSYA --length seçeneği ile belirtilen boyutta kırpılır (belirtilmemişse 0)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"DOSYAya BOYUT bayt eklenir. BOYUT evvelce --length seçeneği ile belirtilir."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "DOSYAnın değişiklik ve erişim zamanları güncellenir"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "KOMUT çalıştırılır"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr ""
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Geçersiz boyut: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Numara izin verilen aralığın dışında: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Negatif boyut: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) başarısız"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "istenen dosya uzunluğu %lu, asıl %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "oluşturulan dosya seyrek değil"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Sayı çözümlenirken `%s' civarında hata"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Bilinmeyen tarih biçimi"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGÜMANLAR...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "`%s' açılamıyor"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "konumlanamıyor"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "dosya ismi boş karakter içeriyor"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"seyrek dosyalar standart çıktıda üretilemez, --file seçeneğini kullanın"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "kalıp yanlış (`%s' yakınında)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Bilinmeyen alan `%s'"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "zaman `%s' olarak ayarlanamaz"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "`%s' parçalanamıyor"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "komut başarısız: %s"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, fuzzy, c-format
msgid "cannot stat `%s'"
msgstr "`%s' parçalanamıyor"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, fuzzy, c-format
msgid "cannot remove directory `%s'"
msgstr "zaman `%s' olarak ayarlanamaz"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "`%s' bağlantısı kesilemiyor"
@@ -2944,6 +2957,9 @@ msgstr "Komut sonlandı\n"
msgid "--stat requires file names"
msgstr "--stat seçeneği dosya isimleri gerektirir"
+#~ msgid "OPTION"
+#~ msgstr "SEÇENEK"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT parametresi pozitif olmalı"
diff --git a/po/uk.gmo b/po/uk.gmo
index 64e388892776d0d5c8f23f7e37bdc0dfb6a53235..6a1bdb7114aea643159ae4599451cac6388cc594 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index fcd998d77441aac4dfa75a10ead9b1ff1cb6d39f..0a16fce713130c0f43c20c1df1c972ec5cd71b82 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,15 +2,15 @@
# This file is distributed under the same license as the tar package.
# Copyright (C) 2017 Free Software Foundation, Inc.
#
-# Sergey Poznyakoff <gray@gnu.org>, 2005-2010, 2016, 2017
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
-#: src/create.c:1599
+# Sergey Poznyakoff <gray@gnu.org>, 2005-2010, 2016, 2017.
+# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2018.
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2017-12-17 13:06+0200\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-06-26 08:31+0200\n"
"Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
"Language: uk\n"
@@ -20,6 +20,7 @@ msgstr ""
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 2.0\n"
#: gnu/argmatch.c:134
#, c-format
@@ -97,7 +98,7 @@ msgid "give a short usage message"
msgstr "вивести коротке повідомлення про використання"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "НАЗВА"
@@ -135,29 +136,29 @@ msgid "write error"
msgstr "помилка запису"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: неоднозначна опція «%s%s»\n"
+msgstr "%s: неоднозначний параметр «%s%s»\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: неоднозначна опція «%s%s»; можливі варіанти:"
+msgstr "%s: неоднозначний параметр «%s%s»; можливі варіанти:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: невідома опція «%s%s»\n"
+msgstr "%s: невідомий параметр «%s%s»\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: опція «%s%s» не може мати аргументу\n"
+msgstr "%s: параметр «%s%s» не може мати аргументу\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: опція «%s%s» вимагає аргументу\n"
+msgstr "%s: параметр «%s%s» вимагає аргументу\n"
#: gnu/getopt.c:621
#, c-format
@@ -232,12 +233,12 @@ msgstr "^[yYтТ]"
msgid "^[nN]"
msgstr "^[nNнН]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Запаковано %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Запаковано %s\n"
@@ -245,12 +246,11 @@ msgstr "Запаковано %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -260,12 +260,12 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Ліцензія GPLv3+: GNU GPL версії 3 або пізнішої <http://gnu.org/licenses/gpl."
-"html>\n"
-"Це вільне програмне забезпечення: ви можете змінювати та розповсюджувати "
+"Умови ліцензування викладено у GPLv3+: GNU GPL версії 3 або новішій, "
+"<https://gnu.org/licenses/gpl.html>\n"
+"Це вільне програмне забезпечення: ви можете вільно змінювати і поширювати "
"його.\n"
-"Не надається ЖОДНИХ ГАРАНТІЙ в межах дозволених правом.\n"
-"\n"
+"Вам не надається ЖОДНИХ ГАРАНТІЙ, окрім гарантій передбачених "
+"законодавством.\n"
#. TRANSLATORS: %s denotes an author name.
#: gnu/version-etc.c:102
@@ -400,15 +400,14 @@ msgid "%s home page: <%s>\n"
msgstr "домашня сторінка %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "домашня сторінка %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "домашня сторінка %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Загальна допомога щодо використання ПЗ GNU: <http://www.gnu.org/gethelp/>\n"
+"Загальна допомога щодо використання ПЗ GNU: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -530,147 +529,147 @@ msgstr "Переспрямовування файлів для віддален
msgid "Cannot execute remote shell"
msgstr "Не вдалося запустити віддалену оболонку"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Напрямок зміщення за межами діапазону"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Помилковий напрям пошуку"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Помилковий зсув у файлі"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Зміщення за межами діапазону"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Помилкова кількість байтів"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Кількість байтів за межами діапазону"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Передчасне закінчення файла"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Некоректний код операції"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Операція не підтримується"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Неочікувані аргументи"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Керує стрічковим пристроєм, отримуючи команди від віддаленого процесу"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "ЧИСЛО"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "встановити рівень налагоджування"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "ФАЙЛ"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "встановити назву файла для виходу налагоджування"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "не вдалося відкрити %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "забагато аргументів"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Хибна команда"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Це не схоже на архів tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Прочитано байтів загалом"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Записано загалом"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Загальна кількість вилучених байтів"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(канал)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr ""
"Відмовляємося читати вміст архіву з термінала (не вказано параметр -f?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr ""
"Відмовляємося записувати вміст архіву до термінала (пропущено параметр -f?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Недійсне значення record_size"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Не вказано назви архіву"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Неможливо перевіряти архів, записаний до stdout"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Архів стиснено. Використовуйте параметр %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Не можна оновлювати стиснені архіви"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "На початку стрічки, закінчуємо"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Надто багато помилок, виконання перервано"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
@@ -678,7 +677,7 @@ msgstr[0] "Розмір запису = %lu блок"
msgstr[1] "Розмір запису = %lu блоки"
msgstr[2] "Розмір запису = %lu блоків"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
@@ -686,39 +685,39 @@ msgstr[0] "Невірне вирівнювання блоку (%lu байт) в
msgstr[1] "Невірне вирівнювання блоку (%lu байти) в архіві"
msgstr[2] "Невірне вирівнювання блоку (%lu байтів) в архіві"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Не вдалося переміститись назад у архіві; можливо архів не можна прочитати "
"без параметра -i"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek не зупинився на межі запису"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: містить некоректний номер тому"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Переповнення номера тому"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Підготуйте том #%d архіву %s ї натисніть Enter: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Кінець файла, замість очікуваної відповіді"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "ПОПЕРЕДЖЕННЯ: незавершений архів"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -729,66 +728,66 @@ msgstr ""
" q Перервати роботу\n"
" у або новий рядок Продовжувати\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Викликати оболонку\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? Вивести цю довідку\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Новий том відсутній. Завершення.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Не вказано назви файла. Спробуйте ще раз.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Недійсні вхідні дані. Наберіть ? щоб отримати підказку.\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "збій виконання команди «%s»"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s не продовжується у цьому томі"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr ""
"%s можливо продовжується у цьому томі: заголовок містить обрізану назву"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s є неправильним розміром (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Цей том є за межами послідовності (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Назви тому відсутня в архіві. Не можна порівняти з %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Етикетка тому %s не співпадає з %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -796,11 +795,11 @@ msgstr ""
"%s: назва файла надто довга щоб зберегти її у заголовку тому GNU; назву "
"обрізано"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "запис не закінчився на межі блоку"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
@@ -808,76 +807,76 @@ msgstr[0] "Вдалося прочитати тільки %lu з %lu байта"
msgstr[1] "Вдалося прочитати тільки %lu з %lu байтів"
msgstr[2] "Вдалося прочитати тільки %lu з %lu байтів"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Різниця у змісті"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Неочікуваний кінець файла в архіві"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Різниця у типі файла"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Різниця у правах доступу"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Різниця у значенні UID"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Різниця у значенні GID"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Різниця у часі модифікації"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Різниця у розмірі"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Не є посиланням до %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Різниця у символічному посиланні"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Різниця у номері пристрою"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Перевірка "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s: невідомий тип файла «%c», порівняно як звичайний файл"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Архів містить назви файлів з вилученими початковими префіксами."
# FIXME: base=64?
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "У архіві містяться перетворені назви файлів."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Перевірка може не знайти первинних файлів."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
@@ -885,47 +884,47 @@ msgstr[0] "ПОМИЛКА ПЕРЕВІРКИ: знайдено %d некорек
msgstr[1] "ПОМИЛКА ПЕРЕВІРКИ: знайдено %d невірних заголовки"
msgstr[2] "ПОМИЛКА ПЕРЕВІРКИ: знайдено %d невірних заголовків"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Самотній блок нулів, зсув %s"
# Не подобається мені це "кешування"...
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: містить мітку каталогу кешування «%s»; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "Значення %s поза межами діапазону типа %s %s..%s; заміна на %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "значення %s за межами діапазону типа %s %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Створення від'ємних вісімкових заголовків"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: назва файла занадто довга (макс. %d); не архівується"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: назва файла занадто довга (не вдалося розділити); не архівується"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: назва посилання занадто довга; не архівується"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
@@ -933,79 +932,79 @@ msgstr[0] "%s: Файл скоротився на %s байт; заповнен
msgstr[1] "%s: Файл скоротився на %s байти; заповнення нулями"
msgstr[2] "%s: Файл скоротився на %s байтів; заповнення нулями"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: файл знаходиться в іншої файлової системі; не архівується"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "вміст не архівується"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Невідомий тип файла; Файл проігноровано"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Відсутні деякі посилання до %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: файл не змінено; не архівується"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: файл є архівом; не архівується"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "каталог не архівується"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: файл змінився під час читання"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: сокет проігноровано"
# FIXME: door?
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: двері проігноровано"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Перехід до наступного заголовка"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Видалення не-заголовка з архіву"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: неймовірно стара дата %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: мітка часу %s зсунута на %s сек. до майбутнього"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Неочікувана суперечність під час створення каталогу"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: пропускаємо наявний файл"
@@ -1028,7 +1027,7 @@ msgstr "Спроба перетворити символічні посилан
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: не вдалося витягнути -- файл починається в іншому томі"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Неочікуваний кінець файла у заголовку довгої назви"
@@ -1058,22 +1057,22 @@ msgstr "%s: Не вдалося створити резервну копію ц
msgid "Cannot rename %s to %s"
msgstr "не вдалося перейменувати %s на %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Каталог перейменовано з %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Новий каталог"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: каталог перебуває у іншій файловій системі; дамп не створено"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: каталог перейменовано"
@@ -1201,35 +1200,35 @@ msgstr "%s: вилучаємо %s\n"
msgid "%s: Cannot remove"
msgstr "%s: не вдалося вилучити"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: пропускаємо"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "блок %s: ** Містить нулі **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "блок %s: ** Кінець файла **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "блок %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Пробіли у заголовку замість очікуваного числового значення типу %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
@@ -1237,17 +1236,17 @@ msgstr ""
"вважається, що це є двійкове доповнення"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Вісімкове значення %.*s знаходиться поза межами діапазону типу %s"
# FIXME: base=64?
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Архів містить застарілі заголовки з основою 64"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr ""
@@ -1255,146 +1254,145 @@ msgstr ""
"типу %s"
# FIXME: base-256
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Значення з основою 256 поза допустимими межами типу %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Знайдено %.*s замість числового значення типу %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Значення %s поза допустимими межами типу %s %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr "посилання до %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr "невідомий тип файла %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Довге посилання--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Довга назва--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Заголовок тому--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Продовжується з байту %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Створення каталогу:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Перейменовано %s у %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: не вдалося перейменувати на %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Перейменовано %s назад у %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Файл було вилучено перед тим як tar встиг його прочитати"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "процес-нащадок"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "канал між процесами"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Вибір локальних файлів:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "долучити ФАЙЛ до архіву (корисне, якщо його назва починається з -)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "КАТАЛОГ"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "перейти до вказаного каталогу"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "читати назви файлів для додання/видобування з вказаного файла"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr ""
"файл, вказаний з параметром -T, містить назви, відокремлені нульовими "
"символами; вмикає --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "відмінити дію попередньої параметра --null"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "усувати лапки з назв вхідних файлів або файлів в архіві (типово)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "не усувати лапки з назв вхідних файлів або файлів в архіві"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T вичитує назви файлів буквально (без аналізу опцій)"
+msgstr "-T вичитує назви файлів буквально (без екранування або аналізу опцій)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr ""
"-T вважає слова що починаються з риски опціями (поведінка за замовчуванням)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "ШАБЛОН"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "не обробляти файли, назви яких відповідають вказаному шаблону"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "виключити назви що відповідають шаблонам, вказаним у файлі"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1402,26 +1400,26 @@ msgstr ""
"не архівувати файли в каталогах, що містять CACHEDIR.TAG, з винятком самого "
"файла"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "не архівувати жодні файли в каталогах, що містять CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "не архівувати каталоги, що містять CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr ""
"не архівувати файли в каталогах, що містять ФАЙЛ, з винятком самого файла"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr ""
"прочитати взірці виключення для кожного з каталогів із файла ФАЙЛ, якщо "
"такий існує"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1429,74 +1427,74 @@ msgstr ""
"прочитати взірці виключення для кожного з каталогів і його підкаталогів із "
"файла ФАЙЛ, якщо такий існує"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "не архівувати жодні файли в каталогах, що містять ФАЙЛ"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "не архівувати каталоги, що містять ФАЙЛ"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "не архівувати каталоги систем керування версіями"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr ""
"прочитати взірці виключення із файлів ігнорування системи керування версіями"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "не архівувати резерві файли та файли блокування"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "рекурсивно проходити каталоги (типово)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "не заходити автоматично у каталоги"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Керування порівнюванням назв (впливає на взірці як вилучення, так і "
"долучення):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "порівнювати шаблони з назвами файлів починаючи від початку назви"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "відповідність взірцям після усіх '/' (типово для виключення)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "шаблони ігнорують відмінності у регістрі символів"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "шаблони враховують регістр (типово)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "користатися шаблонами (типово для вилучення)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "порівнювати назви буквально"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "шаблони стосуються '/' (типово для виключення)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "шаблони не стосуються до '/'"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"The following options were used after any non-optional arguments in archive "
"create or update mode. These options are positional and affect only "
@@ -1507,45 +1505,45 @@ msgstr ""
"впливають лише на аргументи що розташовані після них. Їх використання "
"наприкінці рядка немає сенсу. Будь ласка, розташуйте ці опції належним чином."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
msgstr "-C %s не має дії"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
msgstr "--%s %s не має дії"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
msgstr "--%s не має дії"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "рядок команди"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: список файлів, запит щодо якого надіслано з %s, вже прочитано з %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "не вдалося розділити рядок '%s': %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: прочитана назва файла містить нульовий символ"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Назви файлів містять символи-шаблони"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1553,48 +1551,48 @@ msgstr ""
"Користайтеся параметром --wildcards аби увімкнути шаблони, або параметром --"
"no-wildcards, щоб позбутися цього повідомлення"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Не знайдено в архіві"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Потрібну копію у архіві не знайдено"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Незгідність назви тому"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Використання параметра -C у переліку файлів разом з параметром --listed-"
"incremental не дозволяється"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr ""
"Разом з --listed-incremental можна використовувати лише один параметр -C"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Обидва параметри, «%s» і «%s», вимагають доступу до стандартного входу"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: некоректний формат архіву"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Формат архіву є несумісним з розширеними властивостями GNU"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1818,7 +1816,7 @@ msgstr "Вибір вихідного потоку:"
msgid "extract files to standard output"
msgstr "видобувати файли у стандартний вивід"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "КОМАНДА"
@@ -1854,7 +1852,7 @@ msgstr "читати мапу трансляції імен користувач
msgid "use FILE to map file owner GIDs and names"
msgstr "читати мапу трансляції імен груп та значень GID з ФАЙЛА"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "ДАТА-АБО-ФАЙЛ"
@@ -2069,7 +2067,7 @@ msgstr "розбивати на блоки під час читання (для
msgid "Archive format selection:"
msgstr "Вибір формату архіву:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "ФОРМАТ"
@@ -2153,59 +2151,59 @@ msgstr "ПРОГРАМА"
msgid "filter through PROG (must accept -d)"
msgstr "використовувати ПРОГРАМУ для стиснення/розтискання архіву"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Вибір файлів:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "залишатися у локальної файлової системі під час створення архіву"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "не вилучати початкову похилу риску, '/', з назв файлів"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "Йти за символьними посиланнями: долучати файли, на яки вони вказують"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "Йти за жорсткими посиланнями: долучати файли, на яки вони вказують"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "НАЗВА-ФАЙЛУ"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "починати читання архіву з вказаного файла"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "долучати тільки такі файли, що є новіші за вказану дату або файл"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "ДАТА"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "порівнювати тільки дату і час зміни даних"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "РЕЖИМ"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "перед вилученням створювати резервні файли у вказаному режимі"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "РЯДОК"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2213,59 +2211,59 @@ msgstr ""
"перед вилученням створювати резервні файли з указаним суфіксом (типово '~', "
"якщо не перевизначено змінною середовища SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Перетворювання назв файлів:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "вилучяти вказане ЧИСЛО компонентів з початку назв файлів"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "ВИРАЗ"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "перетворювати назви файлів за допомогою вказаного виразу заміни"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Інформативний вивід:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "виводити докладну інформацію про оброблені файли"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "КЛ.-СЛОВО"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "керування попередженнями"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "виводити контрольне повідомлення кожне ЧИСЛО записів (типово 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "ДІЯ"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "виконати вказану дію у контрольному пункті"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "виводити повідомлення якщо до архіву було додано не всі посилання"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "СИГНАЛ"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2276,35 +2274,35 @@ msgstr ""
"- друкувати статистику по отриманню цього сигналу; дозволеними сигналами є "
"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 і SIGUSR2, а також ці назви без префікса SIG"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "друкувати час модифікації файлів у UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "друкувати час модифікації файлів у повній вирізняльної здатності"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "виводити детальну інформацію у ФАЙЛ"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "попереджувати кожне повідомлення номером блоку в архіві"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "Запитувати підтвердження кожної дії"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "вивести типові налаштування"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "вивести коректні діапазони для полів файлів-знімків"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2312,31 +2310,31 @@ msgstr ""
"під час виведення змісту або видобування файлів друкувати назви каталогів що "
"не відповідають критеріям пошуку"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "показувати перетворені назви файлів"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "СТИЛЬ"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "встановити стиль цитування; дозволені стилі див. нижче"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "цитувати також вказані символи"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "вимкнути цитування вказаних символів"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Параметри сумісності:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
@@ -2344,22 +2342,22 @@ msgstr ""
"під час створення архіву, те ж саме, що і --old-archive. Під час "
"видобування, те ж саме, що --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Інші параметри:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "заборонити користування деякими потенційно небезпечними параметрами"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' не можна використовувати разом з '%s'"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
@@ -2367,40 +2365,40 @@ msgstr ""
"Не можна вказувати більш одного параметра з набору '-Acdtrux', '--delete' "
"та '--test-label'"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Конфлікт параметрів стискання"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Невідомий тип файла %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Не знайдено файл-зразок дати"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Використовується %s замість невідомого формату дати %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Параметр %s: дату «%s» сприйнято як %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "фільтрувати архів через %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Допустимими аргументами параметра --quoting-style є:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2408,120 +2406,120 @@ msgstr ""
"\n"
"Типові налаштування *цієї* копії програми:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "Некоректний ідентифікатор власника або групи"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Неправильний фактор блокування"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Неправильна довжина стрічки"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Недійсне значення для рівня архівації"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Більш ніж одна гранична дата"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Недійсна версія формату розсіяних файлів"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "параметр --atime-preserve='system' не підтримується на цій платформі"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "аргумент --checkpoint мусить бути цілим числом"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Некоректний формат прав доступу"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Невірне число"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Некоректний розмір запису"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Розмір запису має ділитися на %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Некоректна кількість елементів"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Дозволяється лише одна параметр --to-command"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Некоректний аргумент вказання густини: «%s»"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Невідома густина: '%c'"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "Підтримки параметрів '-[0-7][lmh]' у *цій* версії tar не передбачено"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: місце помилки"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "помилка розбору %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[ФАЙЛ]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "неопціональний аргумент для %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "не вдалося розділити значення TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Параметр старого стилю «%c» потребує аргументу."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "вказання --occurrence не має сенсу без вказання переліку файлів"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Для визначення декількох файлів архівів слід використати параметр '-M'"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "Використання --level разом з --listed-incremental не має сенсу"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
@@ -2529,46 +2527,46 @@ msgstr[0] "%s: Мітка тому є надто довга (обмеження
msgstr[1] "%s: Мітка тому є надто довга (обмеження в %lu байти)"
msgstr[2] "%s: Мітка тому є надто довга (обмеження в %lu байтів)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Не можна перевіряти багатотомні архіви"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Не можна перевіряти стиснені архіви"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Не можна використовувати стиснення багатотомних архівів"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Не можна з'єднувати стиснені архіви"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime вимагає подання дати з опцією --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr ""
"Параметр --pax-option використовується тільки з архівами у форматі POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "Параметр --acls можна використовувати лише для архівів у форматі POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr ""
"Параметр --selinux можна використовувати лише для архівів у форматі POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr ""
"Параметр --xattr можна використовувати лише для архівів у форматі POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2576,30 +2574,30 @@ msgstr ""
"Не вдалося визначити назву каталогу верхнього рівня. Будь ласка, вкажіть її "
"явним чином за допомогою параметра --one-top-level=КАТАЛОГ"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Розмір тому не може бути більшим від розміру запису"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Полохливо відмовляюся створювати пустий архів"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Параметри '-Aru' несумісні з '-f -'"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Слід вказати один з параметрів, '-Acdtrux', '--delete' або '--test-label'"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Невдачне завершення внаслідок попередніх помилок"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
@@ -2607,103 +2605,112 @@ msgstr[0] "%s: Файл скоротився на %s байт"
msgstr[1] "%s: Файл скоротився на %s байти"
msgstr[2] "%s: Файл скоротився на %s байтів"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Ключове слово %s не є відоме або ще не реалізоване"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Значення позначки часу поза допустимими межами"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Шаблон %s забороняється уживати"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Не можна перевизначити ключове слово %s"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Невірно сформований розширений заголовок: бракує довжини"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Довжина розширеного заголовку %*s перебуває за межами діапазону"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr ""
"Невірно сформований розширений заголовок: відсутній пробіл після довжини"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Невірно сформований розширений заголовок: відсутній знак рівності"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Невірно сформований розширений заголовок: відсутній знак нового рядка"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Ігноруємо невідоме ключове слово розширеного заголовка, «%s»"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Створена пара ключове слово/значення є задовгою (ключ=%s, довжина=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr ""
"Значення розширеного заголовку %s=%s лежить поза допустимими межами типу %s.."
"%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Невірно сформований розширений заголовок: некоректна змінна %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Невірно сформований розширений заголовок: зайвий %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr ""
"Невірно сформований розширений заголовок: змінна %s: неочікуваний розділювач "
"%c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Невірно сформований розширений заголовок %s: непарна кількість значень"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: некоректне обмеження часу очікування"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: незнана дія"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "запис"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "читання"
@@ -2711,7 +2718,7 @@ msgstr "читання"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Контрольна відмітка запису %u"
@@ -2720,12 +2727,12 @@ msgstr "Контрольна відмітка запису %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Контрольна відмітка читання %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2734,95 +2741,99 @@ msgstr ""
"paxutils\n"
"Перелік параметрів:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Параметри створювання файлів:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "РОЗМІР"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Створити файл заданого розміру"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Писати у вказаний файл, замість стандартного виводу"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Читати назви файлів з вказаного файла"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr ""
"файл, вказаний з параметром -T, містить назви, відокремлені нульовими "
"символами"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Взірець заповнення файла: 'default' (типовий) або 'zeros' (заповнення нулями)"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Розмір блока розсіяного файла"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "Створити розсіяний файл. Решта аргументів дає мапу файла."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "ЗСУВ"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Перед записом даних перейти до вказаного зсуву в файлі"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Не видавати повідомлення про не фатальні помилки"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Статистика файлів:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr "Виводити вміст структури stat для кожного файла. Типовий формат: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Синхронне виконання:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "ПАРАМЕТР"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Виконати вказану команду. Для використання з параметрами --cut, --append, --"
"touch або --unlink"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr ""
"Виконати вказану операцію (див. нижче) по досягненню контрольної відмітки"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Встановлює дати для наступної параметра --touch"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Друкувати виконані операції і код завершення команди"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2830,7 +2841,7 @@ msgstr ""
"Операції синхронного виконання. Виконуються по досягненню контрольної "
"відмітки, вказаної параметром --checkpoint. "
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2838,125 +2849,125 @@ msgstr ""
"Обрізати файл до розміру, вказаного попередньою параметром --length (до 0, "
"якщо її не було вказано)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Додати до файла кількість байтів, вказану попередньою параметром --length."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Поновити час доступу та модифікації файла"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Виконати КОМАНДУ"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
msgstr "Вилучити ФАЙЛ"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Некоректний розмір: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Число поза допустимими межами: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Від'ємний розмір: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "збій виконання stat(%s)"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "замовлений розмір файла %lu, справжній -- %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "створений файл не є розсіяним"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Помилка розбору числа біля «%s»"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Невідомий формат дати"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[АРГУМЕНТИ...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "не вдалося відкрити «%s»"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "не вдалося виконати lseek"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "назва файла містить нульовий символ"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"неможливо створювати розсіяні файли на стандартному виводі; користайтеся "
"параметром --file"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "некоректна маска (біля «%s»)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Невідоме поле «%s»"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "не вдалося встановити часову позначку файла «%s»"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "не вдалося обрізати «%s»"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "помилка команди: %s"
-#: tests/genfile.c:781
+#: tests/genfile.c:772
#, c-format
msgid "cannot stat `%s'"
msgstr "не вдається виконати stat «%s»"
-#: tests/genfile.c:785
+#: tests/genfile.c:776
#, c-format
msgid "cannot remove directory `%s'"
msgstr "не вдалося видалити каталог «%s»"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "не вдалося вилучити «%s»"
@@ -2996,6 +3007,9 @@ msgstr "Команда завершилася\n"
msgid "--stat requires file names"
msgstr "параметр --stat вимагає назв файлів"
+#~ msgid "OPTION"
+#~ msgstr "ПАРАМЕТР"
+
#, fuzzy
#~| msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
diff --git a/po/vi.gmo b/po/vi.gmo
index 7ff4e49a8843a48dcf379ec632635cfe3cf2fd93..777f9411252129ed0ee0fbb5abf8eba62205bd72 100644
Binary files a/po/vi.gmo and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
index 01fba53ec30ad6100a84b1e4ab5b391c7448e2a1..14ee6840aef925e937aa4380730a11efd5633688 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -4,15 +4,15 @@
# This file is distributed under the same license as the tar package.
# Phan Vinh Thinh <teppi82@gmail.com>, 2005.
# Clytie Siddall <clytie@riverland.net.au>, 2007-2010.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014, 2016.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014, 2016, 2017.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-17 07:14+0700\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2017-12-21 13:40+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -105,7 +105,7 @@ msgid "give a short usage message"
msgstr "hiển thị cách sử dụng dạng ngắn gọn"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "TÊN"
@@ -143,29 +143,29 @@ msgid "write error"
msgstr "lỗi ghi"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: tùy chọn “%s” chưa rõ ràng\n"
+msgstr "%s: tùy chọn “%s%s” chưa rõ ràng\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: tùy chọn “%s” chưa rõ ràng; khả năng là:"
+msgstr "%s: tùy chọn “%s%s” chưa rõ ràng; khả năng là:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: không nhận ra tùy chọn “%c%s”\n"
+msgstr "%s: không nhận ra tùy chọn “%s%s”\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn “%c%s” không cho phép đối số\n"
+msgstr "%s: tùy chọn “%s%s” không không cho phép một đối số\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: tùy chọn “--%s” yêu cầu một đối số\n"
+msgstr "%s: tùy chọn “%s%s” cần một đối số\n"
#: gnu/getopt.c:621
#, c-format
@@ -240,12 +240,12 @@ msgstr "^[cCyY]"
msgid "^[nN]"
msgstr "^[kKnN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "Đóng gói bởi %s (%s)\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "Đóng gói bởi %s\n"
@@ -253,12 +253,11 @@ msgstr "Đóng gói bởi %s\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -268,10 +267,10 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Giấy phép GPLv3+: Giấy phép Công cộng GNU phiên bản 3 hay mới hơn:\n"
-"<http://gnu.org/licenses/gpl.html>\n"
-"Đây là phần mềm tự do: bạn có quyền thay đổi và phát hành lại nó.\n"
-"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều kiện được pháp luật cho phép.\n"
+"Giấy phép GPL pb3+ : Giấy phép Công cộng GNU phiên bản 3 hay sau <https://"
+"gnu.org/licenses/gpl.html>.\n"
+"Đây là phần mềm tự do: bạn có quyền sửa đổi và phát hành lại nó.\n"
+"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều khiển được pháp luật cho phép.\n"
"\n"
#. TRANSLATORS: %s denotes an author name.
@@ -409,15 +408,14 @@ msgid "%s home page: <%s>\n"
msgstr "Trang chủ %s: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "Trang chủ %s: <http://www.gnu.org/software/%s/>\n"
+msgstr "Trang chủ %s: <https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr ""
-"Trợ giúp chung về cách sử dụng phần mềm GNU: <http://www.gnu.org/gethelp/>\n"
+"Trợ giúp chung về cách sử dụng phần mềm GNU: <https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -533,189 +531,189 @@ msgstr "Không thể chuyển hướng kết xuất các tập tin cho hệ vỏ
msgid "Cannot execute remote shell"
msgstr "Không thể chạy hệ vỏ ở xa"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "Hướng tìm kiếm vượt quá vùng cho phép"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "Hướng di chuyển vị trí đọc không hợp lệ"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "Khoảng bù di chuyển vị trí đọc không hợp lệ"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "Khoảng bù di chuyển vị trí đọc vượt quá phạm vi cho phép"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "Sai số lượng byte"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "Số lượng byte nằm ngoài phạm vi"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "Gặp kết thúc tập tin sớm"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "Mã thao tác sai"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "Thao tác không được hỗ trợ"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "Gặp đối số bất thường"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "Thao tác một ổ băng từ, chấp nhận lệnh từ một tiến trình ở xa"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "SỐ"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "đặt cấp gỡ rối"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "TẬP-TIN"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "đặt tên tập tin kết xuất gỡ rối"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "không thể mở %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "quá nhiều đối số"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "Câu lệnh rác"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "Đây có vẻ không phải là một kho lưu tar"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "Tổng số byte đã đọc"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "Tổng số byte đã ghi"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "Tổng số byte đã xóa"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(đường ống)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "Từ chối đọc nội dung kho lưu từ thiết bị cuối (thiếu tùy chọn -f ?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "Từ chối ghi nội dung kho lưu vào thiết bị cuối (thiếu tùy chọn -f ?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "Giá trị cho “record_size” không đúng"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "Không đưa ra tên kho lưu"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "Không kiểm tra được kho lưu stdin/stdout"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "Kho lưu được nén. Hãy sử dụng tùy chọn %s"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "Không cập nhật được kho lưu đã nén"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "Tại đầu băng từ, thoát ra bây giờ"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "Quá nhiều lỗi, đang thoát"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "Kích cỡ mục ghi = %lu khối"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "Khối chưa sắp hàng (%lu byte) trong kho lưu"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr ""
"Không thể \"tua\" lại tập tin kho lưu; nó có thể không đọc được khi không có "
"“-i”"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek không dừng lại tại một ranh giới bản ghi"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s: chứa số thứ tự khối không đúng"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "Số thứ tự khối thừa ra"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "Chuẩn bị khối #%d cho %s và nhấn Enter: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "Kết thúc tập tin (EOF) bất ngờ khi cần trả lời của người dùng"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "CẢNH BÁO: Kho lưu không hoàn thành"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -727,65 +725,65 @@ msgstr ""
" q Dừng tar\n"
" y hay dòng mới Tiếp tục lại chạy tiến trình\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! Sản sinh một hệ vỏ con\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? In ra danh sách này\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "Không có khối mới; đang thoát.\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "Chưa ghi rõ tên tập tin. Hãy thử lại.\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "Gõ sai. (Gõ ? để xem trợ giúp.)\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "Câu lệnh %s không thành công"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s không tiếp tục trên khối này"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s có thể tiếp tục trên khối tin này: phần đầu chứa tên bị cắt ngắn"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s là kích thước sai (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "Khối tin này vượt quá dãy cho phép (%s - %s != %s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "Kho lưu không có nhãn tương ứng với %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "Khối %s không tương ứng %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
@@ -793,208 +791,208 @@ msgstr ""
"%s: tên tập tin quá dài để chứa trong một phần đầu đa khối GNU nên bị cắt "
"ngắn"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "tiến trình ghi (write) không dừng lại tại một ranh giới khối"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "Chỉ đọc được %lu từ %lu byte"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "Diff nội dung"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "Kết thúc tập tin bất ngờ trong kho lưu"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "Diff dạng tập tin"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "Diff chế độ"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Khác biệt Uid"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Khác biệt Gid"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "Khác biệt thời gian sửa đổi"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "Khác biệt kích thước"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "Không liên kết tới %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "Khác biệt liên kết mềm"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "Diff số thứ tự của thiết bị"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "Kiểm tra "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr ""
"%s: Không rõ kiểu tập tin “%c” nên khác biệt (diff) như tập tin thông thường"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "Kho lưu chứa tên tập tin không có tiền tố ở đầu."
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "Tài liệu được nén có chứa tên tệp tin chuyển đổi."
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "Sự kiểm tra có thể không định vị được các tập tin gốc."
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "LỖI KIỂM TRA: tìm thấy %d phần đầu không đúng"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "Một khối không đơn lẻ tại %s"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: chứa một thẻ thư mục ghi nhớ tạm %s: %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "giá trị %s vượt quá %s phạm vi %s..%s; đang thay thế %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "giá trị %s vượt quá %s phạm vi %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "Đang tạo phần đầu hệ bát phân âm"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s: tên tập tin quá dài (tối đa là %d); không được dump"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s: tên tập tin quá dài (không chia được); không được dump"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s: tên liên kết quá dài; không được dump"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s: Tập tin được rút ngắn %s byte; độn vào bắng các số không"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s: tập tin trên một hệ thống tập tin khác; không được dump"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "chưa đổ nội dung"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s: Không hiểu kiểu tập tin; tập tin bị lờ đi"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "Thiếu liên kết tới %s."
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: tập tin chưa thay đổi; không được dump"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: tập tin là kho lưu; không được đổ"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "chưa đổ thư mục"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: tập tin đã thay đổi khi chúng ta đọc nó"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: socket bị lờ đi"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: cửa (door) bị lờ đi"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "Nhảy tới phần đầu tiếp theo"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "Xóa không phải phần đầu từ kho lưu"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s: tem thời gian cũ không hợp lý %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s: dấu vết thời gian %s là %s giây trong tương lai"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s: Sự mâu thuẫn bất ngờ khi tạo thư mục"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: bỏ qua tập tin sẵn có"
@@ -1017,7 +1015,7 @@ msgstr "Đang thử rút trích liên kết mềm thành liên kết cứng"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s: Không rút trích được -- tập tin tiếp tục từ khối khác"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "Gặp phần đầu tên dài bất ngờ"
@@ -1035,7 +1033,7 @@ msgstr "%s hiện tại là mới hơn hoặc cùng tuổi"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s: Tên thành viên có chứa “..”"
#: src/extract.c:1696
#, c-format
@@ -1047,22 +1045,22 @@ msgstr "%s: Không thể sao lưu tập tin này"
msgid "Cannot rename %s to %s"
msgstr "Không thể đổi tên %s thành %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s: Thư mục đã bị đổi tên từ %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s: Thư mục là mới"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s: thư mục trên một hệ thống tập tin khác; nên không được dump (đổ)"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s: Thư mục đã bị đổi tên"
@@ -1188,193 +1186,193 @@ msgstr "%s: Đang xóa %s\n"
msgid "%s: Cannot remove"
msgstr "%s: Không thể xóa bỏ"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s: Đang bỏ đi"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "khối %s: ** Khối của các số không (NUL) **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "khối %s: ** Kết thúc tập tin **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "khối %s: "
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "Khoảng trống trong Phần đầu trong khi cần một giá trị số %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr ""
"Giá trị hệ tám %.*s của kho lưu vượt ra phạm vi %s; coi như phần bù của hai"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "Giá trị hệ tám %.*s của kho lưu vượt ra phạm vi %s"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "Kho lưu chứa phần đầu base-64 không còn dùng nữa"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "Kho lưu ký chuỗi base-64 %s vượt ra ngoài vùng %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "Giá trị base-256 của kho lưu vượt ra ngoài vùng %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "Kho lưu chứa %.*s nơi mà cần giá trị số %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "Giá trị kho lưu %s vượt quá phạm vi %s (%s..%s)"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " liên kết tới %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " kiểu tập tin không rõ %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--Liên kết Dài--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--Tên Dài--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--Phần đầu Khối--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--Tiếp tục tại byte %s--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "Đang tạo thư mục:"
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Đang đổi tên %s thành %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s: Không thể đổi tên thành %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "Đang đổi tên %s ngược lại thành %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s: Tập tin bị xóa trước khi chúng ta đọc nó"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "tiến trình con"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "kênh liên tiến trình"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "Lựa chọn tập tin nội bộ:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr ""
"thêm vào kho lưu TẬP-TIN đã cho (có ích nếu tên nó bắt đầu với dấu gạch)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "TMỤC"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "thay đổi tới thư mục THƯ MỤC"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "lấy các tên tập tin cần rút trích hay tạo từ TẬP-TIN"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T đọc tên kết thúc bằng ký hiệu null, ý là --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "tắt hiệu ứng của tùy chọn “--null” trước đây"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "hủy trích dẫn các tên tập tin hay thành viên (mặc định)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "đừng hủy trích dẫn các tên tập tin hay thành viên"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T đọc các tên tập tin nguyên văn (không xử lý tùy chọn)"
+msgstr ""
+"-T đọc các tên tập tin nguyên văn (không thoát chuỗi hay xử lý tùy chọn)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "-T coi các tên tập tin bắt đầu bằng dấu - là tùy chọn (mặc định)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "MẪU"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "loại trừ những tập tin tương ứng với MẪU"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "loại trừ những mẫu liệt kê trong TẬP-TIN"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
@@ -1382,24 +1380,24 @@ msgstr ""
"loại trừ nội dung của thư mục chứa thẻ ghi nhớ tạm CACHEDIR.TAG, trừ tập tin "
"thẻ chính nó"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr ""
"loại trừ mọi thứ đều nằm dưới thư mục chứa thẻ ghi nhớ tạm CACHEDIR.TAG"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "loại trừ thư mục chứa thẻ ghi nhớ tạm CACHEDIR.TAG"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "loại trừ nội dung của thư mục chứa TẬP-TIN, trừ TẬP-TIN chính nó"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "đọc các mẫu loại trừ cho từng thư mục từ TẬP-TIN, nếu có"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
@@ -1407,117 +1405,121 @@ msgstr ""
"đọc các mẫu loại trừ cho từng thư mục và những thư mục con của nó từ TẬP-"
"TIN, nếu có"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "loại trừ mọi thứ đều nằm dưới thư mục chứa TẬP-TIN"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "loại trừ thư mục chứa TẬP-TIN"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "loại trừ thư mục của hệ thống điều khiển phiên bản (v.d. “.svn”)"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "đọc các mẫu loại trừ từ tập tin bỏ qua của VSC"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "loại trừ tập tin kiểu sao lưu và khóa"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "đệ quy vào các thư mục (mặc định)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "tránh sự giảm dần một cách tự động trong các thư mục"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr ""
"Tùy chọn khớp tên tập tin (có tác động mẫu kiểu cả hai loại trừ và bao gồm):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "mẫu tương ứng với bắt đầu tên tập tin"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "mẫu khớp sau bất kỳ “/” nào (mặc định để loại trừ)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "không phân biệt HOA/thường"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "khớp mẫu phân biệt HOA/ thường (mặc định)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "dùng ký tự đại diện (mặc định để loại trừ)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "khớp đúng nguyên văn"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "ký tự đại khớp “/” (mặc định để loại trừ)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "ký tự đại diện không khớp “/”"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"Các tùy chọn sau đây được sử dụng sau một tham số không tùy chọn bất kỳ "
+"trong chế độ tạo hay cập nhật kho nén. Những tùy chọn này có tính vị trí và "
+"chỉ áp dụng với các tham số mà theo sau chúng. Vui lòng thay đổi vị trí của "
+"chúng cho đúng."
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s không có tác dụng"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s không có tác dụng"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s không có tác dụng"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "dòng lệnh"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: danh sách tập tin đã yêu cầu từ %s đã sẵn được đọc từ %s"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "không thể chia tách chuỗi “%s”: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: đọc tên tập tin chứa ký tự vô giá trị"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "Tên tập tin chứa ký tự khớp mẫu"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
@@ -1525,47 +1527,47 @@ msgstr ""
"Dùng “--wildcards” (ký tự đặi diện) để hiệu lực chức năng khớp mẫu,\n"
"hoặc “--no-wildcards” để thu hồi cảnh báo này."
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s: Không tìm thấy trong kho lưu"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s: Không tìm thấy phần tử yêu cầu trong kho lưu"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "Sai khớp nhãn kho lưu"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr ""
"Sử dụng tùy chọn “-C” bên trong danh sách tập tin không được phép với “--"
"listed-incremental”"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "Chỉ cho phép một tùy chọn “-C” với “--listed-incremental”"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "Cả hai tùy chọn “%s” và “%s” đều muốn đầu vào tiêu chuẩn"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s: Định dạng kho lưu không đúng"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "Muốn tính năng GNU trên định dạng kho lưu không tương thích"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1791,7 +1793,7 @@ msgstr "Chọn luồng dữ liệu xuất:"
msgid "extract files to standard output"
msgstr "rút trích tập tin ra đầu ra tiêu chuẩn"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "LỆNH"
@@ -1827,7 +1829,7 @@ msgstr "sử dụng TẬP TIN để ánh xạ MÃ SỐ chủ sở hữu tập ti
msgid "use FILE to map file owner GIDs and names"
msgstr "sử dụng TẬP TIN để ánh xạ MÃ SỐ NHÓM sở hữu tập tin và các tên"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "NGÀY-CỦA-TẬP-TIN"
@@ -2040,7 +2042,7 @@ msgstr "đặt khối lại khi chúng ta đọc (cho đường ống 4.2BSD)"
msgid "Archive format selection:"
msgstr "Lựa chọn định dạng kho lưu:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "Đ.DẠNG"
@@ -2124,59 +2126,59 @@ msgstr "PMỀM"
msgid "filter through PROG (must accept -d)"
msgstr "lọc qua chương TRÌNH (phải chấp nhận -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "Lựa chọn tập tin nội bộ:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "nằm trong hệ thống tập tin nội bộ khi tạo kho lưu"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "đừng bỏ “/” ở đầu tên tập tin"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "theo liên kết mềm; kho lưu và đổ tập tin tới đó nó chỉ"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "theo liên kết cứng; kho lưu và đổ tập tin tới đó nó chỉ"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "TÊN-TH.VIÊN"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "bắt đầu tại thành viên TÊN-THÀNH-VIÊN khi đọc kho lưu"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "chỉ chứa những tập tin mới hơn NGÀY-CỦA-TẬP-TIN"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "NGÀY"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "so sánh ngày và thời gian chỉ khi dữ liệu thay đổi"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "Đ.KHIỂN"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "sao lưu trước khi xóa, chọn phiên bản ĐIỀU KHIỂN"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "CHUỖI"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2184,59 +2186,59 @@ msgstr ""
"sao lưu trước khi xóa, ghi đè hậu tố thông thường (“~” trừ khi ghi đè bằng "
"biến môi trường SIMPLE_BACKUP_SUFFIX)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "Chuyển dạng tên tập tin:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "bỏ đi SỐ thành phần đứng đầu ra tên tập tin khi rút trích"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "BIỂU-THỨC"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "dùng “sed replace BIỂU THỨC” để chuyển dạng tên tập tin"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "Dữ liệu kết quả có tính thông tin:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "liệt kê một cách tỉ mỉ những tập tin được xử lý"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "TỪKHÓA"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "điều khiển cảnh báo"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "hiển thị thông báo về tiến triển sau mỗi bản ghi thứ SỐ (mặc định 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "H.ĐỘNG"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "thực hiện HÀNH_ĐỘNG này ở mỗi điểm kiểm tra"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "in ra một thông báo nếu không phải tất cả các liên kết được dump"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "T.HIỆU"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2247,35 +2249,35 @@ msgstr ""
"khi nhận được TÍN HIỆU này; tín hiệu được phép: SIGHUP, SIGQUIT, SIGINT, "
"SIGUSR1, SIGUSR2; cũng chấp nhận tên không có tiền tố “SIG”;"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "in ra giờ sửa đổi tập tin theo UTC"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "in ra giờ tập tin đến độ phân giải đầy đủ"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "gửi kết quả chi tiết tới TẬP-TIN"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "hiển thị số thứ tự khối trong kho lưu với mỗi thông báo"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "hỏi xác nhận trước mỗi hành động"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "hiển thị các giá trị mặc định của tar"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "hiển thị vùng hợp lệ cho trường “snapshot-file”"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
@@ -2283,94 +2285,94 @@ msgstr ""
"khi liệt kê hay rút trích, liệt kê mỗi thư mục không tương ứng với tiêu chí "
"tìm kiếm"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "hiển thị các tên tập tin hay kho lưu sau khi chuyển dạng"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "KDÁNG"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr ""
"đặt kiểu dáng trích dẫn tên; xem dưới để tìm các giá trị KIỂU DÁNG hợp lệ"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "cũng trích dẫn các ký tự của CHUỖI"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "tắt trích dẫn các ký tự của CHUỖI"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "Tùy chọn tương thích:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr ""
"khi tạo, giống như “--old-archive” khi rút trích, giống như “--no-same-owner”"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "Những tùy chọn khác:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "tắt sử dụng một số tùy chọn có thể gây tai hại"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không được dùng cùng với “%s”"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr ""
"Chỉ cho phép đưa ra một tùy chọn “-Acdtrux”, “--delete” hoặc “--test-label”"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "Mâu thuẫn giữa các tùy chọn nén"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "Không rõ tên tín hiệu: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "Không tìm thấy tập tin mẫu ngày tháng"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "Đang thay thế %s cho dạng ngày tháng không rõ %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "Tùy chọn %s: Đang xử lý ngày tháng “%s” như là %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "lọc kho lưu qua %s"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "Các đối số thích hợp với tùy chọn “--quoting-style” là:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2378,162 +2380,162 @@ msgstr ""
"\n"
"tar *này* mặc định dùng:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "ID của chủ sở hữu hay nhóm không đúng"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "Nhân tố khối không đúng"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "Chiều dài băng từ không đúng"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "Giá trị mức gia số không hợp lệ"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "Có nhiều hơn một ngưỡng ngày tháng"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "Giá trị phiên bản sparse không hợp lệ"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve=\"system\" không được hỗ trợ trên nền tảng này"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "giá trị “--checkpoint” không phải số nguyên"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "Đưa ra chế độ không đúng trên tùy chọn"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "Số không đúng"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "Kích thước bản ghi không đúng"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "Kích thước bản ghi phải là bội số của %d."
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "Số thứ tự của nguyên tố không đúng"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "Cho phép chỉ một tùy chọn “--to-command”"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "Tham số mật độ sai dạng: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "Không hiểu mật độ: “%c”"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "tar *này* không hỗ trợ tùy chọn “-[0-7][lmh]”"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: vị trí của lỗi"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "lỗi phân tích cú pháp %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[TẬP_TIN]…"
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "đối số không phải tùy chọn trong %s"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "không thể chia tách CÁC_TÙY_CHỌN_TAR: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "Tùy chọn cũ “%c” yêu cầu một tham số."
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "“--occurrence” không có giá trị khi không đưa ra một danh sách tập tin"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "Tập tin nhiều kho lưu yêu cầu tùy chọn “-M”"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "Tùy chọn “--level” vô ích nếu không có “--listed-incremental”"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s: Nhãn khối quá dài (giới hạn là %lu byte)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "Không thể kiểm tra kho lưu nhiều khối"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "Không thể kiểm tra kho lưu đã nén"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "Không thể sử dụng kho lưu nhiều khối đã nén"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "Không thể ghép nối các kho nén"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime cần xác định thời gian sử dụng --mtime"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "“--pax-option” chỉ dùng được trên kho lưu POSIX"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "“--acls” chỉ dùng được trên kho lưu POSIX"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "“--selinux” chỉ dùng được trên kho lưu POSIX"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "“--xattrs” chỉ dùng được trên kho lưu POSIX"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
@@ -2541,128 +2543,137 @@ msgstr ""
"Không thể suy diễn tên thư mục cấp cao nhất; hãy đặt nó rõ ràng bằng tùy "
"chọn --one-top-level=THƯ-MỤC"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "Chiều dài khối tin không thể nhỏ hơn kích cỡ mục ghi"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "Từ chối tạo một kho lưu trống rỗng"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "Các tùy chọn “-Aru” không tương thích với “-f -”"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr ""
"Bạn phải chỉ ra một trong số các tùy chọn “-Acdtrux”, “--delete” hoặc “--"
"test-label”"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "Đang thoát với trạng thái thất bại do lỗi xảy ra trước"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s: Tập tin được rút ngắn %s byte"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "Từ khóa %s không rõ hoặc chưa được thực hiện"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "Nhãn thời gian ở ngoại phạm vi cho phép"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "Không thể dùng mẫu “%s”"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "Không thể ghi chèn lên từ khóa “%s”"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "Phần đầu mở rộng dạng sai: thiếu chiều dài"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "Chiều dài phần đầu mở rộng %*s ở ngoại phạm vi được phép"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "Phần đầu mở rộng dạng sai: thiếu khoảng trắng ở sau chiều dài"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "Phần đầu mở rộng bị lỗi: thiếu dấu bằng"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "Phần đầu mở rộng dạng sai: thiếu dòng mới"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "Bỏ qua từ khóa phần đầu mở rộng không rõ “%s”"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "Cặp từ khóa/giá trị đã tạo ra quá dài (từ khóa=%s, chiều dài=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "Phần đầu mở rộng %s=%s nằm ngoài phạm vi (%s..%s)"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "Phần đầu mở rộng dạng sai: %s=%s không hợp lệ"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "Phần đầu mở rộng dạng sai: %s=%s thừa"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "Phần đầu mở rộng dạng sai: %s không hợp lệ: không cần dấu phân cách %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "Phần đầu mở rộng dạng sai: %s không hợp lệ: số giá trị lẻ"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: không phải thời gian chờ tối đa hợp lệ"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: không rõ hành động điểm kiểm"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "ghi"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "đọc"
@@ -2670,7 +2681,7 @@ msgstr "đọc"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "Điểm kiểm tra ghi %u"
@@ -2679,12 +2690,12 @@ msgstr "Điểm kiểm tra ghi %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "Điểm kiểm tra đọc %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2693,80 +2704,84 @@ msgstr ""
"GNU.\n"
"TÙY CHỌN:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "Tùy chọn tạo tập tin:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "CỠ"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "Tạo tập tin có KÍCH_CỠ đã cho"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "Ghi vào tập tin TÊN, thay cho đầu ra tiêu chuẩn"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "Đọc các tên tập tin từ TẬP-TIN"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "“-T” đọc tên kết thúc vô hiệu lực"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr ""
"Điền thêm vào tập tin bằng MẪU đã cho. MẪU là:\n"
" * default mặc định\n"
" * zeros các số không"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "Kích cỡ của khối cho tập tin spare"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr ""
"Tạo ra tập tin sparse. Phần còn lại của dòng lệnh đưa ra ánh xạ tập tin."
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "HIỆU_SỐ"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "Di chuyển vị trí đọc tới hiệu số đã cho trước khi ghi dữ liệu"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "Cấm các lời nhắn chuẩn đoán không nghiêm trọng"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "Tùy chọn thống kê tập tin:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr ""
"In nội dung của cấu trúc stat cho từng tập tin đã cho. ĐỊNH DẠNG mặc định "
"là: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "Tùy chọn thực hiện đồng thời:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "T.CHỌN"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"Thực hiện các ĐỐI_SỐ đã cho. Có ích với “--checkpoint” (điểm kiểm tra) và "
"một trong số:\n"
@@ -2775,19 +2790,19 @@ msgstr ""
" * --touch chạm vào\n"
" * --unlink bỏ liên kết"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "Thực hiện hành động đã cho (xem dưới) khi tới điểm kiểm tra SỐ"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "Đặt ngày tháng cho tùy chọn “-touch” kế tiếp"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "Hiển thị các điểm kiểm tra đã thực hiện và trạng thái thoát của LỆNH"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2795,7 +2810,7 @@ msgstr ""
"Các hành động thực hiện đồng thời; được thực hiện khi tới điểm kiểm tra có "
"số được ghi rõ bằng tùy chọn “--checkpoint”."
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
@@ -2803,126 +2818,126 @@ msgstr ""
"Cắt ngắn TẬP-TIN thành kích cỡ được ghi rõ bằng tùy chọn “--length” trước "
"(không ghi rõ thì 0)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr ""
"Phụ thêm KÍCH_CỠ byte vào TẬP-TIN. KÍCH_CỠ được ghi rõ bằng tùy chọn “--"
"length” trước."
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "Cập nhật các thời gian truy cập và sửa đổi của TẬP-TIN"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "Thực hiện LỆNH"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "Xóa TẬP_TIN"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "Kích cỡ không hợp lệ: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "Số nằm ngoài phạm vi cho phép: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "Kích cỡ bị âm: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) bị lỗi"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "yêu cầu chiều dài tập tin %lu mà có %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "đã tạo tập tin không phải thưa thớt (sparse)"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "Lỗi phân tích số gần “%s”"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "Không rõ định dạng ngày tháng"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ĐSỐ…]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "không thể mở “%s”"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "không thể di chuyển vị trí đọc"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "tên tập tin chứa ký tự null"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr ""
"không thể tạo ra tập tin sparse trên thiết bị gõ chuẩn: dùng tùy chọn “--"
"file”"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "mặt nạ không đúng (gần “%s”)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "Không rõ trường “%s”"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "không thể đặt thời gian trên “%s”"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "không thể cắt ngắn “%s”"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "Câu lệnh không thành công: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "không thể cắt ngắn “%s”"
+msgstr "không thể lấy thống kê “%s”"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "không thể đặt thời gian trên “%s”"
+msgstr "không thể xóa bỏ thư mục “%s”"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "không thể bỏ liên kết “%s”"
@@ -2962,6 +2977,9 @@ msgstr "Lệnh đã chấm dứt\n"
msgid "--stat requires file names"
msgstr "“--stat” cần tên tập tin"
+#~ msgid "OPTION"
+#~ msgstr "T.CHỌN"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: tham số ARGP_HELP_FMT phải là số dương"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 1539d03916a899899265f0a5bdb37a93edd4feb7..ef56b798d54731bf6e6c019d07ee8a0601092e24 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 56078a72883cb0b16e3ea61a72b9f9ae0cb33fb1..da3341d8f0d940b32e5cfdbfc47ae28c4771b03a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,25 +1,27 @@
# Chinese (simplified) translation for tar.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
# Wang Li <charles@linux.net.cn>, 2002.
# Rongjun Mu <rongjunmu+i18n@gmail.com>, 2004.
# Ji ZhengYu <zhengyuji@gmail.com>, 2016.
+# Boyuan Yang <073plan@gmail.com>, 2018.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-05-20 14:33China Standard Time\n"
-"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-10-21 09:49-0400\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.2\n"
#: gnu/argmatch.c:134
#, c-format
@@ -96,7 +98,7 @@ msgid "give a short usage message"
msgstr "显示简短的用法说明"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "名称"
@@ -134,29 +136,29 @@ msgid "write error"
msgstr "写错误"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: 选项“%s”具有歧义\n"
+msgstr "%s: 选项“%s%s”具有歧义\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: 选项“%s”具有歧义; 可能是:"
+msgstr "%s: 选项“%s%s”具有歧义; 可能是:"
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: 无法识别的选项\"%c%s\"\n"
+msgstr "%s: 无法识别的选项\"%s%s\"\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: 选项\"%c%s\"不需要参数\n"
+msgstr "%s: 选项\"%s%s\"不需要参数\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: 选项\"%s\"需要带参数\n"
+msgstr "%s: 选项“%s%s”需要带参数\n"
#: gnu/getopt.c:621
#, c-format
@@ -231,12 +233,12 @@ msgstr "^[yY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "由 %s (%s) 打包\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "由 %s 打包\n"
@@ -244,12 +246,11 @@ msgstr "由 %s 打包\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "(C)"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -259,9 +260,9 @@ msgid ""
"\n"
msgstr ""
"\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"许可证 GPLv3+：GNU GPL 第 3 版或更新版本 <https://gnu.org/licenses/gpl."
"html>\n"
-"这是自由软件：您可以自由地更改并重新发布它。\n"
+"这是自由软件：您可以自由地更改并对其重新发布。\n"
"在法律所允许的范围内不含任何担保。\n"
"\n"
@@ -384,7 +385,7 @@ msgid ""
"Report bugs to: %s\n"
msgstr ""
"\n"
-"将错误报告发送到: %s。翻译错误报告给 <i18n-zh@googlegroups.com>\n"
+"请将错误报告发送到: %s，翻译错误报告给 <i18n-zh@googlegroups.com>\n"
#: gnu/version-etc.c:247
#, c-format
@@ -397,14 +398,13 @@ msgid "%s home page: <%s>\n"
msgstr "%s 主页: <%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
-msgstr "%s 主页: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s 主页：<https://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
-msgstr "GNU 软件的通用帮助: <http://www.gnu.org/gethelp/>\n"
+msgstr "GNU 软件的通用帮助：<https://www.gnu.org/gethelp/>\n"
#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
#. Directly translating this to another language will not work, first because
@@ -513,194 +513,194 @@ msgstr "无法连接至 %s: 解析失败"
#: lib/rtapelib.c:502
#, c-format
msgid "Cannot redirect files for remote shell"
-msgstr "无法为远程 shell重定向文件"
+msgstr "无法为远程 shell 重定向文件"
#: lib/rtapelib.c:516
#, c-format
msgid "Cannot execute remote shell"
msgstr "无法执行远程 shell"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "查寻方向超出范围"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "无效的查寻方向"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "无效的查寻偏移量"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "查寻操作的偏移量超出范围"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "无效的字节数"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "字节数超出范围"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "文件结尾出现过早"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "无效操作模式"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "不支持的操作"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "参数异常"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "接受远程程序的命令操作磁带机"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "NUMBER"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "设定调试级别"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "FILE"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "设定调试输出文件名"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "无法打开 %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "参数过多"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "垃圾命令"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "它似乎不像是一个 tar 归档文件"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "总计读取字节数"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "总计写入字节数"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "总计删除字节数"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(管道)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "无法从终端读取归档内容(缺少 -f 选项?)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "无法向终端写入归档内容(缺少 -f 选项?)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "record_size 的无效值"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "未给出归档文件名"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "无法验证标准输入/标准输出归档文件"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "归档被压缩。使用 %s 选项"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "无法更新压缩归档文件"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "处于磁带的起点，现在退出"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "错误过多，退出"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "记录大小 = %lu 块"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "归档中未对齐的块 (%lu 字节)s"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "无法倒回归档文件；如果没有 -i 可能无法读入它"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek 未停在记录边界处"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s：包含无效的卷编号"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "卷编号溢出"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "为 %2$s 准备卷 #%1$d 并按回车："
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "需得到用户应答时文件结束"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "警告：归档文件不完整"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -711,271 +711,271 @@ msgstr ""
" q\t\t终止 tar\n"
" y or newline\t继续操作\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! 衍生出一个子 shell\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? 打印此列表\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "没有新的卷；退出。\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "未指定文件名。重试。\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "无效输入。输入 ? 显示帮助。\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s 命令失败"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s 在本卷中不连续"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s 在本卷可能连续: 头部包含截短的名字"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s 的大小错误 (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "此卷次序有误（%s - %s != %s）"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "归档未被标记为匹配 %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "卷标 %s 不匹配 %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr "%s: 文件名太长而无法贮存在 GNU 多卷头，已被截短"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "写操作未在记录边界处终止"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "仅能读入 %2$lu 中的 %1$lu 个字节"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "内容不同"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "归档文件中异常的 EOF"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "文件类型不同"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "访问模式不同"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid 不同"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid 不同"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "修改时间不同"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "大小不同"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "没有连接到 %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "符号连接不同"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "设备号不同"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "校验"
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s：未知的文件类型“%c”，与普通文件不同"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "归档包含带有被移除前导字符的文件名。"
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "归档中有文件被改名。"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "位于原始文件中的验证可能失败。"
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "校验失败：检测到 %d 个无效的头"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "在 %s 处一个单独的零块"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s: 包含一个缓存目录标识 %s；%s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "值 %s 超出了 %s 的范围 %s..%s；正在替换 %s"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "值 %s 超出了 %s 的范围 %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "正在生成负八进制头"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s：文件名太长(最长 %d)；未输出"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s：文件名太长(不能被分割)；未输出"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s：连接名太长；未输出"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s：文件缩小 %s 字节；用零填充"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s：文件在不同的文件系统上；未输出"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "未输出内容"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s：未知的文件类型；忽略文件"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "缺少到 %s 的连接。"
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s: 文件未改变；未输出"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s: 文件是归档文件；未输出"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "未输出目录"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s: 在我们读入文件时文件发生了变化"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s: 忽略套接字(socket)"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s: 忽略权限"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "跳转到下一个头"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "从归档文件中删除非头信息"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s：不可信的旧时间戳 %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s：时间戳 %s 是未来的 %s 秒之后"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s：创建目录时出现意外的不一致"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s: 忽略已存在的文件"
@@ -998,7 +998,7 @@ msgstr "正试图将符号连接展开为硬连接"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s：无法展开 -- 文件一直延伸至另一卷中"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "异常的长名字头部"
@@ -1015,7 +1015,7 @@ msgstr "当前的“%s”更新或一样新"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s：成员名称包含“..”"
#: src/extract.c:1696
#, c-format
@@ -1027,22 +1027,22 @@ msgstr "%s：无法备份该文件"
msgid "Cannot rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s：目录已改名，不再是 %s"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s：目录是新的"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s：目录在不同的文件系统上；未输出"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s：目录已被改名"
@@ -1127,9 +1127,8 @@ msgid "Malformed dumpdir: empty name in 'R'"
msgstr "错误的 dumpdir: “R”中有空名字"
#: src/incremen.c:1585
-#, fuzzy
msgid "Malformed dumpdir: 'T' not preceded by 'R'"
-msgstr "错误的 dumpdir: 'T' not preceded by 'R'"
+msgstr "错误的 dumpdir：“T”未以“R”作为前导"
#: src/incremen.c:1591
msgid "Malformed dumpdir: empty name in 'T'"
@@ -1169,372 +1168,373 @@ msgstr "%s：正在删除 %s\n"
msgid "%s: Cannot remove"
msgstr "%s：无法删除"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s：忽略"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "块 %s：** 空块 **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "块 %s：** 文件结束 **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "块 %s："
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "头中需要数值 %s 处为空白符"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr "归档的八进制值 %.*s 超出范围 %s；假定为其二进制补码"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "归档八进制值 %.*s 超出 %s 的范围"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "归档包含过时的 base-64 头"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "归档签署的 base-64 字符串 %s 超出范围 %s"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "归档的 base-256 值超出范围 %s"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "归档包含 %.*s 而需要数字值 %s"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "归档值 %s 超出 %s 的范围 %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " 连接到 %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " 未知的文件类型 %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--长连接--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--长名--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--卷头--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--从 %s 字节继续--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "正在创建目录："
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "将 %s 改名为 %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s：无法重命名为 %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "将 %s 的名字改回 %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s：文件在我们读入之前被删除了"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "子进程"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "进程内通道"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "本地文件名选择:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "添加指定的 FILE 至归档(如果名字以 - 开始会很有用的)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "DIR"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "改变至目录 DIR"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "从 FILE 中获取文件名来解压或创建文件"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T 读取以空终止的名字; 隐含 --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "禁用上一次的效果 --null 选项"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "unquote 输入文件或成员名称(默认)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "不要unquote 输入文件或成员名称"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T 逐字读取文件名(不处理选项)"
+msgstr "-T 逐字读取文件名（不处理选项或进行转义）"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "-T 把以‘-’开始的文件作为选项(默认)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "PATTERN"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "排除以 PATTERN 指定的文件"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "排除 FILE 中列出的模式串"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr "除标识文件本身外，排除包含 CACHEDIR.TAG 的目录中的内容"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "排除包含 CACHEDIR.TAG 的目录中所有内容"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "排除包含 CACHEDIR.TAG 的目录"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "除 FILE 自身外，排除包含 FILE 的目录中的内容"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "若存在FILE, 则从其中读取每个目录的例外匹配项"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr "若存在FILE, 则从其中为每个目录及其子目录读取需要排除的例外匹配项"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "排除包含 FILE 的目录中的所有内容"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "排除包含 FILE 的目录"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "排除版本控制系统目录"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "从VCS 忽略文件中读取排除匹配项"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "排除备份和锁文件"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
-msgstr "目录递归(默认)"
+msgstr "目录递归（默认）"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "避免目录中的自动降级"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr "文件名匹配选项(同时影响排除和包括模式串):"
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "模式串匹配文件名头部"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
-msgstr "模式串匹配任意‘/’后字符(默认对 exclusion 有效)"
+msgstr "模式串匹配任意‘/’后字符（对 exclusion 为默认值）"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "忽略大小写"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "匹配大小写(默认)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
-msgstr "使用通配符(默认对 exclusion )"
+msgstr "使用通配符（对 exclusion 为默认值）"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "逐字匹配字符串"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
-msgstr "通配符匹配‘/’(默认对exclusion 有效)"
+msgstr "通配符匹配‘/’（对 exclusion 为默认值）"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "通配符不匹配‘/’"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"下列选项在归档创建或更新模式中用在任何非可选参数之后。这些选项是可选的，且仅"
+"影响跟随其后的参数。请在安排参数顺序时谨慎处理。"
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s 无效果"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s 无效果"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s 无效果"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "命令行"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s: 从%s 里读取的文件列表已经从%s 里读取了"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "无法拆分字符串‘%s’: %s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s: 读取的文件名含有空字符"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "文件名中所使用的字符匹配模式"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr "使用 --wildcards 打开模式匹配，或是 --no-wildcards 来关闭之"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s：归档中找不到"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s：没有在归档中找到需要的"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "归档卷标不匹配"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr "在文件列表中 -C 选项与 --listed-incremental 选项不许合用"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "仅一个 -C 选项允许与 --listed-incremental 合用"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "选项“%s”和“%s”都需要标准输出"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s：无效的归档格式"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "在不兼容的归档格式上需要 GNU 特征"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1550,7 +1550,7 @@ msgid ""
" tar -tvf archive.tar # List all files in archive.tar verbosely.\n"
" tar -xf archive.tar # Extract all files from archive.tar.\n"
msgstr ""
-" GNU ‘tar’ 将许多文件一起保存至一个单独的磁带或磁盘归档，并能从归档中单独还原"
+"GNU ‘tar’ 将许多文件一起保存至一个单独的磁带或磁盘归档，并能从归档中单独还原"
"所需文件。\n"
"\n"
"示例\n"
@@ -1740,13 +1740,13 @@ msgstr "创建子目录以避免解压松散文件"
#: src/tar.c:491
msgid "Select output stream:"
-msgstr "选择输出流:"
+msgstr "选择输出流："
#: src/tar.c:494
msgid "extract files to standard output"
msgstr "解压文件至标准输出"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "COMMAND"
@@ -1782,7 +1782,7 @@ msgstr "用FILE 映射文件所有者UIDs 和名字"
msgid "use FILE to map file owner GIDs and names"
msgstr "用FILE 映射文件所有者GIDs 和名字"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "DATE-OR-FILE"
@@ -1897,23 +1897,23 @@ msgstr "为xattr 关键字指定排除匹配项"
#: src/tar.c:571
msgid "Enable the SELinux context support"
-msgstr "开启SELinux 上下文支持"
+msgstr "开启 SELinux 上下文支持"
#: src/tar.c:573
msgid "Disable the SELinux context support"
-msgstr "关闭SELinux 上下文支持"
+msgstr "关闭 SELinux 上下文支持"
#: src/tar.c:575
msgid "Enable the POSIX ACLs support"
-msgstr "开启POSIX ACLs 支持"
+msgstr "开启 POSIX ACLs 支持"
#: src/tar.c:577
msgid "Disable the POSIX ACLs support"
-msgstr "关闭POSIX ACLs 支持"
+msgstr "关闭 POSIX ACLs 支持"
#: src/tar.c:582
msgid "Device selection and switching:"
-msgstr "设备选择和切换:"
+msgstr "设备选择和切换："
#: src/tar.c:584
msgid "ARCHIVE"
@@ -1983,7 +1983,7 @@ msgstr "读取时重新分块(只对 4.2BSD 管道有效)"
msgid "Archive format selection:"
msgstr "选择归档格式:"
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "FORMAT"
@@ -1997,11 +1997,11 @@ msgstr "FORMAT 是以下格式中的一种:"
#: src/tar.c:641
msgid "old V7 tar format"
-msgstr "old V7 tar 格式"
+msgstr "旧的 V7 tar 格式"
#: src/tar.c:644
msgid "GNU format as per tar <= 1.12"
-msgstr "GNU 格式 as per tar <= 1.12"
+msgstr "GNU 格式，其中 tar 版本 <= 1.12"
#: src/tar.c:646
msgid "GNU tar 1.13.x format"
@@ -2065,118 +2065,118 @@ msgstr "PROG"
msgid "filter through PROG (must accept -d)"
msgstr "通过 PROG 过滤(必须是能接受 -d 选项的程序)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "本地文件选择:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "创建归档时保存在本地文件系统中"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "不要从文件名中清除引导符‘/’"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "跟踪符号链接；将它们所指向的文件归档并输出"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "跟踪硬链接；将它们所指向的文件归档并输出"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "MEMBER-NAME"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "从归档中的 MEMBER-NAME 成员处开始读取归档"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "只保存比 DATE-OR-FILE 更新的文件"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "DATE"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "当只有数据改变时比较数据和时间"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "CONTROL"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "在删除前备份，选择 CONTROL 版本"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "STRING"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
msgstr ""
"在删除前备份，除非被环境变量 SIMPLE_BACKUP_SUFFIX 覆盖，否则覆盖常用后缀(‘’)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "文件名变换:"
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "解压时从文件名中清除 NUMBER 个引导部分"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "EXPRESSION"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "使用 sed 代替 EXPRESSION 来进行文件名变换"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "提示性输出:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "详细地列出处理的文件"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "KEYWORD"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
-msgstr "警告控制:"
+msgstr "警告控制"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "每隔 NUMBER 个记录显示进度信息(默认为 10 个)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "ACTION"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "在每个检查点上执行 ACTION"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "只要不是所有链接都被输出就打印信息"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "SIGNAL"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2187,125 +2187,125 @@ msgstr ""
"号为: SIGHUP，SIGQUIT，SIGINT，SIGUSR1 和 SIGUSR2；同时也接受不带 SIG 前缀的"
"信号名称"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "以 UTC 格式打印文件修改时间"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "按文件原本时间格式打印"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "将详细输出发送至 FILE"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "每个信息都显示归档内的块数"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "每次操作都要求确认"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "显示 tar 默认选项"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "显示快照文件区的有效范围"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr "列表或解压时，列出每个不匹配查找标准的目录"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "显示变换后的文件名或归档名"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "STYLE"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "设置名称引用风格；有效的 STYLE 值请参阅以下说明"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "来自 STRING 的额外的引用字符"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "禁用来自 STRING 的字符引用"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "兼容性选项:"
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr "创建归档时，相当于 --old-archive；展开归档时，相当于 --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "其它选项:"
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "禁用某些潜在的有危险的选项"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "‘%s’无法与‘%s’一起用"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "您不能指定\"-Acdtrux\", \"--delete\"或是\"--test-label\"外的选项"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "压缩选项冲突"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "未知的信号名称: %s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "找不到数据样板文件"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "把未知的时间格式 %2$s 替换为 %1$s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "选项 %s: 将日期 ‘%s’ 当作 %s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "通过 %s 过滤归档"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "--quoting-style 选项的有效参数为:"
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2313,288 +2313,296 @@ msgstr ""
"\n"
"此 tar 默认为:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "无效的所有者或组ID"
-#: src/tar.c:1347
-#, fuzzy
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "无效的块因子"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "无效的磁带长度"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "无效的增量度"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "多于一个时间阈值"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "无效的离散版本值"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
-msgstr "此平台不支持 --atime-preserve=‘system’ "
+msgstr "此平台不支持 --atime-preserve='system'"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint 值不是个整数"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "选项中给出无效的访问模式"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "无效的数字"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "无效的记录大小"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "记录大小必须是 %d 的倍数。"
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "无效的元素数"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "仅允许使用一个 --to-command 选项"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "错误的压缩参数: %s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "未知的压缩参数: ‘%c’"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "此版本 tar 不支持选项“-[0-7][lmh]”"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu: 错误定位"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "错误解析 %s"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FILE]..."
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "%s 中有非选项参数"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "无法分割 TAR_OPTIONS: %s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "旧选项“%c”需要参数。"
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "没有一个文件列表时 --occurrence 是没有意义的"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "多个归档文件需要使用“-M”选项"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "没有 --listed-incremental 选项的话 --level 选项是无意义的"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s：卷标过长 (限制为 %lu 字节)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "无法检验多卷归档文件"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "无法检验压缩归档文件"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "无法使用多卷压缩归档文件"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "无法联结压缩归档文件"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime 参数需要先用 --mtime 指定日期"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option 只能用于 POSIX 归档中"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls 只能用于 POSIX 归档中"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux 只能用于 POSIX 归档中"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs 只能用于 POSIX 归档中"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr "无法推断顶层目录名; 请用--one-top-level=DIR 明确指定"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "卷长度不可小于记录大小"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "谨慎地拒绝创建空归档文件"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr "选项“-Aru”与“-f -”不兼容"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "您必须从\"-Acdtrux\", \"--delete\"或是\"--test-label\"中指定一个选项"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "由于前次错误，将以上次的错误状态退出"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s：文件缩小 %s 字节"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "关键字 %s 未知或还未实现"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "时间标记超出允许范围"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "不能使用模式 %s"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "不能覆盖关键字 %s"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "错误的扩展头: 缺少 length"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "扩展头长度 %*s 超出范围"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "错误的扩展头: length 后缺少空白符"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "错误的扩展头: 缺少等于符号"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "错误的扩展头: 缺少空行"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "忽略未知的扩展头关键字‘%s’"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "生成的关键字/值对太长了(keyword=%s, length=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "扩展头 %s=%s 超出范围 %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "错误的扩展头: %s=%s 无效"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "错误的扩展头: %s=%s 溢出"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "错误的扩展头: %s 无效: 非预期的分隔符 %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "错误的扩展头: %s 无效: 奇怪的数值"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s: 无效的超时设置"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s: 未知的检查点操作"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "写入"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "读取"
@@ -2602,7 +2610,7 @@ msgstr "读取"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "写入操作的检查点 %u"
@@ -2611,12 +2619,12 @@ msgstr "写入操作的检查点 %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "读取操作的检查点 %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2624,90 +2632,94 @@ msgstr ""
"genfile 为 GNU paxutils 测试软件操作数据文件。\n"
"选项为:\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "文件创建选项:"
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "SIZE"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "创建指定 SIZE 的文件"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "写入文件 NAME，而不是标准输出"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "从 FILE 读取文件名"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T 读取以 NULL 终止的名字"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "以指定的 PATTERN 填充文件。PATTERN 可以是‘default’或是‘zeros’"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "稀疏文件的块大小"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "生成稀疏文件。命令行其余选项指定 map 文件。"
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "OFFSET"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "在写入数据前定位至指定的偏移位"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "隐藏不重要的诊断信息"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "文件统计选项:"
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr "打印每个给定文件的 stat 结构定义的内容。默认 FORMAT 是: "
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "同步执行选项:"
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "OPTION"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"执行 ARGS。与 --checkpoint 或 --cut，--append，--touch 中的一个一起使用时有用"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "只要达到 checkpoint NUMBER 指定的数值就执行指定的操作(见下)"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "为下一个 --touch 选项设定日期"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "显示执行的 checkpoints 以及 COMMAND 的退出状态"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2715,128 +2727,128 @@ msgstr ""
"同步执行操作。当达到由 --checkpoint 选项指定的 checkpoint 数值时会执行这些操"
"作。"
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr "截短 FILE 至由前面 --length 选项指定的大小(如果未指定的话，默认 0)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr "添加 SIZE 字节至 FILE。SIZE 由前面的 --length 选项指定。"
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "更新 FILE 的访问和修改时间"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "执行 COMMAND"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "删除 FILE"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "无效的值: %s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "数值超出所允许的范围: %s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "负值: %s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "stat(%s) 错误"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "需要文件长度为 %lu，实际为 %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "所创建的文件非稀疏文件"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "“%s”附近解析数字错误"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "未知的数据格式"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[ARGS...]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "无法打开“%s”"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "无法定位"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "文件名包含空字符"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr "使用 --file 选项无法在标准输出上生成离散文件"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
-msgstr "不正确的掩码(“%s”附近)"
+msgstr "不正确的掩码（“%s”附近）"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "未知的文件掩码位“%s”"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "无法设定“%s”的时间"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
-msgstr "无法删除“%s”"
+msgstr "无法截断“%s”"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "命令失败: %s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "无法删除“%s”"
+msgstr "无法取得“%s”的状态（stat）"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "无法设定“%s”的时间"
+msgstr "无法删除目录“%s”"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "无法删除 \"%s\""
@@ -2864,7 +2876,7 @@ msgstr "命令由信号 %d 停止了\n"
#: tests/genfile.c:929
#, c-format
msgid "Command dumped core\n"
-msgstr "命令输出 core\n"
+msgstr "命令核心转储\n"
#: tests/genfile.c:932
#, c-format
@@ -2876,6 +2888,9 @@ msgstr "命令终止\n"
msgid "--stat requires file names"
msgstr "--stat 选项需要文件名"
+#~ msgid "OPTION"
+#~ msgstr "OPTION"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT 参数值必须为正"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index e29da0f247e3585ed2b9bb57a01eb572c352d1d5..8b39a4266bd094403677afb0ef694561156c570f 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 54e7e95557891c629a33c9fd3a7ed136ecc2b3b6..9043f7fc73a0f734b59f0237f777ad2a9e7b2f4a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,15 +2,16 @@
# Copyright (C) 2005 Free Software Foundation, Inc.
# This file is distributed under the same license as the tar package.
# Wei-Lun Chao <bluebat@member.fsf.org>, 2009, 2013, 2016.
+# pan93412 <pan93412@gmail.com>, 2018.
#
-#: src/create.c:1599
+#: src/create.c:1598
msgid ""
msgstr ""
-"Project-Id-Version: tar 1.29\n"
+"Project-Id-Version: GNU tar 1.30\n"
"Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2017-12-17 12:31+0200\n"
-"PO-Revision-Date: 2016-10-10 23:39+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"POT-Creation-Date: 2019-02-23 14:57+0200\n"
+"PO-Revision-Date: 2018-05-05 19:29+0800\n"
+"Last-Translator: pan93412 <pan93412@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
@@ -18,6 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.0.6\n"
#: gnu/argmatch.c:134
#, c-format
@@ -94,7 +96,7 @@ msgid "give a short usage message"
msgstr "給出簡短的使用訊息"
#: gnu/argp-parse.c:83 src/tar.c:507 src/tar.c:509 src/tar.c:612
-#: tests/genfile.c:134
+#: tests/genfile.c:129
msgid "NAME"
msgstr "名稱"
@@ -132,29 +134,29 @@ msgid "write error"
msgstr "寫入錯誤"
#: gnu/getopt.c:278
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s：選項 %s 是模稜兩可的\n"
+msgstr "%s：選項「%s%s」是模稜兩可的\n"
#: gnu/getopt.c:284
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s：選項 %s 是模稜兩可的；可能是："
+msgstr "%s：選項「%s%s」是模稜兩可的；可能是："
#: gnu/getopt.c:319
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s：無法辨識的選項 %c%s\n"
+msgstr "%s：無法辨識的選項「%s%s」\n"
#: gnu/getopt.c:345
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s：選項 %c%s 不允許有引數\n"
+msgstr "%s：選項「%s%s」不允許有引數\n"
#: gnu/getopt.c:360
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s：選項 --%s 需要一個引數\n"
+msgstr "%s：選項「%s%s」需要一個引數\n"
#: gnu/getopt.c:621
#, c-format
@@ -229,12 +231,12 @@ msgstr "^[yY是]"
msgid "^[nN]"
msgstr "^[nN否]"
-#: gnu/version-etc.c:74
+#: gnu/version-etc.c:73
#, c-format
msgid "Packaged by %s (%s)\n"
msgstr "由 %s (%s) 打包套件\n"
-#: gnu/version-etc.c:77
+#: gnu/version-etc.c:76
#, c-format
msgid "Packaged by %s\n"
msgstr "由 %s 打包套件\n"
@@ -242,12 +244,11 @@ msgstr "由 %s 打包套件\n"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
-#: gnu/version-etc.c:84
+#: gnu/version-etc.c:83
msgid "(C)"
msgstr "©"
-#: gnu/version-etc.c:86
-#, fuzzy
+#: gnu/version-etc.c:85
msgid ""
"\n"
"License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
@@ -395,12 +396,11 @@ msgid "%s home page: <%s>\n"
msgstr "%s 首頁：<%s>\n"
#: gnu/version-etc.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
msgstr "%s 首頁：<http://www.gnu.org/software/%s/>\n"
#: gnu/version-etc.c:256
-#, fuzzy
msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
msgstr "使用 GNU 軟體的一般說明：<http://www.gnu.org/gethelp/>\n"
@@ -518,187 +518,187 @@ msgstr "無法將檔案重導至遠端命令殼"
msgid "Cannot execute remote shell"
msgstr "無法執行遠端命令殼"
-#: rmt/rmt.c:432
+#: rmt/rmt.c:436
msgid "Seek direction out of range"
msgstr "尋求方向超出範圍"
-#: rmt/rmt.c:438
+#: rmt/rmt.c:442
msgid "Invalid seek direction"
msgstr "無效的尋求方向"
-#: rmt/rmt.c:446
+#: rmt/rmt.c:450
msgid "Invalid seek offset"
msgstr "無效的尋求偏移"
-#: rmt/rmt.c:452
+#: rmt/rmt.c:456
msgid "Seek offset out of range"
msgstr "尋求偏移值超出範圍"
-#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608
+#: rmt/rmt.c:497 rmt/rmt.c:548 rmt/rmt.c:612
msgid "Invalid byte count"
msgstr "無效的位元組計數"
-#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625
+#: rmt/rmt.c:503 rmt/rmt.c:554 rmt/rmt.c:618 rmt/rmt.c:629
msgid "Byte count out of range"
msgstr "位元組計數超出範圍"
-#: rmt/rmt.c:558
+#: rmt/rmt.c:562
msgid "Premature eof"
msgstr "過早出現檔尾"
-#: rmt/rmt.c:601
+#: rmt/rmt.c:605
msgid "Invalid operation code"
msgstr "無效的運算碼"
-#: rmt/rmt.c:636 rmt/rmt.c:680
+#: rmt/rmt.c:640 rmt/rmt.c:684
msgid "Operation not supported"
msgstr "作業不支援"
-#: rmt/rmt.c:664
+#: rmt/rmt.c:668
msgid "Unexpected arguments"
msgstr "未預期的引數"
-#: rmt/rmt.c:689
+#: rmt/rmt.c:693
msgid "Manipulate a tape drive, accepting commands from a remote process"
msgstr "操控磁帶機，從遠端行程接受命令"
-#: rmt/rmt.c:696 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
-#: src/tar.c:714 src/tar.c:730 tests/genfile.c:171
+#: rmt/rmt.c:700 src/tar.c:432 src/tar.c:436 src/tar.c:610 src/tar.c:625
+#: src/tar.c:715 src/tar.c:731 tests/genfile.c:166
msgid "NUMBER"
msgstr "數目"
-#: rmt/rmt.c:697
+#: rmt/rmt.c:701
msgid "set debug level"
msgstr "設定除錯等級"
-#: rmt/rmt.c:698 src/names.c:71 src/names.c:75 src/names.c:93 src/names.c:103
-#: src/names.c:106 src/names.c:109 src/names.c:112 src/names.c:114
-#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:747
-#: tests/genfile.c:136 tests/genfile.c:185 tests/genfile.c:189
-#: tests/genfile.c:192 tests/genfile.c:198
+#: rmt/rmt.c:702 src/names.c:70 src/names.c:74 src/names.c:92 src/names.c:102
+#: src/names.c:105 src/names.c:108 src/names.c:111 src/names.c:113
+#: src/tar.c:430 src/tar.c:511 src/tar.c:513 src/tar.c:615 src/tar.c:748
+#: tests/genfile.c:131 tests/genfile.c:180 tests/genfile.c:184
+#: tests/genfile.c:187 tests/genfile.c:193
msgid "FILE"
msgstr "檔案"
-#: rmt/rmt.c:699
+#: rmt/rmt.c:703
msgid "set debug output file name"
msgstr "設定除錯輸出檔案名稱"
-#: rmt/rmt.c:715 rmt/rmt.c:783
+#: rmt/rmt.c:719 rmt/rmt.c:787
#, c-format
msgid "cannot open %s"
msgstr "無法開啟 %s"
-#: rmt/rmt.c:780 tests/genfile.c:977 tests/genfile.c:994
+#: rmt/rmt.c:784 tests/genfile.c:977
#, c-format
msgid "too many arguments"
msgstr "太多引數"
-#: rmt/rmt.c:822
+#: rmt/rmt.c:826
msgid "Garbage command"
msgstr "無用的命令"
-#: src/buffer.c:474 src/buffer.c:479 src/buffer.c:773 src/buffer.c:1415
-#: src/buffer.c:1452 src/buffer.c:1464 src/buffer.c:1493 src/delete.c:211
-#: src/list.c:275 src/update.c:188
+#: src/buffer.c:476 src/buffer.c:481 src/buffer.c:775 src/buffer.c:1417
+#: src/buffer.c:1454 src/buffer.c:1466 src/buffer.c:1495 src/delete.c:210
+#: src/list.c:274 src/update.c:187
msgid "This does not look like a tar archive"
msgstr "這個看起來不像 tar 封存"
-#: src/buffer.c:590
+#: src/buffer.c:592
msgid "Total bytes read"
msgstr "已讀取位元組總數"
-#: src/buffer.c:592
+#: src/buffer.c:594
msgid "Total bytes written"
msgstr "已寫入位元組總數"
-#: src/buffer.c:593
+#: src/buffer.c:595
msgid "Total bytes deleted"
msgstr "已刪除位元組總數"
-#: src/buffer.c:672
+#: src/buffer.c:674
msgid "(pipe)"
msgstr "(管線)"
-#: src/buffer.c:696
+#: src/buffer.c:698
msgid "Refusing to read archive contents from terminal (missing -f option?)"
msgstr "拒絕從終端機讀取封存內容 (缺少 -f 選項？)"
-#: src/buffer.c:698
+#: src/buffer.c:700
msgid "Refusing to write archive contents to terminal (missing -f option?)"
msgstr "拒絕寫入封存內容到終端機 (缺少 -f 選項？)"
-#: src/buffer.c:711
+#: src/buffer.c:713
msgid "Invalid value for record_size"
msgstr "無效的記錄大小"
-#: src/buffer.c:714
+#: src/buffer.c:716
msgid "No archive name given"
msgstr "沒有指定封存名稱"
-#: src/buffer.c:757
+#: src/buffer.c:759
msgid "Cannot verify stdin/stdout archive"
msgstr "無法檢驗標準輸出入封存"
-#: src/buffer.c:770
+#: src/buffer.c:772
#, c-format
msgid "Archive is compressed. Use %s option"
msgstr "封存被壓縮過。使用 %s 選項"
-#: src/buffer.c:828 src/tar.c:2455
+#: src/buffer.c:830 src/tar.c:2464
msgid "Cannot update compressed archives"
msgstr "無法更新壓縮的封存"
-#: src/buffer.c:928
+#: src/buffer.c:930
msgid "At beginning of tape, quitting now"
msgstr "位於磁帶起始部分，立刻退出"
-#: src/buffer.c:934
+#: src/buffer.c:936
msgid "Too many errors, quitting"
msgstr "太多錯誤，離開中"
-#: src/buffer.c:967
+#: src/buffer.c:969
#, c-format
msgid "Record size = %lu block"
msgid_plural "Record size = %lu blocks"
msgstr[0] "記錄大小 = %lu 區塊"
-#: src/buffer.c:988
+#: src/buffer.c:990
#, c-format
msgid "Unaligned block (%lu byte) in archive"
msgid_plural "Unaligned block (%lu bytes) in archive"
msgstr[0] "封存中未排列的區塊 (%lu 位元組)"
-#: src/buffer.c:1075
+#: src/buffer.c:1077
msgid "Cannot backspace archive file; it may be unreadable without -i"
msgstr "無法倒退封存檔案；沒有 -i 也許會無法讀取"
-#: src/buffer.c:1107
+#: src/buffer.c:1109
msgid "rmtlseek not stopped at a record boundary"
msgstr "rmtlseek 無法在記錄分界處停止"
-#: src/buffer.c:1168
+#: src/buffer.c:1170
#, c-format
msgid "%s: contains invalid volume number"
msgstr "%s：包含無效的卷冊號碼"
-#: src/buffer.c:1203
+#: src/buffer.c:1205
msgid "Volume number overflow"
msgstr "卷冊號碼已滿"
-#: src/buffer.c:1218
+#: src/buffer.c:1220
#, c-format
msgid "Prepare volume #%d for %s and hit return: "
msgstr "準備好卷冊 #%d 以完成 %s 並按下 return: "
-#: src/buffer.c:1224
+#: src/buffer.c:1226
msgid "EOF where user reply was expected"
msgstr "到達期待使用者回答的檔案末端"
-#: src/buffer.c:1229 src/buffer.c:1261
+#: src/buffer.c:1231 src/buffer.c:1263
msgid "WARNING: Archive is incomplete"
msgstr "警告：封存不完整"
-#: src/buffer.c:1243
+#: src/buffer.c:1245
#, c-format
msgid ""
" n name Give a new file name for the next (and subsequent) volume(s)\n"
@@ -709,271 +709,271 @@ msgstr ""
" q 放棄打包\n"
" y 或 newline 繼續作業\n"
-#: src/buffer.c:1248
+#: src/buffer.c:1250
#, c-format
msgid " ! Spawn a subshell\n"
msgstr " ! 衍生一個子命令殼\n"
-#: src/buffer.c:1249
+#: src/buffer.c:1251
#, c-format
msgid " ? Print this list\n"
msgstr " ? 列印這個清單\n"
-#: src/buffer.c:1256
+#: src/buffer.c:1258
msgid "No new volume; exiting.\n"
msgstr "沒有新卷冊；離開。\n"
-#: src/buffer.c:1289
+#: src/buffer.c:1291
msgid "File name not specified. Try again.\n"
msgstr "檔案名稱尚未指定。再次嘗試。\n"
-#: src/buffer.c:1301
+#: src/buffer.c:1303
#, c-format
msgid "Invalid input. Type ? for help.\n"
msgstr "無效的輸入。按下 ? 以獲得說明。\n"
-#: src/buffer.c:1352
+#: src/buffer.c:1354
#, c-format
msgid "%s command failed"
msgstr "%s 命令失敗"
-#: src/buffer.c:1529 src/buffer.c:1545
+#: src/buffer.c:1531 src/buffer.c:1547
#, c-format
msgid "%s is not continued on this volume"
msgstr "%s 在本卷冊中並不連續"
-#: src/buffer.c:1541
+#: src/buffer.c:1543
#, c-format
msgid "%s is possibly continued on this volume: header contains truncated name"
msgstr "%s 在本卷冊中可能連續：標頭含有截斷的名稱"
-#: src/buffer.c:1559
+#: src/buffer.c:1561
#, c-format
msgid "%s is the wrong size (%s != %s + %s)"
msgstr "%s 的大小有錯 (%s != %s + %s)"
-#: src/buffer.c:1574
+#: src/buffer.c:1576
#, c-format
msgid "This volume is out of sequence (%s - %s != %s)"
msgstr "本卷冊已超出序列 (%s - %s !=%s)"
-#: src/buffer.c:1652 src/buffer.c:1678
+#: src/buffer.c:1654 src/buffer.c:1672
#, c-format
msgid "Archive not labeled to match %s"
msgstr "封存未標誌為符合 %s"
-#: src/buffer.c:1682
+#: src/buffer.c:1676
#, c-format
msgid "Volume %s does not match %s"
msgstr "卷冊 %s 不符合 %s"
-#: src/buffer.c:1774
+#: src/buffer.c:1769
#, c-format
msgid ""
"%s: file name too long to be stored in a GNU multivolume header, truncated"
msgstr "%s：檔名太長，無法儲存於 GNU 多重卷冊標頭之中，已截斷"
-#: src/buffer.c:1965
+#: src/buffer.c:1962
msgid "write did not end on a block boundary"
msgstr "並未於區段界限結束寫入"
-#: src/compare.c:98
+#: src/compare.c:97
#, c-format
msgid "Could only read %lu of %lu byte"
msgid_plural "Could only read %lu of %lu bytes"
msgstr[0] "只能讀取 %2$lu 位元組中的 %1$lu 個"
-#: src/compare.c:108 src/compare.c:398
+#: src/compare.c:107 src/compare.c:397
msgid "Contents differ"
msgstr "內容不同"
-#: src/compare.c:134 src/extract.c:1204 src/incremen.c:1508 src/list.c:488
-#: src/list.c:1404 src/xheader.c:847
+#: src/compare.c:133 src/extract.c:1204 src/incremen.c:1508 src/list.c:487
+#: src/list.c:1401 src/xheader.c:865
msgid "Unexpected EOF in archive"
msgstr "未預期的封存結尾"
-#: src/compare.c:182 src/compare.c:198 src/compare.c:317 src/compare.c:422
+#: src/compare.c:181 src/compare.c:197 src/compare.c:316 src/compare.c:421
msgid "File type differs"
msgstr "檔案類型不同"
-#: src/compare.c:185 src/compare.c:205 src/compare.c:331
+#: src/compare.c:184 src/compare.c:204 src/compare.c:330
msgid "Mode differs"
msgstr "模式不同"
-#: src/compare.c:208
+#: src/compare.c:207
msgid "Uid differs"
msgstr "Uid 號碼不同"
-#: src/compare.c:210
+#: src/compare.c:209
msgid "Gid differs"
msgstr "Gid 號碼不同"
-#: src/compare.c:214
+#: src/compare.c:213
msgid "Mod time differs"
msgstr "修改時間不同"
-#: src/compare.c:218 src/compare.c:432
+#: src/compare.c:217 src/compare.c:431
msgid "Size differs"
msgstr "大小不同"
-#: src/compare.c:267
+#: src/compare.c:266
#, c-format
msgid "Not linked to %s"
msgstr "並未鏈結至 %s"
-#: src/compare.c:293
+#: src/compare.c:292
msgid "Symlink differs"
msgstr "符號連結不同"
-#: src/compare.c:325
+#: src/compare.c:324
msgid "Device number differs"
msgstr "裝置編號不同"
-#: src/compare.c:473
+#: src/compare.c:472
#, c-format
msgid "Verify "
msgstr "驗證 "
-#: src/compare.c:480
+#: src/compare.c:479
#, c-format
msgid "%s: Unknown file type '%c', diffed as normal file"
msgstr "%s：不明檔案類型 %c，會以普通檔案的方式作比較"
-#: src/compare.c:535
+#: src/compare.c:534
msgid "Archive contains file names with leading prefixes removed."
msgstr "封存包含前置文字被移除的檔案名稱。"
-#: src/compare.c:541
+#: src/compare.c:540
msgid "Archive contains transformed file names."
msgstr "封存含有變換過的檔案名稱。"
-#: src/compare.c:546
+#: src/compare.c:545
msgid "Verification may fail to locate original files."
msgstr "查核動作可能無法找到原始檔案"
-#: src/compare.c:620
+#: src/compare.c:619
#, c-format
msgid "VERIFY FAILURE: %d invalid header detected"
msgid_plural "VERIFY FAILURE: %d invalid headers detected"
msgstr[0] "驗證失敗：%d 偵測到無效的標頭"
-#: src/compare.c:638 src/list.c:252
+#: src/compare.c:637 src/list.c:251
#, c-format
msgid "A lone zero block at %s"
msgstr "位於 %s 的孤立零值區塊"
-#: src/create.c:74
+#: src/create.c:73
#, c-format
msgid "%s: contains a cache directory tag %s; %s"
msgstr "%s：包含一個快取目錄標記 %s; %s"
-#: src/create.c:263
+#: src/create.c:262
#, c-format
msgid "value %s out of %s range %s..%s; substituting %s"
msgstr "數值 %s 已超出 %s 的範圍 %s..%s；以 %s 替代中"
-#: src/create.c:269
+#: src/create.c:268
#, c-format
msgid "value %s out of %s range %s..%s"
msgstr "數值 %s 已超出 %s 的範圍 %s..%s"
-#: src/create.c:329
+#: src/create.c:328
msgid "Generating negative octal headers"
msgstr "正在產生負數的八進位標頭"
-#: src/create.c:606 src/create.c:669
+#: src/create.c:605 src/create.c:668
#, c-format
msgid "%s: file name is too long (max %d); not dumped"
msgstr "%s：檔名太長 (最大 %d)；未傾印"
-#: src/create.c:616
+#: src/create.c:615
#, c-format
msgid "%s: file name is too long (cannot be split); not dumped"
msgstr "%s：檔名太長 (無法分割)；未傾印"
-#: src/create.c:643
+#: src/create.c:642
#, c-format
msgid "%s: link name is too long; not dumped"
msgstr "%s：鏈結名稱太長；未傾印"
-#: src/create.c:1106
+#: src/create.c:1105
#, c-format
msgid "%s: File shrank by %s byte; padding with zeros"
msgid_plural "%s: File shrank by %s bytes; padding with zeros"
msgstr[0] "%s：檔案縮小了 %s 位元組；以零值填補"
-#: src/create.c:1204
+#: src/create.c:1203
#, c-format
msgid "%s: file is on a different filesystem; not dumped"
msgstr "%s：檔案位於不同的檔案系統；未傾印"
-#: src/create.c:1247 src/create.c:1258 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1246 src/create.c:1257 src/incremen.c:609 src/incremen.c:616
msgid "contents not dumped"
msgstr "內容無法傾印"
-#: src/create.c:1464
+#: src/create.c:1463
#, c-format
msgid "%s: Unknown file type; file ignored"
msgstr "%s：不明檔案類型；忽略該檔案"
-#: src/create.c:1576
+#: src/create.c:1575
#, c-format
msgid "Missing links to %s."
msgstr "缺少連結到 %s。"
-#: src/create.c:1737
+#: src/create.c:1736
#, c-format
msgid "%s: file is unchanged; not dumped"
msgstr "%s：檔案沒有變更；未傾印"
-#: src/create.c:1746
+#: src/create.c:1745
#, c-format
msgid "%s: file is the archive; not dumped"
msgstr "%s：檔案是封存；未傾印"
-#: src/create.c:1774 src/incremen.c:603
+#: src/create.c:1773 src/incremen.c:602
msgid "directory not dumped"
msgstr "目錄未傾印"
-#: src/create.c:1846
+#: src/create.c:1845
#, c-format
msgid "%s: file changed as we read it"
msgstr "%s：檔案在讀取時已變更"
-#: src/create.c:1922
+#: src/create.c:1921
#, c-format
msgid "%s: socket ignored"
msgstr "%s：忽略通訊端"
-#: src/create.c:1928
+#: src/create.c:1927
#, c-format
msgid "%s: door ignored"
msgstr "%s：忽略匣門"
-#: src/delete.c:216 src/list.c:288 src/update.c:192
+#: src/delete.c:215 src/list.c:287 src/update.c:191
msgid "Skipping to next header"
msgstr "跳至下一個標頭"
-#: src/delete.c:281
+#: src/delete.c:280
msgid "Deleting non-header from archive"
msgstr "從封存中刪除無標頭者"
-#: src/extract.c:302
+#: src/extract.c:301
#, c-format
msgid "%s: implausibly old time stamp %s"
msgstr "%s：難以確信的舊時間戳記 %s"
-#: src/extract.c:320
+#: src/extract.c:319
#, c-format
msgid "%s: time stamp %s is %s s in the future"
msgstr "%s：時間戳記 %s 代表未來的 %s 秒"
-#: src/extract.c:553
+#: src/extract.c:552
#, c-format
msgid "%s: Unexpected inconsistency when making directory"
msgstr "%s：產生目錄時有未預期的不一致"
-#: src/extract.c:771
+#: src/extract.c:770
#, c-format
msgid "%s: skipping existing file"
msgstr "%s：跳過既有的檔案"
@@ -996,7 +996,7 @@ msgstr "嘗試解開符號連結為硬式連結"
msgid "%s: Cannot extract -- file is continued from another volume"
msgstr "%s：無法解開 -- 檔案延續自其他卷冊"
-#: src/extract.c:1603 src/list.c:1167
+#: src/extract.c:1603 src/list.c:1164
msgid "Unexpected long name header"
msgstr "未預期的長名稱標頭"
@@ -1013,7 +1013,7 @@ msgstr "目前的 %s 較新或相同"
#: src/extract.c:1664
#, c-format
msgid "%s: Member name contains '..'"
-msgstr ""
+msgstr "%s：會員名稱包含了「..」"
#: src/extract.c:1696
#, c-format
@@ -1025,22 +1025,22 @@ msgstr "%s：之前無法備份這個檔案"
msgid "Cannot rename %s to %s"
msgstr "無法將 %s 重新命名為 %s"
-#: src/incremen.c:494 src/incremen.c:536
+#: src/incremen.c:493 src/incremen.c:535
#, c-format
msgid "%s: Directory has been renamed from %s"
msgstr "%s：目錄已從 %s 重新命名"
-#: src/incremen.c:549
+#: src/incremen.c:548
#, c-format
msgid "%s: Directory is new"
msgstr "%s：目錄是新的"
-#: src/incremen.c:566
+#: src/incremen.c:565
#, c-format
msgid "%s: directory is on a different filesystem; not dumped"
msgstr "%s：目錄位於不同的檔案系統；未傾印"
-#: src/incremen.c:587
+#: src/incremen.c:586
#, c-format
msgid "%s: Directory has been renamed"
msgstr "%s：目錄已被重新命名"
@@ -1166,372 +1166,373 @@ msgstr "%s：正在刪除 %s\n"
msgid "%s: Cannot remove"
msgstr "%s：無法移除"
-#: src/list.c:219
+#: src/list.c:218
#, c-format
msgid "%s: Omitting"
msgstr "%s：省略中"
-#: src/list.c:237
+#: src/list.c:236
#, c-format
msgid "block %s: ** Block of NULs **\n"
msgstr "區塊 %s：** 空值區塊 **\n"
-#: src/list.c:263
+#: src/list.c:262
#, c-format
msgid "block %s: ** End of File **\n"
msgstr "區塊 %s：** 檔案結尾 **\n"
-#: src/list.c:285 src/list.c:1136 src/list.c:1372
+#: src/list.c:284 src/list.c:1133 src/list.c:1369
#, c-format
msgid "block %s: "
msgstr "區塊 %s："
#. TRANSLATORS: %s is type of the value (gid_t, uid_t,
#. etc.)
-#: src/list.c:751
+#: src/list.c:752
#, c-format
msgid "Blanks in header where numeric %s value expected"
msgstr "空白出現在標頭中預期為數值 %s 的地方"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:806
+#: src/list.c:807
#, c-format
msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
msgstr "封存八進位數值 %.*s 超出 %s 範圍；假定為二的補數"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:817
+#: src/list.c:818
#, c-format
msgid "Archive octal value %.*s is out of %s range"
msgstr "封存八進位數值 %.*s 超出 %s 範圍"
-#: src/list.c:838
+#: src/list.c:839
msgid "Archive contains obsolescent base-64 headers"
msgstr "封存含有過時的 base-64 標頭"
-#: src/list.c:852
+#: src/list.c:853
#, c-format
msgid "Archive signed base-64 string %s is out of %s range"
msgstr "封存有號 base-64 字串 %s 超出 %s 範圍"
-#: src/list.c:883
+#: src/list.c:884
#, c-format
msgid "Archive base-256 value is out of %s range"
msgstr "封存 base-256 值超出 %s 範圍"
#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:912
+#: src/list.c:913
#, c-format
msgid "Archive contains %.*s where numeric %s value expected"
msgstr "封存包含 %.*s 於預期為數值 %s 的地方"
#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:934
+#: src/list.c:935
#, c-format
msgid "Archive value %s is out of %s range %s..%s"
msgstr "封存值 %s 已超出 %s 的範圍 %s..%s"
-#: src/list.c:1272
+#: src/list.c:1269
#, c-format
msgid " link to %s\n"
msgstr " 連結到 %s\n"
-#: src/list.c:1280
+#: src/list.c:1277
#, c-format
msgid " unknown file type %s\n"
msgstr " 不明檔案類型 %s\n"
-#: src/list.c:1298
+#: src/list.c:1295
#, c-format
msgid "--Long Link--\n"
msgstr "--長 連 結--\n"
-#: src/list.c:1302
+#: src/list.c:1299
#, c-format
msgid "--Long Name--\n"
msgstr "--長 名 稱--\n"
-#: src/list.c:1306
+#: src/list.c:1303
#, c-format
msgid "--Volume Header--\n"
msgstr "--卷 冊 標 頭--\n"
-#: src/list.c:1314
+#: src/list.c:1311
#, c-format
msgid "--Continued at byte %s--\n"
msgstr "--於第 %s 位元組繼續--\n"
-#: src/list.c:1377
+#: src/list.c:1374
msgid "Creating directory:"
msgstr "正在建立目錄："
-#: src/misc.c:738
+#: src/misc.c:751
#, c-format
msgid "Renaming %s to %s\n"
msgstr "正在將 %s 重新命名為 %s\n"
-#: src/misc.c:747 src/misc.c:766
+#: src/misc.c:760 src/misc.c:779
#, c-format
msgid "%s: Cannot rename to %s"
msgstr "%s：無法重新命名為 %s"
-#: src/misc.c:771
+#: src/misc.c:784
#, c-format
msgid "Renaming %s back to %s\n"
msgstr "將 %s 的名稱還原為 %s\n"
-#: src/misc.c:1134
+#: src/misc.c:1147
#, c-format
msgid "%s: File removed before we read it"
msgstr "%s：讀取檔案之前已被移除"
-#: src/misc.c:1148
+#: src/misc.c:1161
msgid "child process"
msgstr "子行程"
-#: src/misc.c:1157
+#: src/misc.c:1170
msgid "interprocess channel"
msgstr "行程間通道"
-#: src/names.c:69
+#: src/names.c:68
msgid "Local file name selection:"
msgstr "本機檔案名稱選擇:"
-#: src/names.c:72
+#: src/names.c:71
msgid "add given FILE to the archive (useful if its name starts with a dash)"
msgstr "將給定的 FILE 加入封存 (如果它的名稱以減號開始時就很有用)"
-#: src/names.c:73 src/tar.c:484
+#: src/names.c:72 src/tar.c:484
msgid "DIR"
msgstr "目錄"
-#: src/names.c:74
+#: src/names.c:73
msgid "change to directory DIR"
msgstr "更改至目錄 DIR"
-#: src/names.c:76
+#: src/names.c:75
msgid "get names to extract or create from FILE"
msgstr "從 FILE 中取得要解開或建立的名稱"
-#: src/names.c:78
+#: src/names.c:77
msgid "-T reads null-terminated names; implies --verbatim-files-from"
msgstr "-T 讀取零值終結的名稱，隱含 --verbatim-files-from"
-#: src/names.c:81
+#: src/names.c:80
msgid "disable the effect of the previous --null option"
msgstr "停用先前 --null 選項的效果"
-#: src/names.c:83
+#: src/names.c:82
msgid "unquote input file or member names (default)"
msgstr "去除輸入檔案或成員名稱的引號 (預設)"
-#: src/names.c:85
+#: src/names.c:84
msgid "do not unquote input file or member names"
msgstr "不去除輸入檔案或成員名稱的引號"
-#: src/names.c:87
-#, fuzzy
+#: src/names.c:86
msgid "-T reads file names verbatim (no escape or option handling)"
-msgstr "-T 會逐字地讀取檔案名稱 (無選項處理)"
+msgstr "-T 會逐字地讀取檔案名稱 (無跳出或選項處理)"
-#: src/names.c:89
+#: src/names.c:88
msgid "-T treats file names starting with dash as options (default)"
msgstr "-T 會將以減號起始的檔案名稱視為選項 (預設)"
-#: src/names.c:91 tests/genfile.c:140
+#: src/names.c:90 tests/genfile.c:135
msgid "PATTERN"
msgstr "胚騰"
-#: src/names.c:92
+#: src/names.c:91
msgid "exclude files, given as a PATTERN"
msgstr "排除給定胚騰的檔案"
-#: src/names.c:94
+#: src/names.c:93
msgid "exclude patterns listed in FILE"
msgstr "排除 FILE 中所列出的胚騰"
-#: src/names.c:96
+#: src/names.c:95
msgid ""
"exclude contents of directories containing CACHEDIR.TAG, except for the tag "
"file itself"
msgstr "排除包含 CACHEDIR.TAG 的目錄內容，除了該標記檔案本身"
-#: src/names.c:99
+#: src/names.c:98
msgid "exclude everything under directories containing CACHEDIR.TAG"
msgstr "排除包含 CACHEDIR.TAG 的目錄之下所有東西"
-#: src/names.c:102
+#: src/names.c:101
msgid "exclude directories containing CACHEDIR.TAG"
msgstr "排除包含 CACHEDIR.TAG 的目錄"
-#: src/names.c:104
+#: src/names.c:103
msgid "exclude contents of directories containing FILE, except for FILE itself"
msgstr "排除包含 FILE 的目錄內容，除了該檔案本身"
-#: src/names.c:107
+#: src/names.c:106
msgid "read exclude patterns for each directory from FILE, if it exists"
msgstr "讀取時排除來自 FILE 的每一個目錄胚騰，如果有的話"
-#: src/names.c:110
+#: src/names.c:109
msgid ""
"read exclude patterns for each directory and its subdirectories from FILE, "
"if it exists"
msgstr "讀取時排除來自 FILE 的每一個目錄及其子目錄的胚騰，如果有的話"
-#: src/names.c:113
+#: src/names.c:112
msgid "exclude everything under directories containing FILE"
msgstr "排除包含 FILE 的目錄之下所有東西"
-#: src/names.c:115
+#: src/names.c:114
msgid "exclude directories containing FILE"
msgstr "排除包含 FILE 的目錄"
-#: src/names.c:117
+#: src/names.c:116
msgid "exclude version control system directories"
msgstr "排除版本控制系統目錄"
-#: src/names.c:119
+#: src/names.c:118
msgid "read exclude patterns from the VCS ignore files"
msgstr "讀取時排除來自版本控制系統忽略檔案的胚騰"
-#: src/names.c:121
+#: src/names.c:120
msgid "exclude backup and lock files"
msgstr "排除備份和鎖定檔案"
-#: src/names.c:123
+#: src/names.c:122
msgid "recurse into directories (default)"
msgstr "遞迴進入目錄 (預設)"
-#: src/names.c:125
+#: src/names.c:124
msgid "avoid descending automatically in directories"
msgstr "避免自動在目錄中遞降"
-#: src/names.c:130
+#: src/names.c:129
msgid "File name matching options (affect both exclude and include patterns):"
msgstr "檔案名稱吻合選項 (同時影響排除和包含胚騰同者)："
-#: src/names.c:133
+#: src/names.c:132
msgid "patterns match file name start"
msgstr "胚騰會吻合檔案名稱開頭"
-#: src/names.c:135
+#: src/names.c:134
msgid "patterns match after any '/' (default for exclusion)"
msgstr "胚騰會吻合任何 / 之後的名稱 (預設排除)"
-#: src/names.c:137
+#: src/names.c:136
msgid "ignore case"
msgstr "忽略大小寫"
-#: src/names.c:139
+#: src/names.c:138
msgid "case sensitive matching (default)"
msgstr "大小寫需相符的吻合 (預設)"
-#: src/names.c:141
+#: src/names.c:140
msgid "use wildcards (default for exclusion)"
msgstr "使用萬用字元 (預設排除)"
-#: src/names.c:143
+#: src/names.c:142
msgid "verbatim string matching"
msgstr "逐字進行吻合"
-#: src/names.c:145
+#: src/names.c:144
msgid "wildcards match '/' (default for exclusion)"
msgstr "萬用字元會吻合 / (預設排除)"
-#: src/names.c:147
+#: src/names.c:146
msgid "wildcards do not match '/'"
msgstr "萬用字元不會吻合 /"
-#: src/names.c:733
+#: src/names.c:732
msgid ""
"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."
msgstr ""
+"以下的選項使用於建立與更新模式中的任何非選用參數。這些選項的位置，並且只影響"
+"跟隨他們的參數。請正確的重新擺放它們。"
-#: src/names.c:744
+#: src/names.c:743
#, c-format
msgid "-C %s has no effect"
-msgstr ""
+msgstr "-C %s 沒有任何效果"
-#: src/names.c:749
+#: src/names.c:748
#, c-format
msgid "--%s %s has no effect"
-msgstr ""
+msgstr "--%s %s 沒有任何效果"
-#: src/names.c:753
+#: src/names.c:752
#, c-format
msgid "--%s has no effect"
-msgstr ""
+msgstr "--%s 沒有任何效果"
-#: src/names.c:879
+#: src/names.c:878
msgid "command line"
msgstr "命令列"
-#: src/names.c:897
+#: src/names.c:896
#, c-format
msgid "%s: file list requested from %s already read from %s"
msgstr "%s：%s 要求的檔案清單已經由 %s 所讀取"
-#: src/names.c:978 src/checkpoint.c:274
+#: src/names.c:977 src/checkpoint.c:308
#, c-format
msgid "cannot split string '%s': %s"
msgstr "無法分割字串 %s：%s"
-#: src/names.c:1025
+#: src/names.c:1024
#, c-format
msgid "%s: file name read contains nul character"
msgstr "%s：所讀檔案名稱含有空值字元"
-#: src/names.c:1358
+#: src/names.c:1388
msgid "Pattern matching characters used in file names"
msgstr "用於檔案名稱的胚騰匹配字元"
-#: src/names.c:1360
+#: src/names.c:1390
msgid ""
"Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
"this warning"
msgstr "使用 --wildcards 以啟用胚騰匹配，或 --no-wildcards 以抑制這個警告"
-#: src/names.c:1378 src/names.c:1394
+#: src/names.c:1408 src/names.c:1424
#, c-format
msgid "%s: Not found in archive"
msgstr "%s：在封存中找不到"
-#: src/names.c:1379
+#: src/names.c:1409
#, c-format
msgid "%s: Required occurrence not found in archive"
msgstr "%s：要求項目在封存中找不到"
-#: src/names.c:1413
+#: src/names.c:1443
#, c-format
msgid "Archive label mismatch"
msgstr "封存標貼不匹配"
-#: src/names.c:1717
+#: src/names.c:1747
msgid ""
"Using -C option inside file list is not allowed with --listed-incremental"
msgstr "於檔案清單內部使用 -C 選項是不允許與 --listed-incremental 共用"
-#: src/names.c:1723
+#: src/names.c:1753
msgid "Only one -C option is allowed with --listed-incremental"
msgstr "只有一個 -C 選項是允許與 --listed-incremental 共用"
-#: src/tar.c:88
+#: src/tar.c:87
#, c-format
msgid "Options '%s' and '%s' both want standard input"
msgstr "選項 %s 和 %s 兩者都需要標準輸入"
-#: src/tar.c:165
+#: src/tar.c:164
#, c-format
msgid "%s: Invalid archive format"
msgstr "%s：無效的封存格式"
-#: src/tar.c:197
+#: src/tar.c:196
msgid "GNU features wanted on incompatible archive format"
msgstr "不能在不兼容的封存格式中使用 GNU 功能"
-#: src/tar.c:265
+#: src/tar.c:264
#, c-format
msgid ""
"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
@@ -1741,7 +1742,7 @@ msgstr "選取輸出串流："
msgid "extract files to standard output"
msgstr "解開檔案到標準輸出"
-#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:195
+#: src/tar.c:495 src/tar.c:588 src/tar.c:590 tests/genfile.c:190
msgid "COMMAND"
msgstr "命令"
@@ -1777,7 +1778,7 @@ msgstr "利用 FILE 來映射檔案擁有者 UID 和名稱"
msgid "use FILE to map file owner GIDs and names"
msgstr "利用 FILE 來映射檔案擁有者 GID 和名稱"
-#: src/tar.c:515 src/tar.c:700
+#: src/tar.c:515 src/tar.c:701
msgid "DATE-OR-FILE"
msgstr "檔案的日期"
@@ -1978,7 +1979,7 @@ msgstr "讀取時重新分區 (用於 4.2BSD 管線)"
msgid "Archive format selection:"
msgstr "封存格式選擇："
-#: src/tar.c:637 tests/genfile.c:158
+#: src/tar.c:637 tests/genfile.c:153
msgid "FORMAT"
msgstr "格式"
@@ -2062,59 +2063,59 @@ msgstr "程式"
msgid "filter through PROG (must accept -d)"
msgstr "以 PROG 過濾處理 (必須接受 -d)"
-#: src/tar.c:689
+#: src/tar.c:690
msgid "Local file selection:"
msgstr "本機檔案選擇:"
-#: src/tar.c:691
+#: src/tar.c:692
msgid "stay in local file system when creating archive"
msgstr "建立封存時保持在本地檔案系統中"
-#: src/tar.c:693
+#: src/tar.c:694
msgid "don't strip leading '/'s from file names"
msgstr "不要從檔案名稱中截去前導的 '/'"
-#: src/tar.c:695
+#: src/tar.c:696
msgid "follow symlinks; archive and dump the files they point to"
msgstr "跟隨符號連結；封存和傾印它們所指涉的檔案"
-#: src/tar.c:697
+#: src/tar.c:698
msgid "follow hard links; archive and dump the files they refer to"
msgstr "跟隨硬式連結；封存和傾印它們所參考的檔案"
-#: src/tar.c:698
+#: src/tar.c:699
msgid "MEMBER-NAME"
msgstr "成員-名稱"
-#: src/tar.c:699
+#: src/tar.c:700
msgid "begin at member MEMBER-NAME when reading the archive"
msgstr "讀取封存時從名為 MEMBER-NAME 的成員開始"
-#: src/tar.c:701
+#: src/tar.c:702
msgid "only store files newer than DATE-OR-FILE"
msgstr "只儲存比 DATE-OF-FILE 還新的檔案"
-#: src/tar.c:703
+#: src/tar.c:704
msgid "DATE"
msgstr "日期"
-#: src/tar.c:704
+#: src/tar.c:705
msgid "compare date and time when data changed only"
msgstr "只有當資料變更時才比較日期和時間"
-#: src/tar.c:705
+#: src/tar.c:706
msgid "CONTROL"
msgstr "控制"
-#: src/tar.c:706
+#: src/tar.c:707
msgid "backup before removal, choose version CONTROL"
msgstr "移除之前先備份，選擇版本 CONTROL"
-#: src/tar.c:707 src/tar.c:766 src/tar.c:768 tests/genfile.c:174
+#: src/tar.c:708 src/tar.c:767 src/tar.c:769 tests/genfile.c:169
msgid "STRING"
msgstr "字串"
-#: src/tar.c:708
+#: src/tar.c:709
msgid ""
"backup before removal, override usual suffix ('~' unless overridden by "
"environment variable SIMPLE_BACKUP_SUFFIX)"
@@ -2122,59 +2123,59 @@ msgstr ""
"移除之前先備份並覆寫常用後置文字 ( ~ 除非被環境變數 SIMPLE_BACKUP_SUFFIX 所蓋"
"過)"
-#: src/tar.c:713
+#: src/tar.c:714
msgid "File name transformations:"
msgstr "檔案名稱變換："
-#: src/tar.c:715
+#: src/tar.c:716
msgid "strip NUMBER leading components from file names on extraction"
msgstr "從檔案名稱中截去以 NUMBER 為首的成分"
-#: src/tar.c:717
+#: src/tar.c:718
msgid "EXPRESSION"
msgstr "表示式"
-#: src/tar.c:718
+#: src/tar.c:719
msgid "use sed replace EXPRESSION to transform file names"
msgstr "利用 sed 將 EXPRESSION 替代為變換檔案名稱"
-#: src/tar.c:724
+#: src/tar.c:725
msgid "Informative output:"
msgstr "富含資訊的輸出:"
-#: src/tar.c:727
+#: src/tar.c:728
msgid "verbosely list files processed"
msgstr "詳細列出處理過的檔案"
-#: src/tar.c:728
+#: src/tar.c:729
msgid "KEYWORD"
msgstr "關鍵字"
-#: src/tar.c:729
+#: src/tar.c:730
msgid "warning control"
msgstr "警告控制"
-#: src/tar.c:731
+#: src/tar.c:732
msgid "display progress messages every NUMBERth record (default 10)"
msgstr "每幾項記錄顯示一次進度訊息 (預設 10)"
-#: src/tar.c:733
+#: src/tar.c:734
msgid "ACTION"
msgstr "動作"
-#: src/tar.c:734
+#: src/tar.c:735
msgid "execute ACTION on each checkpoint"
msgstr "於每個查核點執行 ACTION"
-#: src/tar.c:737
+#: src/tar.c:738
msgid "print a message if not all links are dumped"
msgstr "如果並非所有連結都被傾印則印出訊息"
-#: src/tar.c:738
+#: src/tar.c:739
msgid "SIGNAL"
msgstr "信號"
-#: src/tar.c:739
+#: src/tar.c:740
msgid ""
"print total bytes after processing the archive; with an argument - print "
"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2185,125 +2186,125 @@ msgstr ""
"的信號是：SIGHUP、SIGQUIT、SIGINT、SIGUSR1 和 SIGUSR2；不具 SIG 前綴的名稱也"
"是可接受的"
-#: src/tar.c:744
+#: src/tar.c:745
msgid "print file modification times in UTC"
msgstr "以 UTC 印出檔案修改時間"
-#: src/tar.c:746
+#: src/tar.c:747
msgid "print file time to its full resolution"
msgstr "以完整精度印出檔案時間"
-#: src/tar.c:748
+#: src/tar.c:749
msgid "send verbose output to FILE"
msgstr "將詳細輸出送至 FILE"
-#: src/tar.c:750
+#: src/tar.c:751
msgid "show block number within archive with each message"
msgstr "每則訊息附帶顯示在封存中的區塊號碼"
-#: src/tar.c:752
+#: src/tar.c:753
msgid "ask for confirmation for every action"
msgstr "任何動作都要求確認"
-#: src/tar.c:755
+#: src/tar.c:756
msgid "show tar defaults"
msgstr "顯示 tar 預設值"
-#: src/tar.c:757
+#: src/tar.c:758
msgid "show valid ranges for snapshot-file fields"
msgstr "顯示快照檔案欄位的有效範圍"
-#: src/tar.c:759
+#: src/tar.c:760
msgid ""
"when listing or extracting, list each directory that does not match search "
"criteria"
msgstr "當表列或解開時，列出每一個不符合搜尋條件的目錄"
-#: src/tar.c:761
+#: src/tar.c:762
msgid "show file or archive names after transformation"
msgstr "顯示變換之後的檔案或封存名稱"
-#: src/tar.c:764
+#: src/tar.c:765
msgid "STYLE"
msgstr "樣式"
-#: src/tar.c:765
+#: src/tar.c:766
msgid "set name quoting style; see below for valid STYLE values"
msgstr "設定名稱引號樣式；參看下列的有效樣式值"
-#: src/tar.c:767
+#: src/tar.c:768
msgid "additionally quote characters from STRING"
msgstr "來自 STRING 的額外引號字元"
-#: src/tar.c:769
+#: src/tar.c:770
msgid "disable quoting for characters from STRING"
msgstr "停用來自字串的引號字元"
-#: src/tar.c:774
+#: src/tar.c:775
msgid "Compatibility options:"
msgstr "相容選項："
-#: src/tar.c:777
+#: src/tar.c:778
msgid ""
"when creating, same as --old-archive; when extracting, same as --no-same-"
"owner"
msgstr "當建立時，等同於 --old-archive。當解開時，等同於 --no-same-owner"
-#: src/tar.c:782
+#: src/tar.c:783
msgid "Other options:"
msgstr "其他選項："
-#: src/tar.c:785
+#: src/tar.c:786
msgid "disable use of some potentially harmful options"
msgstr "停用某些潛在有害的選項"
#. TRANSLATORS: Both %s in this statement are replaced with
#. option names.
-#: src/tar.c:845
+#: src/tar.c:846
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "%s：無法與 %s 一同使用"
-#: src/tar.c:933
+#: src/tar.c:934
msgid ""
"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' "
"option"
msgstr "您不可以指定超過一個 -Acdtrux, --delete 或 --test-label 選項"
-#: src/tar.c:945
+#: src/tar.c:946
msgid "Conflicting compression options"
msgstr "互相抵觸的壓縮選項"
-#: src/tar.c:1004
+#: src/tar.c:1000
#, c-format
msgid "Unknown signal name: %s"
msgstr "不明的信號名稱：%s"
-#: src/tar.c:1028
+#: src/tar.c:1030
msgid "Date sample file not found"
msgstr "找不到日期範例檔案"
-#: src/tar.c:1036
+#: src/tar.c:1038
#, c-format
msgid "Substituting %s for unknown date format %s"
msgstr "以 %s 代替不明的日期格式 %s"
-#: src/tar.c:1065
+#: src/tar.c:1067
#, c-format
msgid "Option %s: Treating date '%s' as %s"
msgstr "選項 %1$s: 以 %3$s 格式來處理日期 %2$s"
-#: src/tar.c:1105 src/tar.c:1109 src/tar.c:1113 src/tar.c:1117 src/tar.c:1121
-#: src/tar.c:1125 src/tar.c:1129
+#: src/tar.c:1107 src/tar.c:1111 src/tar.c:1115 src/tar.c:1119 src/tar.c:1123
+#: src/tar.c:1127 src/tar.c:1131 src/tar.c:1135
#, c-format
msgid "filter the archive through %s"
msgstr "將封存透過 %s 篩選"
-#: src/tar.c:1137
+#: src/tar.c:1143
msgid "Valid arguments for the --quoting-style option are:"
msgstr "用於 --quoting-style 的有效引數選項是："
-#: src/tar.c:1141
+#: src/tar.c:1147
msgid ""
"\n"
"*This* tar defaults to:\n"
@@ -2311,287 +2312,296 @@ msgstr ""
"\n"
"*這個* tar 預設為:\n"
-#: src/tar.c:1253
+#: src/tar.c:1259
msgid "Invalid owner or group ID"
msgstr "無效的擁有者或群組識別號"
-#: src/tar.c:1347
+#: src/tar.c:1353
msgid "Invalid blocking factor"
msgstr "無效的分區因子"
-#: src/tar.c:1467
+#: src/tar.c:1472
msgid "Invalid tape length"
msgstr "無效的磁帶長度"
-#: src/tar.c:1481
+#: src/tar.c:1486
msgid "Invalid incremental level value"
msgstr "無效的遞增等級值"
-#: src/tar.c:1527
+#: src/tar.c:1532
msgid "More than one threshold date"
msgstr "一個以上的限定日期"
-#: src/tar.c:1594 src/tar.c:1597
+#: src/tar.c:1599 src/tar.c:1602
msgid "Invalid sparse version value"
msgstr "無效的稀疏版本值"
-#: src/tar.c:1661
+#: src/tar.c:1670
msgid "--atime-preserve='system' is not supported on this platform"
msgstr "--atime-preserve='system' 於這個平臺未被支援"
-#: src/tar.c:1686
+#: src/tar.c:1695
msgid "--checkpoint value is not an integer"
msgstr "--checkpoint 值不是整數"
-#: src/tar.c:1764
+#: src/tar.c:1773
msgid "Invalid mode given on option"
msgstr "選項中的模式無效"
-#: src/tar.c:1797
+#: src/tar.c:1806
msgid "Invalid number"
msgstr "無效的號碼"
-#: src/tar.c:1861
+#: src/tar.c:1870
msgid "Invalid record size"
msgstr "無效的記錄大小"
-#: src/tar.c:1864
+#: src/tar.c:1873
#, c-format
msgid "Record size must be a multiple of %d."
msgstr "記錄大小必須是 %d 的倍數。"
-#: src/tar.c:1910
+#: src/tar.c:1919
msgid "Invalid number of elements"
msgstr "無效的元素號碼"
-#: src/tar.c:1935
+#: src/tar.c:1944
msgid "Only one --to-command option allowed"
msgstr "只允許一個 --to-command 選項"
-#: src/tar.c:2023
+#: src/tar.c:2032
#, c-format
msgid "Malformed density argument: %s"
msgstr "異常的密度引數：%s"
-#: src/tar.c:2049
+#: src/tar.c:2058
#, c-format
msgid "Unknown density: '%c'"
msgstr "不明的密度：%c"
-#: src/tar.c:2066
+#: src/tar.c:2075
#, c-format
msgid "Options '-[0-7][lmh]' not supported by *this* tar"
msgstr "這個版本的 tar 不支援 -[0-7][lmh] 選項"
-#: src/tar.c:2073
+#: src/tar.c:2082
#, c-format
msgid "%s:%lu: location of the error"
msgstr "%s:%lu：錯誤的位置"
-#: src/tar.c:2076
+#: src/tar.c:2085
#, c-format
msgid "error parsing %s"
msgstr "剖析 %s 時發生錯誤"
-#: src/tar.c:2090
+#: src/tar.c:2099
msgid "[FILE]..."
msgstr "[FILE]…"
-#: src/tar.c:2181
+#: src/tar.c:2190
#, c-format
msgid "non-option arguments in %s"
msgstr "%s 中出現非選項的引數"
-#: src/tar.c:2196
+#: src/tar.c:2205
#, c-format
msgid "cannot split TAR_OPTIONS: %s"
msgstr "無法分割 TAR_OPTIONS：%s"
-#: src/tar.c:2291
+#: src/tar.c:2300
#, c-format
msgid "Old option '%c' requires an argument."
msgstr "舊的選項 %c 需要一個引數。"
-#: src/tar.c:2364
+#: src/tar.c:2373
msgid "--occurrence is meaningless without a file list"
msgstr "若無檔案列表，--occurrence 便不具意義"
-#: src/tar.c:2390
+#: src/tar.c:2399
msgid "Multiple archive files require '-M' option"
msgstr "指定多個封存時需要 -M 選項"
-#: src/tar.c:2407
+#: src/tar.c:2416
msgid "--level is meaningless without --listed-incremental"
msgstr "--level 不與 --listed-incremental 共用是無意義的"
-#: src/tar.c:2424
+#: src/tar.c:2433
#, c-format
msgid "%s: Volume label is too long (limit is %lu byte)"
msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
msgstr[0] "%s：卷冊標籤太長 (限制為 %lu 位元組)"
-#: src/tar.c:2437
+#: src/tar.c:2446
msgid "Cannot verify multi-volume archives"
msgstr "無法驗證多重卷冊的封存"
-#: src/tar.c:2439
+#: src/tar.c:2448
msgid "Cannot verify compressed archives"
msgstr "無法驗證壓縮過的封存"
-#: src/tar.c:2453
+#: src/tar.c:2462
msgid "Cannot use multi-volume compressed archives"
msgstr "無法使用多重卷冊的壓縮封存"
-#: src/tar.c:2457
+#: src/tar.c:2466
msgid "Cannot concatenate compressed archives"
msgstr "無法串接壓縮過的檔案"
-#: src/tar.c:2464
+#: src/tar.c:2473
msgid "--clamp-mtime needs a date specified using --mtime"
msgstr "--clamp-mtime 需要一個以 --mtime 指定的日期"
-#: src/tar.c:2474
+#: src/tar.c:2483
msgid "--pax-option can be used only on POSIX archives"
msgstr "--pax-option 只能用於 POSIX 封存"
-#: src/tar.c:2481
+#: src/tar.c:2490
msgid "--acls can be used only on POSIX archives"
msgstr "--acls 只能用於 POSIX 封存"
-#: src/tar.c:2486
+#: src/tar.c:2495
msgid "--selinux can be used only on POSIX archives"
msgstr "--selinux 只能用於 POSIX 封存"
-#: src/tar.c:2491
+#: src/tar.c:2500
msgid "--xattrs can be used only on POSIX archives"
msgstr "--xattrs 只能用於 POSIX 封存"
-#: src/tar.c:2540
+#: src/tar.c:2549
msgid ""
"Cannot deduce top-level directory name; please set it explicitly with --one-"
"top-level=DIR"
msgstr "無法推論頂層目錄名稱；請以 --one-top-level=DIR 來明確地設定它"
-#: src/tar.c:2573
+#: src/tar.c:2582
msgid "Volume length cannot be less than record size"
msgstr "卷冊長度無法少於記錄大小"
-#: src/tar.c:2597
+#: src/tar.c:2606
msgid "Cowardly refusing to create an empty archive"
msgstr "斗膽拒絕建立空的封存"
-#: src/tar.c:2623
+#: src/tar.c:2632
msgid "Options '-Aru' are incompatible with '-f -'"
msgstr " -Aru 與 -f - 選項不相容"
-#: src/tar.c:2711
+#: src/tar.c:2743
msgid ""
"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
msgstr "您必須指定 -Acdtrux, --delete 或 --test-label 選項之一"
-#: src/tar.c:2768
+#: src/tar.c:2800
#, c-format
msgid "Exiting with failure status due to previous errors"
msgstr "由於先前錯誤而以失敗狀態離開"
-#: src/update.c:87
+#: src/update.c:86
#, c-format
msgid "%s: File shrank by %s byte"
msgid_plural "%s: File shrank by %s bytes"
msgstr[0] "%s：檔案縮減了 %s 位元組"
-#: src/xheader.c:165
+#: src/xheader.c:164
#, c-format
msgid "Keyword %s is unknown or not yet implemented"
msgstr "關鍵字 %s 為未知或尚未實作"
-#: src/xheader.c:174
+#: src/xheader.c:173
msgid "Time stamp is out of allowed range"
msgstr "時間戳記超出了允許範圍"
-#: src/xheader.c:205
+#: src/xheader.c:188
+#, c-format
+msgid "Malformed pax option: %s"
+msgstr ""
+
+#: src/xheader.c:207
#, c-format
msgid "Pattern %s cannot be used"
msgstr "胚騰 %s 無法使用"
-#: src/xheader.c:219
+#: src/xheader.c:221
#, c-format
msgid "Keyword %s cannot be overridden"
msgstr "關鍵字 %s 無法被蓋過"
-#: src/xheader.c:668
+#: src/xheader.c:476
+msgid "can't update global extended header record"
+msgstr ""
+
+#: src/xheader.c:686
msgid "Malformed extended header: missing length"
msgstr "異常的擴充標頭：長度缺少"
-#: src/xheader.c:677
+#: src/xheader.c:695
#, c-format
msgid "Extended header length %*s is out of range"
msgstr "擴充標頭長度 %*s 超出範圍"
-#: src/xheader.c:689
+#: src/xheader.c:707
msgid "Malformed extended header: missing blank after length"
msgstr "異常的擴充標頭：在長度之後缺少空白"
-#: src/xheader.c:697
+#: src/xheader.c:715
msgid "Malformed extended header: missing equal sign"
msgstr "異常的擴充標頭：缺少等號"
-#: src/xheader.c:703
+#: src/xheader.c:721
msgid "Malformed extended header: missing newline"
msgstr "異常的擴充標頭：缺少新列"
-#: src/xheader.c:741
+#: src/xheader.c:759
#, c-format
msgid "Ignoring unknown extended header keyword '%s'"
msgstr "忽略不明擴充標頭關鍵字 %s"
-#: src/xheader.c:1023
+#: src/xheader.c:1041
#, c-format
msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
msgstr "產生的關鍵字/值對太長 (關鍵字=%s，長度=%s)"
#. TRANSLATORS: The first %s is the pax extended header keyword
#. (atime, gid, etc.).
-#: src/xheader.c:1053
+#: src/xheader.c:1071
#, c-format
msgid "Extended header %s=%s is out of range %s..%s"
msgstr "擴充標頭 %s=%s 超出範圍 %s..%s"
-#: src/xheader.c:1104 src/xheader.c:1137 src/xheader.c:1487
+#: src/xheader.c:1122 src/xheader.c:1155 src/xheader.c:1505
#, c-format
msgid "Malformed extended header: invalid %s=%s"
msgstr "異常的擴充標頭：無效的 %s=%s"
-#: src/xheader.c:1440 src/xheader.c:1465 src/xheader.c:1520
+#: src/xheader.c:1458 src/xheader.c:1483 src/xheader.c:1538
#, c-format
msgid "Malformed extended header: excess %s=%s"
msgstr "異常的擴充標頭：過剩的 %s=%s"
-#: src/xheader.c:1533
+#: src/xheader.c:1551
#, c-format
msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
msgstr "異常的擴充標頭：無效的 %s：未預期的分隔符號 %c"
-#: src/xheader.c:1543
+#: src/xheader.c:1561
#, c-format
msgid "Malformed extended header: invalid %s: odd number of values"
msgstr "異常的擴充標頭：無效的 %s：奇怪的數值數量"
-#: src/checkpoint.c:114
+#: src/checkpoint.c:133
#, c-format
msgid "%s: not a valid timeout"
msgstr "%s：不是有效的時間限制"
-#: src/checkpoint.c:121
+#: src/checkpoint.c:146
#, c-format
msgid "%s: unknown checkpoint action"
msgstr "%s：不明查核點動作"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "write"
msgstr "寫入"
-#: src/checkpoint.c:202
+#: src/checkpoint.c:236
msgid "read"
msgstr "讀取"
@@ -2599,7 +2609,7 @@ msgstr "讀取"
#. *not* "Writing a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
#. *not* "Escribiendo un punto de comprobaci@'on"
-#: src/checkpoint.c:218
+#: src/checkpoint.c:252
#, c-format
msgid "Write checkpoint %u"
msgstr "寫入的查核點 %u"
@@ -2608,12 +2618,12 @@ msgstr "寫入的查核點 %u"
#. *not* "Reading a checkpoint".
#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
#. *not* "Leyendo un punto de comprobaci@'on"
-#: src/checkpoint.c:224
+#: src/checkpoint.c:258
#, c-format
msgid "Read checkpoint %u"
msgstr "讀取的查核點 %u"
-#: tests/genfile.c:115
+#: tests/genfile.c:110
msgid ""
"genfile manipulates data files for GNU paxutils test suite.\n"
"OPTIONS are:\n"
@@ -2621,91 +2631,95 @@ msgstr ""
"genfile 在 GNU paxutils 測試套件中用於操控資料檔案。\n"
"選項：\n"
-#: tests/genfile.c:131
+#: tests/genfile.c:126
msgid "File creation options:"
msgstr "檔案建立選項："
-#: tests/genfile.c:132 tests/genfile.c:143
+#: tests/genfile.c:127 tests/genfile.c:138
msgid "SIZE"
msgstr "大小"
-#: tests/genfile.c:133
+#: tests/genfile.c:128
msgid "Create file of the given SIZE"
msgstr "以給定 SIZE 建立檔案。"
-#: tests/genfile.c:135
+#: tests/genfile.c:130
msgid "Write to file NAME, instead of standard output"
msgstr "寫入檔案 NAME，以代替標準輸出"
-#: tests/genfile.c:137
+#: tests/genfile.c:132
msgid "Read file names from FILE"
msgstr "從 FILE 讀取檔案名稱"
-#: tests/genfile.c:139
+#: tests/genfile.c:134
msgid "-T reads null-terminated names"
msgstr "-T 讀取零值終結的名稱"
-#: tests/genfile.c:141
+#: tests/genfile.c:136
msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'"
msgstr "以給定 PATTERN 填充檔案。PATTERN 是 default 或 zeros"
-#: tests/genfile.c:144
+#: tests/genfile.c:139
msgid "Size of a block for sparse file"
msgstr "用於稀疏檔案的區塊大小"
-#: tests/genfile.c:146
+#: tests/genfile.c:141
msgid "Generate sparse file. Rest of the command line gives the file map."
msgstr "產生稀疏檔案。命令列的其餘部分給出檔案對映。"
-#: tests/genfile.c:148
+#: tests/genfile.c:143
msgid "OFFSET"
msgstr "偏移值"
-#: tests/genfile.c:149
+#: tests/genfile.c:144
msgid "Seek to the given offset before writing data"
msgstr "寫入資料之前尋求給定的偏移值"
-#: tests/genfile.c:152
+#: tests/genfile.c:147
msgid "Suppress non-fatal diagnostic messages"
msgstr "抑制非嚴重的診斷訊息"
-#: tests/genfile.c:156
+#: tests/genfile.c:151
msgid "File statistics options:"
msgstr "檔案統計選項："
-#: tests/genfile.c:159
+#: tests/genfile.c:154
msgid "Print contents of struct stat for each given file. Default FORMAT is: "
msgstr "列印每個給定檔案的結構狀態內容。預設 FORMAT 為："
-#: tests/genfile.c:166
+#: tests/genfile.c:161
msgid "Synchronous execution options:"
msgstr "同步的執行選項："
-#: tests/genfile.c:168
-msgid "OPTION"
-msgstr "選項"
+#: tests/genfile.c:163
+msgid "N"
+msgstr ""
-#: tests/genfile.c:169
+#: tests/genfile.c:164
+#, fuzzy
+#| msgid ""
+#| "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --"
+#| "touch, --unlink"
msgid ""
-"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, "
-"--unlink"
+"Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with "
+"--checkpoint and one of --cut, --append, --touch, --unlink"
msgstr ""
"執行引數。適合與 --checkpoint 以及 --cut, --append, --touch, --unlink 之一共"
"用"
-#: tests/genfile.c:172
+#: tests/genfile.c:167
msgid "Perform given action (see below) upon reaching checkpoint NUMBER"
msgstr "當達到查核點 NUMBER 時實行給定動作 (參看以下)"
-#: tests/genfile.c:175
+#: tests/genfile.c:170
msgid "Set date for next --touch option"
msgstr "設定後續 --touch 選項所需的日期"
-#: tests/genfile.c:178
+#: tests/genfile.c:173
msgid "Display executed checkpoints and exit status of COMMAND"
msgstr "顯示已執行的查核點以及 COMMAND 的離開狀態"
-#: tests/genfile.c:183
+#: tests/genfile.c:178
msgid ""
"Synchronous execution actions. These are executed when checkpoint number "
"given by --checkpoint option is reached."
@@ -2713,128 +2727,128 @@ msgstr ""
"同步的執行動作。當到達由 --checkpoint 選項所給定的查核點編號時，這些動作會被"
"執行。"
-#: tests/genfile.c:186
+#: tests/genfile.c:181
msgid ""
"Truncate FILE to the size specified by previous --length option (or 0, if it "
"is not given)"
msgstr "依先前 --length 選項指定的大小來截斷檔案 (如果它未被給定就是 0)"
-#: tests/genfile.c:190
+#: tests/genfile.c:185
msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option."
msgstr "附加 SIZE 位元組到 FILE。SIZE 是由先前 --length 選項所給定。"
-#: tests/genfile.c:193
+#: tests/genfile.c:188
msgid "Update the access and modification times of FILE"
msgstr "更新檔案的存取和修改時間"
-#: tests/genfile.c:196
+#: tests/genfile.c:191
msgid "Execute COMMAND"
msgstr "執行 COMMAND"
-#: tests/genfile.c:199
+#: tests/genfile.c:194
msgid "Delete FILE"
-msgstr ""
+msgstr "移除檔案"
-#: tests/genfile.c:250
+#: tests/genfile.c:245
#, c-format
msgid "Invalid size: %s"
msgstr "無效的大小：%s"
-#: tests/genfile.c:255
+#: tests/genfile.c:250
#, c-format
msgid "Number out of allowed range: %s"
msgstr "號碼超出允許的範圍：%s"
-#: tests/genfile.c:258
+#: tests/genfile.c:253
#, c-format
msgid "Negative size: %s"
msgstr "負值大小：%s"
-#: tests/genfile.c:271 tests/genfile.c:642
+#: tests/genfile.c:266 tests/genfile.c:633
#, c-format
msgid "stat(%s) failed"
msgstr "狀態(%s) 失敗"
-#: tests/genfile.c:274
+#: tests/genfile.c:269
#, c-format
msgid "requested file length %lu, actual %lu"
msgstr "要求檔案長度 %lu，實際則是 %lu"
-#: tests/genfile.c:278
+#: tests/genfile.c:273
#, c-format
msgid "created file is not sparse"
msgstr "建立的不是稀疏檔案"
-#: tests/genfile.c:375
+#: tests/genfile.c:366
#, c-format
msgid "Error parsing number near `%s'"
msgstr "剖析數字接近 %s 時發生錯誤"
-#: tests/genfile.c:381
+#: tests/genfile.c:372
#, c-format
msgid "Unknown date format"
msgstr "不明的日期格式"
-#: tests/genfile.c:405
+#: tests/genfile.c:396
msgid "[ARGS...]"
msgstr "[引數…]"
-#: tests/genfile.c:442 tests/genfile.c:482 tests/genfile.c:583
-#: tests/genfile.c:746 tests/genfile.c:760
+#: tests/genfile.c:433 tests/genfile.c:473 tests/genfile.c:574
+#: tests/genfile.c:737 tests/genfile.c:751
#, c-format
msgid "cannot open `%s'"
msgstr "無法開啟 %s"
-#: tests/genfile.c:448
+#: tests/genfile.c:439
msgid "cannot seek"
msgstr "無法尋求"
-#: tests/genfile.c:465
+#: tests/genfile.c:456
#, c-format
msgid "file name contains null character"
msgstr "檔案名稱含有空字元"
-#: tests/genfile.c:578
+#: tests/genfile.c:569
#, c-format
msgid "cannot generate sparse files on standard output, use --file option"
msgstr "無法於標準輸出產生稀疏檔案，使用 --file 選項"
-#: tests/genfile.c:669
+#: tests/genfile.c:660
#, c-format
msgid "incorrect mask (near `%s')"
msgstr "不正確遮罩 (接近 %s)"
-#: tests/genfile.c:675 tests/genfile.c:708
+#: tests/genfile.c:666 tests/genfile.c:699
#, c-format
msgid "Unknown field `%s'"
msgstr "不明的欄位 %s"
-#: tests/genfile.c:735
+#: tests/genfile.c:726
#, c-format
msgid "cannot set time on `%s'"
msgstr "無法設定時間為 %s"
-#: tests/genfile.c:765
+#: tests/genfile.c:756
#, c-format
msgid "cannot truncate `%s'"
msgstr "無法截斷 %s"
-#: tests/genfile.c:774
+#: tests/genfile.c:765
#, c-format
msgid "command failed: %s"
msgstr "命令失敗：%s"
-#: tests/genfile.c:781
-#, fuzzy, c-format
+#: tests/genfile.c:772
+#, c-format
msgid "cannot stat `%s'"
-msgstr "無法截斷 %s"
+msgstr "無法統計「%s」"
-#: tests/genfile.c:785
-#, fuzzy, c-format
+#: tests/genfile.c:776
+#, c-format
msgid "cannot remove directory `%s'"
-msgstr "無法設定時間為 %s"
+msgstr "無法移除目錄「%s」"
-#: tests/genfile.c:788
+#: tests/genfile.c:779
#, c-format
msgid "cannot unlink `%s'"
msgstr "無法取消連結 %s"
@@ -2874,6 +2888,9 @@ msgstr "命令終止\n"
msgid "--stat requires file names"
msgstr "--stat 需要檔案名稱"
+#~ msgid "OPTION"
+#~ msgstr "選項"
+
#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
#~ msgstr "%.*s: ARGP_HELP_FMT 參數必須是正值"
diff --git a/rmt/Makefile.in b/rmt/Makefile.in
index ccb3252de82f545ad6cf9c80dc4f7503ca00d758..9ca0a0e8d6f97df70b218bdf81af788caac82ae9 100644
--- a/rmt/Makefile.in
+++ b/rmt/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,13 +89,11 @@ build_triplet = @build@
host_triplet = @host@
EXTRA_PROGRAMS = rmt$(EXEEXT)
subdir = rmt
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+ $(top_srcdir)/m4/__inline.m4 \
$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \
- $(top_srcdir)/m4/asm-underscore.m4 \
$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \
$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \
$(top_srcdir)/m4/canonicalize.m4 \
@@ -105,11 +113,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/extern-inline.m4 \
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \
- $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \
- $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filenamecat.m4 \
- $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
- $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
+ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
+ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
+ $(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fileblocks.m4 \
+ $(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
+ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
+ $(top_srcdir)/m4/fnmatch_h.m4 $(top_srcdir)/m4/fpending.m4 \
$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
$(top_srcdir)/m4/futimens.m4 \
@@ -123,7 +132,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 \
$(top_srcdir)/m4/group-member.m4 \
- $(top_srcdir)/m4/hard-locale.m4 \
$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/human.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \
$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \
@@ -218,6 +226,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -283,6 +292,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/build-aux/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
@@ -374,6 +385,7 @@ GNULIB_FFSL = @GNULIB_FFSL@
GNULIB_FFSLL = @GNULIB_FFSLL@
GNULIB_FGETC = @GNULIB_FGETC@
GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FNMATCH = @GNULIB_FNMATCH@
GNULIB_FOPEN = @GNULIB_FOPEN@
GNULIB_FPRINTF = @GNULIB_FPRINTF@
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
@@ -406,6 +418,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
@@ -422,6 +435,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALENAME = @GNULIB_LOCALENAME@
GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_LSTAT = @GNULIB_LSTAT@
@@ -660,6 +674,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -683,6 +698,9 @@ HAVE_FEATURES_H = @HAVE_FEATURES_H@
HAVE_FFS = @HAVE_FFS@
HAVE_FFSL = @HAVE_FFSL@
HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FNMATCH = @HAVE_FNMATCH@
+HAVE_FNMATCH_H = @HAVE_FNMATCH_H@
+HAVE_FREELOCALE = @HAVE_FREELOCALE@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSTATAT = @HAVE_FSTATAT@
HAVE_FSYNC = @HAVE_FSYNC@
@@ -695,13 +713,16 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
HAVE_GETLOGIN = @HAVE_GETLOGIN@
HAVE_GETOPT_H = @HAVE_GETOPT_H@
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -734,6 +755,7 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -804,7 +826,6 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
HAVE_TIMEGM = @HAVE_TIMEGM@
HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
HAVE_TZSET = @HAVE_TZSET@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
@@ -859,8 +880,6 @@ HAVE_WMEMSET = @HAVE_WMEMSET@
HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
HAVE__BOOL = @HAVE__BOOL@
HAVE__EXIT = @HAVE__EXIT@
-HOST_CPU = @HOST_CPU@
-HOST_CPU_C_ABI = @HOST_CPU_C_ABI@
INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
@@ -905,6 +924,7 @@ NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
+NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
@@ -932,6 +952,7 @@ NEXT_DIRENT_H = @NEXT_DIRENT_H@
NEXT_ERRNO_H = @NEXT_ERRNO_H@
NEXT_FCNTL_H = @NEXT_FCNTL_H@
NEXT_FLOAT_H = @NEXT_FLOAT_H@
+NEXT_FNMATCH_H = @NEXT_FNMATCH_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
@@ -992,9 +1013,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@
REPLACE_FDOPEN = @REPLACE_FDOPEN@
REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FNMATCH = @REPLACE_FNMATCH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREELOCALE = @REPLACE_FREELOCALE@
REPLACE_FREOPEN = @REPLACE_FREOPEN@
REPLACE_FSEEK = @REPLACE_FSEEK@
REPLACE_FSEEKO = @REPLACE_FSEEKO@
@@ -1012,6 +1035,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
REPLACE_GMTIME = @REPLACE_GMTIME@
REPLACE_ISATTY = @REPLACE_ISATTY@
@@ -1042,6 +1066,7 @@ REPLACE_MKNOD = @REPLACE_MKNOD@
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
REPLACE_MKTIME = @REPLACE_MKTIME@
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@
REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
@@ -1243,7 +1268,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits rmt/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnits rmt/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1550,6 +1574,8 @@ uninstall-am: uninstall-rmtPROGRAMS
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-rmtPROGRAMS
+.PRECIOUS: Makefile
+
rmt.o: ../gnu/configmake.h
diff --git a/rmt/rmt.c b/rmt/rmt.c
index fff83b87a57402e048b0cded6732de0d9f84fbd3..658a243deed79f0503f87d1abdd5c0cded8483ca 100644
--- a/rmt/rmt.c
+++ b/rmt/rmt.c
@@ -51,13 +51,16 @@ FILE *dbgout;
} \
while (0)
-#define VDEBUG(lev, pfx, fmt, ap) \
+#define VDEBUG(lev, pfx, fmt) \
do \
{ \
if (dbgout && (lev) <= dbglev) \
{ \
+ va_list aptr; \
+ va_start (aptr, fmt); \
fprintf (dbgout, "%s", pfx); \
- vfprintf (dbgout, fmt, ap); \
+ vfprintf (dbgout, fmt, aptr); \
+ va_end (aptr); \
} \
} \
while (0)
@@ -100,8 +103,9 @@ rmt_write (const char *fmt, ...)
va_list ap;
va_start (ap, fmt);
vfprintf (stdout, fmt, ap);
+ va_end (ap);
fflush (stdout);
- VDEBUG (10, "S: ", fmt, ap);
+ VDEBUG (10, "S: ", fmt);
}
static void
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3e315b78dd558679850050c08023345c6e7cfa4c..2b67642598506d459b9d820b8ee87bd75348ebae 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,7 +1,6 @@
# Make GNU tar scripts.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index f9cc0bab1d53e28b70e0d202428d912b99dd4b57..e93dc30b2ba66fc561c3bef06347487a918cc37e 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,8 +16,7 @@
# Make GNU tar scripts.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -35,7 +34,17 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -98,12 +107,11 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = scripts
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+ $(top_srcdir)/m4/__inline.m4 \
$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \
- $(top_srcdir)/m4/asm-underscore.m4 \
$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \
$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \
$(top_srcdir)/m4/canonicalize.m4 \
@@ -123,11 +131,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/extern-inline.m4 \
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \
- $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \
- $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filenamecat.m4 \
- $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
- $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
+ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
+ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
+ $(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fileblocks.m4 \
+ $(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
+ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
+ $(top_srcdir)/m4/fnmatch_h.m4 $(top_srcdir)/m4/fpending.m4 \
$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
$(top_srcdir)/m4/futimens.m4 \
@@ -141,7 +150,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 \
$(top_srcdir)/m4/group-member.m4 \
- $(top_srcdir)/m4/hard-locale.m4 \
$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/human.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \
$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \
@@ -236,6 +244,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -289,6 +298,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
@@ -380,6 +390,7 @@ GNULIB_FFSL = @GNULIB_FFSL@
GNULIB_FFSLL = @GNULIB_FFSLL@
GNULIB_FGETC = @GNULIB_FGETC@
GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FNMATCH = @GNULIB_FNMATCH@
GNULIB_FOPEN = @GNULIB_FOPEN@
GNULIB_FPRINTF = @GNULIB_FPRINTF@
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
@@ -412,6 +423,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
@@ -428,6 +440,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALENAME = @GNULIB_LOCALENAME@
GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_LSTAT = @GNULIB_LSTAT@
@@ -666,6 +679,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -689,6 +703,9 @@ HAVE_FEATURES_H = @HAVE_FEATURES_H@
HAVE_FFS = @HAVE_FFS@
HAVE_FFSL = @HAVE_FFSL@
HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FNMATCH = @HAVE_FNMATCH@
+HAVE_FNMATCH_H = @HAVE_FNMATCH_H@
+HAVE_FREELOCALE = @HAVE_FREELOCALE@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSTATAT = @HAVE_FSTATAT@
HAVE_FSYNC = @HAVE_FSYNC@
@@ -701,13 +718,16 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
HAVE_GETLOGIN = @HAVE_GETLOGIN@
HAVE_GETOPT_H = @HAVE_GETOPT_H@
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -740,6 +760,7 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -810,7 +831,6 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
HAVE_TIMEGM = @HAVE_TIMEGM@
HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
HAVE_TZSET = @HAVE_TZSET@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
@@ -865,8 +885,6 @@ HAVE_WMEMSET = @HAVE_WMEMSET@
HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
HAVE__BOOL = @HAVE__BOOL@
HAVE__EXIT = @HAVE__EXIT@
-HOST_CPU = @HOST_CPU@
-HOST_CPU_C_ABI = @HOST_CPU_C_ABI@
INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
@@ -911,6 +929,7 @@ NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
+NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
@@ -938,6 +957,7 @@ NEXT_DIRENT_H = @NEXT_DIRENT_H@
NEXT_ERRNO_H = @NEXT_ERRNO_H@
NEXT_FCNTL_H = @NEXT_FCNTL_H@
NEXT_FLOAT_H = @NEXT_FLOAT_H@
+NEXT_FNMATCH_H = @NEXT_FNMATCH_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
@@ -998,9 +1018,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@
REPLACE_FDOPEN = @REPLACE_FDOPEN@
REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FNMATCH = @REPLACE_FNMATCH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREELOCALE = @REPLACE_FREELOCALE@
REPLACE_FREOPEN = @REPLACE_FREOPEN@
REPLACE_FSEEK = @REPLACE_FSEEK@
REPLACE_FSEEKO = @REPLACE_FSEEKO@
@@ -1018,6 +1040,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
REPLACE_GMTIME = @REPLACE_GMTIME@
REPLACE_ISATTY = @REPLACE_ISATTY@
@@ -1048,6 +1071,7 @@ REPLACE_MKNOD = @REPLACE_MKNOD@
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
REPLACE_MKTIME = @REPLACE_MKTIME@
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@
REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
@@ -1263,7 +1287,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits scripts/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnits scripts/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1538,6 +1561,8 @@ uninstall-am: uninstall-libexecSCRIPTS uninstall-sbinSCRIPTS
uninstall uninstall-am uninstall-libexecSCRIPTS \
uninstall-sbinSCRIPTS
+.PRECIOUS: Makefile
+
backup.sh: $(srcdir)/backup.sh.in
sed $(SED_CMD) $? > $@
diff --git a/scripts/backup-specs b/scripts/backup-specs
index da3b375e623b7aaf8186eac5b43c6b0b78cf21ac..20189ec4367bf5253739a5f6fb6e42299fae0f88 100644
--- a/scripts/backup-specs
+++ b/scripts/backup-specs
@@ -82,8 +82,7 @@ SLEEP_MESSAGE="`awk '
}' /dev/null`"
-# Copyright 2004, 2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/scripts/backup.sh.in b/scripts/backup.sh.in
index 15fc09d8187c95121494c1b0cb28dded45f94501..3ddb7efa79bf6836bcac358a7374e8eda17b191d 100644
--- a/scripts/backup.sh.in
+++ b/scripts/backup.sh.in
@@ -1,8 +1,7 @@
#! /bin/sh
# Make backups.
-# Copyright 2004-2006, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/scripts/dump-remind.in b/scripts/dump-remind.in
index 8f1aefca7236fd2cc86c9d03ace5c9eb3c8a0479..e480357631470fa5dcdf9f725ed0e99ef58b4cd6 100644
--- a/scripts/dump-remind.in
+++ b/scripts/dump-remind.in
@@ -8,8 +8,7 @@
# interested parties that a tape for the next volume of the backup needs to
# be put in the tape drive.
-# Copyright 2004-2005, 2010, 2012-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/scripts/restore.in b/scripts/restore.in
index 34d231327aae3dbe92639e4317a687514eed7646..ba80575d7f85213649fddbeff9deef53bdf33831 100644
--- a/scripts/restore.in
+++ b/scripts/restore.in
@@ -1,8 +1,7 @@
#! /bin/sh
# Restore backups.
-# Copyright 2004, 2006, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/src/Makefile.am b/src/Makefile.am
index 6abc1b3391daf03a4c6a547ca490782699f66f75..5fc081f7f91614df5b203d5b4a70f1af9bc6b96f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
# Makefile for GNU tar sources.
-# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2009, 2013-2014,
-# 2016-2017 Free Software Foundation, Inc.
+# Copyright 1994-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/src/Makefile.in b/src/Makefile.in
index 82f38c982fa309258db7180beb8477e8e52db276..61f06a27e49cfa1739ae77cd3bde683ae05280cb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,8 +16,7 @@
# Makefile for GNU tar sources.
-# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2009, 2013-2014,
-# 2016-2017 Free Software Foundation, Inc.
+# Copyright 1994-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -36,7 +35,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -100,13 +109,11 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = tar$(EXEEXT)
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+ $(top_srcdir)/m4/__inline.m4 \
$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \
- $(top_srcdir)/m4/asm-underscore.m4 \
$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \
$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \
$(top_srcdir)/m4/canonicalize.m4 \
@@ -126,11 +133,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/extern-inline.m4 \
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \
- $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \
- $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filenamecat.m4 \
- $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
- $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
+ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
+ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
+ $(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fileblocks.m4 \
+ $(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
+ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
+ $(top_srcdir)/m4/fnmatch_h.m4 $(top_srcdir)/m4/fpending.m4 \
$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
$(top_srcdir)/m4/futimens.m4 \
@@ -144,7 +152,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 \
$(top_srcdir)/m4/group-member.m4 \
- $(top_srcdir)/m4/hard-locale.m4 \
$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/human.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \
$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \
@@ -239,6 +246,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -315,6 +324,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/build-aux/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
@@ -406,6 +417,7 @@ GNULIB_FFSL = @GNULIB_FFSL@
GNULIB_FFSLL = @GNULIB_FFSLL@
GNULIB_FGETC = @GNULIB_FGETC@
GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FNMATCH = @GNULIB_FNMATCH@
GNULIB_FOPEN = @GNULIB_FOPEN@
GNULIB_FPRINTF = @GNULIB_FPRINTF@
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
@@ -438,6 +450,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
@@ -454,6 +467,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALENAME = @GNULIB_LOCALENAME@
GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_LSTAT = @GNULIB_LSTAT@
@@ -692,6 +706,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -715,6 +730,9 @@ HAVE_FEATURES_H = @HAVE_FEATURES_H@
HAVE_FFS = @HAVE_FFS@
HAVE_FFSL = @HAVE_FFSL@
HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FNMATCH = @HAVE_FNMATCH@
+HAVE_FNMATCH_H = @HAVE_FNMATCH_H@
+HAVE_FREELOCALE = @HAVE_FREELOCALE@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSTATAT = @HAVE_FSTATAT@
HAVE_FSYNC = @HAVE_FSYNC@
@@ -727,13 +745,16 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
HAVE_GETLOGIN = @HAVE_GETLOGIN@
HAVE_GETOPT_H = @HAVE_GETOPT_H@
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -766,6 +787,7 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -836,7 +858,6 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
HAVE_TIMEGM = @HAVE_TIMEGM@
HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
HAVE_TZSET = @HAVE_TZSET@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
@@ -891,8 +912,6 @@ HAVE_WMEMSET = @HAVE_WMEMSET@
HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
HAVE__BOOL = @HAVE__BOOL@
HAVE__EXIT = @HAVE__EXIT@
-HOST_CPU = @HOST_CPU@
-HOST_CPU_C_ABI = @HOST_CPU_C_ABI@
INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
@@ -937,6 +956,7 @@ NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
+NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
@@ -964,6 +984,7 @@ NEXT_DIRENT_H = @NEXT_DIRENT_H@
NEXT_ERRNO_H = @NEXT_ERRNO_H@
NEXT_FCNTL_H = @NEXT_FCNTL_H@
NEXT_FLOAT_H = @NEXT_FLOAT_H@
+NEXT_FNMATCH_H = @NEXT_FNMATCH_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
@@ -1024,9 +1045,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@
REPLACE_FDOPEN = @REPLACE_FDOPEN@
REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FNMATCH = @REPLACE_FNMATCH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREELOCALE = @REPLACE_FREELOCALE@
REPLACE_FREOPEN = @REPLACE_FREOPEN@
REPLACE_FSEEK = @REPLACE_FSEEK@
REPLACE_FSEEKO = @REPLACE_FSEEKO@
@@ -1044,6 +1067,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
REPLACE_GMTIME = @REPLACE_GMTIME@
REPLACE_ISATTY = @REPLACE_ISATTY@
@@ -1074,6 +1098,7 @@ REPLACE_MKNOD = @REPLACE_MKNOD@
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
REPLACE_MKTIME = @REPLACE_MKTIME@
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@
REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
@@ -1300,7 +1325,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnits src/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1630,6 +1654,8 @@ uninstall-am: uninstall-binPROGRAMS
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-binPROGRAMS
+.PRECIOUS: Makefile
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/arith.h b/src/arith.h
index c3430d7c537109d0ada7b1d25cc6942732bbd364..ef1f45f4d56c1250edf7aca335a80cc3606bb3dd 100644
--- a/src/arith.h
+++ b/src/arith.h
@@ -1,6 +1,5 @@
/* Long integers, for GNU tar.
- Copyright 1999, 2007, 2013-2014, 2016-2017 Free Software Foundation,
- Inc.
+ Copyright 1999-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/src/buffer.c b/src/buffer.c
index 51f299fddebb9cfd543e402424114ce9df3345fd..7781009a04407e97dac75b76eb32a0e2a09ed9e7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,7 +1,6 @@
/* Buffer management for tar.
- Copyright 1988, 1992-1994, 1996-1997, 1999-2010, 2013-2014, 2016-2017
- Free Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -281,7 +280,8 @@ enum compress_type {
ct_lzip,
ct_lzma,
ct_lzop,
- ct_xz
+ ct_xz,
+ ct_zstd
};
static enum compress_type archive_compression_type = ct_none;
@@ -310,6 +310,7 @@ static struct zip_magic const magic[] = {
{ ct_lzma, 6, "\xFFLZMA" },
{ ct_lzop, 4, "\211LZO" },
{ ct_xz, 6, "\xFD" "7zXZ" },
+ { ct_zstd, 4, "\x28\xB5\x2F\xFD" },
};
#define NMAGIC (sizeof(magic)/sizeof(magic[0]))
@@ -325,6 +326,7 @@ static struct zip_program zip_program[] = {
{ ct_lzma, XZ_PROGRAM, "-J" },
{ ct_lzop, LZOP_PROGRAM, "--lzop" },
{ ct_xz, XZ_PROGRAM, "-J" },
+ { ct_zstd, ZSTD_PROGRAM, "--zstd" },
{ ct_none }
};
@@ -1500,7 +1502,7 @@ try_new_volume (void)
if (!read_header0 (&dummy))
return false;
tar_stat_destroy (&dummy);
- assign_string (&volume_label, current_header->header.name);
+ ASSIGN_STRING_N (&volume_label, current_header->header.name);
set_next_block_after (header);
header = find_next_block ();
if (header->header.typeflag != GNUTYPE_MULTIVOL)
@@ -1510,7 +1512,7 @@ try_new_volume (void)
if (!read_header0 (&dummy))
return false;
tar_stat_destroy (&dummy);
- assign_string (&continued_file_name, current_header->header.name);
+ ASSIGN_STRING_N (&continued_file_name, current_header->header.name);
continued_file_size =
UINTMAX_FROM_HEADER (current_header->header.size);
continued_file_offset =
@@ -1653,15 +1655,7 @@ match_volume_label (void)
quote (volume_label_option)));
if (label->header.typeflag == GNUTYPE_VOLHDR)
{
- if (memchr (label->header.name, '\0', sizeof label->header.name))
- assign_string (&volume_label, label->header.name);
- else
- {
- volume_label = xmalloc (sizeof (label->header.name) + 1);
- memcpy (volume_label, label->header.name,
- sizeof (label->header.name));
- volume_label[sizeof (label->header.name)] = 0;
- }
+ ASSIGN_STRING_N (&volume_label, label->header.name);
}
else if (label->header.typeflag == XGLTYPE)
{
@@ -1697,8 +1691,7 @@ _write_volume_label (const char *str)
memset (label, 0, BLOCKSIZE);
strcpy (label->header.name, str);
- assign_string (¤t_stat_info.file_name,
- label->header.name);
+ assign_string (¤t_stat_info.file_name, label->header.name);
current_stat_info.had_trailing_slash =
strip_trailing_slashes (current_stat_info.file_name);
@@ -1768,15 +1761,19 @@ gnu_add_multi_volume_header (struct bufmap *map)
{
int tmp;
union block *block = find_next_block ();
+ size_t len = strlen (map->file_name);
- if (strlen (map->file_name) > NAME_FIELD_SIZE)
- WARN ((0, 0,
- _("%s: file name too long to be stored in a GNU multivolume header, truncated"),
- quotearg_colon (map->file_name)));
+ if (len > NAME_FIELD_SIZE)
+ {
+ WARN ((0, 0,
+ _("%s: file name too long to be stored in a GNU multivolume header, truncated"),
+ quotearg_colon (map->file_name)));
+ len = NAME_FIELD_SIZE;
+ }
memset (block, 0, BLOCKSIZE);
- strncpy (block->header.name, map->file_name, NAME_FIELD_SIZE);
+ memcpy (block->header.name, map->file_name, len);
block->header.typeflag = GNUTYPE_MULTIVOL;
OFF_TO_CHARS (map->sizeleft, block->header.size);
diff --git a/src/checkpoint.c b/src/checkpoint.c
index 4c86b52601de52a573c5c114f03d08dd984f0afd..18fc9203dfb8ffcdf5c769b3da610148654345a5 100644
--- a/src/checkpoint.c
+++ b/src/checkpoint.c
@@ -1,6 +1,6 @@
/* Checkpoint management for tar.
- Copyright 2007, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 2007-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -23,6 +23,7 @@
#include <sys/ioctl.h>
#include <termios.h>
#include "fprintftime.h"
+#include <signal.h>
enum checkpoint_opcode
{
@@ -32,7 +33,8 @@ enum checkpoint_opcode
cop_ttyout,
cop_sleep,
cop_exec,
- cop_totals
+ cop_totals,
+ cop_wait
};
struct checkpoint_action
@@ -43,6 +45,7 @@ struct checkpoint_action
{
time_t time;
char *command;
+ int signal;
} v;
};
@@ -52,6 +55,16 @@ static unsigned checkpoint;
/* List of checkpoint actions */
static struct checkpoint_action *checkpoint_action, *checkpoint_action_tail;
+/* State of the checkpoint system */
+enum {
+ CHKP_INIT, /* Needs initialization */
+ CHKP_COMPILE, /* Actions are being compiled */
+ CHKP_RUN /* Actions are being run */
+};
+static int checkpoint_state;
+/* Blocked signals */
+static sigset_t sigs;
+
static struct checkpoint_action *
alloc_action (enum checkpoint_opcode opcode)
{
@@ -85,6 +98,12 @@ checkpoint_compile_action (const char *str)
{
struct checkpoint_action *act;
+ if (checkpoint_state == CHKP_INIT)
+ {
+ sigemptyset (&sigs);
+ checkpoint_state = CHKP_COMPILE;
+ }
+
if (strcmp (str, ".") == 0 || strcmp (str, "dot") == 0)
alloc_action (cop_dot);
else if (strcmp (str, "bell") == 0)
@@ -117,6 +136,12 @@ checkpoint_compile_action (const char *str)
}
else if (strcmp (str, "totals") == 0)
alloc_action (cop_totals);
+ else if (strncmp (str, "wait=", 5) == 0)
+ {
+ act = alloc_action (cop_wait);
+ act->v.signal = decode_signal (str + 5);
+ sigaddset (&sigs, act->v.signal);
+ }
else
FATAL_ERROR ((0, 0, _("%s: unknown checkpoint action"), str));
}
@@ -124,15 +149,24 @@ checkpoint_compile_action (const char *str)
void
checkpoint_finish_compile (void)
{
- if (checkpoint_option)
+ if (checkpoint_state == CHKP_INIT
+ && checkpoint_option
+ && !checkpoint_action)
+ {
+ /* Provide a historical default */
+ checkpoint_compile_action ("echo");
+ }
+
+ if (checkpoint_state == CHKP_COMPILE)
{
- if (!checkpoint_action)
- /* Provide a historical default */
- checkpoint_compile_action ("echo");
+ sigprocmask (SIG_BLOCK, &sigs, NULL);
+
+ if (!checkpoint_option)
+ /* set default checkpoint rate */
+ checkpoint_option = DEFAULT_CHECKPOINT;
+
+ checkpoint_state = CHKP_RUN;
}
- else if (checkpoint_action)
- /* Otherwise, set default checkpoint rate */
- checkpoint_option = DEFAULT_CHECKPOINT;
}
static const char *checkpoint_total_format[] = {
@@ -390,6 +424,13 @@ run_checkpoint_actions (bool do_write)
case cop_totals:
compute_duration ();
print_total_stats ();
+ break;
+
+ case cop_wait:
+ {
+ int n;
+ sigwait (&sigs, &n);
+ }
}
}
}
diff --git a/src/common.h b/src/common.h
index bbe167efd4e59e92452a7e570c4a35fa842e66cd..501e0d3a777b82f92a19b9652df5a75c595c379a 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,7 +1,6 @@
/* Common declarations for the tar program.
- Copyright 1988, 1992-1994, 1996-1997, 1999-2010, 2012-2017 Free
- Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -302,6 +301,10 @@ enum hole_detection_method
GLOBAL enum hole_detection_method hole_detection;
+/* The first entry in names.c:namelist specifies the member name to
+ start extracting from. Set by add_starting_file() upon seeing the
+ -K option.
+*/
GLOBAL bool starting_file_option;
/* Specified maximum byte length of each tape volume (multiple of 1024). */
@@ -628,6 +631,8 @@ void skip_member (void);
char const *quote_n_colon (int n, char const *arg);
void assign_string (char **dest, const char *src);
+void assign_string_n (char **string, const char *value, size_t n);
+#define ASSIGN_STRING_N(s,v) assign_string_n (s, v, sizeof (v))
int unquote_string (char *str);
char *zap_slashes (char *name);
char *normalize_filename (int cdidx, const char *name);
@@ -750,6 +755,7 @@ const char *name_next (int change_dirs);
void name_gather (void);
struct name *addname (char const *string, int change_dir,
bool cmdline, struct name *parent);
+void add_starting_file (char const *file_name);
void remname (struct name *name);
bool name_match (const char *name);
void names_notfound (void);
@@ -791,6 +797,8 @@ void set_exit_status (int val);
void request_stdin (const char *option);
+int decode_signal (const char *);
+
/* Where an option comes from: */
enum option_source
{
@@ -829,6 +837,7 @@ void xheader_store (char const *keyword, struct tar_stat_info *st,
void xheader_read (struct xheader *xhdr, union block *header, off_t size);
void xheader_write (char type, char *name, time_t t, struct xheader *xhdr);
void xheader_write_global (struct xheader *xhdr);
+void xheader_forbid_global (void);
void xheader_finish (struct xheader *hdr);
void xheader_destroy (struct xheader *hdr);
char *xheader_xhdr_name (struct tar_stat_info *st);
diff --git a/src/compare.c b/src/compare.c
index fee137297ed70f901c85a23da1861ef24780538f..419fc9fd3e20121eba6ca08c509167d5b09a7705 100644
--- a/src/compare.c
+++ b/src/compare.c
@@ -1,7 +1,6 @@
/* Diff files from a tar archive.
- Copyright 1988, 1992-1994, 1996-1997, 1999-2001, 2003-2007,
- 2009-2010, 2012-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/src/create.c b/src/create.c
index 35bcf5b0c878f1adff2bcd69c4dc0b416800c42c..bb9c115b76c3bddda7994357a4d6e679c6d05c40 100644
--- a/src/create.c
+++ b/src/create.c
@@ -1,7 +1,6 @@
/* Create a tar archive.
- Copyright 1985, 1992-1994, 1996-1997, 1999-2001, 2003-2007,
- 2009-2010, 2012-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 1985-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -518,8 +517,8 @@ start_private_header (const char *name, size_t size, time_t t)
MODE_TO_CHARS (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, header->header.mode);
UID_TO_CHARS (0, header->header.uid);
GID_TO_CHARS (0, header->header.gid);
- strncpy (header->header.magic, TMAGIC, TMAGLEN);
- strncpy (header->header.version, TVERSION, TVERSLEN);
+ memcpy (header->header.magic, TMAGIC, TMAGLEN);
+ memcpy (header->header.version, TVERSION, TVERSLEN);
return header;
}
@@ -917,8 +916,8 @@ start_header (struct tar_stat_info *st)
case POSIX_FORMAT:
case USTAR_FORMAT:
- strncpy (header->header.magic, TMAGIC, TMAGLEN);
- strncpy (header->header.version, TVERSION, TVERSLEN);
+ memcpy (header->header.magic, TMAGIC, TMAGLEN);
+ memcpy (header->header.version, TVERSION, TVERSLEN);
break;
default:
diff --git a/src/delete.c b/src/delete.c
index 9044ba2cc805554166d4139ff76655d2617da61c..f86e011bfe42f54bf8375060a24761f9a7feeca8 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -1,7 +1,6 @@
/* Delete entries from a tar archive.
- Copyright 1988, 1992, 1994, 1996-1997, 2000-2001, 2003-2006, 2010,
- 2013-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/src/exclist.c b/src/exclist.c
index f20b98e581ebda310377374a3152b1be4681bffd..288f3be8b1b3a99e38d61fb8c394af64fbd51f98 100644
--- a/src/exclist.c
+++ b/src/exclist.c
@@ -1,6 +1,6 @@
/* Per-directory exclusion files for tar.
- Copyright 2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 2014-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/src/exit.c b/src/exit.c
index 49443184d5990bf5e2b7abb24b43f37765deadf8..42d9da7228391513f51a53450485eccc46993422 100644
--- a/src/exit.c
+++ b/src/exit.c
@@ -1,6 +1,6 @@
/* Exit from GNU tar.
- Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 2009-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/src/extract.c b/src/extract.c
index 395db557328ad34952924a48052fe629935ac46f..8276f8fe25d66737fd81cc4734f3bb5d4e78be52 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -1,7 +1,6 @@
/* Extract files from a tar archive.
- Copyright 1988, 1992-1994, 1996-2001, 2003-2007, 2010, 2012-2014,
- 2016-2017 Free Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -788,6 +787,7 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made)
case UNLINK_FIRST_OLD_FILES:
break;
}
+ FALLTHROUGH;
case ENOENT:
/* Attempt creating missing intermediate directories. */
diff --git a/src/incremen.c b/src/incremen.c
index ca611f65064bfd85629d511522284e1c52758149..417ce3954e02f5fec5174d846f86f397d1f925d0 100644
--- a/src/incremen.c
+++ b/src/incremen.c
@@ -1,7 +1,6 @@
/* GNU dump extensions to tar.
- Copyright 1988, 1992-1994, 1996-1997, 1999-2001, 2003-2009,
- 2013-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -915,6 +914,7 @@ store_rename (struct directory *dir, struct obstack *stk)
obstack_code_rename (stk, p->orig->name, p->name);
obstack_code_rename (stk, "", prev->name);
+ free (temp_name);
}
}
}
@@ -997,10 +997,10 @@ read_incr_db_01 (int version, const char *initbuf)
newer_mtime_option = decode_timespec (buf, &ebuf, false);
if (! valid_timespec (newer_mtime_option))
- ERROR ((0, errno, "%s:%ld: %s",
- quotearg_colon (listed_incremental_option),
- lineno,
- _("Invalid time stamp")));
+ FATAL_ERROR ((0, errno, "%s:%ld: %s",
+ quotearg_colon (listed_incremental_option),
+ lineno,
+ _("Invalid time stamp")));
else
{
if (version == 1 && *ebuf)
@@ -1042,9 +1042,9 @@ read_incr_db_01 (int version, const char *initbuf)
mtime = decode_timespec (strp, &ebuf, false);
strp = ebuf;
if (!valid_timespec (mtime) || *strp != ' ')
- ERROR ((0, errno, "%s:%ld: %s",
- quotearg_colon (listed_incremental_option), lineno,
- _("Invalid modification time")));
+ FATAL_ERROR ((0, errno, "%s:%ld: %s",
+ quotearg_colon (listed_incremental_option), lineno,
+ _("Invalid modification time")));
errno = 0;
u = strtoumax (strp, &ebuf, 10);
@@ -1052,9 +1052,9 @@ read_incr_db_01 (int version, const char *initbuf)
errno = ERANGE;
if (errno || strp == ebuf || *ebuf != ' ')
{
- ERROR ((0, errno, "%s:%ld: %s",
- quotearg_colon (listed_incremental_option), lineno,
- _("Invalid modification time (nanoseconds)")));
+ FATAL_ERROR ((0, errno, "%s:%ld: %s",
+ quotearg_colon (listed_incremental_option), lineno,
+ _("Invalid modification time (nanoseconds)")));
mtime.tv_nsec = -1;
}
else
@@ -1068,17 +1068,17 @@ read_incr_db_01 (int version, const char *initbuf)
TYPE_MINIMUM (dev_t), TYPE_MAXIMUM (dev_t));
strp = ebuf;
if (errno || *strp != ' ')
- ERROR ((0, errno, "%s:%ld: %s",
+ FATAL_ERROR ((0, errno, "%s:%ld: %s",
quotearg_colon (listed_incremental_option), lineno,
- _("Invalid device number")));
+ _("Invalid device number")));
ino = strtosysint (strp, &ebuf,
TYPE_MINIMUM (ino_t), TYPE_MAXIMUM (ino_t));
strp = ebuf;
if (errno || *strp != ' ')
- ERROR ((0, errno, "%s:%ld: %s",
- quotearg_colon (listed_incremental_option), lineno,
- _("Invalid inode number")));
+ FATAL_ERROR ((0, errno, "%s:%ld: %s",
+ quotearg_colon (listed_incremental_option), lineno,
+ _("Invalid inode number")));
strp++;
unquote_string (strp);
diff --git a/src/list.c b/src/list.c
index 14388a557ae67a67dc2cb7e67c077c42a266357d..a985bcc144a0808b2dbc049a2cabec252cd02e58 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1,7 +1,6 @@
/* List a tar archive, with support routines for reading a tar archive.
- Copyright 1988, 1992-1994, 1996-2001, 2003-2007, 2010, 2012-2017 Free
- Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -23,7 +22,7 @@
#include <system.h>
#include <inttostr.h>
#include <quotearg.h>
-
+#include <time.h>
#include "common.h"
union block *current_header; /* points to current archive header */
@@ -631,10 +630,12 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
stat_info->stat.st_mode = mode;
stat_info->mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime);
stat_info->mtime.tv_nsec = 0;
- assign_string (&stat_info->uname,
- header->header.uname[0] ? header->header.uname : NULL);
- assign_string (&stat_info->gname,
- header->header.gname[0] ? header->header.gname : NULL);
+ assign_string_n (&stat_info->uname,
+ header->header.uname[0] ? header->header.uname : NULL,
+ sizeof (header->header.uname));
+ assign_string_n (&stat_info->gname,
+ header->header.gname[0] ? header->header.gname : NULL,
+ sizeof (header->header.gname));
xheader_xattr_init (stat_info);
@@ -1049,15 +1050,11 @@ tartime (struct timespec t, bool full_time)
{
if (full_time)
{
- sprintf (buffer, "%04ld-%02d-%02d %02d:%02d:%02d",
- tm->tm_year + 1900L, tm->tm_mon + 1, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec);
+ strftime (buffer, sizeof buffer, "%Y-%m-%d %H:%M:%S", tm);
code_ns_fraction (ns, buffer + strlen (buffer));
}
else
- sprintf (buffer, "%04ld-%02d-%02d %02d:%02d",
- tm->tm_year + 1900L, tm->tm_mon + 1, tm->tm_mday,
- tm->tm_hour, tm->tm_min);
+ strftime (buffer, sizeof buffer, "%Y-%m-%d %H:%M", tm);
return buffer;
}
@@ -1443,7 +1440,7 @@ test_archive_label (void)
decode_header (current_header,
¤t_stat_info, ¤t_format, 0);
if (current_header->header.typeflag == GNUTYPE_VOLHDR)
- assign_string (&volume_label, current_header->header.name);
+ ASSIGN_STRING_N (&volume_label, current_header->header.name);
if (volume_label)
{
diff --git a/src/map.c b/src/map.c
index 770e4f563fbf8c58ef0a852c2000eb55ca58f1b3..f2ed6cd32a13b17baf5a1f441449b65d6c5518bd 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,6 +1,6 @@
/* Owner/group mapping for tar
- Copyright 2015-2017 Free Software Foundation, Inc.
+ Copyright 2015-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/src/misc.c b/src/misc.c
index cd07f530e3aa3f2e7f92f95f96656ab4d4e9f8d2..cb7254f266c4e2d7d41387c083e9edfff50f0047 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,7 +1,6 @@
/* Miscellaneous functions, not really specific to GNU tar.
- Copyright 1988, 1992, 1994-1997, 1999-2001, 2003-2007, 2009-2010,
- 2012-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -50,6 +49,20 @@ assign_string (char **string, const char *value)
*string = value ? xstrdup (value) : 0;
}
+void
+assign_string_n (char **string, const char *value, size_t n)
+{
+ free (*string);
+ if (value)
+ {
+ size_t l = strnlen (value, n);
+ char *p = xmalloc (l + 1);
+ memcpy (p, value, l);
+ p[l] = 0;
+ *string = p;
+ }
+}
+
#if 0
/* This function is currently unused; perhaps it should be removed? */
@@ -727,7 +740,7 @@ maybe_backup_file (const char *file_name, bool this_is_the_archive)
&& (S_ISBLK (file_stat.st_mode) || S_ISCHR (file_stat.st_mode)))
return true;
- after_backup_name = find_backup_file_name (file_name, backup_type);
+ after_backup_name = find_backup_file_name (chdir_fd, file_name, backup_type);
if (! after_backup_name)
xalloc_die ();
diff --git a/src/names.c b/src/names.c
index f6ad9fe0a64254789dfd9092f17db7b7da45c6f0..28ae21f9a1b2894d4a57b70b37da8b70a135338c 100644
--- a/src/names.c
+++ b/src/names.c
@@ -1,7 +1,6 @@
/* Various processing of names.
- Copyright 1988, 1992, 1994, 1996-2001, 2003-2007, 2009, 2013-2017
- Free Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -1227,6 +1226,34 @@ addname (char const *string, int change_dir, bool cmdline, struct name *parent)
return name;
}
+void
+add_starting_file (char const *file_name)
+{
+ struct name *name = make_name (file_name);
+
+ if (starting_file_option)
+ {
+ struct name *head = namelist;
+ remname (head);
+ free_name (head);
+ }
+
+ name->prev = NULL;
+ name->next = namelist;
+ namelist = name;
+ if (!nametail)
+ nametail = namelist;
+
+ name->found_count = 0;
+ name->matching_flags = INCLUDE_OPTIONS;
+ name->change_dir = 0;
+ name->directory = NULL;
+ name->parent = NULL;
+ name->cmdline = true;
+
+ starting_file_option = true;
+}
+
/* Find a match for FILE_NAME (whose string length is LENGTH) in the name
list. */
static struct name *
@@ -1283,19 +1310,22 @@ name_match (const char *file_name)
}
cursor = namelist_match (file_name, length);
+ if (starting_file_option)
+ {
+ /* If starting_file_option is set, the head of the list is the name
+ of the member to start extraction from. Skip the match unless it
+ is head. */
+ if (cursor == namelist)
+ starting_file_option = false;
+ else
+ cursor = NULL;
+ }
if (cursor)
{
if (!(ISSLASH (file_name[cursor->length]) && recursion_option)
|| cursor->found_count == 0)
cursor->found_count++; /* remember it matched */
- if (starting_file_option)
- {
- free (namelist);
- namelist = NULL;
- nametail = NULL;
- }
chdir_do (cursor->change_dir);
-
/* We got a match. */
return ISFOUND (cursor);
}
@@ -1767,6 +1797,11 @@ collect_and_sort_names (void)
name->found_count++;
add_hierarchy_to_namelist (&st, name);
}
+ else
+ {
+ errno = ENOTDIR;
+ open_diag (name->name);
+ }
}
}
@@ -1821,7 +1856,7 @@ collect_and_sort_names (void)
if (listed_incremental_option)
{
- for (name = namelist; name && name->name[0] == 0; name++)
+ for (name = namelist; name && name->name[0] == 0; name = name->next)
;
if (name)
append_incremental_renames (name->directory);
diff --git a/src/sparse.c b/src/sparse.c
index d41c0eacd1f355284a4cdb185c1d3c00bf4f0c08..d642a46384685bcd200c0b2e74e8895be958bbe1 100644
--- a/src/sparse.c
+++ b/src/sparse.c
@@ -1,6 +1,6 @@
/* Functions for dealing with sparse files
- Copyright 2003-2007, 2010, 2013-2017 Free Software Foundation, Inc.
+ Copyright 2003-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -427,6 +427,30 @@ sparse_dump_region (struct tar_sparse_file *file, size_t i)
bufsize);
return false;
}
+ else if (bytes_read == 0)
+ {
+ char buf[UINTMAX_STRSIZE_BOUND];
+ struct stat st;
+ size_t n;
+ if (fstat (file->fd, &st) == 0)
+ n = file->stat_info->stat.st_size - st.st_size;
+ else
+ n = file->stat_info->stat.st_size
+ - (file->stat_info->sparse_map[i].offset
+ + file->stat_info->sparse_map[i].numbytes
+ - bytes_left);
+
+ WARNOPT (WARN_FILE_SHRANK,
+ (0, 0,
+ ngettext ("%s: File shrank by %s byte; padding with zeros",
+ "%s: File shrank by %s bytes; padding with zeros",
+ n),
+ quotearg_colon (file->stat_info->orig_file_name),
+ STRINGIFY_BIGINT (n, buf)));
+ if (! ignore_failed_read_option)
+ set_exit_status (TAREXIT_DIFFERS);
+ return false;
+ }
memset (blk->buffer + bytes_read, 0, BLOCKSIZE - bytes_read);
bytes_left -= bytes_read;
@@ -464,9 +488,9 @@ sparse_extract_region (struct tar_sparse_file *file, size_t i)
return false;
}
set_next_block_after (blk);
+ file->dumped_size += BLOCKSIZE;
count = blocking_write (file->fd, blk->buffer, wrbytes);
write_size -= count;
- file->dumped_size += count;
mv_size_left (file->stat_info->archive_file_size - file->dumped_size);
file->offset += count;
if (count != wrbytes)
@@ -598,6 +622,12 @@ check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end)
rdsize);
return false;
}
+ else if (bytes_read == 0)
+ {
+ report_difference (file->stat_info, _("Size differs"));
+ return false;
+ }
+
if (!zero_block_p (diff_buffer, bytes_read))
{
char begbuf[INT_BUFSIZE_BOUND (off_t)];
@@ -609,6 +639,7 @@ check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end)
beg += bytes_read;
}
+
return true;
}
@@ -635,6 +666,7 @@ check_data_region (struct tar_sparse_file *file, size_t i)
return false;
}
set_next_block_after (blk);
+ file->dumped_size += BLOCKSIZE;
bytes_read = safe_read (file->fd, diff_buffer, rdsize);
if (bytes_read == SAFE_READ_ERROR)
{
@@ -645,7 +677,11 @@ check_data_region (struct tar_sparse_file *file, size_t i)
rdsize);
return false;
}
- file->dumped_size += bytes_read;
+ else if (bytes_read == 0)
+ {
+ report_difference (¤t_stat_info, _("Size differs"));
+ return false;
+ }
size_left -= bytes_read;
mv_size_left (file->stat_info->archive_file_size - file->dumped_size);
if (memcmp (blk->buffer, diff_buffer, rdsize))
@@ -1213,7 +1249,8 @@ pax_decode_header (struct tar_sparse_file *file)
union block *blk;
char *p;
size_t i;
-
+ off_t start;
+
#define COPY_BUF(b,buf,src) do \
{ \
char *endp = b->buffer + BLOCKSIZE; \
@@ -1229,8 +1266,9 @@ pax_decode_header (struct tar_sparse_file *file)
if (src == endp) \
{ \
set_next_block_after (b); \
- file->dumped_size += BLOCKSIZE; \
b = find_next_block (); \
+ if (!b) \
+ FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); \
src = b->buffer; \
endp = b->buffer + BLOCKSIZE; \
} \
@@ -1240,9 +1278,11 @@ pax_decode_header (struct tar_sparse_file *file)
dst[-1] = 0; \
} while (0)
+ start = current_block_ordinal ();
set_next_block_after (current_header);
- file->dumped_size += BLOCKSIZE;
blk = find_next_block ();
+ if (!blk)
+ FATAL_ERROR ((0, 0, _("Unexpected EOF in archive")));
p = blk->buffer;
COPY_BUF (blk,nbuf,p);
if (!decode_num (&u, nbuf, TYPE_MAXIMUM (size_t)))
@@ -1278,6 +1318,8 @@ pax_decode_header (struct tar_sparse_file *file)
sparse_add_map (file->stat_info, &sp);
}
set_next_block_after (blk);
+
+ file->dumped_size += BLOCKSIZE * (current_block_ordinal () - start);
}
return true;
diff --git a/src/suffix.c b/src/suffix.c
index 47027e7315142834d85b0dfd04090b8f6cd6790e..370b048dc718cc4c1e185c908c645d8cc0b6ef62 100644
--- a/src/suffix.c
+++ b/src/suffix.c
@@ -1,6 +1,5 @@
/* This file is part of GNU tar.
- Copyright 2007, 2009, 2013-2014, 2016-2017 Free Software Foundation,
- Inc.
+ Copyright 2007-2019 Free Software Foundation, Inc.
Written by Sergey Poznyakoff.
@@ -46,6 +45,8 @@ static struct compression_suffix compression_suffixes[] = {
{ S(lzo, LZOP) },
{ S(xz, XZ) },
{ S(txz, XZ) }, /* Slackware */
+ { S(zst, ZSTD) },
+ { S(tzst, ZSTD) },
{ NULL }
#undef S
#undef __CAT2__
@@ -60,7 +61,7 @@ find_compression_suffix (const char *name, size_t *ret_len)
{
size_t len;
struct compression_suffix *p;
-
+
suf++;
len = strlen (suf);
@@ -99,10 +100,14 @@ strip_compression_suffix (const char *name)
{
char *s = NULL;
size_t len;
+ struct compression_suffix const *p = find_compression_suffix (name, &len);
- if (find_compression_suffix (name, &len))
+ if (p)
{
- if (strncmp (name + len - 4, ".tar", 4) == 0)
+ /* Strip an additional ".tar" suffix, but only if the just-stripped
+ "outer" suffix did not begin with "t". */
+ if (len > 4 && strncmp (name + len - 4, ".tar", 4) == 0
+ && p->suffix[0] != 't')
len -= 4;
if (len == 0)
return NULL;
@@ -112,4 +117,3 @@ strip_compression_suffix (const char *name)
}
return s;
}
-
diff --git a/src/system.c b/src/system.c
index b4f698535dd82dce6ee4ccf4ba5fdd7aafda12e4..e1c567230704788c17e3759b9e7c4763e6be1b17 100644
--- a/src/system.c
+++ b/src/system.c
@@ -1,7 +1,6 @@
/* System-dependent calls for tar.
- Copyright 2003-2008, 2010, 2013-2014, 2016-2017 Free Software
- Foundation, Inc.
+ Copyright 2003-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/src/tar.c b/src/tar.c
index 3f844a8fd8dce372c59e1593d7ee38eea9dfbcff..d66fed8696fc41e8682792b1ede3872c7b21dcfe 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -1,7 +1,6 @@
/* A tar (tape archiver) program.
- Copyright 1988, 1992-1997, 1999-2001, 2003-2007, 2012-2017 Free
- Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
Written by John Gilmore, starting 1985-08-25.
@@ -348,7 +347,8 @@ enum
WARNING_OPTION,
XATTR_OPTION,
XATTR_EXCLUDE,
- XATTR_INCLUDE
+ XATTR_INCLUDE,
+ ZSTD_OPTION,
};
static char const doc[] = N_("\
@@ -682,6 +682,7 @@ static struct argp_option options[] = {
{"lzma", LZMA_OPTION, 0, 0, NULL, GRID+1 },
{"lzop", LZOP_OPTION, 0, 0, NULL, GRID+1 },
{"xz", 'J', 0, 0, NULL, GRID+1 },
+ {"zstd", ZSTD_OPTION, 0, 0, NULL, GRID+1 },
#undef GRID
#define GRID 100
@@ -974,36 +975,37 @@ stat_on_signal (int signo)
#endif
}
-static void
-set_stat_signal (const char *name)
+int
+decode_signal (const char *name)
{
static struct sigtab
{
char const *name;
int signo;
} const sigtab[] = {
- { "SIGUSR1", SIGUSR1 },
{ "USR1", SIGUSR1 },
- { "SIGUSR2", SIGUSR2 },
{ "USR2", SIGUSR2 },
- { "SIGHUP", SIGHUP },
{ "HUP", SIGHUP },
- { "SIGINT", SIGINT },
{ "INT", SIGINT },
- { "SIGQUIT", SIGQUIT },
{ "QUIT", SIGQUIT }
};
struct sigtab const *p;
+ char const *s = name;
+ if (strncmp (s, "SIG", 3) == 0)
+ s += 3;
for (p = sigtab; p < sigtab + sizeof (sigtab) / sizeof (sigtab[0]); p++)
- if (strcmp (p->name, name) == 0)
- {
- stat_on_signal (p->signo);
- return;
- }
+ if (strcmp (p->name, s) == 0)
+ return p->signo;
FATAL_ERROR ((0, 0, _("Unknown signal name: %s"), name));
}
+static void
+set_stat_signal (const char *name)
+{
+ stat_on_signal (decode_signal (name));
+}
+
struct textual_date
{
@@ -1129,6 +1131,10 @@ tar_help_filter (int key, const char *text, void *input)
s = xasprintf (_("filter the archive through %s"), XZ_PROGRAM);
break;
+ case ZSTD_OPTION:
+ s = xasprintf (_("filter the archive through %s"), ZSTD_PROGRAM);
+ break;
+
case ARGP_KEY_HELP_EXTRA:
{
const char *tstr;
@@ -1151,7 +1157,7 @@ tar_help_filter (int key, const char *text, void *input)
return s;
}
-static char *
+static char * _GL_ATTRIBUTE_MALLOC
expand_pax_option (struct tar_args *targs, const char *arg)
{
struct obstack stk;
@@ -1437,8 +1443,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
case 'K':
optloc_save (OC_STARTING_FILE, args->loc);
- starting_file_option = true;
- addname (arg, 0, true, NULL);
+ add_starting_file (arg);
break;
case ONE_FILE_SYSTEM_OPTION:
@@ -1650,6 +1655,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
set_use_compress_program_option (COMPRESS_PROGRAM, args->loc);
break;
+ case ZSTD_OPTION:
+ set_use_compress_program_option (ZSTD_PROGRAM, args->loc);
+ break;
+
case ATIME_PRESERVE_OPTION:
atime_preserve_option =
(arg
@@ -2656,7 +2665,28 @@ decode_options (int argc, char **argv)
report_textual_dates (&args);
}
-
+
+#ifdef ENABLE_ERROR_PRINT_PROGNAME
+/* The error() function from glibc correctly prefixes each message it
+ prints with program_name as set by set_program_name. However, its
+ replacement from gnulib, which is linked in on systems where this
+ function is not available, prints the name returned by getprogname()
+ instead. Due to this messages output by tar subprocess (which sets its
+ program name to 'tar (child)') become indiscernible from those printed
+ by the main process. In particular, this breaks the remfiles01.at and
+ remfiles02.at test cases.
+
+ To avoid this, on such systems the following helper function is used
+ to print proper program name. Its address is assigned to the
+ error_print_progname variable, which error() then uses instead of
+ printing getprogname() result.
+ */
+static void
+tar_print_progname (void)
+{
+ fprintf (stderr, "%s: ", program_name);
+}
+#endif
/* Tar proper. */
@@ -2666,7 +2696,9 @@ main (int argc, char **argv)
{
set_start_time ();
set_program_name (argv[0]);
-
+#ifdef ENABLE_ERROR_PRINT_PROGNAME
+ error_print_progname = tar_print_progname;
+#endif
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
diff --git a/src/tar.h b/src/tar.h
index 858b990da98c26614ff7d5485d979f4d8a95d532..724b3a85298fdb5eb926bb52612143033fd4a522 100644
--- a/src/tar.h
+++ b/src/tar.h
@@ -1,7 +1,6 @@
/* GNU tar Archive Format description.
- Copyright 1988-1989, 1991-1997, 2000-2001, 2003-2007, 2012-2014,
- 2016-2017 Free Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/src/transform.c b/src/transform.c
index e450dd22ee91f2d1e99c8b4c2d9e00b401cd7af7..d0ac2a5275175811b4e71fcf7f527ebf7d3791ac 100644
--- a/src/transform.c
+++ b/src/transform.c
@@ -1,6 +1,5 @@
/* This file is part of GNU tar.
- Copyright 2006-2008, 2013-2014, 2016-2017 Free Software Foundation,
- Inc.
+ Copyright 2006-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -101,7 +100,7 @@ add_segment (struct transform *tf)
}
static void
-add_literal_segment (struct transform *tf, char *str, char *end)
+add_literal_segment (struct transform *tf, const char *str, const char *end)
{
size_t len = end - str;
if (len)
@@ -273,7 +272,7 @@ parse_transform_expr (const char *expr)
USAGE_ERROR ((0, 0, _("Invalid transform expression: %s"), errbuf));
}
- if (str[0] == '^' || str[strlen (str) - 1] == '$')
+ if (str[0] == '^' || (i > 2 && str[i - 3] == '$'))
tf->transform_type = transform_first;
free (str);
@@ -403,6 +402,7 @@ parse_transform_expr (const char *expr)
cur++;
}
add_literal_segment (tf, beg, cur);
+ free(str);
return p;
}
@@ -550,7 +550,7 @@ _single_transform_name_to_obstack (struct transform *tf, char *input)
default:
break;
}
- /*FALL THROUGH*/
+ FALLTHROUGH;
case ctl_upcase:
case ctl_locase:
diff --git a/src/unlink.c b/src/unlink.c
index 6719e7dda6bcd4ab8b49ab49d726e46993f11653..5a72f701288d30075b93328eff95cb3ced7ddb22 100644
--- a/src/unlink.c
+++ b/src/unlink.c
@@ -1,6 +1,6 @@
/* Unlink files.
- Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 2009-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -127,7 +127,9 @@ flush_deferred_unlinks (bool force)
case EEXIST:
/* OpenSolaris >=10 sets EEXIST instead of ENOTEMPTY
if trying to remove a non-empty directory */
+#if defined ENOTEMPTY && ENOTEMPTY != EEXIST
case ENOTEMPTY:
+#endif
/* Keep the record in list, in the hope we'll
be able to remove it later */
prev = p;
diff --git a/src/update.c b/src/update.c
index 2f823e45a02a29e5719a0a43dd1b6472217b34bb..38b5ce15589283494d307ec2ef9a2ae4a5c1eeaf 100644
--- a/src/update.c
+++ b/src/update.c
@@ -1,7 +1,6 @@
/* Update a tar archive.
- Copyright 1988, 1992, 1994, 1996-1997, 1999-2001, 2003-2005, 2007,
- 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 1988-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -111,7 +110,7 @@ update_archive (void)
name_gather ();
open_archive (ACCESS_UPDATE);
- buffer_write_global_xheader ();
+ xheader_forbid_global ();
while (!found_end)
{
diff --git a/src/utf8.c b/src/utf8.c
index a018ce0a9169b0868bada7ce0efd711e7cb5c26f..53a1ab21bd5311a58aa454cd32512f0bfd7b307b 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -1,7 +1,6 @@
/* Charset handling for GNU tar.
- Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
- Foundation, Inc.
+ Copyright 2004-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -36,11 +35,14 @@
# define iconv_open(tocode, fromcode) ((iconv_t) -1)
# undef iconv
-# define iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft) ((size_t) 0)
+# define iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft) (errno = ENOSYS, (size_t) -1)
# undef iconv_close
# define iconv_close(cd) 0
+# undef iconv_t
+# define iconv_t int
+
#endif
@@ -65,10 +67,9 @@ bool
utf8_convert (bool to_utf, char const *input, char **output)
{
char ICONV_CONST *ib;
- char *ob;
+ char *ob, *ret;
size_t inlen;
size_t outlen;
- size_t rc;
iconv_t cd = utf8_init (to_utf);
if (cd == 0)
@@ -81,11 +82,27 @@ utf8_convert (bool to_utf, char const *input, char **output)
inlen = strlen (input) + 1;
outlen = inlen * MB_LEN_MAX + 1;
- ob = *output = xmalloc (outlen);
+ ob = ret = xmalloc (outlen);
ib = (char ICONV_CONST *) input;
- rc = iconv (cd, &ib, &inlen, &ob, &outlen);
+ /* According to POSIX, "if iconv() encounters a character in the input
+ buffer that is valid, but for which an identical character does not
+ exist in the target codeset, iconv() shall perform an
+ implementation-defined conversion on this character." It will "update
+ the variables pointed to by the arguments to reflect the extent of the
+ conversion and return the number of non-identical conversions performed".
+ On error, it returns -1.
+ In other words, non-zero return always indicates failure, either because
+ the input was not fully converted, or because it was converted in a
+ non-reversible way.
+ */
+ if (iconv (cd, &ib, &inlen, &ob, &outlen) != 0)
+ {
+ free (ret);
+ return false;
+ }
*ob = 0;
- return rc != -1;
+ *output = ret;
+ return true;
}
diff --git a/src/warning.c b/src/warning.c
index bfcd2d276c47f270a4faef675cbbbdb9e29da4f4..8851b24e3c0d37b372213347634bbb2e41ff44d1 100644
--- a/src/warning.c
+++ b/src/warning.c
@@ -1,6 +1,6 @@
/* Warnings for GNU tar.
- Copyright 2009, 2012-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright 2009-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/src/xattrs.c b/src/xattrs.c
index 5049d08bc121fd526776149d76e5662c59046b7b..df65460ea1df07402e9ea8324f69d1a60446adfd 100644
--- a/src/xattrs.c
+++ b/src/xattrs.c
@@ -1,6 +1,6 @@
/* Support for extended attributes.
- Copyright (C) 2006-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -246,13 +246,36 @@ xattrs__acls_set (struct tar_stat_info const *st,
acl_free (acl);
}
+/* Cleanup textual representation of the ACL in VAL by eliminating tab
+ characters and comments */
+static void
+xattrs_acls_cleanup (char *val, size_t *plen)
+{
+ char *p, *q;
+
+ p = q = val + strcspn (val, "#\t");
+ while (*q)
+ {
+ if (*q == '\t')
+ q++;
+ else if (*q == '#')
+ {
+ while (*q != '\n')
+ q++;
+ }
+ else
+ *p++ = *q++;
+ }
+ *plen = p - val;
+ *p++ = 0;
+}
+
static void
xattrs__acls_get_a (int parentfd, const char *file_name,
struct tar_stat_info *st,
char **ret_ptr, size_t * ret_len)
{
char *val = NULL;
- ssize_t len;
acl_t acl;
if (!(acl = acl_get_file_at (parentfd, file_name, ACL_TYPE_ACCESS)))
@@ -262,7 +285,7 @@ xattrs__acls_get_a (int parentfd, const char *file_name,
return;
}
- val = acl_to_text (acl, &len);
+ val = acl_to_text (acl, NULL);
acl_free (acl);
if (!val)
@@ -272,8 +295,7 @@ xattrs__acls_get_a (int parentfd, const char *file_name,
}
*ret_ptr = xstrdup (val);
- *ret_len = len;
-
+ xattrs_acls_cleanup (*ret_ptr, ret_len);
acl_free (val);
}
@@ -284,7 +306,6 @@ xattrs__acls_get_d (int parentfd, char const *file_name,
char **ret_ptr, size_t * ret_len)
{
char *val = NULL;
- ssize_t len;
acl_t acl;
if (!(acl = acl_get_file_at (parentfd, file_name, ACL_TYPE_DEFAULT)))
@@ -294,7 +315,7 @@ xattrs__acls_get_d (int parentfd, char const *file_name,
return;
}
- val = acl_to_text (acl, &len);
+ val = acl_to_text (acl, NULL);
acl_free (acl);
if (!val)
@@ -304,8 +325,7 @@ xattrs__acls_get_d (int parentfd, char const *file_name,
}
*ret_ptr = xstrdup (val);
- *ret_len = len;
-
+ xattrs_acls_cleanup (*ret_ptr, ret_len);
acl_free (val);
}
#endif /* HAVE_POSIX_ACLS */
@@ -336,6 +356,7 @@ acls_one_line (const char *prefix, char delim,
obstack_grow (&stk, prefix, pref_len);
obstack_grow (&stk, aclstring, move);
+ pos += move + 1;
aclstring += move + 1;
}
@@ -740,6 +761,8 @@ xattrs_print (struct tar_stat_info const *st)
{
fprintf (stdlis, " a: ");
acls_one_line ("", ',', st->acls_a_ptr, st->acls_a_len);
+ if (st->acls_a_len && st->acls_d_len)
+ fprintf (stdlis, ",");
acls_one_line ("default:", ',', st->acls_d_ptr, st->acls_d_len);
fprintf (stdlis, "\n");
}
diff --git a/src/xattrs.h b/src/xattrs.h
index f537dd30da326f7590c4c20de12715b8403c0a26..b284cb2ac01cf8b89d7e3cd9a477ade27ede1384 100644
--- a/src/xattrs.h
+++ b/src/xattrs.h
@@ -1,6 +1,6 @@
/* Support for extended attributes.
- Copyright (C) 2006-2014, 2016-2017 Free Software Foundation, Inc.
+ Copyright (C) 2006-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/src/xheader.c b/src/xheader.c
index 6d97131dd3a4073ed388d13fa2979ecf8d257323..46bf4bbe0c6a019397c33497088ad3503273a92f 100644
--- a/src/xheader.c
+++ b/src/xheader.c
@@ -1,7 +1,6 @@
/* POSIX extended headers for tar.
- Copyright (C) 2003-2007, 2009-2010, 2012-2014, 2016-2017 Free
- Software Foundation, Inc.
+ Copyright (C) 2003-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
@@ -185,6 +184,9 @@ xheader_set_keyword_equal (char *kw, char *eq)
bool global = true;
char *p = eq;
+ if (eq == kw)
+ USAGE_ERROR ((0, 0, _("Malformed pax option: %s"), quote (kw)));
+
if (eq[-1] == ':')
{
p--;
@@ -255,7 +257,7 @@ char *
xheader_format_name (struct tar_stat_info *st, const char *fmt, size_t n)
{
char *buf;
- size_t len = strlen (fmt);
+ size_t len;
char *q;
const char *p;
char *dirp = NULL;
@@ -266,43 +268,51 @@ xheader_format_name (struct tar_stat_info *st, const char *fmt, size_t n)
char nbuf[UINTMAX_STRSIZE_BOUND];
char const *nptr = NULL;
- for (p = fmt; *p && (p = strchr (p, '%')); )
+ len = 0;
+ for (p = fmt; *p; p++)
{
- switch (p[1])
+ if (*p == '%' && p[1])
{
- case '%':
- len--;
- break;
-
- case 'd':
- if (st)
+ switch (*++p)
{
- if (!dirp)
- dirp = dir_name (st->orig_file_name);
- dir = safer_name_suffix (dirp, false, absolute_names_option);
- len += strlen (dir) - 2;
- }
- break;
+ case '%':
+ len++;
+ break;
- case 'f':
- if (st)
- {
- base = last_component (st->orig_file_name);
- len += strlen (base) - 2;
- }
- break;
+ case 'd':
+ if (st)
+ {
+ if (!dirp)
+ dirp = dir_name (st->orig_file_name);
+ dir = safer_name_suffix (dirp, false, absolute_names_option);
+ len += strlen (dir);
+ }
+ break;
+
+ case 'f':
+ if (st)
+ {
+ base = last_component (st->orig_file_name);
+ len += strlen (base);
+ }
+ break;
- case 'p':
- pptr = umaxtostr (getpid (), pidbuf);
- len += pidbuf + sizeof pidbuf - 1 - pptr - 2;
- break;
+ case 'p':
+ pptr = umaxtostr (getpid (), pidbuf);
+ len += pidbuf + sizeof pidbuf - 1 - pptr;
+ break;
- case 'n':
- nptr = umaxtostr (n, nbuf);
- len += nbuf + sizeof nbuf - 1 - nptr - 2;
- break;
+ case 'n':
+ nptr = umaxtostr (n, nbuf);
+ len += nbuf + sizeof nbuf - 1 - nptr;
+ break;
+
+ default:
+ len += 2;
+ }
}
- p++;
+ else
+ len++;
}
buf = xmalloc (len + 1);
@@ -458,6 +468,14 @@ xheader_write_global (struct xheader *xhdr)
}
}
+/* Forbid modifications of the global extended header */
+void
+xheader_forbid_global (void)
+{
+ if (keyword_global_override_list)
+ USAGE_ERROR ((0, 0, _("can't update global extended header record")));
+}
+
void
xheader_xattr_init (struct tar_stat_info *st)
{
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2d7939d5f8a76a8a9ce3d5c791c41c78566b802b..bc657da2973af4c41163b03f820fd351b3f0e78f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
# Makefile for GNU tar regression tests.
-# Copyright 1996-1997, 1999-2001, 2003-2007, 2009, 2012-2015 Free Software
+# Copyright 1996-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -17,9 +17,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 star/README star/quicktest.sh
+EXTRA_DIST = $(TESTSUITE_AT) \
+ testsuite package.m4 star/README star/quicktest.sh \
+ compress.m4
+
DISTCLEANFILES = atconfig $(check_SCRIPTS)
MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+CLEANFILES =
## ------------ ##
## package.m4. ##
@@ -43,6 +47,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
TESTSUITE_AT = \
testsuite.at\
+ compress.m4\
T-cd.at\
T-dir00.at\
T-dir01.at\
@@ -66,6 +71,11 @@ TESTSUITE_AT = \
chtype.at\
comprec.at\
comperr.at\
+ checkpoint/defaults.at\
+ checkpoint/interval.at\
+ checkpoint/dot.at\
+ checkpoint/dot-compat.at\
+ checkpoint/dot-int.at\
delete01.at\
delete02.at\
delete03.at\
@@ -228,6 +238,9 @@ TESTSUITE_AT = \
spmvp00.at\
spmvp01.at\
spmvp10.at\
+ sptrcreat.at\
+ sptrdiff00.at\
+ sptrdiff01.at\
time01.at\
time02.at\
truncate.at\
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 233a596995a90b67a0926fe36920e43b658d48e8..7d36b3b35e0d2838b36ef9826d00d7f08bf54ca3 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,7 @@
# Makefile for GNU tar regression tests.
-# Copyright 1996-1997, 1999-2001, 2003-2007, 2009, 2012-2015 Free Software
+# Copyright 1996-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -33,7 +33,17 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -98,13 +108,11 @@ host_triplet = @host@
check_PROGRAMS = genfile$(EXEEXT) checkseekhole$(EXEEXT) \
ckmtime$(EXEEXT)
subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/atlocal.in $(top_srcdir)/build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+ $(top_srcdir)/m4/__inline.m4 \
$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \
- $(top_srcdir)/m4/asm-underscore.m4 \
$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \
$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \
$(top_srcdir)/m4/canonicalize.m4 \
@@ -124,11 +132,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/extern-inline.m4 \
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \
- $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \
- $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filenamecat.m4 \
- $(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
- $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
+ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
+ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
+ $(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fileblocks.m4 \
+ $(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
+ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
+ $(top_srcdir)/m4/fnmatch_h.m4 $(top_srcdir)/m4/fpending.m4 \
$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
$(top_srcdir)/m4/futimens.m4 \
@@ -142,7 +151,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 \
$(top_srcdir)/m4/group-member.m4 \
- $(top_srcdir)/m4/hard-locale.m4 \
$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/human.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \
$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \
@@ -237,6 +245,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = atlocal
@@ -311,6 +320,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/atlocal.in \
+ $(top_srcdir)/build-aux/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
@@ -402,6 +413,7 @@ GNULIB_FFSL = @GNULIB_FFSL@
GNULIB_FFSLL = @GNULIB_FFSLL@
GNULIB_FGETC = @GNULIB_FGETC@
GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FNMATCH = @GNULIB_FNMATCH@
GNULIB_FOPEN = @GNULIB_FOPEN@
GNULIB_FPRINTF = @GNULIB_FPRINTF@
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
@@ -434,6 +446,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
@@ -450,6 +463,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALENAME = @GNULIB_LOCALENAME@
GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_LSTAT = @GNULIB_LSTAT@
@@ -688,6 +702,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -711,6 +726,9 @@ HAVE_FEATURES_H = @HAVE_FEATURES_H@
HAVE_FFS = @HAVE_FFS@
HAVE_FFSL = @HAVE_FFSL@
HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FNMATCH = @HAVE_FNMATCH@
+HAVE_FNMATCH_H = @HAVE_FNMATCH_H@
+HAVE_FREELOCALE = @HAVE_FREELOCALE@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSTATAT = @HAVE_FSTATAT@
HAVE_FSYNC = @HAVE_FSYNC@
@@ -723,13 +741,16 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
HAVE_GETLOGIN = @HAVE_GETLOGIN@
HAVE_GETOPT_H = @HAVE_GETOPT_H@
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -762,6 +783,7 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -832,7 +854,6 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
HAVE_TIMEGM = @HAVE_TIMEGM@
HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
HAVE_TZSET = @HAVE_TZSET@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
@@ -887,8 +908,6 @@ HAVE_WMEMSET = @HAVE_WMEMSET@
HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
HAVE__BOOL = @HAVE__BOOL@
HAVE__EXIT = @HAVE__EXIT@
-HOST_CPU = @HOST_CPU@
-HOST_CPU_C_ABI = @HOST_CPU_C_ABI@
INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
@@ -933,6 +952,7 @@ NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
+NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H = @NEXT_AS_FIRST_DIRECTIVE_FNMATCH_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
@@ -960,6 +980,7 @@ NEXT_DIRENT_H = @NEXT_DIRENT_H@
NEXT_ERRNO_H = @NEXT_ERRNO_H@
NEXT_FCNTL_H = @NEXT_FCNTL_H@
NEXT_FLOAT_H = @NEXT_FLOAT_H@
+NEXT_FNMATCH_H = @NEXT_FNMATCH_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
@@ -1020,9 +1041,11 @@ REPLACE_FCNTL = @REPLACE_FCNTL@
REPLACE_FDOPEN = @REPLACE_FDOPEN@
REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FNMATCH = @REPLACE_FNMATCH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREELOCALE = @REPLACE_FREELOCALE@
REPLACE_FREOPEN = @REPLACE_FREOPEN@
REPLACE_FSEEK = @REPLACE_FSEEK@
REPLACE_FSEEKO = @REPLACE_FSEEKO@
@@ -1040,6 +1063,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
REPLACE_GMTIME = @REPLACE_GMTIME@
REPLACE_ISATTY = @REPLACE_ISATTY@
@@ -1070,6 +1094,7 @@ REPLACE_MKNOD = @REPLACE_MKNOD@
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
REPLACE_MKTIME = @REPLACE_MKTIME@
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@
REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
@@ -1249,13 +1274,18 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 star/README star/quicktest.sh
+EXTRA_DIST = $(TESTSUITE_AT) \
+ testsuite package.m4 star/README star/quicktest.sh \
+ compress.m4
+
DISTCLEANFILES = atconfig $(check_SCRIPTS)
MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+CLEANFILES =
#
TESTSUITE_AT = \
testsuite.at\
+ compress.m4\
T-cd.at\
T-dir00.at\
T-dir01.at\
@@ -1279,6 +1309,11 @@ TESTSUITE_AT = \
chtype.at\
comprec.at\
comperr.at\
+ checkpoint/defaults.at\
+ checkpoint/interval.at\
+ checkpoint/dot.at\
+ checkpoint/dot-compat.at\
+ checkpoint/dot-int.at\
delete01.at\
delete02.at\
delete03.at\
@@ -1441,6 +1476,9 @@ TESTSUITE_AT = \
spmvp00.at\
spmvp01.at\
spmvp10.at\
+ sptrcreat.at\
+ sptrdiff00.at\
+ sptrdiff01.at\
time01.at\
time02.at\
truncate.at\
@@ -1505,7 +1543,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnits tests/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1676,6 +1713,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1771,6 +1809,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
{ \
diff --git a/tests/T-cd.at b/tests/T-cd.at
index 1e5e8ab7abdafa2401138990f8b1e9ca2f691596..4da904b819ed57ae6b769144a0a98d868ba40484 100644
--- a/tests/T-cd.at
+++ b/tests/T-cd.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/T-dir00.at b/tests/T-dir00.at
index 827eb65d2d800feea2a663ce37f5ddeec5365dd1..0dd7a5bef9289dd2d8e779de1a5372c7206dc843 100644
--- a/tests/T-dir00.at
+++ b/tests/T-dir00.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/T-dir01.at b/tests/T-dir01.at
index 379563899fa1a10438ea12bb81ca620fdc32b57a..9a2d8bfc6591fe4f5dfff3584846cf7297f68811 100644
--- a/tests/T-dir01.at
+++ b/tests/T-dir01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/T-empty.at b/tests/T-empty.at
index b4c81fc14cc4b78635e68031c1b824ae037e06ce..8a32a95783c7347f5c9e17a5fdc754455422b942 100644
--- a/tests/T-empty.at
+++ b/tests/T-empty.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/T-mult.at b/tests/T-mult.at
index d891665c4aa4006514f0213b382fe34c98fc517d..ba0af2d37cd6b02b4f763db24a6f864befd0beae 100644
--- a/tests/T-mult.at
+++ b/tests/T-mult.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/T-nest.at b/tests/T-nest.at
index eb70cf121c7d165a478c25b5e9e5c6157a77f2ce..f5e19b5387384b7caace1d3b11a1a056d974979b 100644
--- a/tests/T-nest.at
+++ b/tests/T-nest.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/T-nonl.at b/tests/T-nonl.at
index c14dfb274eec13d50a7256cc19bbf30acacf0071..101c80a96c46de34bd3e8b81cbd84bad18900b1b 100644
--- a/tests/T-nonl.at
+++ b/tests/T-nonl.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
@@ -29,9 +29,8 @@ AT_KEYWORDS([files-from nonewline nonl T-nonl])
AT_TAR_CHECK([
genfile --length=0 --file empty
-AS_ECHO_N(c) > 1.nonl
-echo d > 2.nonl
-AS_ECHO_N(e) >> 2.nonl
+printf c > 1.nonl
+printf 'd\ne' > 2.nonl
touch a b c d e
AT_DATA([filelist],[a
b
@@ -59,4 +58,3 @@ c
[],[],[],[ustar])
AT_CLEANUP
-
diff --git a/tests/T-null.at b/tests/T-null.at
index 5359a5a48ab0b77312af5b08196d1f4ec13d8548..409cd6b5f9b4283430b1ff349087bc7e315cca93 100644
--- a/tests/T-null.at
+++ b/tests/T-null.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/T-null2.at b/tests/T-null2.at
index b3c4e44b9997e360d1c234dc7e16b761b91c8538..4f71f290be755209b87059f328f0d9478401f9fc 100644
--- a/tests/T-null2.at
+++ b/tests/T-null2.at
@@ -1,5 +1,5 @@
# This file is part of test suite for GNU tar. -*- Autotest -*-
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/T-rec.at b/tests/T-rec.at
index 20af22ae5c8631595f1c265f73237d7c820ca2cf..d226aa7d7d5b177885666bde69f6e05b9cb018f6 100644
--- a/tests/T-rec.at
+++ b/tests/T-rec.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/T-recurse.at b/tests/T-recurse.at
index e65c87578c0810abe380e54dabf15c00d8331d34..77f7147b17770d1c2fcbb416c8f6ddded1e4c87b 100644
--- a/tests/T-recurse.at
+++ b/tests/T-recurse.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/T-zfile.at b/tests/T-zfile.at
index 63cc31572580a10aa124f156b138e8691afe2d16..ae5e143dd9f3a7697989d40262d9b2b50d8f6e8f 100644
--- a/tests/T-zfile.at
+++ b/tests/T-zfile.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/acls01.at b/tests/acls01.at
index 73f4ec90309bcbabd57d00c2ec93b24e74d773c3..2b587aadf9c325a14a6ced4a2f64d68a0ed7ad70 100644
--- a/tests/acls01.at
+++ b/tests/acls01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2011, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2011-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/acls02.at b/tests/acls02.at
index 5dad575c5dbfb5bc84e1b5a17a2cdd880025e157..325cf1002ce3814128b579692394ed69f9bb6efa 100644
--- a/tests/acls02.at
+++ b/tests/acls02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2011, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2011-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/acls03.at b/tests/acls03.at
index e4041cff6fd772ae850fc1176476c60ad3cc7ea4..8f4facbdd45da5d706740aaa868f6694d5161ff2 100644
--- a/tests/acls03.at
+++ b/tests/acls03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/add-file.at b/tests/add-file.at
index b7fa9a8f5deee79bd6296691f5556efc530d432c..e9d2d15b2b1681db9dbfc90d4d3be9b3f0e36b2c 100644
--- a/tests/add-file.at
+++ b/tests/add-file.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2016-2017 Free Software Foundation, Inc.
+# Copyright 2016-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/append.at b/tests/append.at
index fbcaddc67dc03bf144a25d7fdfb98f9944aff508..d6dc1fd6c48b5678d62915b929bc667e4cd550a2 100644
--- a/tests/append.at
+++ b/tests/append.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/append01.at b/tests/append01.at
index e705cd940885106c0396447f0fafe653ec3703a4..cce9874ff237058a380faba9c84fa93cbde633a7 100644
--- a/tests/append01.at
+++ b/tests/append01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/append02.at b/tests/append02.at
index 52d5d68605b8e11d08a826b212d111c5f8c38650..3cd77600a89988011efc557de34cdf80901ffdf2 100644
--- a/tests/append02.at
+++ b/tests/append02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/append03.at b/tests/append03.at
index edb70f2e50c822446b8037f7e71a2df3011fb624..392b1ab85077ce6a7c7718c5f418adf8f672c405 100644
--- a/tests/append03.at
+++ b/tests/append03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/append04.at b/tests/append04.at
index 7999f928d44191b94ed071e65f454cbfc3474588..19365f4f6e4d4e736f6c4b28135f0b6fa0adfded 100644
--- a/tests/append04.at
+++ b/tests/append04.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/append05.at b/tests/append05.at
index 86ab5a785ee3693bd35ba0852210f0be1b8a1b7a..ef34cbeb8745f89385eed556e0e7310d1e1c410e 100644
--- a/tests/append05.at
+++ b/tests/append05.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2016-2017 Free Software Foundation, Inc.
+# Copyright 2016-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/atlocal.in b/tests/atlocal.in
index c67ddfc4700bcf7afa3e6a97f204a49497e28a60..4e3c47d09fe1c971b9206e6e16f43f8900cca8f7 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,7 +1,6 @@
# @configure_input@ -*- shell-script -*-
# Configurable variable values for tar test suite.
-# Copyright 2004, 2006, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/backup01.at b/tests/backup01.at
index 6a3be5796da293df4399be490923c2f1709d9d85..bebff74ae483814cc32e9b8fc53588fbbbc07052 100644
--- a/tests/backup01.at
+++ b/tests/backup01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009-2010, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/capabs_raw01.at b/tests/capabs_raw01.at
index 8b8391a488ff3956341d211554e6d7b05895a819..ef440f644db203a1fa015b4650228f4302fa37c5 100644
--- a/tests/capabs_raw01.at
+++ b/tests/capabs_raw01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2012-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/checkpoint/defaults.at b/tests/checkpoint/defaults.at
new file mode 100644
index 0000000000000000000000000000000000000000..d89d1e15a99130e0c1f1a46681bdfb802dad91cc
--- /dev/null
+++ b/tests/checkpoint/defaults.at
@@ -0,0 +1,25 @@
+# This file is part of GNU tar test suite. -*- Autotest -*-
+# Copyright 2019 Free Software Foundation, Inc.
+#
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+AT_SETUP([checkpoint defaults])
+AT_KEYWORDS([checkpoint checkpoint/defaults])
+CPT_CHECK([
+tar --checkpoint -c -f ../a.tar .
+],
+[0],
+[],
+[tar: Write checkpoint 10
+])
+AT_CLEANUP
diff --git a/tests/checkpoint/dot-compat.at b/tests/checkpoint/dot-compat.at
new file mode 100644
index 0000000000000000000000000000000000000000..0e9c2f34a22827ab89dbc0c041c94bfaad11bd21
--- /dev/null
+++ b/tests/checkpoint/dot-compat.at
@@ -0,0 +1,23 @@
+# This file is part of GNU tar test suite. -*- Autotest -*-
+# Copyright 2019 Free Software Foundation, Inc.
+#
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+AT_SETUP([dot action (compatibility syntax)])
+AT_KEYWORDS([checkpoint checkpoint/dot-compat])
+CPT_CHECK([
+tar --checkpoint=.2 -c -f ../a.tar .
+],
+[],
+[.....])
+AT_CLEANUP
diff --git a/tests/checkpoint/dot-int.at b/tests/checkpoint/dot-int.at
new file mode 100644
index 0000000000000000000000000000000000000000..8fba21e5ff119e846a52585128b7c5dab90ffd1a
--- /dev/null
+++ b/tests/checkpoint/dot-int.at
@@ -0,0 +1,24 @@
+# This file is part of GNU tar test suite. -*- Autotest -*-
+# Copyright 2019 Free Software Foundation, Inc.
+#
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+AT_SETUP([dot action and interval])
+AT_KEYWORDS([checkpoint checkpoint/dot-int])
+CPT_CHECK([
+tar --checkpoint-action=dot --checkpoint=2 -c -f ../a.tar .
+],
+[],
+[.....])
+AT_CLEANUP
+
diff --git a/tests/checkpoint/dot.at b/tests/checkpoint/dot.at
new file mode 100644
index 0000000000000000000000000000000000000000..f940823a72f8e629702342b1856ddaa8a9430518
--- /dev/null
+++ b/tests/checkpoint/dot.at
@@ -0,0 +1,24 @@
+# This file is part of GNU tar test suite. -*- Autotest -*-
+# Copyright 2019 Free Software Foundation, Inc.
+#
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+AT_SETUP([dot action])
+AT_KEYWORDS([checkpoint checkpoint/dot])
+CPT_CHECK([
+tar --checkpoint-action=dot -c -f ../a.tar .
+],
+[],
+[.])
+AT_CLEANUP
+
diff --git a/tests/checkpoint/interval.at b/tests/checkpoint/interval.at
new file mode 100644
index 0000000000000000000000000000000000000000..b5d3f98f9f3736e1b8f1f67c1da81776f9879f8d
--- /dev/null
+++ b/tests/checkpoint/interval.at
@@ -0,0 +1,29 @@
+# This file is part of GNU tar test suite. -*- Autotest -*-
+# Copyright 2019 Free Software Foundation, Inc.
+#
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+AT_SETUP([checkpoint interval])
+AT_KEYWORDS([checkpoint checkpoint/interval])
+CPT_CHECK([
+tar --checkpoint=2 -c -f ../a.tar .
+],
+[0],
+[],
+[tar: Write checkpoint 2
+tar: Write checkpoint 4
+tar: Write checkpoint 6
+tar: Write checkpoint 8
+tar: Write checkpoint 10
+])
+AT_CLEANUP
diff --git a/tests/checkseekhole.c b/tests/checkseekhole.c
index c1f6d004ef369fe271b74a99468f49ee6db91006..fa434b8ee13fe75dbc7efc826b36a4c6dca9ab77 100644
--- a/tests/checkseekhole.c
+++ b/tests/checkseekhole.c
@@ -1,6 +1,6 @@
/* Test suite for GNU tar - SEEK_HOLE detector.
- Copyright 2015-2017 Free Software Foundation, Inc.
+ Copyright 2015-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/tests/chtype.at b/tests/chtype.at
index 38ca34b007843ab10bd6c1be50c4ae1e29c9ad8a..91a97dbf6b083c04538b3154a7a464c506adf83c 100644
--- a/tests/chtype.at
+++ b/tests/chtype.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/ckmtime.c b/tests/ckmtime.c
index 4298bb34df96bd13cfa305d0dc771d0ba22c8aa6..32180df94fce565c495b90c8d3d584b4578baf17 100644
--- a/tests/ckmtime.c
+++ b/tests/ckmtime.c
@@ -1,5 +1,5 @@
/* Check if filesystem timestamps are consistent with the system time.
- Copyright (C) 2016-2017 Free Software Foundation, Inc.
+ Copyright (C) 2016-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/tests/comperr.at b/tests/comperr.at
index c6f3771af8556b6fcc99ede91dcd8e52b5506467..12902de0afae19766c6a4aff3f6293c2edacdddf 100644
--- a/tests/comperr.at
+++ b/tests/comperr.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comprec.at b/tests/comprec.at
index 8124d5b86995b70f0d029d0ba3a34c5ffce29790..b0c85c607654a60b8b423387b1a5eff954a4e54a 100644
--- a/tests/comprec.at
+++ b/tests/comprec.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/compress.m4 b/tests/compress.m4
new file mode 100644
index 0000000000000000000000000000000000000000..1f226327ceb2e59a0657ab615e7414054b301050
--- /dev/null
+++ b/tests/compress.m4
@@ -0,0 +1,56 @@
+# This file is part of GNU tar testsuite. -*- Autotest -*-
+# Copyright 2018-2019 Free Software Foundation, Inc.
+#
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+dnl TAR_CHECK_COMPRESS(TOOL, SUF[, SUF2])
+dnl Tests whether tar can create archives using TOOL (i.e. using the --TOOL
+dnl command line option). SUF and optional SUF2 are suffixes for created
+dnl archives (without leading dot). Tar should be able to use TOOL to
+dnl automatically decompress archives with names ending on these suffixes.
+m4_define([TAR_CHECK_COMPRESS],
+[AT_SETUP([compress: $1])
+AT_KEYWORDS([compression compress-$1 $1])
+
+AT_CHECK([
+AT_GZIP_PREREQ($1)
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --$1
+tar --$1 -cf k.tar.$2 empty
+tar tf k.tar.$2
+
+m4_foreach([SUF], m4_quote(m4_shift($@)),
+[
+echo testing .SUF
+tar -acf k2.tar.SUF empty
+cat k2.tar.SUF | $1 -d > k.SUF.tar
+tar tf k.SUF.tar
+])
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.$2
+test -f empty
+],
+[0],
+[empty
+m4_foreach([SUF],m4_quote(m4_shift($@)),[testing .SUF
+empty
+])])
+
+AT_CLEANUP
+])
diff --git a/tests/delete01.at b/tests/delete01.at
index b2607b46958dee70e7d9b88e7bef2a728c2f2aa6..bba4c2056c3092203ef1d8f9bae035816b1f70a6 100644
--- a/tests/delete01.at
+++ b/tests/delete01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/delete02.at b/tests/delete02.at
index 597c0da8de6da084b9f849f8b2ef8251387d53b8..36b7670a46b3c292681ec2408228459934499a78 100644
--- a/tests/delete02.at
+++ b/tests/delete02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004-2005, 2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/delete03.at b/tests/delete03.at
index 77a38e535d6f36226f53b5db4984243ee42da8e7..e8ec7287f4a9b8207f98374977530dfdb3e50ad6 100644
--- a/tests/delete03.at
+++ b/tests/delete03.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/delete04.at b/tests/delete04.at
index 73bdbc31beb3b1b8a33cec2b26dbbfd7f7808517..f7cba78b34e3553e16e34862771e11ada942f703 100644
--- a/tests/delete04.at
+++ b/tests/delete04.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/delete05.at b/tests/delete05.at
index b600c98e8bd49066cb4619005e6b92bc8109ebb8..81777564eae9001e91c8c6655f99fa10ada49d9b 100644
--- a/tests/delete05.at
+++ b/tests/delete05.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/difflink.at b/tests/difflink.at
index eadfb088231a65ea1a2a5ceaf94e0f879bd1d14d..ab4b0263237642b5e5ac68293c193944b617e7a2 100644
--- a/tests/difflink.at
+++ b/tests/difflink.at
@@ -1,6 +1,6 @@
# This file is part of GNU tar test suite -*- Autotest -*-
#
-# Copyright 2017 Free Software Foundation, Inc.
+# Copyright 2017-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,14 +20,14 @@ AT_TAR_CHECK([
mkdir a
genfile -f a/x
ln -s x a/y
-ln a/y a/z
-tar cf a.tar a
+ln a/x a/z
+tar cf a.tar a/x a/y a/z
rm a/z
ln -s x a/z
tar df a.tar
],
[1],
-[a/z: Not linked to a/y
+[a/z: Not linked to a/x
],
[],
[],[],[ustar]) # Testing one format is enough
diff --git a/tests/dirrem01.at b/tests/dirrem01.at
index 40344dc0a9d4acd80d393e4a463bf7fb3897ea66..24bf39252c19b5bf2ab83a9080a65c126b7631a7 100644
--- a/tests/dirrem01.at
+++ b/tests/dirrem01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2017 Free Software Foundation, Inc.
+# Copyright 2017-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -27,9 +27,13 @@
# it prints a warning and exits with TAREXIT_DIFFERS.
#
# This test checks whether this behaviour is mimicked for directories, too.
-
-# Remark: This file is based on 'filerem01.at', which is the test-case for
-# a vanishing file.
+#
+# Notes:
+# 1. This file is based on 'filerem01.at', which is the test-case for
+# a vanishing file.
+# 2. Depending on the stat.st_ctime resolution, the "file changed as we
+# read it" warning might be issued for dir/sub. The test takes care to
+# suppress it.
AT_SETUP([directory removed before reading])
AT_KEYWORDS([create incremental listed dirchange dirrem dirrem01])
@@ -47,9 +51,10 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
- --listed-incremental db -v dir >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \
+ --listed-incremental db \
+ --warning=no-file-changed \
+ -v dir >/dev/null
],
[1],
[ignore],
diff --git a/tests/dirrem02.at b/tests/dirrem02.at
index e1cf9ef82112ff9f95a7537ca42898e18d6b79fd..3c63bbeb2ba982291f35f2f02c9781818e84780f 100644
--- a/tests/dirrem02.at
+++ b/tests/dirrem02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2017 Free Software Foundation, Inc.
+# Copyright 2017-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -20,7 +20,7 @@
# Description:
#
-# When an explicitley named directory disappears during creation
+# When an explicitly named directory disappears during creation
# of incremental dump, tar should still exit with TAREXIT_FAILURE (2).
#
# For further details see dirrem01.at
@@ -44,9 +44,10 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
- --listed-incremental db -v dir dir/sub >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \
+ --listed-incremental db \
+ --warning=no-file-changed \
+ -v dir dir/sub >/dev/null
],
[2],
[ignore],
diff --git a/tests/exclude.at b/tests/exclude.at
index 81546c66179c83f0e85187337ee839b09fae72c9..d7f80936b43da1788ca746357e3487660274b96b 100644
--- a/tests/exclude.at
+++ b/tests/exclude.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2007, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2007-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude01.at b/tests/exclude01.at
index d52bc196d342da929818dfbf50ae1f69f4b5d37f..a9afe1dc59cc422820a9313286ed0f3ff0e29cfd 100644
--- a/tests/exclude01.at
+++ b/tests/exclude01.at
@@ -1,5 +1,5 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude02.at b/tests/exclude02.at
index 35533bdc4c5d663040eb2354319ef999c3e324d3..3d633c41a53f59a8e6a165a7ebfa31e0623e89c6 100644
--- a/tests/exclude02.at
+++ b/tests/exclude02.at
@@ -1,5 +1,5 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude03.at b/tests/exclude03.at
index ca73b92e490f7c9f864299a4d1964e7bdaf0dba7..d7821b9b250e585fa96ba3b3830fcaec88344b02 100644
--- a/tests/exclude03.at
+++ b/tests/exclude03.at
@@ -1,5 +1,5 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude04.at b/tests/exclude04.at
index 3b4df016ad55f5f247d4fd72efde7912d6fbf94c..54281ad50265e1a3f5394e949ee8ffa8564f382e 100644
--- a/tests/exclude04.at
+++ b/tests/exclude04.at
@@ -1,5 +1,5 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude05.at b/tests/exclude05.at
index b51fcfcb73a502584ea923428458d62d5cf9cef8..a4a8d2815f8d6eecad2706fabf09c57e323d2124 100644
--- a/tests/exclude05.at
+++ b/tests/exclude05.at
@@ -1,6 +1,5 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
-# Copyright 2009-2010, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude06.at b/tests/exclude06.at
index 78e830671c4e7a3643b5e32e2d2e7ed25f96f2f4..48e6868a431f857295c88343df4720a136f545a9 100644
--- a/tests/exclude06.at
+++ b/tests/exclude06.at
@@ -1,5 +1,5 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude07.at b/tests/exclude07.at
index 2ec2c5f9d6dae7bed561b064fc02926965a0bd6a..4062e2a3d83f263383f66d4edd885c2aadea8adc 100644
--- a/tests/exclude07.at
+++ b/tests/exclude07.at
@@ -1,5 +1,5 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude08.at b/tests/exclude08.at
index 8c36efda70bb99380a922f96e2e0181eb29aaec5..8abe86c861a1081312706b04832dcadffcf325f3 100644
--- a/tests/exclude08.at
+++ b/tests/exclude08.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude09.at b/tests/exclude09.at
index e6809a7ca7556fbf71a426e986e5e560869abfc3..1e6e3f08e911b27b500b70160c63ac03735aaae2 100644
--- a/tests/exclude09.at
+++ b/tests/exclude09.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude10.at b/tests/exclude10.at
index 0f92b006ad0fa0343397751cde6d9fbe2930bd0b..7fffe15520fc3cfbf6b48952822464fd2246413f 100644
--- a/tests/exclude10.at
+++ b/tests/exclude10.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude11.at b/tests/exclude11.at
index 3c1b8faa15c879e4fb7bc7f74cb6dfa4df7e1751..f8e46f8c2ae2fcd7ae7d59dce5e6746c54d84d98 100644
--- a/tests/exclude11.at
+++ b/tests/exclude11.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude12.at b/tests/exclude12.at
index de89fc766b8eb65a53698eda88d3d138e0c5f3c3..4a85d8322a9373951ae1a7cdfb1410d787aa1d57 100644
--- a/tests/exclude12.at
+++ b/tests/exclude12.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude13.at b/tests/exclude13.at
index c884f7f039e87c3b6829611f2323f1099d2f7cc7..3c9c0b747544bf5bf9b0ee3592867bbea6aef19a 100644
--- a/tests/exclude13.at
+++ b/tests/exclude13.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude14.at b/tests/exclude14.at
index b909617fab64aa9239238b34050ae80e8aac94f8..aa0e05cd156632ea65cf0e62a71574d2d83ef7d3 100644
--- a/tests/exclude14.at
+++ b/tests/exclude14.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude15.at b/tests/exclude15.at
index 8c81468704582ae8f2b6030ad9cbfbde275ebbd8..eab6b8e486eb5379a67dba8761002e8771f7b6df 100644
--- a/tests/exclude15.at
+++ b/tests/exclude15.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/exclude16.at b/tests/exclude16.at
index 6560f9b4edad394bcd65cbff9ad23c2caced9d4a..932c00c9b961a65f31428c995baa81797a6f9310 100644
--- a/tests/exclude16.at
+++ b/tests/exclude16.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac01.at b/tests/extrac01.at
index 3f8c1143b5348d77af2e915c101350b1be32af28..b630908c7ea85fda4ed031dc59b3340b317a5657 100644
--- a/tests/extrac01.at
+++ b/tests/extrac01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac02.at b/tests/extrac02.at
index 91d0e09dc42784d5104078485174c98d58482254..a7cc33d919c2dd5b5dfbfcc415a95a47a7e3b384 100644
--- a/tests/extrac02.at
+++ b/tests/extrac02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac03.at b/tests/extrac03.at
index 2bd0e6fd84e16015a1dcb557cbe41a218272fcb5..b080f64c5dab56850ce2871f7eba8f00414ddac8 100644
--- a/tests/extrac03.at
+++ b/tests/extrac03.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac04.at b/tests/extrac04.at
index 39c92f4bd731784c2a940ef3c58d3cd473822dc4..df784d746a30b174c95cd51dfbee77a42f321a30 100644
--- a/tests/extrac04.at
+++ b/tests/extrac04.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac05.at b/tests/extrac05.at
index bb41cd3b53d03352368474870c7f98ebd9e87a6f..b16794d07e060c01a63973393d17cd84662c47ee 100644
--- a/tests/extrac05.at
+++ b/tests/extrac05.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac06.at b/tests/extrac06.at
index d47c5d71f10869748e2675ad2e39458c178a70cb..22947fc8b14554960cd8395e03681acccc16a6e1 100644
--- a/tests/extrac06.at
+++ b/tests/extrac06.at
@@ -2,8 +2,7 @@
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac07.at b/tests/extrac07.at
index 0c93b624d02e1c80c1d239aaf8d5316e2a214da9..dd7af3b1bbee6c62a945961a1299b2115e219016 100644
--- a/tests/extrac07.at
+++ b/tests/extrac07.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac08.at b/tests/extrac08.at
index 7a6395885975ffc80cacd3bb95d3ceabc79dea0f..09ff0579c8b04005d23712b4133bc3a379e4cc03 100644
--- a/tests/extrac08.at
+++ b/tests/extrac08.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac09.at b/tests/extrac09.at
index b754ba90a62999964560ecb9ff68c88c4f0e3ad9..393d0f5c8870f019e6dabfa5d05233d99a7854d4 100644
--- a/tests/extrac09.at
+++ b/tests/extrac09.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac10.at b/tests/extrac10.at
index b0f4f84fb00cb1f946b0116069e73c1360836dc8..fff9f6bdc14a2336701c502e1b1ef1d6c74b4469 100644
--- a/tests/extrac10.at
+++ b/tests/extrac10.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac11.at b/tests/extrac11.at
index 56b97fe74a7f78462b3733341c6be5ba86e409b3..197cf59f2bebe39c7e043cb58c1ab11efbc2814d 100644
--- a/tests/extrac11.at
+++ b/tests/extrac11.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac12.at b/tests/extrac12.at
index eb4c2675be4fe9bd41b4da519433557584409c62..04b1a731a82c155ba334bd46aef625744f037f05 100644
--- a/tests/extrac12.at
+++ b/tests/extrac12.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac13.at b/tests/extrac13.at
index e09f1f9f22b9e8690a0b5eb8988bc6d49e059368..5a2dfaaf5718f90a2a230d738c74a84b55690eb2 100644
--- a/tests/extrac13.at
+++ b/tests/extrac13.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac14.at b/tests/extrac14.at
index 1a6f3e5b1e49f59bf87af27a76e2abf3103296e1..7e1ab0f26aa3d1b499632fd774db7541a0b19b4c 100644
--- a/tests/extrac14.at
+++ b/tests/extrac14.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac15.at b/tests/extrac15.at
index e178c5a8a7349db0a0649862d7020aae470c475f..b9ecc6b153a67f99e7682fec8b15cd74d08eb279 100644
--- a/tests/extrac15.at
+++ b/tests/extrac15.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac16.at b/tests/extrac16.at
index 23ace1407085c0e6704214d79abcd6a742e36dff..e2d7046d998f13485aced31dbf762c9d3bae8242 100644
--- a/tests/extrac16.at
+++ b/tests/extrac16.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac17.at b/tests/extrac17.at
index 992dd43064beec0237c0965cbe02c32448f29c04..628b03c8db12c55e02726d1763ecd00f734b1569 100644
--- a/tests/extrac17.at
+++ b/tests/extrac17.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac18.at b/tests/extrac18.at
index 615a4500acf33a9bed8119e3325659a13e79e622..b63e1b2cc2554041da1ae45359fa8d8e41f18f5a 100644
--- a/tests/extrac18.at
+++ b/tests/extrac18.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2011, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2011-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac19.at b/tests/extrac19.at
index a551f0e5c266c6582d69dbef44adc90d2afd1318..8c391a47a5960979566db693f691712ca6c3b112 100644
--- a/tests/extrac19.at
+++ b/tests/extrac19.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2011, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2011-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac20.at b/tests/extrac20.at
index dd9b00df9ec5fac7f30b774985628a8784a654ef..cc5ddd2969eed8685e769acce1b59eab85c932c6 100644
--- a/tests/extrac20.at
+++ b/tests/extrac20.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2017 Free Software Foundation, Inc.
+# Copyright 2017-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/extrac21.at b/tests/extrac21.at
index 671b1010ba59aced90353f8f04ec8633b0360f7a..30e0cc6c9cea6f0971d8599601d9484fde8cff49 100644
--- a/tests/extrac21.at
+++ b/tests/extrac21.at
@@ -1,5 +1,5 @@
# Test suite for GNU tar. -*- Autotest -*-
-# Copyright 2017 Free Software Foundation, Inc.
+# Copyright 2017-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/filerem01.at b/tests/filerem01.at
index bf02053843f693567a0cfd9188450aab01c75dd6..7d4a78087ace9af88edd92701bcd2ecf5437961c 100644
--- a/tests/filerem01.at
+++ b/tests/filerem01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -33,7 +33,7 @@
# http://lists.gnu.org/archive/html/bug-tar/2009-03/msg00000.html
#
-AT_SETUP([file removed as we read it (ca. 22 seconds)])
+AT_SETUP([file removed as we read it])
AT_KEYWORDS([create incremental listed filechange filerem filerem01])
AT_TAR_CHECK([
@@ -43,8 +43,7 @@ genfile --file dir/file1
genfile --file dir/sub/file2
genfile --run --checkpoint=3 --unlink dir/file1 -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
+ tar --blocking-factor=1 -c -f archive.tar \
--listed-incremental db -v dir >/dev/null
],
[1],
diff --git a/tests/filerem02.at b/tests/filerem02.at
index 5e6d1beff8eccdf53986a3468250d47442bc4e1e..731bf11865248165df9b6d2040345345203e2b20 100644
--- a/tests/filerem02.at
+++ b/tests/filerem02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -23,7 +23,7 @@
# file or directory disappears that is explicitly mentioned
# in the command line.
-AT_SETUP([toplevel file removed (ca. 24 seconds)])
+AT_SETUP([toplevel file removed])
AT_KEYWORDS([create incremental listed filechange filerem filerem02])
AT_TAR_CHECK([
@@ -35,8 +35,7 @@ mkdir dir2
genfile --file dir2/file1
genfile --run --checkpoint=3 --exec 'rm -rf dir2' -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
+ tar --blocking-factor=1 -c -f archive.tar \
--listed-incremental db -v --warning=no-new-dir dir dir2 >/dev/null
],
[2],
diff --git a/tests/genfile.c b/tests/genfile.c
index 66c54df2b38f570e3d9009b7629bd46df6db7f24..dc822c71f3973de277c1c3469bc21706e8749e00 100644
--- a/tests/genfile.c
+++ b/tests/genfile.c
@@ -1,11 +1,9 @@
-/* Generate a file containing some preset patterns.
- Print statistics for existing files.
+/* Multi-purpose tool for tar and cpio testsuite.
- Copyright (C) 1995, 1996, 1997, 2001, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1995-1997, 2001-2018 Free Software Foundation, Inc.
François Pinard <pinard@iro.umontreal.ca>, 1995.
- Sergey Poznyakoff <gray@mirddin.farlep.net>, 2004, 2005, 2006, 2007, 2008.
+ Sergey Poznyakoff <gray@gnu.org>, 2004-2018.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,8 +16,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <system.h>
@@ -96,10 +93,8 @@ size_t block_size = 512;
/* Block buffer for sparse file */
char *buffer;
-/* Number of arguments and argument vector for mode == mode_exec */
-int exec_argc;
-char **exec_argv;
-char *checkpoint_option;
+/* Checkpoint granularity for mode == mode_exec */
+char *checkpoint_granularity;
/* Time for --touch option */
struct timespec touch_time;
@@ -165,8 +160,8 @@ static struct argp_option options[] = {
{NULL, 0, NULL, 0,
N_("Synchronous execution options:"), GRP},
- {"run", 'r', N_("OPTION"), OPTION_ARG_OPTIONAL,
- N_("Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, --unlink"),
+ {"run", 'r', N_("N"), OPTION_ARG_OPTIONAL,
+ N_("Execute ARGS. Trigger checkpoints every Nth record (default 1). Useful with --checkpoint and one of --cut, --append, --touch, --unlink"),
GRP+1 },
{"checkpoint", OPT_CHECKPOINT, N_("NUMBER"), 0,
N_("Perform given action (see below) upon reaching checkpoint NUMBER"),
@@ -351,11 +346,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
case 'r':
mode = mode_exec;
- if (arg)
- {
- argcv_get (arg, "", NULL, &exec_argc, &exec_argv);
- checkpoint_option = "--checkpoint";
- }
+ checkpoint_granularity = arg ? arg : "1";
break;
case 'T':
@@ -822,10 +813,10 @@ process_checkpoint (size_t n)
}
}
-#define CHECKPOINT_TEXT "Write checkpoint"
+#define CHECKPOINT_TEXT "genfile checkpoint"
void
-exec_command (void)
+exec_command (int argc, char **argv)
{
int status;
pid_t pid;
@@ -833,20 +824,28 @@ exec_command (void)
char *p;
FILE *fp;
char buf[128];
-
+ int xargc;
+ char **xargv;
+ int i;
+ char checkpoint_option[80];
+
/* Insert --checkpoint option.
- FIXME: This assumes that exec_argv does not use traditional tar options
+ FIXME: This assumes that argv does not use traditional tar options
(without dash).
- FIXME: There is no way to set checkpoint argument (granularity).
*/
- if (checkpoint_option)
- {
- exec_argc++;
- exec_argv = xrealloc (exec_argv, (exec_argc + 1) * sizeof (*exec_argv));
- memmove (exec_argv+2, exec_argv+1,
- (exec_argc - 1) * sizeof (*exec_argv));
- exec_argv[1] = checkpoint_option;
- }
+ xargc = argc + 5;
+ xargv = xcalloc (xargc + 1, sizeof (xargv[0]));
+ xargv[0] = argv[0];
+ snprintf (checkpoint_option, sizeof (checkpoint_option),
+ "--checkpoint=%s", checkpoint_granularity);
+ xargv[1] = checkpoint_option;
+ xargv[2] = "--checkpoint-action";
+ xargv[3] = "echo=" CHECKPOINT_TEXT " %u";
+ xargv[4] = "--checkpoint-action";
+ xargv[5] = "wait=SIGUSR1";
+
+ for (i = 1; i <= argc; i++)
+ xargv[i + 5] = argv[i];
#ifdef SIGCHLD
/* System V fork+wait does not work if SIGCHLD is ignored. */
@@ -872,8 +871,8 @@ exec_command (void)
/* Make sure POSIX locale is used */
setenv ("LC_ALL", "POSIX", 1);
- execvp (exec_argv[0], exec_argv);
- error (EXIT_FAILURE, errno, "execvp %s", exec_argv[0]);
+ execvp (xargv[0], xargv);
+ error (EXIT_FAILURE, errno, "execvp %s", xargv[0]);
}
/* Master */
@@ -900,6 +899,7 @@ exec_command (void)
if (!(*end && !isspace ((unsigned char) *end)))
{
process_checkpoint (n);
+ kill (pid, SIGUSR1);
continue;
}
}
@@ -985,14 +985,7 @@ main (int argc, char **argv)
break;
case mode_exec:
- if (!checkpoint_option)
- {
- exec_argc = argc;
- exec_argv = argv;
- }
- else if (argc)
- error (EXIT_FAILURE, 0, _("too many arguments"));
- exec_command ();
+ exec_command (argc, argv);
break;
default:
diff --git a/tests/grow.at b/tests/grow.at
index b04250dbd4e95640cb56601a4cd9e8c5f305f107..566d131e99e339e5f8ab2191ec2021e406087d11 100644
--- a/tests/grow.at
+++ b/tests/grow.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -28,7 +27,7 @@ AT_KEYWORDS([grow filechange])
AT_TAR_CHECK([
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
],
[1],
[foo
diff --git a/tests/gzip.at b/tests/gzip.at
index 15220873ab22b570c875ad309cfdde542c876e1e..ade520428706f486822aad1e8d0c16ef7943f5f8 100644
--- a/tests/gzip.at
+++ b/tests/gzip.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2007, 2009-2010, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/ignfail.at b/tests/ignfail.at
index 446c441b526a7e56c890b8028bb51a3d6ba32d16..00cc2b3bd9b1fa6b58cb9b5d855cb27f3b993ff3 100644
--- a/tests/ignfail.at
+++ b/tests/ignfail.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/incr01.at b/tests/incr01.at
index 82c5cbd849e7aec03453c890113546e1dba4aad6..637f277d8039086aec63bb8538aefd10a06d39a0 100644
--- a/tests/incr01.at
+++ b/tests/incr01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005, 2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/incr02.at b/tests/incr02.at
index 8f7a37b8815d4c238d2f7e65847be5d0d2a76801..52683b84b0dc96094ff775bb80689e34daac030a 100644
--- a/tests/incr02.at
+++ b/tests/incr02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005, 2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/incr03.at b/tests/incr03.at
index a89d8b69ab647562341ee43a19b35f70322a7b32..0b118057c23372d8fca4029c2d728c31deba2cbc 100644
--- a/tests/incr03.at
+++ b/tests/incr03.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/incr04.at b/tests/incr04.at
index ea0dfe3b9d80df032334ee60f066e53f23181e6a..1abc47cb37056689a9ef547db671ba151a34a70a 100644
--- a/tests/incr04.at
+++ b/tests/incr04.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/incr05.at b/tests/incr05.at
index dd991fe8c69bcf3b36129940872a88be3eaf1089..d270e86053f3da08dae00840591d22a1dfacccb6 100644
--- a/tests/incr05.at
+++ b/tests/incr05.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/incr06.at b/tests/incr06.at
index a4e8ed52422a0d2b6c7fcd805bfed9200dfd651c..53f6986c92a79320050139ac433cfec3dc63c39d 100644
--- a/tests/incr06.at
+++ b/tests/incr06.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/incr07.at b/tests/incr07.at
index bc35448d0ca1ac71546e95d9d8926c5a44ae1150..bea10901e30ad0dcc426a772fdf26f07587b041a 100644
--- a/tests/incr07.at
+++ b/tests/incr07.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/incr08.at b/tests/incr08.at
index f50a614f43341185fe200530aae816c3e58a1ab6..f21ee26b21d2a2afa3f5696608c0cbfa196b5b95 100644
--- a/tests/incr08.at
+++ b/tests/incr08.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -38,24 +38,10 @@
AT_SETUP([filename normalization])
AT_KEYWORDS([incremental create incr08 chdir])
-AT_TAR_CHECK([
-AT_CHECK_TIMESTAMP
-AT_SORT_PREREQ
-mkdir tartest
-cd tartest
-mkdir foo
-mkdir foo/subdir
-mkdir foo/subdir/dir1
-mkdir subdir
-mkdir subdir/dir2
-decho A
-find .|sort
-
-decho B
-DIR=`pwd`
-tar -cvf ../foo.tar --listed-incremental=../foo.snar -C foo . $DIR 2>../err |\
- sed "s|$DIR|ABSPATH|"
-sed "s|$DIR|ABSPATH|" ../err >&2
+AT_TAR_WITH_HOOK(
+[AT_CHECK([
+DIR=`pwd`/gnu/tartest
+sed "s|$DIR|ABSPATH|" stdout
],
[0],
[A
@@ -72,7 +58,12 @@ B
ABSPATH/
ABSPATH/subdir/
ABSPATH/subdir/dir2/
-],
+])
+
+AT_CHECK([
+DIR=`pwd`/gnu/tartest
+sed "/tar: Removing leading \`\/*\/' from/d;s|$DIR|ABSPATH|" stderr],
+[0],
[A
B
tar: .: Directory is new
@@ -81,7 +72,26 @@ tar: ./subdir/dir1: Directory is new
tar: ABSPATH: Directory is new
tar: ABSPATH/subdir: Directory is new
tar: ABSPATH/subdir/dir2: Directory is new
-tar: Removing leading `/' from member names
-],[],[],[gnu])
+])],
+[AT_TAR_CHECK([
+AT_CHECK_TIMESTAMP
+AT_SORT_PREREQ
+mkdir tartest
+cd tartest
+mkdir foo
+mkdir foo/subdir
+mkdir foo/subdir/dir1
+mkdir subdir
+mkdir subdir/dir2
+decho A
+find .|sort
+
+decho B
+DIR=`pwd`
+tar -cvf ../foo.tar --listed-incremental=../foo.snar -C foo . $DIR
+],
+[0],
+[stdout],
+[stderr],[],[],[gnu])])
AT_CLEANUP
diff --git a/tests/incr09.at b/tests/incr09.at
index 011fa50c598d53aa3eaa630ff1cacd3aed07bbfb..32290177b1a49ac46d208c8cf5b5bf51b9a55bc8 100644
--- a/tests/incr09.at
+++ b/tests/incr09.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/incr10.at b/tests/incr10.at
index de309b2b19818f4aafad84b696d143950e85a1e7..a48fbd84507917fc57f4e06cb4f70700d8ffa550 100644
--- a/tests/incr10.at
+++ b/tests/incr10.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/incr11.at b/tests/incr11.at
index 169dcde1d3c4d5f5f66ef719a367ddbf0abc420b..fc3ef6060601dbfa4d3e26999085feb1502a8a58 100644
--- a/tests/incr11.at
+++ b/tests/incr11.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/incremental.at b/tests/incremental.at
index 9ab6801368d2b69a2a5c294ee09b608df14485ef..44d77a3d4538e10a078d72bf43d63c3e714f8854 100644
--- a/tests/incremental.at
+++ b/tests/incremental.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/indexfile.at b/tests/indexfile.at
index 1623cabd17e5f152da15e287e43e7bd3d504b014..38b13215398f2fbba2390ec0d8e4a3e99e3fbe5f 100644
--- a/tests/indexfile.at
+++ b/tests/indexfile.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/label01.at b/tests/label01.at
index 457ad293c8f03d66538d96da46759bdd402f4cf8..545c06731f408ef5398bf15d4595b809b765d3dd 100644
--- a/tests/label01.at
+++ b/tests/label01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/label02.at b/tests/label02.at
index be303fe8f8135cf6bf16c6d44a3f1d1b183441a0..ff3acd2fe8c1f00d2d192dd9025861b40b7c78e3 100644
--- a/tests/label02.at
+++ b/tests/label02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/label03.at b/tests/label03.at
index d698e3bd5cbaa80ed597b2d5b1f543bb7fa3fa98..4efd9c337641162c89d8dcf745a590df7d9a4460 100644
--- a/tests/label03.at
+++ b/tests/label03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/label04.at b/tests/label04.at
index 05bf4d517324826f7a8b5ca2aab609f7de59f138..1a950262e8d6df3325aca2eb983839a3095345f7 100644
--- a/tests/label04.at
+++ b/tests/label04.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/label05.at b/tests/label05.at
index 8dc892b821379b8ee73f6290f9a30051fd3870f7..8524de598cff8868136da9a16d5fda5afce9a042 100644
--- a/tests/label05.at
+++ b/tests/label05.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/link01.at b/tests/link01.at
index d8aa99d706c373178cf8c354e66246f350559d71..75c5cb0fd4d4456f9e75476487aeddf5494dc6a6 100644
--- a/tests/link01.at
+++ b/tests/link01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/link02.at b/tests/link02.at
index 3b129bb1ebe3a69bce8d4fa241d9cab4510fb7eb..8ce5620bb987f602496efa7810434803d61c18fa 100644
--- a/tests/link02.at
+++ b/tests/link02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/link03.at b/tests/link03.at
index 8ec84995efa36b3f9203e54b2c4d5961dcd79a66..e991601e18cf291453d8c368c5b6d0b10010f21c 100644
--- a/tests/link03.at
+++ b/tests/link03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/link04.at b/tests/link04.at
index 511482f37315464562b2ba94e1248a0ab35438a8..94f6c02deeb4579c04e1247d5b96e0638ddfa9c3 100644
--- a/tests/link04.at
+++ b/tests/link04.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/listed01.at b/tests/listed01.at
index 62e561863ed4b312c8ccba4ee0934cb8e49a34b0..8a166bc68b3f974957433bebe9b72281212b998e 100644
--- a/tests/listed01.at
+++ b/tests/listed01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004-2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/listed02.at b/tests/listed02.at
index db3c407887ac695365c4208724422512db6d09de..0451f0bbfed4b70b1f37a75cd02cc7a5835dce56 100644
--- a/tests/listed02.at
+++ b/tests/listed02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004-2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/listed03.at b/tests/listed03.at
index 96db0b938db35a1198383c09c3eb794b07af939c..38c6187db5fd52c5a8c09ec67b9c778f30c4d77b 100644
--- a/tests/listed03.at
+++ b/tests/listed03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/listed04.at b/tests/listed04.at
index 139f92c8ef92e3d70002ddc081641de82b1c945a..ad7668f779352f48c97c7366c6779c4803fb43b7 100644
--- a/tests/listed04.at
+++ b/tests/listed04.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/listed05.at b/tests/listed05.at
index 4d238a83cda2c1bb883b9cb83234c9b1903aabda..78880db496c220c67fa8d7caf02e936b7e126574 100644
--- a/tests/listed05.at
+++ b/tests/listed05.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/long01.at b/tests/long01.at
index 4c41b00ba418bf4f678ea326053f66bd10e38756..99d3382465278c371a1b56833b8eb9094a6968bc 100644
--- a/tests/long01.at
+++ b/tests/long01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/longv7.at b/tests/longv7.at
index 9bc8882fdd47a210bf0123dd3d44f8b0628c2ffe..62c2f555e2a5e910fbe31c194b9a86c3b841d822 100644
--- a/tests/longv7.at
+++ b/tests/longv7.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/lustar01.at b/tests/lustar01.at
index f49b9add2760afdd1715b9e0a7bcbd5010102d15..d1fcaee0293ede5b17d44458262d1c31fde5f455 100644
--- a/tests/lustar01.at
+++ b/tests/lustar01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/lustar02.at b/tests/lustar02.at
index e4d3a1289556e2c4a445a836c9527c5583b4c6c7..2d744341b9c0189eb1a7a08502608fa05fe89f34 100644
--- a/tests/lustar02.at
+++ b/tests/lustar02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/lustar03.at b/tests/lustar03.at
index 438d23ff3cb5e360903fb2ee05b1b92b0346fb37..f6834b10cd6529394a902cc4bc8078b156c6c00c 100644
--- a/tests/lustar03.at
+++ b/tests/lustar03.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/map.at b/tests/map.at
index 93a9ed428efbb392326b0575b1c5897b8640b120..3d70703dac7c27b175aef39a800e8c86335453ec 100644
--- a/tests/map.at
+++ b/tests/map.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/multiv01.at b/tests/multiv01.at
index 28c8e7530f1f0ca910625548aa97e164f9d73f66..e0a8454cf00f26ee021ab4bbc15dc0241e82c097 100644
--- a/tests/multiv01.at
+++ b/tests/multiv01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/multiv02.at b/tests/multiv02.at
index e6f1a38b4fc8ffed103e89c3e46555f3fbb241f3..731bce47380ee921474060bd0d18955739322436 100644
--- a/tests/multiv02.at
+++ b/tests/multiv02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/multiv03.at b/tests/multiv03.at
index 81e167a67b8a0d5357fb7d2c49b3366fe19faecf..f37ad2bba9ea66e8d5efb3f90c00941b10c8fe92 100644
--- a/tests/multiv03.at
+++ b/tests/multiv03.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/multiv04.at b/tests/multiv04.at
index b2b24cc50faff63d3555e3c7f4eeb0e61038e6c7..b4a613a64205146b8f32d89556cd46db7dbc3c82 100644
--- a/tests/multiv04.at
+++ b/tests/multiv04.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/multiv05.at b/tests/multiv05.at
index 3071389f23f9fe1f9cd5a6512af83935b62361aa..0f10164ae5ce477871fd28b38dfb294484fb6f1b 100644
--- a/tests/multiv05.at
+++ b/tests/multiv05.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2008, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/multiv06.at b/tests/multiv06.at
index 87f39b67fc63795bd7bea8e8747bfdf6e5ba5a53..0c1c802d3077a415a4074f0c1d6d24754aa4d432 100644
--- a/tests/multiv06.at
+++ b/tests/multiv06.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2008, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2008-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/multiv07.at b/tests/multiv07.at
index 8ae49c604cfa8797e2bdc87ff1f75b6261e7cf61..09f991b3229ff26bfd4afbd028eb1cd383a2f59e 100644
--- a/tests/multiv07.at
+++ b/tests/multiv07.at
@@ -1,5 +1,5 @@
# Test suite for GNU tar. -*- Autotest -*-
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/multiv08.at b/tests/multiv08.at
index 200ef63487f577ef80c96b802f24b5b0b3926fdc..2fc114b6e16af41225513bbfa010a68f4e5a6e0a 100644
--- a/tests/multiv08.at
+++ b/tests/multiv08.at
@@ -1,5 +1,5 @@
# Test suite for GNU tar. -*- Autotest -*-
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/multiv09.at b/tests/multiv09.at
index 42948479d3dc12b4c80da887a3418e3c820e19ed..391ef34882299def62702dcb737d65c2c5e70263 100644
--- a/tests/multiv09.at
+++ b/tests/multiv09.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/multiv10.at b/tests/multiv10.at
index 03fbf15b658214716ad82f69a25bc3bf6fed8f0f..5dab053b7a85b3c755426f45a172cf12eb6d5bc1 100644
--- a/tests/multiv10.at
+++ b/tests/multiv10.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/numeric.at b/tests/numeric.at
index 8054fc3c29c43b0340c55944c91202c766ef9b31..4ef92c7a26b2bddde342590b47da4f75c314a45f 100644
--- a/tests/numeric.at
+++ b/tests/numeric.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,14 +27,17 @@ tar $1 -vvf a dir |dnl
])
AT_TAR_CHECK([
-mkdir dir
-genfile --file dir/file
-
MYUID=$(id -u) || AT_SKIP_TEST
MYGID=$(id -g) || AT_SKIP_TEST
MYUSR=$(id -un) || AT_SKIP_TEST
MYGRP=$(id -gn) || AT_SKIP_TEST
+mkdir dir
+# Ensure correct group id on BSDs.
+chown :$MYGID dir >/dev/null 2>/dev/null
+genfile --file dir/file
+
+
TESTOP([--create])
TESTOP([--list])
TESTOP([--diff])
diff --git a/tests/old.at b/tests/old.at
index f5fabc0871f568f42912521a3f7cb21bb2d55c09..a253dbbbee4238e0a31e273411125c0b8824a30f 100644
--- a/tests/old.at
+++ b/tests/old.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/onetop01.at b/tests/onetop01.at
index fed1afefcdcffb071d413e62d96fe95758435048..2139d5b4d122b5f875449143f9385b20751b497a 100644
--- a/tests/onetop01.at
+++ b/tests/onetop01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2014-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/onetop02.at b/tests/onetop02.at
index 0ba91f8826bc33ed7b0e1a00559e615abf2766e9..98b5bc97496b36c221f9e1937e25650bebd73a3d 100644
--- a/tests/onetop02.at
+++ b/tests/onetop02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2014-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/onetop03.at b/tests/onetop03.at
index 52464a084b5c4563c3b841f798a3c3086f211c10..4c3597bb25e62b89719d26faaf39bda495ecb639 100644
--- a/tests/onetop03.at
+++ b/tests/onetop03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2014-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/onetop04.at b/tests/onetop04.at
index 8f5809a12a412b3d55d327b902685ba03a3fa504..3fb307ed952a918ef22804bbb66a3e576251388e 100644
--- a/tests/onetop04.at
+++ b/tests/onetop04.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2014-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/onetop05.at b/tests/onetop05.at
index 954a65f0848decb04038f09d751d755951aa2f26..23eea8d1004f54b549fe9e3b1afb3311eea2ff65 100644
--- a/tests/onetop05.at
+++ b/tests/onetop05.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2015-2017 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/opcomp01.at b/tests/opcomp01.at
index 68e28673ad79647bf073c3446e99ad2afb43c9bd..02c8cc0316b7155ed89efb7f163dfab8060f56ad 100644
--- a/tests/opcomp01.at
+++ b/tests/opcomp01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/opcomp02.at b/tests/opcomp02.at
index c8823b96e2c785869ecb3eb026553ae15ad7537f..208f80f09581fc759bffed0256ad5e13974fac0f 100644
--- a/tests/opcomp02.at
+++ b/tests/opcomp02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/opcomp03.at b/tests/opcomp03.at
index 2bb355e07a8c342f04313ed46f2633aa39b0e4a8..bc67eaab9efd3b3e597125991c0bbf9bb3908b47 100644
--- a/tests/opcomp03.at
+++ b/tests/opcomp03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/opcomp04.at b/tests/opcomp04.at
index a8837d15aa927cd94c4bf9398e8cb6df49191036..3b34a43bdf18c8a71416e732f126cea56a61cd7f 100644
--- a/tests/opcomp04.at
+++ b/tests/opcomp04.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/opcomp05.at b/tests/opcomp05.at
index e9e8050404679eef4136871036d24dce1e2fe858..56f6d183e764ee7f42d29ac596720c4402b237d2 100644
--- a/tests/opcomp05.at
+++ b/tests/opcomp05.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/opcomp06.at b/tests/opcomp06.at
index 54f4621bd3679eaf35489ae6a0b1a1df5278b03f..08bc11f6c6132a3a34935329bece13bf2208c2a1 100644
--- a/tests/opcomp06.at
+++ b/tests/opcomp06.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/options.at b/tests/options.at
index fef6ad602a1b8abc09aca3a8630af0cfe3035679..5223c687241ba8b81b4d604dac87cce2e454c91d 100644
--- a/tests/options.at
+++ b/tests/options.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/options02.at b/tests/options02.at
index 420a8daf7c6a74cc1e5968b20482c85f2b16026a..9a2e1bbdbf43186aeb5f7185be7e99925012517a 100644
--- a/tests/options02.at
+++ b/tests/options02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/options03.at b/tests/options03.at
index 710f1086bd053fad3093845aa47ae66355cae010..8c3d8267a62d542f307d3cce28991ec184959095 100644
--- a/tests/options03.at
+++ b/tests/options03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2016-2017 Free Software Foundation, Inc.
+# Copyright 2016-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/owner.at b/tests/owner.at
index cd64e95cf590fbe5637c0669c9c09953ea7fa873..ee1cc52466171dd1bf7e1720ea9082ae0d8136fa 100644
--- a/tests/owner.at
+++ b/tests/owner.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2011, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2011-2019 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/package.m4 b/tests/package.m4
index 76a1252fc17e140964d7430f721420c84427201a..4cf10ec2de1a44eaf813886669c62d356dbe27fd 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -1,6 +1,6 @@
# Signature of the current package.
m4_define([AT_PACKAGE_NAME], [GNU tar])
m4_define([AT_PACKAGE_TARNAME], [tar])
-m4_define([AT_PACKAGE_VERSION], [1.30])
-m4_define([AT_PACKAGE_STRING], [GNU tar 1.30])
+m4_define([AT_PACKAGE_VERSION], [1.32])
+m4_define([AT_PACKAGE_STRING], [GNU tar 1.32])
m4_define([AT_PACKAGE_BUGREPORT], [bug-tar@gnu.org])
diff --git a/tests/pipe.at b/tests/pipe.at
index e8407c97c62bc7f816028cd8a67f9cc011d5e297..ea4f907c5bb17b3978259dc8a644ddb18f087c9e 100644
--- a/tests/pipe.at
+++ b/tests/pipe.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004-2009, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/positional01.at b/tests/positional01.at
index 79c4ec5dd3e1dab251d371ef4e283fec8fb9452b..b2783f7a5558c2ccac7a8e388fe4d5f5ff23adbb 100644
--- a/tests/positional01.at
+++ b/tests/positional01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2016-2017 Free Software Foundation, Inc.
+# Copyright 2016-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/positional02.at b/tests/positional02.at
index 92cb90a4cf3aea0aa32ef72e74a858c2a7a378e6..64c5400c2cfe5bd8ca93b3f27aab59057f158843 100644
--- a/tests/positional02.at
+++ b/tests/positional02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2016-2017 Free Software Foundation, Inc.
+# Copyright 2016-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/positional03.at b/tests/positional03.at
index 11359e7e8494ed63aab3840b9160b208b9032713..3239925d35ef2e682f652398f324bfcb0762caf7 100644
--- a/tests/positional03.at
+++ b/tests/positional03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2016-2017 Free Software Foundation, Inc.
+# Copyright 2016-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/recurs02.at b/tests/recurs02.at
index ed35f24646a00b8d55c4ae8bab018b102dd77645..7fb1f7ea7dd5d5d9b167af692dd1b62d51887333 100644
--- a/tests/recurs02.at
+++ b/tests/recurs02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/recurse.at b/tests/recurse.at
index 0126ab0f44f14f382a1636613c3fa04f1cb0c82b..92ad5f4352f50ef094689eca1dc83385a21dce2c 100644
--- a/tests/recurse.at
+++ b/tests/recurse.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/remfiles01.at b/tests/remfiles01.at
index 4b339598106053e241a27c7a63249ed297ac39b6..9284590eaf5b79e499a38c4d4b206c999da5516f 100644
--- a/tests/remfiles01.at
+++ b/tests/remfiles01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/remfiles02.at b/tests/remfiles02.at
index cd861e1b8e182ef1814c01af996a7a48d2d171cc..e5c090e8d47144f315895381000448b2b7e65903 100644
--- a/tests/remfiles02.at
+++ b/tests/remfiles02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/remfiles03.at b/tests/remfiles03.at
index dc5048b923ce9464a436450bbe1ee9a2afad2415..9df0f47d2de46d1a633c6a01825c2f1034163a7b 100644
--- a/tests/remfiles03.at
+++ b/tests/remfiles03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/remfiles04a.at b/tests/remfiles04a.at
index 23c534d96499bb24a8d6872cdab9925415a284db..7014baf3e0b5cfff17864f68a833d5a71e5bce1a 100644
--- a/tests/remfiles04a.at
+++ b/tests/remfiles04a.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles04b.at b/tests/remfiles04b.at
index f690454be79d373899b203603c75a355e527b01f..95042d5ea9f718c53a0d95bab52cdd04acad9ab5 100644
--- a/tests/remfiles04b.at
+++ b/tests/remfiles04b.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles04c.at b/tests/remfiles04c.at
index 9c590f58e94d5eff7899efb8b711ff06a17d4e0e..b523869a93d1f21e6797771f79daf40d10a90cac 100644
--- a/tests/remfiles04c.at
+++ b/tests/remfiles04c.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles05a.at b/tests/remfiles05a.at
index 60f6651e8fa1527174d3178e1357ca19394bee5d..529f0b30c40bd96c468e21ac65a2023c2e898aca 100644
--- a/tests/remfiles05a.at
+++ b/tests/remfiles05a.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles05b.at b/tests/remfiles05b.at
index 6783ba36a10b5e7098845cb965947e6881e1c038..7c1419ed61627eea1f8d5665941a9440b49121f5 100644
--- a/tests/remfiles05b.at
+++ b/tests/remfiles05b.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles05c.at b/tests/remfiles05c.at
index c314b1e810354dfdb0aa5cdfd3096d6b37355f65..35cdd477b1fa7cb26fac541fdd6aa691a1c7ce76 100644
--- a/tests/remfiles05c.at
+++ b/tests/remfiles05c.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles06a.at b/tests/remfiles06a.at
index 70d71db2aa7c57c9be6feb6c4a37525250d43024..9e0be65a55de11f0b8eaba4322f2584ecaf78137 100644
--- a/tests/remfiles06a.at
+++ b/tests/remfiles06a.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles06b.at b/tests/remfiles06b.at
index 692b70b493c2c1ecefdaf1011b367b9c127e4fac..0f5eb6067afe075bc89ca53fb3c18d430d263ea4 100644
--- a/tests/remfiles06b.at
+++ b/tests/remfiles06b.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles06c.at b/tests/remfiles06c.at
index bc66bb6036ab34a642efc84c4eef3ed958a15b7a..61a0c5df73826b2e12c9fa13471dedb7b6375539 100644
--- a/tests/remfiles06c.at
+++ b/tests/remfiles06c.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles07a.at b/tests/remfiles07a.at
index b8194a8c0f29e6aa2d0af62ba19bd941f0b68501..ac3922d04e0ee0734a596dd1988f17afebdec845 100644
--- a/tests/remfiles07a.at
+++ b/tests/remfiles07a.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles07b.at b/tests/remfiles07b.at
index 4a62de3c25f7cbb385567f9b0dbb4c60b81f85af..6a00eda8996aa7d968395be65d6f164326721ca1 100644
--- a/tests/remfiles07b.at
+++ b/tests/remfiles07b.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles07c.at b/tests/remfiles07c.at
index 4c312a553a99fca0b9aa78de4f9ae6f599e386e3..41b196e070f12f9c747a0030bcb2060334adc901 100644
--- a/tests/remfiles07c.at
+++ b/tests/remfiles07c.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles08a.at b/tests/remfiles08a.at
index 59248d6a5a3618589a542f1011a56c5fe55efd35..d044e8cc310b746f8254db978f3f85df646350a4 100644
--- a/tests/remfiles08a.at
+++ b/tests/remfiles08a.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles08b.at b/tests/remfiles08b.at
index 5aeb8ad60783d400502a8bca40a995c73406dca9..1675108ec6b53d09b8d2008be60635270aa8d0ff 100644
--- a/tests/remfiles08b.at
+++ b/tests/remfiles08b.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles08c.at b/tests/remfiles08c.at
index 1f5adab9ba531fbd284c6ab83b2652001d915187..716b29c6c501fc4548a4ec9b0bc0d5f09ad95eaa 100644
--- a/tests/remfiles08c.at
+++ b/tests/remfiles08c.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles09a.at b/tests/remfiles09a.at
index 02a31ff805374f31670e348747aa912b8710bf28..bc1504ab4ed4c50335c8967ecb37a3be7a3d594a 100644
--- a/tests/remfiles09a.at
+++ b/tests/remfiles09a.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles09b.at b/tests/remfiles09b.at
index aebaf54512b3deb2bb112ea0744155b22e461b89..2332a3249063f4bac9ad8cb546e440d8eb902734 100644
--- a/tests/remfiles09b.at
+++ b/tests/remfiles09b.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles09c.at b/tests/remfiles09c.at
index d03d66bf23bb97894c627116d6543519a6538d8c..984545a99d297028c33e29ab6f23495a89e0899b 100644
--- a/tests/remfiles09c.at
+++ b/tests/remfiles09c.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remfiles10.at b/tests/remfiles10.at
index 281939b64dbb3b80127299a869cb2d43584633ad..398410712943eed1d965a097a60a584c891c9cbf 100644
--- a/tests/remfiles10.at
+++ b/tests/remfiles10.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
#
# GNU tar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/rename01.at b/tests/rename01.at
index 07ccd06f53ced7e818b208124298b2f24f0da640..a388df32a2d81301cf386b8c72e5a22f99b26b47 100644
--- a/tests/rename01.at
+++ b/tests/rename01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/rename02.at b/tests/rename02.at
index f7e0f3a50c19a78903de9064b97983ac43508cd3..24f74127d0701898303a49f0230bda212f18e048 100644
--- a/tests/rename02.at
+++ b/tests/rename02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/rename03.at b/tests/rename03.at
index 18cb7cdb057567c4c9c5956a2f4149aeb5ef0dc9..0bfc1889bd2c849b88512a8f88a6c7e2d79aa74a 100644
--- a/tests/rename03.at
+++ b/tests/rename03.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/rename04.at b/tests/rename04.at
index 180cb147eaf2524c078f10bdee742dc17a1d63b9..8c549ca30bb72c6df58c7feeb8130df8635e266b 100644
--- a/tests/rename04.at
+++ b/tests/rename04.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2008, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2008-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/rename05.at b/tests/rename05.at
index 92d2ae5a9bb916b8e4c3ca61a428f303fdffe751..e51ead55d3740523508a4517ae4f7d2be0bb8530 100644
--- a/tests/rename05.at
+++ b/tests/rename05.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2008, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2008-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/same-order01.at b/tests/same-order01.at
index b8f36472c158799b5fc6b5928904c5c6e8c23643..9707cf64117fdda5197f14f8d56579296bfee6cb 100644
--- a/tests/same-order01.at
+++ b/tests/same-order01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/same-order02.at b/tests/same-order02.at
index 3174509e5a20950a209593d19c5be9d7f6ce4ae5..e82eded8eb6a416e49879934b42f423e9160d9a3 100644
--- a/tests/same-order02.at
+++ b/tests/same-order02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/selacl01.at b/tests/selacl01.at
index c4145262a28c24887159eea99e2d3a1ecc5871ed..d7564a0a7ff57adf34b99d5199f3a2f89f394091 100644
--- a/tests/selacl01.at
+++ b/tests/selacl01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2011, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2011-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/selnx01.at b/tests/selnx01.at
index f4af605f7b2f0fa000d4ab6dbbc3a589a4c7ed3c..490b651a54eeac3d48bfa9e5d8d30e72dd8fb2a5 100644
--- a/tests/selnx01.at
+++ b/tests/selnx01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2012-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/shortfile.at b/tests/shortfile.at
index b59ed4f1b82f87bca7c33e3835d62c6b21ff4d77..046a4fefd80c912c9597095ddb5567393ad089cb 100644
--- a/tests/shortfile.at
+++ b/tests/shortfile.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2007, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2007-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/shortrec.at b/tests/shortrec.at
index c84663df1b2306a3697f27502b88ab7f8269d2c3..bdf2fbed3e8def66a255d49ab1b95e4691a48616 100644
--- a/tests/shortrec.at
+++ b/tests/shortrec.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005, 2007-2009, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/shortupd.at b/tests/shortupd.at
index 6d5dd9bfb408a2be90e37e1823706bc91f3ef932..23657c23515ea1983eac0da7f52c915341b087d5 100644
--- a/tests/shortupd.at
+++ b/tests/shortupd.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2007, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2007-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/sigpipe.at b/tests/sigpipe.at
index 3abe768c9f903f0d627be7db05aa5d95a434ae18..79dd78544e1aa5f72bc8be2932857231e7ea1f55 100644
--- a/tests/sigpipe.at
+++ b/tests/sigpipe.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/sparse01.at b/tests/sparse01.at
index ffc2e2650784519e70e3d8c9d0b0293b879da207..d896e6801f137a705a74c5f69c9a04c889e809c0 100644
--- a/tests/sparse01.at
+++ b/tests/sparse01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/sparse02.at b/tests/sparse02.at
index 61a3372eb309806a72973364b3b4d4516f5abfaa..54167825bf10397ad9c0f5c56feaa4f2571f9618 100644
--- a/tests/sparse02.at
+++ b/tests/sparse02.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/sparse03.at b/tests/sparse03.at
index 768ca2b8ede0f6833a727eef596eacff9025259b..61d2b487799459a62c48fcfa78167c8790b7b222 100644
--- a/tests/sparse03.at
+++ b/tests/sparse03.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -20,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([storing sparse files > 8G])
-AT_KEYWORDS([sparse sparse03])
+AT_KEYWORDS([sparse sparse03 largefile])
# Tar 1.15.1 incorrectly computed sparse member size if the extended
# PAX header contained size keyword.
@@ -28,6 +27,7 @@ AT_KEYWORDS([sparse sparse03])
# http://lists.gnu.org/archive/html/bug-tar/2005-06/msg00040.html
AT_TAR_CHECK([
+AT_SKIP_LARGE_FILES
genfile --length 1000 --file begin
genfile --length 1000 --file end
genfile --sparse --file sparsefile --block-size 512 8G A || AT_SKIP_TEST
diff --git a/tests/sparse04.at b/tests/sparse04.at
index 66627daf07628c5ab601c960aed210d0a15c111e..38c661bccf27e7c8dc66fb16ef0b019378a37dd2 100644
--- a/tests/sparse04.at
+++ b/tests/sparse04.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/sparse05.at b/tests/sparse05.at
index ed5db456f19d1f7de8cbeec3c7b1dfd9f75e3a47..3e749cf5918376941ef00705da9f89382b644b46 100644
--- a/tests/sparse05.at
+++ b/tests/sparse05.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([listing sparse files bigger than 2^33 B])
-AT_KEYWORDS([sparse sparse05])
+AT_KEYWORDS([sparse sparse05 largefile])
# Description: If an archive in POSIX.1-2001 archive contained a sparse file
# member whose real size (excluding zero blocks) is bigger than 2^33 bytes,
@@ -29,6 +29,7 @@ AT_KEYWORDS([sparse sparse05])
# http://lists.gnu.org/archive/html/bug-tar/2013-01/msg00001.html
AT_TAR_CHECK([
+AT_SKIP_LARGE_FILES
AT_DATA([mapfile],
[0 =2560
m4_for([i], 1, 999, 1, [10M =2560
diff --git a/tests/sparse06.at b/tests/sparse06.at
index 530e2f8b3c89e09c0f36b507ac54cc2641c34769..650b4f57eb77d632273a62bda0308b012a9a31ff 100644
--- a/tests/sparse06.at
+++ b/tests/sparse06.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/sparse07.at b/tests/sparse07.at
index 78596d70add2c321ad473acb37ab2b7ab2b5bc98..33cca896db8eab5e7e9fd51a0aa4a21606bbcc09 100644
--- a/tests/sparse07.at
+++ b/tests/sparse07.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2016-2017 Free Software Foundation, Inc.
+# Copyright 2016-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/sparsemv.at b/tests/sparsemv.at
index 7aae74d2323a2d328726a7d75ab83c85d6b467fb..b00d14e6fce1069a61761bd7d437a3dc9d21850c 100644
--- a/tests/sparsemv.at
+++ b/tests/sparsemv.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005-2008, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/sparsemvp.at b/tests/sparsemvp.at
index 2752bc89bd3b8ee5b62c9604b6732d164c660008..f6ace3c1ba5743f43696c260610789c207ac2322 100644
--- a/tests/sparsemvp.at
+++ b/tests/sparsemvp.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005-2009, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/spmvp00.at b/tests/spmvp00.at
index 81cca8ad148b953beec18ffb1576960cb6625e57..90468fde053f342ca3084b62826ec0387891119f 100644
--- a/tests/spmvp00.at
+++ b/tests/spmvp00.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/spmvp01.at b/tests/spmvp01.at
index 50a33b0c0264400012bd02308ed8da10e8b035c7..0a99c7d55aeb2dacf41f93c3de7991f8dedf4532 100644
--- a/tests/spmvp01.at
+++ b/tests/spmvp01.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/spmvp10.at b/tests/spmvp10.at
index e4604425ab078d0fc2c98071239e815574c62164..08adfd4b94461a3df36faa1bb23b50aeab23a75b 100644
--- a/tests/spmvp10.at
+++ b/tests/spmvp10.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/sptrcreat.at b/tests/sptrcreat.at
new file mode 100644
index 0000000000000000000000000000000000000000..2c730cc6bd4ed6d38c503d2f35675dfbac645799
--- /dev/null
+++ b/tests/sptrcreat.at
@@ -0,0 +1,58 @@
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
+
+# Test suite for GNU tar.
+# Copyright 2018-2019 Free Software Foundation, Inc.
+
+# This file is part of GNU tar.
+
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Tar up to 1.30 would loop endlessly if a sparse file had been truncated
+# while being archived (with --sparse flag).
+#
+# The bug has been assigned id CVE-2018-20482 (on the grounds that it is a
+# denial of service possibility).
+#
+# Reported by: Chris Siebenmann <cks.gnutar-01@cs.toronto.edu>
+# References: <20181226223948.781EB32008E@apps1.cs.toronto.edu>,
+# <http://lists.gnu.org/archive/html/bug-tar/2018-12/msg00023.html>
+# <https://utcc.utoronto.ca/~cks/space/blog/sysadmin/TarFindingTruncateBug>
+# <https://nvd.nist.gov/vuln/detail/CVE-2018-20482>
+
+AT_SETUP([sparse file truncated while archiving])
+AT_KEYWORDS([truncate filechange sparse sptr sptrcreat])
+
+AT_TAR_CHECK([
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \
+ tar --sparse -vcf bar foo baz
+echo Exit status: $?
+echo separator
+genfile --file foo --seek 200m --length 11575296 --pattern=zeros
+tar dvf bar | sed '/foo: Mod time differs/d'],
+[0],
+[foo
+baz
+Exit status: 1
+separator
+foo
+baz
+],
+[tar: foo: File shrank by 11575296 bytes; padding with zeros
+],
+[],[],[posix, gnu, oldgnu])
+
+AT_CLEANUP
diff --git a/tests/sptrdiff00.at b/tests/sptrdiff00.at
new file mode 100644
index 0000000000000000000000000000000000000000..990c6fa4b963807121f7509c3fd6afde23b701f3
--- /dev/null
+++ b/tests/sptrdiff00.at
@@ -0,0 +1,52 @@
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
+#
+# Test suite for GNU tar.
+# Copyright 2018-2019 Free Software Foundation, Inc.
+#
+# This file is part of GNU tar.
+#
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# While fixing CVE-2018-20482 (see sptrcreat.at) it has been discovered
+# that similar bug exists in file checking code (tar d).
+# This test case checks if tar correctly handles a short read condition
+# appearing in check_sparse_region.
+
+AT_SETUP([file truncated in sparse region while comparing])
+AT_KEYWORDS([truncate filechange sparse sptr sptrdiff diff])
+
+# This triggers short read in check_sparse_region.
+AT_TAR_CHECK([
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \
+ tar --sparse -vdf bar
+],
+[1],
+[creating
+foo
+baz
+comparing
+foo
+foo: Size differs
+baz
+],
+[],
+[],[],[posix, gnu, oldgnu])
+
+AT_CLEANUP
diff --git a/tests/sptrdiff01.at b/tests/sptrdiff01.at
new file mode 100644
index 0000000000000000000000000000000000000000..fcada14ca192ac181e78540e9f4bd68f28d5e1a5
--- /dev/null
+++ b/tests/sptrdiff01.at
@@ -0,0 +1,52 @@
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
+#
+# Test suite for GNU tar.
+# Copyright 2018-2019 Free Software Foundation, Inc.
+#
+# This file is part of GNU tar.
+#
+# GNU tar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU tar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# While fixing CVE-2018-20482 (see sptrcreat.at) it has been discovered
+# that similar bug exists in file checking code (tar d).
+# This test case checks if tar correctly handles a short read condition
+# appearing in check_data_region.
+
+AT_SETUP([file truncated in data region while comparing])
+AT_KEYWORDS([truncate filechange sparse sptr sptrdiff diff])
+
+# This triggers short read in check_data_region.
+AT_TAR_CHECK([
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 5 --length 221278210 --truncate foo -- \
+ tar --sparse -vdf bar
+],
+[1],
+[creating
+foo
+baz
+comparing
+foo
+foo: Size differs
+baz
+],
+[],
+[],[],[posix, gnu, oldgnu])
+
+AT_CLEANUP
diff --git a/tests/star/README b/tests/star/README
index a8f128d5c16331dd732776fe1f2d7bcdef7e6a33..554f122e79f59dcd6704895dcd3d262c52c7c13a 100644
--- a/tests/star/README
+++ b/tests/star/README
@@ -67,8 +67,7 @@ the example below:
* Copying
-Copyright 2004, 2006-2008, 2010, 2012-2014, 2016-2017 Free Software
-Foundation, Inc.
+Copyright 2004-2019 Free Software Foundation, Inc.
This file is part of GNU tar.
diff --git a/tests/star/gtarfail.at b/tests/star/gtarfail.at
index e8199d126a60a6eff43dca3c01acabb2c1121386..339d5007b682eecb9fe9c11672ffb9688e4709b1 100644
--- a/tests/star/gtarfail.at
+++ b/tests/star/gtarfail.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/star/gtarfail2.at b/tests/star/gtarfail2.at
index fc6922cf3c6b457908245b50faf5b311c0bc9873..02d1217c6888795882770df9545b085cf24e5d51 100644
--- a/tests/star/gtarfail2.at
+++ b/tests/star/gtarfail2.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/star/multi-fail.at b/tests/star/multi-fail.at
index 5622fcf0c6640caa7555c1b7be0d61fff457e704..c0d46dfbce7b031bdec08ed2c66e9e8fe2de56d4 100644
--- a/tests/star/multi-fail.at
+++ b/tests/star/multi-fail.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/star/pax-big-10g.at b/tests/star/pax-big-10g.at
index 4de14486167ed153e89a05664fba62f769bc7d50..92e7158a6e0f0bcac446c19d632f305a05e12f76 100644
--- a/tests/star/pax-big-10g.at
+++ b/tests/star/pax-big-10g.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -20,11 +19,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([pax-big-10g])
-AT_KEYWORDS([star pax-big-10g])
+AT_KEYWORDS([star pax-big-10g largefile])
unset TAR_OPTIONS
AT_CHECK([
+AT_SKIP_LARGE_FILES
AT_GZIP_PREREQ([bzip2])
AT_STAR_PREREQ([pax-big-10g.tar.bz2],[ca15c23acc8d8bb1f27e60113a5f8bff])
diff --git a/tests/star/quicktest.sh b/tests/star/quicktest.sh
index c7c8c3b4ec5535aa6e7bfa1307750b499e421ef7..9d481983bfd961f33294ac5397d03b461c7568fe 100755
--- a/tests/star/quicktest.sh
+++ b/tests/star/quicktest.sh
@@ -1,7 +1,6 @@
#! /bin/sh
# This file is part of GNU tar testsuite.
-# Copyright 2004-2005, 2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/star/ustar-big-2g.at b/tests/star/ustar-big-2g.at
index 1d62bfa3b473d4f845c14f3961edd64e209c9695..f44d6ed30025b1a375c5c571d359ea89b7263980 100644
--- a/tests/star/ustar-big-2g.at
+++ b/tests/star/ustar-big-2g.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -20,11 +19,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([ustar-big-2g])
-AT_KEYWORDS([star ustar-big-2g])
+AT_KEYWORDS([star ustar-big-2g largefile])
unset TAR_OPTIONS
AT_CHECK([
+AT_SKIP_LARGE_FILES
AT_GZIP_PREREQ([bzip2])
AT_STAR_PREREQ([ustar-big-2g.tar.bz2],[b63979733629c8fcdf40b60065422767])
diff --git a/tests/star/ustar-big-8g.at b/tests/star/ustar-big-8g.at
index 8caf8161b213fcb2974e06982154bcead16b347a..13bf7133f35e1b130974937c59693256ca947f69 100644
--- a/tests/star/ustar-big-8g.at
+++ b/tests/star/ustar-big-8g.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -20,11 +19,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([ustar-big-8g])
-AT_KEYWORDS([star ustar-big-8g])
+AT_KEYWORDS([star ustar-big-8g largefile])
unset TAR_OPTIONS
AT_CHECK([
+AT_SKIP_LARGE_FILES
AT_GZIP_PREREQ([bzip2])
AT_STAR_PREREQ([ustar-big-8g.tar.bz2],[60ff503fa4b8288bef7ada89e9c91b0f])
diff --git a/tests/testsuite b/tests/testsuite
index 9b813a5fdb4e214f5a0db219e822309bfeeb355d..a349094e69df8cb7c379413d2add029df9256864 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -590,10 +590,10 @@ at_tested='tar'
# numerical order.
at_format='???'
# Description of all the test groups.
-at_help_all="1;version.at:20;tar version;;
-2;pipe.at:30;decompressing from stdin;pipe;
-3;options.at:25;mixing options;options options00;
-4;options02.at:27;interspersed options;options options02;
+at_help_all="1;version.at:19;tar version;;
+2;pipe.at:29;decompressing from stdin;pipe;
+3;options.at:24;mixing options;options options00;
+4;options02.at:26;interspersed options;options options02;
5;options03.at:21;TAR_OPTIONS with string arguments;options options03;
6;opcomp01.at:21;occurrence compatibility;opcomp opcomp01;
7;opcomp02.at:21;occurrence compatibility;opcomp opcomp02;
@@ -601,215 +601,229 @@ at_help_all="1;version.at:20;tar version;;
9;opcomp04.at:21;compress option compatibility;opcomp opcomp04;
10;opcomp05.at:21;--pax-option compatibility;opcomp opcomp05;
11;opcomp06.at:21;--pax-option compatibility;opcomp opcomp06;
-12;positional01.at:21;Exclude;options positional positional01 exclude;
-13;positional02.at:21;Directory;options positional positional02 directory chdir;
-14;positional03.at:21;Several options;options positional positional03 chdir;
-15;add-file.at:21;The --add-file option;add-file;
-16;T-mult.at:21;multiple file lists;files-from t-mult;
-17;T-nest.at:21;nested file lists;files-from t-nest;
-18;T-rec.at:21;recursive file lists;files-from t-rec;
-19;T-recurse.at:27;files-from & recurse: toggle;recurse t-recurse files-from;
-20;T-recurse.at:66;toggle --recursion (not) from -T;recurse t-recurse t-recurse2 files-from;
-21;T-cd.at:21;-C in file lists;files-from t-cd chdir;
-22;T-empty.at:27;empty entries;files-from empty-line;
-23;T-null.at:22;0-separated file without -0;files-from null t-null;
-24;T-null2.at:17;--null enables verbatim reading;files-from null t-null2 t-verbatim;
-25;T-zfile.at:26;empty file;files-from empty-file;
-26;T-nonl.at:27;entries with missing newlines;files-from nonewline nonl t-nonl;
-27;T-dir00.at:28;recursive extraction from --files-from;files-from extract t-dir t-dir00;
-28;T-dir01.at:28;trailing slash in --files-from;files-from extract t-dir t-dir01;
-29;indexfile.at:27;tar --index-file=FILE --file=-;stdout indexfile;
-30;verbose.at:27;tar cvf -;stdout verbose;
-31;gzip.at:24;gzip;gzip;
-32;recurse.at:22;recurse;recurse;
-33;recurs02.at:30;recurse: toggle;recurse options recurse02;
-34;shortrec.at:26;short records;shortrec;
-35;numeric.at:18;--numeric-owner basic tests;options numeric numeric-owner;
-36;same-order01.at:27;working -C with --same-order;same-order same-order01 chdir;
-37;same-order02.at:26;multiple -C options;same-order same-order02 chdir;
-38;append.at:22;append;append append00;
-39;append01.at:30;appending files with long names;append append01;
-40;append02.at:55;append vs. create;append append02 append-gnu;
-41;append03.at:21;append with name transformation;append append03;
-42;append04.at:29;append with verify;append append04 verify append-verify;
-43;append05.at:32;append after changed blocking;append append05 blocking;
-44;xform-h.at:31;transforming hard links on create;transform xform xform-h;
-45;xform01.at:26;transformations and GNU volume labels;transform xform xform01 volume;
-46;xform02.at:21;transforming escaped delimiters on create;transform xform delimiter;
-47;xform03.at:21;transforming hard link targets;transform xform link;
-48;exclude.at:23;exclude;exclude;
-49;exclude01.at:19;exclude wildcards;exclude exclude01;
-50;exclude02.at:19;exclude: anchoring;exclude exclude02;
-51;exclude03.at:19;exclude: wildcards match slash;exclude exclude03;
-52;exclude04.at:19;exclude: case insensitive;exclude exclude04;
-53;exclude05.at:22;exclude: lots of excludes;exclude exclude05;
-54;exclude06.at:26;exclude: long files in pax archives;exclude exclude06 chdir;
-55;exclude07.at:19;exclude: --exclude-backups option;exclude exclude07;
-56;exclude08.at:36;--exclude-tag option;exclude exclude-tag exclude08;
-57;exclude09.at:37;--exclude-tag option and --listed-incremental;exclude exclude-tag listed incremental exclude09;
-58;exclude10.at:38;--exclude-tag option in incremental pass;exclude exclude-tag listed incremental exclude10;
-59;exclude11.at:36;--exclude-tag-under option;exclude exclude-tag exclude-tag-under exclude11;
-60;exclude12.at:37;--exclude-tag-under and --listed-incremental;exclude exclude-tag exclude-tag-under listed incremental exclude12;
-61;exclude13.at:39;--exclude-tag-under option in incremental pass;exclude exclude-tag exclude-tag-under listed incremental exclude13;
-62;exclude14.at:36;--exclude-tag-all option;exclude exclude-tag exclude-tag-all exclude14;
-63;exclude15.at:36;--exclude-tag-all and --listed-incremental;exclude exclude-tag exclude-tag-all listed incremental exclude15;
-64;exclude16.at:38;--exclude-tag-all option in incremental pass;exclude exclude-tag exclude-tag-all listed incremental exclude16;
-65;delete01.at:24;deleting a member after a big one;delete delete01;
-66;delete02.at:24;deleting a member from stdin archive;delete delete02;
-67;delete03.at:22;deleting members with long names;delete delete03;
-68;delete04.at:24;deleting a large last member;delete delete04;
-69;delete05.at:28;deleting non-existing member;delete delete05;
-70;extrac01.at:24;extract over an existing directory;extract extract01;
-71;extrac02.at:24;extracting symlinks over an existing file;extract extract02 symlink;
-72;extrac03.at:24;extraction loops;extract extract03;
-73;extrac04.at:24;extract + fnmatch;extract extract04 fnmatch;
-74;extrac05.at:31;extracting selected members from pax;extract extract05;
-75;extrac06.at:35;mode of extracted directories;extract extract06 directory mode;
-76;extrac07.at:28;extracting symlinks to a read-only dir;extract extract07 read-only symlink chdir;
-77;extrac08.at:33;restoring mode on existing directory;extract extrac08;
-78;extrac09.at:34;extracting even when . and .. are unreadable;extract extrac09 chdir;
-79;extrac10.at:29;-C and delayed setting of metadata;extract extrac10 chdir;
-80;extrac11.at:25;scarce file descriptors;extract extrac11 chdir;
-81;extrac12.at:25;extract dot permissions;extract extrac12 chdir;
-82;extrac13.at:26;extract over symlinks;extract extrac13 chdir;
-83;extrac14.at:25;extract -C symlink;extract extrac14 chdir;
-84;extrac15.at:25;extract parent mkdir failure;extract extrac15 chdir;
-85;extrac16.at:26;extract empty directory with -C;extract extrac16 chdir;
-86;extrac17.at:21;name matching/transformation ordering;extract extrac17 chdir;
-87;extrac18.at:34;keep-old-files;extract extrac18 old-files keep-old-files;
-88;extrac19.at:21;skip-old-files;extract extrac19 old-files skip-old-files;
-89;extrac20.at:21;keep-directory-symlink;extrac20 extract old-files keep-old-files;
-90;extrac21.at:31;delay-directory-restore;extract extract21 read-only symlink delay-directory-restore;
-91;backup01.at:34;extracting existing dir with --backup;extract backup backup01;
-92;difflink.at:17;link mismatch;diff difflink;
-93;label01.at:21;single-volume label;label label01;
-94;label02.at:21;multi-volume label;label label02 multi-label multivolume multiv;
-95;label03.at:27;test-label option;label label03 test-label;
-96;label04.at:27;label with non-create option;label label04;
-97;label05.at:24;label with non-create option;label label05;
-98;incremental.at:24;incremental;incremental listed incr00;
-99;incr01.at:28;restore broken symlinks from incremental;incremental incr01;
-100;incr02.at:33;restoring timestamps from incremental;incremental timestamp restore incr02;
-101;listed01.at:27;--listed for individual files;listed incremental listed01;
-102;listed02.at:29;working --listed;listed incremental listed02;
-103;listed03.at:24;incremental dump when the parent directory is unreadable;listed incremental listed03;
-104;listed04.at:26;--listed-incremental and --one-file-system;listed incremental listed04;
-105;listed05.at:33;--listed-incremental and remounted directories;listed incremental listed05 chdir;
-106;incr03.at:29;renamed files in incrementals;incremental incr03 rename;
-107;incr04.at:30;proper icontents initialization;incremental incr04 icontents;
-108;incr05.at:21;incremental dumps with -C;incremental incr05 chdir;
-109;incr06.at:21;incremental dumps of nested directories;incremental incr06 chdir;
-110;incr07.at:18;incremental restores with -C;incremental extract incr07 chdir;
-111;incr08.at:38;filename normalization;incremental create incr08 chdir;
-112;incr09.at:26;incremental with alternating -C;incremental create incr09 chdir;
-113;incr10.at:18;concatenated incremental archives (deletes);incremental concat cat incr10 chdir;
-114;incr11.at:25;concatenated incremental archives (renames);incremental concat cat incr11 chdir;
-115;filerem01.at:36;file removed as we read it (ca. 22 seconds);create incremental listed filechange filerem filerem01;
-116;filerem02.at:26;toplevel file removed (ca. 24 seconds);create incremental listed filechange filerem filerem02;
-117;dirrem01.at:34;directory removed before reading;create incremental listed dirchange dirrem dirrem01;
-118;dirrem02.at:31;explicitly named directory removed before reading;create incremental listed dirchange dirrem dirrem02;
-119;rename01.at:25;renamed dirs in incrementals;incremental rename rename01;
-120;rename02.at:25;move between hierarchies;incremental rename rename02;
-121;rename03.at:24;cyclic renames;incremental rename rename03 cyclic-rename;
-122;rename04.at:27;renamed directory containing subdirectories;incremental rename04 rename;
-123;rename05.at:24;renamed subdirectories;incremental rename05 rename;
-124;chtype.at:28;changed file types in incrementals;incremental listed chtype;
-125;ignfail.at:24;ignfail;ignfail;
-126;link01.at:34;link count gt 2;hardlinks link01;
-127;link02.at:32;preserve hard links with --remove-files;hardlinks link02;
-128;link03.at:24;working -l with --remove-files;hardlinks link03;
-129;link04.at:29;link count is 1 but multiple occurrences;hardlinks link04;
-130;longv7.at:25;long names in V7 archives;longname longv7;
-131;long01.at:29;long file names divisible by block size;longname long512;
-132;lustar01.at:22;ustar: unsplittable file name;longname ustar lustar01;
-133;lustar02.at:22;ustar: unsplittable path name;longname ustar lustar02;
-134;lustar03.at:22;ustar: splitting long names;longname ustar lustar03;
-135;old.at:24;old archives;old;
-136;time01.at:20;time: tricky time stamps;time time01;
-137;time02.at:20;time: clamping mtime;time time02;
-138;multiv01.at:24;multivolume dumps from pipes;multivolume multiv multiv01 chdir;
-139;multiv02.at:29;skipping a straddling member;multivolume multiv multiv02;
-140;multiv03.at:31;MV archive & long filenames;multivolume multiv multiv03;
-141;multiv04.at:37;split directory members in a MV archive;multivolume multiv incremental listed multiv04;
-142;multiv05.at:27;Restoring after an out of sync volume;multivolume multiv multiv05 sync;
-143;multiv06.at:27;Multivolumes with L=record_size;multivolume multiv multiv06;
-144;multiv07.at:28;volumes split at an extended header;multivolume multiv multiv07 xsplit;
-145;multiv08.at:25;multivolume header creation;multivolume multiv multiv08;
-146;multiv09.at:26;bad next volume;multivolume multiv multiv09;
-147;multiv10.at:37;file start at the beginning of a posix volume;multivolume multiv multiv10;
-148;owner.at:21;--owner and --group;owner;
-149;map.at:21;--owner-map and --group-map;owner map;
-150;sparse01.at:22;sparse files;sparse sparse01;
-151;sparse02.at:22;extracting sparse file over a pipe;sparse sparse02;
-152;sparse03.at:22;storing sparse files > 8G;sparse sparse03;
-153;sparse04.at:21;storing long sparse file names;sparse sparse04;
-154;sparse05.at:21;listing sparse files bigger than 2^33 B;sparse sparse05;
-155;sparse06.at:21;storing sparse file using seek method;sparse sparse06 chdir;
-156;sparse07.at:21;sparse files with unicode names;sparse sparse07 unicode;
-157;sparsemv.at:22;sparse files in MV archives;sparse multiv sparsemv;
-158;spmvp00.at:22;sparse files in PAX MV archives, v.0.0;sparse multivolume multiv sparsemvp sparsemvp00;
-159;spmvp01.at:22;sparse files in PAX MV archives, v.0.1;sparse multiv sparsemvp sparsemvp01;
-160;spmvp10.at:22;sparse files in PAX MV archives, v.1.0;sparse multivolume multiv sparsemvp sparsemvp10;
-161;update.at:29;update unchanged directories;update update00;
-162;update01.at:29;update directories;update update01;
-163;update02.at:26;update changed files;update update02;
-164;update03.at:20;update with chdir;update update03 chdir;
-165;verify.at:25;verify;verify;
-166;volume.at:24;volume;volume volcheck;
-167;volsize.at:30;volume header size;volume volsize;
-168;comprec.at:22;compressed format recognition;comprec;
-169;shortfile.at:26;short input files;shortfile shortfile0;
-170;shortupd.at:31;updating short archives;shortfile shortfile1 shortupd;
-171;truncate.at:30;truncate;truncate filechange;
-172;grow.at:25;grow;grow filechange;
-173;sigpipe.at:21;sigpipe handling;sigpipe;
-174;comperr.at:18;compressor program failure;compress comperr;
-175;remfiles01.at:28;remove-files with compression;create remove-files remfiles01 gzip;
-176;remfiles02.at:28;remove-files with compression: grand-child;create remove-files remfiles02 gzip;
-177;remfiles03.at:28;remove-files with symbolic links;create remove-files remfiles03;
-178;remfiles04a.at:25;remove-files with -C:rel in -c/non-incr. mode;create remove-files remfiles04 remfiles04a chdir;
-179;remfiles04b.at:33;remove-files with -C:rel in -c/incr. mode;create incremental remove-files remfiles04 remfiles04b chdir;
-180;remfiles04c.at:33;remove-files with -C:rel in -r mode;create append remove-files remfiles04 remfiles04c chdir;
-181;remfiles05a.at:34;remove-files with -C:rel,rel in -c/non-incr. mode;create remove-files remfiles05 remfiles05a chdir;
-182;remfiles05b.at:25;remove-files with -C:rel,rel in -c/incr. mode;create incremental remove-files remfiles05 remfiles05b chdir;
-183;remfiles05c.at:25;remove-files with -C:rel,rel in -r mode;create append remove-files remfiles05 remfiles05c chdir;
-184;remfiles06a.at:25;remove-files with -C:rel,abs in -c/non-incr. mode;create remove-files remfiles06 remfiles06a chdir;
-185;remfiles06b.at:25;remove-files with -C:rel,abs in -c/incr. mode;create incremental remove-files remfiles06 remfiles06b chdir;
-186;remfiles06c.at:25;remove-files with -C:rel,abs in -r mode;create append remove-files remfiles06 remfiles06c chdir;
-187;remfiles07a.at:25;remove-files with -C:abs,rel in -c/non-incr. mode;create remove-files remfiles07 remfiles07a chdir;
-188;remfiles07b.at:25;remove-files with -C:abs,rel in -c/incr. mode;create incremental remove-files remfiles07 remfiles07b chdir;
-189;remfiles07c.at:25;remove-files with -C:abs,rel in -r mode;create append remove-files remfiles07 remfiles07c chdir;
-190;remfiles08a.at:28;remove-files deleting two subdirs in -c/non-incr. mode;create remove-files remfiles08 remfiles08a chdir;
-191;remfiles08b.at:31;remove-files deleting two subdirs in -c/incr. mode;create incremental remove-files remfiles08 remfiles08b chdir;
-192;remfiles08c.at:28;remove-files deleting two subdirs in -r mode;create append remove-files remfiles08 remfiles08c chdir;
-193;remfiles09a.at:25;remove-files on full directory in -c/non-incr. mode;create remove-files remfiles09 remfiles09a;
-194;remfiles09b.at:29;remove-files on full directory in -c/incr. mode;create incremental remove-files remfiles09 remfiles09b;
-195;remfiles09c.at:25;remove-files on full directory in -r mode;create append remove-files remfiles09 remfiles09c;
-196;remfiles10.at:20;remove-files;create remove-files remfiles10;
-197;xattr01.at:25;xattrs: basic functionality;xattrs xattr01;
-198;xattr02.at:25;xattrs: change directory with -C option;xattrs xattr02 chdir;
-199;xattr03.at:25;xattrs: trusted.* attributes;xattrs xattr03 chdir;
-200;xattr04.at:26;xattrs: s/open/openat/ regression;xattrs xattr04 chdir;
-201;xattr05.at:28;xattrs: keywords with '=' and '%';xattrs xattr05 chdir;
-202;xattr06.at:27;xattrs: exclude xattrs on create ;xattrs xattr06;
-203;xattr07.at:26;xattrs: xattrs and --skip-old-files;xattrs xattr07;
-204;acls01.at:25;acls: basic functionality;xattrs acls acls01;
-205;acls02.at:25;acls: work with -C;xattrs acls acls02 chdir;
-206;acls03.at:30;acls: default ACLs;xattrs acls acls03 chdir;
-207;selnx01.at:25;selinux: basic store/restore;xattrs selinux selnx01;
-208;selacl01.at:25;acls/selinux: special files & fifos;xattrs selinux acls selacls01;
-209;capabs_raw01.at:25;capabilities: binary store/restore;xattrs capabilities capabs_raw01;
-210;onetop01.at:21;tar --one-top-level;extract onetop onetop01;
-211;onetop02.at:21;tar --one-top-level --show-transformed;extract onetop onetop02;
-212;onetop03.at:21;tar --one-top-level --transform;extract onetop onetop03;
-213;onetop04.at:21;tar --one-top-level --transform;extract onetop onetop04;
-214;onetop05.at:21;tar --one-top-level restoring permissions;extract onetop onetop05 chdir;
-215;gtarfail.at:22;gtarfail;star gtarfail;
-216;gtarfail2.at:22;gtarfail2;star gtarfail2;
-217;multi-fail.at:22;multi-fail;star multivolume multiv multi-fail;
-218;ustar-big-2g.at:22;ustar-big-2g;star ustar-big-2g;
-219;ustar-big-8g.at:22;ustar-big-8g;star ustar-big-8g;
-220;pax-big-10g.at:22;pax-big-10g;star pax-big-10g;
+12;defaults.at:16;checkpoint defaults;checkpoint checkpoint/defaults;
+13;interval.at:16;checkpoint interval;checkpoint checkpoint/interval;
+14;dot.at:16;dot action;checkpoint checkpoint/dot;
+15;dot-compat.at:16;dot action (compatibility syntax);checkpoint checkpoint/dot-compat;
+16;dot-int.at:16;dot action and interval;checkpoint checkpoint/dot-int;
+17;testsuite.at:242;compress: gzip;compression compress-gzip gzip;
+18;testsuite.at:243;compress: bzip2;compression compress-bzip2 bzip2;
+19;testsuite.at:244;compress: xz;compression compress-xz xz;
+20;testsuite.at:246;compress: lzip;compression compress-lzip lzip;
+21;testsuite.at:247;compress: lzop;compression compress-lzop lzop;
+22;testsuite.at:248;compress: zstd;compression compress-zstd zstd;
+23;positional01.at:21;Exclude;options positional positional01 exclude;
+24;positional02.at:21;Directory;options positional positional02 directory chdir;
+25;positional03.at:21;Several options;options positional positional03 chdir;
+26;add-file.at:21;The --add-file option;add-file;
+27;T-mult.at:21;multiple file lists;files-from t-mult;
+28;T-nest.at:21;nested file lists;files-from t-nest;
+29;T-rec.at:21;recursive file lists;files-from t-rec;
+30;T-recurse.at:27;files-from & recurse: toggle;recurse t-recurse files-from;
+31;T-recurse.at:66;toggle --recursion (not) from -T;recurse t-recurse t-recurse2 files-from;
+32;T-cd.at:21;-C in file lists;files-from t-cd chdir;
+33;T-empty.at:26;empty entries;files-from empty-line;
+34;T-null.at:21;0-separated file without -0;files-from null t-null;
+35;T-null2.at:17;--null enables verbatim reading;files-from null t-null2 t-verbatim;
+36;T-zfile.at:26;empty file;files-from empty-file;
+37;T-nonl.at:27;entries with missing newlines;files-from nonewline nonl t-nonl;
+38;T-dir00.at:28;recursive extraction from --files-from;files-from extract t-dir t-dir00;
+39;T-dir01.at:28;trailing slash in --files-from;files-from extract t-dir t-dir01;
+40;indexfile.at:26;tar --index-file=FILE --file=-;stdout indexfile;
+41;verbose.at:26;tar cvf -;stdout verbose;
+42;gzip.at:23;gzip;gzip;
+43;recurse.at:21;recurse;recurse;
+44;recurs02.at:30;recurse: toggle;recurse options recurse02;
+45;shortrec.at:25;short records;shortrec;
+46;numeric.at:18;--numeric-owner basic tests;options numeric numeric-owner;
+47;same-order01.at:26;working -C with --same-order;same-order same-order01 chdir;
+48;same-order02.at:25;multiple -C options;same-order same-order02 chdir;
+49;append.at:21;append;append append00;
+50;append01.at:29;appending files with long names;append append01;
+51;append02.at:54;append vs. create;append append02 append-gnu;
+52;append03.at:21;append with name transformation;append append03;
+53;append04.at:29;append with verify;append append04 verify append-verify;
+54;append05.at:32;append after changed blocking;append append05 blocking;
+55;xform-h.at:30;transforming hard links on create;transform xform xform-h;
+56;xform01.at:26;transformations and GNU volume labels;transform xform xform01 volume;
+57;xform02.at:21;transforming escaped delimiters on create;transform xform delimiter;
+58;xform03.at:21;transforming hard link targets;transform xform link;
+59;exclude.at:23;exclude;exclude;
+60;exclude01.at:19;exclude wildcards;exclude exclude01;
+61;exclude02.at:19;exclude: anchoring;exclude exclude02;
+62;exclude03.at:19;exclude: wildcards match slash;exclude exclude03;
+63;exclude04.at:19;exclude: case insensitive;exclude exclude04;
+64;exclude05.at:21;exclude: lots of excludes;exclude exclude05;
+65;exclude06.at:26;exclude: long files in pax archives;exclude exclude06 chdir;
+66;exclude07.at:19;exclude: --exclude-backups option;exclude exclude07;
+67;exclude08.at:36;--exclude-tag option;exclude exclude-tag exclude08;
+68;exclude09.at:37;--exclude-tag option and --listed-incremental;exclude exclude-tag listed incremental exclude09;
+69;exclude10.at:38;--exclude-tag option in incremental pass;exclude exclude-tag listed incremental exclude10;
+70;exclude11.at:36;--exclude-tag-under option;exclude exclude-tag exclude-tag-under exclude11;
+71;exclude12.at:37;--exclude-tag-under and --listed-incremental;exclude exclude-tag exclude-tag-under listed incremental exclude12;
+72;exclude13.at:39;--exclude-tag-under option in incremental pass;exclude exclude-tag exclude-tag-under listed incremental exclude13;
+73;exclude14.at:36;--exclude-tag-all option;exclude exclude-tag exclude-tag-all exclude14;
+74;exclude15.at:36;--exclude-tag-all and --listed-incremental;exclude exclude-tag exclude-tag-all listed incremental exclude15;
+75;exclude16.at:38;--exclude-tag-all option in incremental pass;exclude exclude-tag exclude-tag-all listed incremental exclude16;
+76;delete01.at:23;deleting a member after a big one;delete delete01;
+77;delete02.at:23;deleting a member from stdin archive;delete delete02;
+78;delete03.at:21;deleting members with long names;delete delete03;
+79;delete04.at:23;deleting a large last member;delete delete04;
+80;delete05.at:27;deleting non-existing member;delete delete05;
+81;extrac01.at:23;extract over an existing directory;extract extract01;
+82;extrac02.at:23;extracting symlinks over an existing file;extract extract02 symlink;
+83;extrac03.at:23;extraction loops;extract extract03;
+84;extrac04.at:23;extract + fnmatch;extract extract04 fnmatch;
+85;extrac05.at:30;extracting selected members from pax;extract extract05;
+86;extrac06.at:34;mode of extracted directories;extract extract06 directory mode;
+87;extrac07.at:27;extracting symlinks to a read-only dir;extract extract07 read-only symlink chdir;
+88;extrac08.at:33;restoring mode on existing directory;extract extrac08;
+89;extrac09.at:34;extracting even when . and .. are unreadable;extract extrac09 chdir;
+90;extrac10.at:29;-C and delayed setting of metadata;extract extrac10 chdir;
+91;extrac11.at:25;scarce file descriptors;extract extrac11 chdir;
+92;extrac12.at:25;extract dot permissions;extract extrac12 chdir;
+93;extrac13.at:26;extract over symlinks;extract extrac13 chdir;
+94;extrac14.at:25;extract -C symlink;extract extrac14 chdir;
+95;extrac15.at:25;extract parent mkdir failure;extract extrac15 chdir;
+96;extrac16.at:26;extract empty directory with -C;extract extrac16 chdir;
+97;extrac17.at:21;name matching/transformation ordering;extract extrac17 chdir;
+98;extrac18.at:34;keep-old-files;extract extrac18 old-files keep-old-files;
+99;extrac19.at:21;skip-old-files;extract extrac19 old-files skip-old-files;
+100;extrac20.at:21;keep-directory-symlink;extrac20 extract old-files keep-old-files;
+101;extrac21.at:31;delay-directory-restore;extract extract21 read-only symlink delay-directory-restore;
+102;backup01.at:33;extracting existing dir with --backup;extract backup backup01;
+103;difflink.at:17;link mismatch;diff difflink;
+104;label01.at:21;single-volume label;label label01;
+105;label02.at:21;multi-volume label;label label02 multi-label multivolume multiv;
+106;label03.at:27;test-label option;label label03 test-label;
+107;label04.at:27;label with non-create option;label label04;
+108;label05.at:24;label with non-create option;label label05;
+109;incremental.at:23;incremental;incremental listed incr00;
+110;incr01.at:27;restore broken symlinks from incremental;incremental incr01;
+111;incr02.at:32;restoring timestamps from incremental;incremental timestamp restore incr02;
+112;listed01.at:26;--listed for individual files;listed incremental listed01;
+113;listed02.at:28;working --listed;listed incremental listed02;
+114;listed03.at:24;incremental dump when the parent directory is unreadable;listed incremental listed03;
+115;listed04.at:26;--listed-incremental and --one-file-system;listed incremental listed04;
+116;listed05.at:33;--listed-incremental and remounted directories;listed incremental listed05 chdir;
+117;incr03.at:28;renamed files in incrementals;incremental incr03 rename;
+118;incr04.at:29;proper icontents initialization;incremental incr04 icontents;
+119;incr05.at:21;incremental dumps with -C;incremental incr05 chdir;
+120;incr06.at:21;incremental dumps of nested directories;incremental incr06 chdir;
+121;incr07.at:18;incremental restores with -C;incremental extract incr07 chdir;
+122;incr08.at:38;filename normalization;incremental create incr08 chdir;
+123;incr09.at:26;incremental with alternating -C;incremental create incr09 chdir;
+124;incr10.at:18;concatenated incremental archives (deletes);incremental concat cat incr10 chdir;
+125;incr11.at:25;concatenated incremental archives (renames);incremental concat cat incr11 chdir;
+126;filerem01.at:36;file removed as we read it;create incremental listed filechange filerem filerem01;
+127;filerem02.at:26;toplevel file removed;create incremental listed filechange filerem filerem02;
+128;dirrem01.at:38;directory removed before reading;create incremental listed dirchange dirrem dirrem01;
+129;dirrem02.at:31;explicitly named directory removed before reading;create incremental listed dirchange dirrem dirrem02;
+130;rename01.at:24;renamed dirs in incrementals;incremental rename rename01;
+131;rename02.at:24;move between hierarchies;incremental rename rename02;
+132;rename03.at:23;cyclic renames;incremental rename rename03 cyclic-rename;
+133;rename04.at:27;renamed directory containing subdirectories;incremental rename04 rename;
+134;rename05.at:24;renamed subdirectories;incremental rename05 rename;
+135;chtype.at:27;changed file types in incrementals;incremental listed chtype;
+136;ignfail.at:23;ignfail;ignfail;
+137;link01.at:33;link count gt 2;hardlinks link01;
+138;link02.at:32;preserve hard links with --remove-files;hardlinks link02;
+139;link03.at:24;working -l with --remove-files;hardlinks link03;
+140;link04.at:29;link count is 1 but multiple occurrences;hardlinks link04;
+141;longv7.at:24;long names in V7 archives;longname longv7;
+142;long01.at:28;long file names divisible by block size;longname long512;
+143;lustar01.at:21;ustar: unsplittable file name;longname ustar lustar01;
+144;lustar02.at:21;ustar: unsplittable path name;longname ustar lustar02;
+145;lustar03.at:21;ustar: splitting long names;longname ustar lustar03;
+146;old.at:23;old archives;old;
+147;time01.at:20;time: tricky time stamps;time time01;
+148;time02.at:20;time: clamping mtime;time time02;
+149;multiv01.at:23;multivolume dumps from pipes;multivolume multiv multiv01 chdir;
+150;multiv02.at:28;skipping a straddling member;multivolume multiv multiv02;
+151;multiv03.at:30;MV archive & long filenames;multivolume multiv multiv03;
+152;multiv04.at:36;split directory members in a MV archive;multivolume multiv incremental listed multiv04;
+153;multiv05.at:26;Restoring after an out of sync volume;multivolume multiv multiv05 sync;
+154;multiv06.at:27;Multivolumes with L=record_size;multivolume multiv multiv06;
+155;multiv07.at:28;volumes split at an extended header;multivolume multiv multiv07 xsplit;
+156;multiv08.at:25;multivolume header creation;multivolume multiv multiv08;
+157;multiv09.at:26;bad next volume;multivolume multiv multiv09;
+158;multiv10.at:37;file start at the beginning of a posix volume;multivolume multiv multiv10;
+159;owner.at:21;--owner and --group;owner;
+160;map.at:21;--owner-map and --group-map;owner map;
+161;sparse01.at:21;sparse files;sparse sparse01;
+162;sparse02.at:21;extracting sparse file over a pipe;sparse sparse02;
+163;sparse03.at:21;storing sparse files > 8G;sparse sparse03 largefile;
+164;sparse04.at:21;storing long sparse file names;sparse sparse04;
+165;sparse05.at:21;listing sparse files bigger than 2^33 B;sparse sparse05 largefile;
+166;sparse06.at:21;storing sparse file using seek method;sparse sparse06 chdir;
+167;sparse07.at:21;sparse files with unicode names;sparse sparse07 unicode;
+168;sparsemv.at:21;sparse files in MV archives;sparse multiv sparsemv;
+169;spmvp00.at:21;sparse files in PAX MV archives, v.0.0;sparse multivolume multiv sparsemvp sparsemvp00;
+170;spmvp01.at:21;sparse files in PAX MV archives, v.0.1;sparse multiv sparsemvp sparsemvp01;
+171;spmvp10.at:21;sparse files in PAX MV archives, v.1.0;sparse multivolume multiv sparsemvp sparsemvp10;
+172;sptrcreat.at:33;sparse file truncated while archiving;truncate filechange sparse sptr sptrcreat;
+173;sptrdiff00.at:26;file truncated in sparse region while comparing;truncate filechange sparse sptr sptrdiff diff;
+174;sptrdiff01.at:26;file truncated in data region while comparing;truncate filechange sparse sptr sptrdiff diff;
+175;update.at:28;update unchanged directories;update update00;
+176;update01.at:29;update directories;update update01;
+177;update02.at:26;update changed files;update update02;
+178;update03.at:20;update with chdir;update update03 chdir;
+179;verify.at:25;verify;verify;
+180;volume.at:23;volume;volume volcheck;
+181;volsize.at:29;volume header size;volume volsize;
+182;comprec.at:21;compressed format recognition;comprec;
+183;shortfile.at:26;short input files;shortfile shortfile0;
+184;shortupd.at:31;updating short archives;shortfile shortfile1 shortupd;
+185;truncate.at:29;truncate;truncate filechange;
+186;grow.at:24;grow;grow filechange;
+187;sigpipe.at:21;sigpipe handling;sigpipe;
+188;comperr.at:18;compressor program failure;compress comperr;
+189;remfiles01.at:28;remove-files with compression;create remove-files remfiles01 gzip;
+190;remfiles02.at:28;remove-files with compression: grand-child;create remove-files remfiles02 gzip;
+191;remfiles03.at:28;remove-files with symbolic links;create remove-files remfiles03;
+192;remfiles04a.at:25;remove-files with -C:rel in -c/non-incr. mode;create remove-files remfiles04 remfiles04a chdir;
+193;remfiles04b.at:33;remove-files with -C:rel in -c/incr. mode;create incremental remove-files remfiles04 remfiles04b chdir;
+194;remfiles04c.at:33;remove-files with -C:rel in -r mode;create append remove-files remfiles04 remfiles04c chdir;
+195;remfiles05a.at:34;remove-files with -C:rel,rel in -c/non-incr. mode;create remove-files remfiles05 remfiles05a chdir;
+196;remfiles05b.at:25;remove-files with -C:rel,rel in -c/incr. mode;create incremental remove-files remfiles05 remfiles05b chdir;
+197;remfiles05c.at:25;remove-files with -C:rel,rel in -r mode;create append remove-files remfiles05 remfiles05c chdir;
+198;remfiles06a.at:25;remove-files with -C:rel,abs in -c/non-incr. mode;create remove-files remfiles06 remfiles06a chdir;
+199;remfiles06b.at:25;remove-files with -C:rel,abs in -c/incr. mode;create incremental remove-files remfiles06 remfiles06b chdir;
+200;remfiles06c.at:25;remove-files with -C:rel,abs in -r mode;create append remove-files remfiles06 remfiles06c chdir;
+201;remfiles07a.at:25;remove-files with -C:abs,rel in -c/non-incr. mode;create remove-files remfiles07 remfiles07a chdir;
+202;remfiles07b.at:25;remove-files with -C:abs,rel in -c/incr. mode;create incremental remove-files remfiles07 remfiles07b chdir;
+203;remfiles07c.at:25;remove-files with -C:abs,rel in -r mode;create append remove-files remfiles07 remfiles07c chdir;
+204;remfiles08a.at:28;remove-files deleting two subdirs in -c/non-incr. mode;create remove-files remfiles08 remfiles08a chdir;
+205;remfiles08b.at:31;remove-files deleting two subdirs in -c/incr. mode;create incremental remove-files remfiles08 remfiles08b chdir;
+206;remfiles08c.at:28;remove-files deleting two subdirs in -r mode;create append remove-files remfiles08 remfiles08c chdir;
+207;remfiles09a.at:25;remove-files on full directory in -c/non-incr. mode;create remove-files remfiles09 remfiles09a;
+208;remfiles09b.at:29;remove-files on full directory in -c/incr. mode;create incremental remove-files remfiles09 remfiles09b;
+209;remfiles09c.at:25;remove-files on full directory in -r mode;create append remove-files remfiles09 remfiles09c;
+210;remfiles10.at:20;remove-files;create remove-files remfiles10;
+211;xattr01.at:25;xattrs: basic functionality;xattrs xattr01;
+212;xattr02.at:25;xattrs: change directory with -C option;xattrs xattr02 chdir;
+213;xattr03.at:25;xattrs: trusted.* attributes;xattrs xattr03 chdir;
+214;xattr04.at:26;xattrs: s/open/openat/ regression;xattrs xattr04 chdir;
+215;xattr05.at:28;xattrs: keywords with '=' and '%';xattrs xattr05 chdir;
+216;xattr06.at:27;xattrs: exclude xattrs on create ;xattrs xattr06;
+217;xattr07.at:26;xattrs: xattrs and --skip-old-files;xattrs xattr07;
+218;acls01.at:25;acls: basic functionality;xattrs acls acls01;
+219;acls02.at:25;acls: work with -C;xattrs acls acls02 chdir;
+220;acls03.at:30;acls: default ACLs;xattrs acls acls03 chdir;
+221;selnx01.at:25;selinux: basic store/restore;xattrs selinux selnx01;
+222;selacl01.at:25;acls/selinux: special files & fifos;xattrs selinux acls selacls01;
+223;capabs_raw01.at:25;capabilities: binary store/restore;xattrs capabilities capabs_raw01;
+224;onetop01.at:21;tar --one-top-level;extract onetop onetop01;
+225;onetop02.at:21;tar --one-top-level --show-transformed;extract onetop onetop02;
+226;onetop03.at:21;tar --one-top-level --transform;extract onetop onetop03;
+227;onetop04.at:21;tar --one-top-level --transform;extract onetop onetop04;
+228;onetop05.at:21;tar --one-top-level restoring permissions;extract onetop onetop05 chdir;
+229;gtarfail.at:21;gtarfail;star gtarfail;
+230;gtarfail2.at:21;gtarfail2;star gtarfail2;
+231;multi-fail.at:21;multi-fail;star multivolume multiv multi-fail;
+232;ustar-big-2g.at:21;ustar-big-2g;star ustar-big-2g largefile;
+233;ustar-big-8g.at:21;ustar-big-8g;star ustar-big-8g largefile;
+234;pax-big-10g.at:21;pax-big-10g;star pax-big-10g largefile;
"
# List of the all the test groups.
at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -823,7 +837,7 @@ at_fn_validate_ranges ()
for at_grp
do
eval at_value=\$$at_grp
- if test $at_value -lt 1 || test $at_value -gt 220; then
+ if test $at_value -lt 1 || test $at_value -gt 234; then
$as_echo "invalid test group: $at_value" >&2
exit 1
fi
@@ -1122,7 +1136,7 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-GNU tar 1.30 test suite test groups:
+GNU tar 1.32 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -1163,7 +1177,7 @@ _ATEOF
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (GNU tar 1.30)" &&
+ $as_echo "$as_me (GNU tar 1.32)" &&
cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1180,96 +1194,105 @@ case $at_groups in #(
* ) at_print_banners=false ;;
esac
# Text for banner N, set to a single space once printed.
-# Banner 1. testsuite.at:209
+# Banner 1. testsuite.at:207
+# Category starts at test group 3.
+at_banner_text_1="Options"
+# Banner 2. testsuite.at:212
# Category starts at test group 6.
-at_banner_text_1="Option compatibility"
-# Banner 2. testsuite.at:217
+at_banner_text_2="Option compatibility"
+# Banner 3. testsuite.at:220
# Category starts at test group 12.
-at_banner_text_2="Positional options"
-# Banner 3. testsuite.at:223
-# Category starts at test group 16.
-at_banner_text_3="The -T option"
-# Banner 4. testsuite.at:237
-# Category starts at test group 29.
-at_banner_text_4="Various options"
-# Banner 5. testsuite.at:246
-# Category starts at test group 36.
-at_banner_text_5="The --same-order option"
-# Banner 6. testsuite.at:250
-# Category starts at test group 38.
-at_banner_text_6="Append"
-# Banner 7. testsuite.at:258
-# Category starts at test group 44.
-at_banner_text_7="Transforms"
-# Banner 8. testsuite.at:264
-# Category starts at test group 48.
-at_banner_text_8="Exclude"
+at_banner_text_3="Checkpoints"
+# Banner 4. testsuite.at:240
+# Category starts at test group 17.
+at_banner_text_4="Compression"
+# Banner 5. testsuite.at:250
+# Category starts at test group 23.
+at_banner_text_5="Positional options"
+# Banner 6. testsuite.at:256
+# Category starts at test group 27.
+at_banner_text_6="The -T option"
+# Banner 7. testsuite.at:270
+# Category starts at test group 40.
+at_banner_text_7="Various options"
+# Banner 8. testsuite.at:279
+# Category starts at test group 47.
+at_banner_text_8="The --same-order option"
# Banner 9. testsuite.at:283
-# Category starts at test group 65.
-at_banner_text_9="Deletions"
-# Banner 10. testsuite.at:290
-# Category starts at test group 70.
-at_banner_text_10="Extracting"
-# Banner 11. testsuite.at:315
-# Category starts at test group 92.
-at_banner_text_11="Comparing"
-# Banner 12. testsuite.at:318
-# Category starts at test group 93.
-at_banner_text_12="Volume label operations"
-# Banner 13. testsuite.at:325
-# Category starts at test group 98.
-at_banner_text_13="Incremental archives"
-# Banner 14. testsuite.at:344
-# Category starts at test group 115.
-at_banner_text_14="Files removed while archiving"
-# Banner 15. testsuite.at:348
-# Category starts at test group 117.
-at_banner_text_15="Directories removed while archiving"
-# Banner 16. testsuite.at:352
-# Category starts at test group 119.
-at_banner_text_16="Renames"
-# Banner 17. testsuite.at:360
-# Category starts at test group 125.
-at_banner_text_17="Ignore failing reads"
-# Banner 18. testsuite.at:363
+# Category starts at test group 49.
+at_banner_text_9="Append"
+# Banner 10. testsuite.at:291
+# Category starts at test group 55.
+at_banner_text_10="Transforms"
+# Banner 11. testsuite.at:297
+# Category starts at test group 59.
+at_banner_text_11="Exclude"
+# Banner 12. testsuite.at:316
+# Category starts at test group 76.
+at_banner_text_12="Deletions"
+# Banner 13. testsuite.at:323
+# Category starts at test group 81.
+at_banner_text_13="Extracting"
+# Banner 14. testsuite.at:348
+# Category starts at test group 103.
+at_banner_text_14="Comparing"
+# Banner 15. testsuite.at:351
+# Category starts at test group 104.
+at_banner_text_15="Volume label operations"
+# Banner 16. testsuite.at:358
+# Category starts at test group 109.
+at_banner_text_16="Incremental archives"
+# Banner 17. testsuite.at:377
# Category starts at test group 126.
-at_banner_text_18="Link handling"
-# Banner 19. testsuite.at:369
+at_banner_text_17="Files removed while archiving"
+# Banner 18. testsuite.at:381
+# Category starts at test group 128.
+at_banner_text_18="Directories removed while archiving"
+# Banner 19. testsuite.at:385
# Category starts at test group 130.
-at_banner_text_19="Specific archive formats"
-# Banner 20. testsuite.at:380
-# Category starts at test group 138.
-at_banner_text_20="Multivolume archives"
-# Banner 21. testsuite.at:392
-# Category starts at test group 148.
-at_banner_text_21="Owner and Groups"
-# Banner 22. testsuite.at:396
-# Category starts at test group 150.
-at_banner_text_22="Sparse files"
-# Banner 23. testsuite.at:409
+at_banner_text_19="Renames"
+# Banner 20. testsuite.at:393
+# Category starts at test group 136.
+at_banner_text_20="Ignore failing reads"
+# Banner 21. testsuite.at:396
+# Category starts at test group 137.
+at_banner_text_21="Link handling"
+# Banner 22. testsuite.at:402
+# Category starts at test group 141.
+at_banner_text_22="Specific archive formats"
+# Banner 23. testsuite.at:413
+# Category starts at test group 149.
+at_banner_text_23="Multivolume archives"
+# Banner 24. testsuite.at:425
+# Category starts at test group 159.
+at_banner_text_24="Owner and Groups"
+# Banner 25. testsuite.at:429
# Category starts at test group 161.
-at_banner_text_23="Updates"
-# Banner 24. testsuite.at:415
-# Category starts at test group 165.
-at_banner_text_24="Verifying the archive"
-# Banner 25. testsuite.at:418
-# Category starts at test group 166.
-at_banner_text_25="Volume operations"
-# Banner 26. testsuite.at:422
-# Category starts at test group 168.
-at_banner_text_26=""
-# Banner 27. testsuite.at:432
+at_banner_text_25="Sparse files"
+# Banner 26. testsuite.at:445
# Category starts at test group 175.
-at_banner_text_27="Removing files after archiving"
-# Banner 28. testsuite.at:456
-# Category starts at test group 197.
-at_banner_text_28="Extended attributes"
-# Banner 29. testsuite.at:474
-# Category starts at test group 210.
-at_banner_text_29="One top level"
-# Banner 30. testsuite.at:481
-# Category starts at test group 215.
-at_banner_text_30="Star tests"
+at_banner_text_26="Updates"
+# Banner 27. testsuite.at:451
+# Category starts at test group 179.
+at_banner_text_27="Verifying the archive"
+# Banner 28. testsuite.at:454
+# Category starts at test group 180.
+at_banner_text_28="Volume operations"
+# Banner 29. testsuite.at:458
+# Category starts at test group 182.
+at_banner_text_29=""
+# Banner 30. testsuite.at:468
+# Category starts at test group 189.
+at_banner_text_30="Removing files after archiving"
+# Banner 31. testsuite.at:492
+# Category starts at test group 211.
+at_banner_text_31="Extended attributes"
+# Banner 32. testsuite.at:510
+# Category starts at test group 224.
+at_banner_text_32="One top level"
+# Banner 33. testsuite.at:517
+# Category starts at test group 229.
+at_banner_text_33="Star tests"
# Take any -C into account.
if $at_change_dir ; then
@@ -1430,11 +1453,11 @@ exec 5>>"$at_suite_log"
# Banners and logs.
$as_echo "## ------------------------ ##
-## GNU tar 1.30 test suite. ##
+## GNU tar 1.32 test suite. ##
## ------------------------ ##"
{
$as_echo "## ------------------------ ##
-## GNU tar 1.30 test suite. ##
+## GNU tar 1.32 test suite. ##
## ------------------------ ##"
echo
@@ -1679,7 +1702,7 @@ IFS=$as_save_IFS
esac
if test -f "$at_program_"; then
{
- $as_echo "$at_srcdir/testsuite.at:197: $at_program_ --version"
+ $as_echo "$at_srcdir/testsuite.at:199: $at_program_ --version"
"$at_program_" --version </dev/null
echo
} >&5 2>&1
@@ -2278,7 +2301,7 @@ _ASBOX
$as_echo "Please send $at_msg and all information you think might help:
To: <bug-tar@gnu.org>
- Subject: [GNU tar 1.30] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [GNU tar 1.32] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
You may investigate any problem if you feel able to do so, in which
case the test suite provides a good starting point. Its output may
@@ -2293,7 +2316,7 @@ exit 0
## Actual tests. ##
## ------------- ##
#AT_START_1
-at_fn_group_banner 1 'version.at:20' \
+at_fn_group_banner 1 'version.at:19' \
"tar version" " "
at_xfail=no
(
@@ -2302,17 +2325,17 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/version.at:22: tar --version | sed 1q"
-at_fn_check_prepare_notrace 'a shell pipeline' "version.at:22"
+$as_echo "$at_srcdir/version.at:21: tar --version | sed 1q"
+at_fn_check_prepare_notrace 'a shell pipeline' "version.at:21"
( $at_check_trace; tar --version | sed 1q
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "tar (GNU tar) 1.30
+echo >>"$at_stdout"; $as_echo "tar (GNU tar) 1.32
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/version.at:22"
+at_fn_check_status 0 $at_status "$at_srcdir/version.at:21"
if $at_failed; then :
cat >$XFAILFILE <<'_EOT'
@@ -2334,7 +2357,7 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_1
#AT_START_2
-at_fn_group_banner 2 'pipe.at:30' \
+at_fn_group_banner 2 'pipe.at:29' \
"decompressing from stdin" " "
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
@@ -2348,7 +2371,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/pipe.at:34:
+$as_echo "$at_srcdir/pipe.at:33:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -2371,7 +2394,7 @@ echo \"separator\"
cmp orig/file1 directory/file1
echo \"separator\"
cmp orig/file2 directory/file2)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:34"
+at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:33"
( $at_check_trace;
mkdir v7
(cd v7
@@ -2406,12 +2429,12 @@ separator
separator
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:34"
+at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:33"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/pipe.at:34:
+$as_echo "$at_srcdir/pipe.at:33:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -2434,7 +2457,7 @@ echo \"separator\"
cmp orig/file1 directory/file1
echo \"separator\"
cmp orig/file2 directory/file2)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:34"
+at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:33"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -2469,12 +2492,12 @@ separator
separator
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:34"
+at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:33"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/pipe.at:34:
+$as_echo "$at_srcdir/pipe.at:33:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -2497,7 +2520,7 @@ echo \"separator\"
cmp orig/file1 directory/file1
echo \"separator\"
cmp orig/file2 directory/file2)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:34"
+at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:33"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -2532,12 +2555,12 @@ separator
separator
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:34"
+at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:33"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/pipe.at:34:
+$as_echo "$at_srcdir/pipe.at:33:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -2560,7 +2583,7 @@ echo \"separator\"
cmp orig/file1 directory/file1
echo \"separator\"
cmp orig/file2 directory/file2)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:34"
+at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:33"
( $at_check_trace;
mkdir posix
(cd posix
@@ -2595,12 +2618,12 @@ separator
separator
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:34"
+at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:33"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/pipe.at:34:
+$as_echo "$at_srcdir/pipe.at:33:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -2623,7 +2646,7 @@ echo \"separator\"
cmp orig/file1 directory/file1
echo \"separator\"
cmp orig/file2 directory/file2)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:34"
+at_fn_check_prepare_notrace 'a `...` command substitution' "pipe.at:33"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -2658,7 +2681,7 @@ separator
separator
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:34"
+at_fn_check_status 0 $at_status "$at_srcdir/pipe.at:33"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2671,8 +2694,8 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_2
#AT_START_3
-at_fn_group_banner 3 'options.at:25' \
- "mixing options" " "
+at_fn_group_banner 3 'options.at:24' \
+ "mixing options" " " 1
at_xfail=no
(
$as_echo "3. $at_setup_line: testing $at_desc ..."
@@ -2681,12 +2704,12 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/options.at:28:
+$as_echo "$at_srcdir/options.at:27:
echo > file1
TAR_OPTIONS=--numeric-owner tar chof archive file1
tar tf archive
"
-at_fn_check_prepare_notrace 'an embedded newline' "options.at:28"
+at_fn_check_prepare_notrace 'an embedded newline' "options.at:27"
( $at_check_trace;
echo > file1
TAR_OPTIONS=--numeric-owner tar chof archive file1
@@ -2699,7 +2722,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/options.at:28"
+at_fn_check_status 0 $at_status "$at_srcdir/options.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2710,8 +2733,8 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_3
#AT_START_4
-at_fn_group_banner 4 'options02.at:27' \
- "interspersed options" " "
+at_fn_group_banner 4 'options02.at:26' \
+ "interspersed options" " " 1
at_xfail=no
(
$as_echo "4. $at_setup_line: testing $at_desc ..."
@@ -2720,12 +2743,12 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/options02.at:30:
+$as_echo "$at_srcdir/options02.at:29:
echo > file1
tar c file1 -f archive
tar tf archive
"
-at_fn_check_prepare_notrace 'an embedded newline' "options02.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "options02.at:29"
( $at_check_trace;
echo > file1
tar c file1 -f archive
@@ -2738,7 +2761,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/options02.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/options02.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2750,7 +2773,7 @@ read at_status <"$at_status_file"
#AT_STOP_4
#AT_START_5
at_fn_group_banner 5 'options03.at:21' \
- "TAR_OPTIONS with string arguments" " "
+ "TAR_OPTIONS with string arguments" " " 1
at_xfail=no
(
$as_echo "5. $at_setup_line: testing $at_desc ..."
@@ -2803,7 +2826,7 @@ read at_status <"$at_status_file"
#AT_STOP_5
#AT_START_6
at_fn_group_banner 6 'opcomp01.at:21' \
- "occurrence compatibility" " " 1
+ "occurrence compatibility" " " 2
at_xfail=no
(
$as_echo "6. $at_setup_line: testing $at_desc ..."
@@ -2839,7 +2862,7 @@ read at_status <"$at_status_file"
#AT_STOP_6
#AT_START_7
at_fn_group_banner 7 'opcomp02.at:21' \
- "occurrence compatibility" " " 1
+ "occurrence compatibility" " " 2
at_xfail=no
(
$as_echo "7. $at_setup_line: testing $at_desc ..."
@@ -2875,7 +2898,7 @@ read at_status <"$at_status_file"
#AT_STOP_7
#AT_START_8
at_fn_group_banner 8 'opcomp03.at:21' \
- "--verify compatibility" " " 1
+ "--verify compatibility" " " 2
at_xfail=no
(
$as_echo "8. $at_setup_line: testing $at_desc ..."
@@ -2911,7 +2934,7 @@ read at_status <"$at_status_file"
#AT_STOP_8
#AT_START_9
at_fn_group_banner 9 'opcomp04.at:21' \
- "compress option compatibility" " " 1
+ "compress option compatibility" " " 2
at_xfail=no
(
$as_echo "9. $at_setup_line: testing $at_desc ..."
@@ -2959,7 +2982,7 @@ read at_status <"$at_status_file"
#AT_STOP_9
#AT_START_10
at_fn_group_banner 10 'opcomp05.at:21' \
- "--pax-option compatibility" " " 1
+ "--pax-option compatibility" " " 2
at_xfail=no
(
$as_echo "10. $at_setup_line: testing $at_desc ..."
@@ -2995,7 +3018,7 @@ read at_status <"$at_status_file"
#AT_STOP_10
#AT_START_11
at_fn_group_banner 11 'opcomp06.at:21' \
- "--pax-option compatibility" " " 1
+ "--pax-option compatibility" " " 2
at_xfail=no
(
$as_echo "11. $at_setup_line: testing $at_desc ..."
@@ -3080,14 +3103,802 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_11
#AT_START_12
-at_fn_group_banner 12 'positional01.at:21' \
- "Exclude" " " 2
+at_fn_group_banner 12 'defaults.at:16' \
+ "checkpoint defaults" " " 3
at_xfail=no
(
$as_echo "12. $at_setup_line: testing $at_desc ..."
$at_traceon
+{ set +x
+$as_echo "$at_srcdir/defaults.at:18:
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file \$i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint -c -f ../a.tar .
+
+"
+at_fn_check_prepare_notrace 'an embedded newline' "defaults.at:18"
+( $at_check_trace;
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file $i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint -c -f ../a.tar .
+
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "tar: Write checkpoint 10
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/defaults.at:18"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_12
+#AT_START_13
+at_fn_group_banner 13 'interval.at:16' \
+ "checkpoint interval" " " 3
+at_xfail=no
+(
+ $as_echo "13. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/interval.at:18:
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file \$i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint=2 -c -f ../a.tar .
+
+"
+at_fn_check_prepare_notrace 'an embedded newline' "interval.at:18"
+( $at_check_trace;
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file $i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint=2 -c -f ../a.tar .
+
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "tar: Write checkpoint 2
+tar: Write checkpoint 4
+tar: Write checkpoint 6
+tar: Write checkpoint 8
+tar: Write checkpoint 10
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/interval.at:18"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_13
+#AT_START_14
+at_fn_group_banner 14 'dot.at:16' \
+ "dot action" " " 3
+at_xfail=no
+(
+ $as_echo "14. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/dot.at:18:
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file \$i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint-action=dot -c -f ../a.tar .
+
+"
+at_fn_check_prepare_notrace 'an embedded newline' "dot.at:18"
+( $at_check_trace;
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file $i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint-action=dot -c -f ../a.tar .
+
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "." | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/dot.at:18"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_14
+#AT_START_15
+at_fn_group_banner 15 'dot-compat.at:16' \
+ "dot action (compatibility syntax)" " " 3
+at_xfail=no
+(
+ $as_echo "15. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/dot-compat.at:18:
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file \$i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint=.2 -c -f ../a.tar .
+
+"
+at_fn_check_prepare_notrace 'an embedded newline' "dot-compat.at:18"
+( $at_check_trace;
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file $i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint=.2 -c -f ../a.tar .
+
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "....." | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/dot-compat.at:18"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_15
+#AT_START_16
+at_fn_group_banner 16 'dot-int.at:16' \
+ "dot action and interval" " " 3
+at_xfail=no
+(
+ $as_echo "16. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/dot-int.at:18:
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file \$i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint-action=dot --checkpoint=2 -c -f ../a.tar .
+
+"
+at_fn_check_prepare_notrace 'an embedded newline' "dot-int.at:18"
+( $at_check_trace;
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file $i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+
+tar --checkpoint-action=dot --checkpoint=2 -c -f ../a.tar .
+
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "....." | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/dot-int.at:18"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_16
+#AT_START_17
+at_fn_group_banner 17 'testsuite.at:242' \
+ "compress: gzip" " " 4
+at_xfail=no
+(
+ $as_echo "17. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite.at:242:
+
+cat /dev/null | gzip - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --gzip
+tar --gzip -cf k.tar.gz empty
+tar tf k.tar.gz
+
+
+echo testing .gz
+tar -acf k2.tar.gz empty
+cat k2.tar.gz | gzip -d > k.gz.tar
+tar tf k.gz.tar
+
+echo testing .tgz
+tar -acf k2.tar.tgz empty
+cat k2.tar.tgz | gzip -d > k.tgz.tar
+tar tf k.tgz.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.gz
+test -f empty
+"
+at_fn_check_prepare_notrace 'an embedded newline' "testsuite.at:242"
+( $at_check_trace;
+
+cat /dev/null | gzip - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --gzip
+tar --gzip -cf k.tar.gz empty
+tar tf k.tar.gz
+
+
+echo testing .gz
+tar -acf k2.tar.gz empty
+cat k2.tar.gz | gzip -d > k.gz.tar
+tar tf k.gz.tar
+
+echo testing .tgz
+tar -acf k2.tar.tgz empty
+cat k2.tar.tgz | gzip -d > k.tgz.tar
+tar tf k.tgz.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.gz
+test -f empty
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "empty
+testing .gz
+empty
+testing .tgz
+empty
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:242"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_17
+#AT_START_18
+at_fn_group_banner 18 'testsuite.at:243' \
+ "compress: bzip2" " " 4
+at_xfail=no
+(
+ $as_echo "18. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite.at:243:
+
+cat /dev/null | bzip2 - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --bzip2
+tar --bzip2 -cf k.tar.bz2 empty
+tar tf k.tar.bz2
+
+
+echo testing .bz2
+tar -acf k2.tar.bz2 empty
+cat k2.tar.bz2 | bzip2 -d > k.bz2.tar
+tar tf k.bz2.tar
+
+echo testing .tbz2
+tar -acf k2.tar.tbz2 empty
+cat k2.tar.tbz2 | bzip2 -d > k.tbz2.tar
+tar tf k.tbz2.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.bz2
+test -f empty
+"
+at_fn_check_prepare_notrace 'an embedded newline' "testsuite.at:243"
+( $at_check_trace;
+
+cat /dev/null | bzip2 - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --bzip2
+tar --bzip2 -cf k.tar.bz2 empty
+tar tf k.tar.bz2
+
+
+echo testing .bz2
+tar -acf k2.tar.bz2 empty
+cat k2.tar.bz2 | bzip2 -d > k.bz2.tar
+tar tf k.bz2.tar
+
+echo testing .tbz2
+tar -acf k2.tar.tbz2 empty
+cat k2.tar.tbz2 | bzip2 -d > k.tbz2.tar
+tar tf k.tbz2.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.bz2
+test -f empty
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "empty
+testing .bz2
+empty
+testing .tbz2
+empty
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:243"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_18
+#AT_START_19
+at_fn_group_banner 19 'testsuite.at:244' \
+ "compress: xz" " " 4
+at_xfail=no
+(
+ $as_echo "19. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite.at:244:
+
+cat /dev/null | xz - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --xz
+tar --xz -cf k.tar.xz empty
+tar tf k.tar.xz
+
+
+echo testing .xz
+tar -acf k2.tar.xz empty
+cat k2.tar.xz | xz -d > k.xz.tar
+tar tf k.xz.tar
+
+echo testing .txz
+tar -acf k2.tar.txz empty
+cat k2.tar.txz | xz -d > k.txz.tar
+tar tf k.txz.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.xz
+test -f empty
+"
+at_fn_check_prepare_notrace 'an embedded newline' "testsuite.at:244"
+( $at_check_trace;
+
+cat /dev/null | xz - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --xz
+tar --xz -cf k.tar.xz empty
+tar tf k.tar.xz
+
+
+echo testing .xz
+tar -acf k2.tar.xz empty
+cat k2.tar.xz | xz -d > k.xz.tar
+tar tf k.xz.tar
+
+echo testing .txz
+tar -acf k2.tar.txz empty
+cat k2.tar.txz | xz -d > k.txz.tar
+tar tf k.txz.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.xz
+test -f empty
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "empty
+testing .xz
+empty
+testing .txz
+empty
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:244"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_19
+#AT_START_20
+at_fn_group_banner 20 'testsuite.at:246' \
+ "compress: lzip" " " 4
+at_xfail=no
+(
+ $as_echo "20. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite.at:246:
+
+cat /dev/null | lzip - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --lzip
+tar --lzip -cf k.tar.lz empty
+tar tf k.tar.lz
+
+
+echo testing .lz
+tar -acf k2.tar.lz empty
+cat k2.tar.lz | lzip -d > k.lz.tar
+tar tf k.lz.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.lz
+test -f empty
+"
+at_fn_check_prepare_notrace 'an embedded newline' "testsuite.at:246"
+( $at_check_trace;
+
+cat /dev/null | lzip - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --lzip
+tar --lzip -cf k.tar.lz empty
+tar tf k.tar.lz
+
+
+echo testing .lz
+tar -acf k2.tar.lz empty
+cat k2.tar.lz | lzip -d > k.lz.tar
+tar tf k.lz.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.lz
+test -f empty
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "empty
+testing .lz
+empty
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:246"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_20
+#AT_START_21
+at_fn_group_banner 21 'testsuite.at:247' \
+ "compress: lzop" " " 4
+at_xfail=no
+(
+ $as_echo "21. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite.at:247:
+
+cat /dev/null | lzop - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --lzop
+tar --lzop -cf k.tar.lzo empty
+tar tf k.tar.lzo
+
+
+echo testing .lzo
+tar -acf k2.tar.lzo empty
+cat k2.tar.lzo | lzop -d > k.lzo.tar
+tar tf k.lzo.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.lzo
+test -f empty
+"
+at_fn_check_prepare_notrace 'an embedded newline' "testsuite.at:247"
+( $at_check_trace;
+
+cat /dev/null | lzop - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --lzop
+tar --lzop -cf k.tar.lzo empty
+tar tf k.tar.lzo
+
+
+echo testing .lzo
+tar -acf k2.tar.lzo empty
+cat k2.tar.lzo | lzop -d > k.lzo.tar
+tar tf k.lzo.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.lzo
+test -f empty
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "empty
+testing .lzo
+empty
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:247"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_21
+#AT_START_22
+at_fn_group_banner 22 'testsuite.at:248' \
+ "compress: zstd" " " 4
+at_xfail=no
+(
+ $as_echo "22. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite.at:248:
+
+cat /dev/null | zstd - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --zstd
+tar --zstd -cf k.tar.zst empty
+tar tf k.tar.zst
+
+
+echo testing .zst
+tar -acf k2.tar.zst empty
+cat k2.tar.zst | zstd -d > k.zst.tar
+tar tf k.zst.tar
+
+echo testing .tzst
+tar -acf k2.tar.tzst empty
+cat k2.tar.tzst | zstd -d > k.tzst.tar
+tar tf k.tzst.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.zst
+test -f empty
+"
+at_fn_check_prepare_notrace 'an embedded newline' "testsuite.at:248"
+( $at_check_trace;
+
+cat /dev/null | zstd - > /dev/null 2>&1 || exit 77
+
+unset TAR_OPTIONS
+
+touch empty
+set -e
+: create with --zstd
+tar --zstd -cf k.tar.zst empty
+tar tf k.tar.zst
+
+
+echo testing .zst
+tar -acf k2.tar.zst empty
+cat k2.tar.zst | zstd -d > k.zst.tar
+tar tf k.zst.tar
+
+echo testing .tzst
+tar -acf k2.tar.tzst empty
+cat k2.tar.tzst | zstd -d > k.tzst.tar
+tar tf k.tzst.tar
+
+
+# Extraction: ensure compressed format is correctly recognized
+rm -f empty
+tar xf k.tar.zst
+test -f empty
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "empty
+testing .zst
+empty
+testing .tzst
+empty
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:248"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_22
+#AT_START_23
+at_fn_group_banner 23 'positional01.at:21' \
+ "Exclude" " " 5
+at_xfail=no
+(
+ $as_echo "23. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
{ set +x
$as_echo "$at_srcdir/positional01.at:24:
@@ -3149,13 +3960,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_12
-#AT_START_13
-at_fn_group_banner 13 'positional02.at:21' \
- "Directory" " " 2
+#AT_STOP_23
+#AT_START_24
+at_fn_group_banner 24 'positional02.at:21' \
+ "Directory" " " 5
at_xfail=no
(
- $as_echo "13. $at_setup_line: testing $at_desc ..."
+ $as_echo "24. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3213,13 +4024,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_13
-#AT_START_14
-at_fn_group_banner 14 'positional03.at:21' \
- "Several options" " " 2
+#AT_STOP_24
+#AT_START_25
+at_fn_group_banner 25 'positional03.at:21' \
+ "Several options" " " 5
at_xfail=no
(
- $as_echo "14. $at_setup_line: testing $at_desc ..."
+ $as_echo "25. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3274,14 +4085,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_14
-#AT_START_15
-at_fn_group_banner 15 'add-file.at:21' \
- "The --add-file option" " " 2
+#AT_STOP_25
+#AT_START_26
+at_fn_group_banner 26 'add-file.at:21' \
+ "The --add-file option" " " 5
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "15. $at_setup_line: testing $at_desc ..."
+ $as_echo "26. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3719,14 +4530,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_15
-#AT_START_16
-at_fn_group_banner 16 'T-mult.at:21' \
- "multiple file lists" " " 3
+#AT_STOP_26
+#AT_START_27
+at_fn_group_banner 27 'T-mult.at:21' \
+ "multiple file lists" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "16. $at_setup_line: testing $at_desc ..."
+ $as_echo "27. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3808,14 +4619,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_16
-#AT_START_17
-at_fn_group_banner 17 'T-nest.at:21' \
- "nested file lists" " " 3
+#AT_STOP_27
+#AT_START_28
+at_fn_group_banner 28 'T-nest.at:21' \
+ "nested file lists" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "17. $at_setup_line: testing $at_desc ..."
+ $as_echo "28. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3899,14 +4710,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_17
-#AT_START_18
-at_fn_group_banner 18 'T-rec.at:21' \
- "recursive file lists" " " 3
+#AT_STOP_28
+#AT_START_29
+at_fn_group_banner 29 'T-rec.at:21' \
+ "recursive file lists" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "18. $at_setup_line: testing $at_desc ..."
+ $as_echo "29. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3988,14 +4799,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_18
-#AT_START_19
-at_fn_group_banner 19 'T-recurse.at:27' \
- "files-from & recurse: toggle" " " 3
+#AT_STOP_29
+#AT_START_30
+at_fn_group_banner 30 'T-recurse.at:27' \
+ "files-from & recurse: toggle" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "19. $at_setup_line: testing $at_desc ..."
+ $as_echo "30. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4479,14 +5290,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_19
-#AT_START_20
-at_fn_group_banner 20 'T-recurse.at:66' \
- "toggle --recursion (not) from -T" " " 3
+#AT_STOP_30
+#AT_START_31
+at_fn_group_banner 31 'T-recurse.at:66' \
+ "toggle --recursion (not) from -T" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "20. $at_setup_line: testing $at_desc ..."
+ $as_echo "31. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4845,14 +5656,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_20
-#AT_START_21
-at_fn_group_banner 21 'T-cd.at:21' \
- "-C in file lists" " " 3
+#AT_STOP_31
+#AT_START_32
+at_fn_group_banner 32 'T-cd.at:21' \
+ "-C in file lists" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "21. $at_setup_line: testing $at_desc ..."
+ $as_echo "32. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4932,14 +5743,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_21
-#AT_START_22
-at_fn_group_banner 22 'T-empty.at:27' \
- "empty entries" " " 3
+#AT_STOP_32
+#AT_START_33
+at_fn_group_banner 33 'T-empty.at:26' \
+ "empty entries" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "22. $at_setup_line: testing $at_desc ..."
+ $as_echo "33. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4955,7 +5766,7 @@ _ATEOF
{ set +x
-$as_echo "$at_srcdir/T-empty.at:37:
+$as_echo "$at_srcdir/T-empty.at:36:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -4971,7 +5782,7 @@ genfile --file trzy
tar cfvT archive ../file-list
)"
-at_fn_check_prepare_notrace 'an embedded newline' "T-empty.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "T-empty.at:36"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -4997,7 +5808,7 @@ dwa
trzy
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/T-empty.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/T-empty.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5008,14 +5819,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_22
-#AT_START_23
-at_fn_group_banner 23 'T-null.at:22' \
- "0-separated file without -0" " " 3
+#AT_STOP_33
+#AT_START_34
+at_fn_group_banner 34 'T-null.at:21' \
+ "0-separated file without -0" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "23. $at_setup_line: testing $at_desc ..."
+ $as_echo "34. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5023,7 +5834,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/T-null.at:25:
+$as_echo "$at_srcdir/T-null.at:24:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -5047,7 +5858,7 @@ genfile -f trzy
tar cfTv archive file-list
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "T-null.at:25"
+at_fn_check_prepare_notrace 'a `...` command substitution' "T-null.at:24"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -5083,7 +5894,7 @@ dwa
trzy
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/T-null.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/T-null.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5094,14 +5905,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_23
-#AT_START_24
-at_fn_group_banner 24 'T-null2.at:17' \
- "--null enables verbatim reading" " " 3
+#AT_STOP_34
+#AT_START_35
+at_fn_group_banner 35 'T-null2.at:17' \
+ "--null enables verbatim reading" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "24. $at_setup_line: testing $at_desc ..."
+ $as_echo "35. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5183,14 +5994,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_24
-#AT_START_25
-at_fn_group_banner 25 'T-zfile.at:26' \
- "empty file" " " 3
+#AT_STOP_35
+#AT_START_36
+at_fn_group_banner 36 'T-zfile.at:26' \
+ "empty file" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "25. $at_setup_line: testing $at_desc ..."
+ $as_echo "36. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5269,14 +6080,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_25
-#AT_START_26
-at_fn_group_banner 26 'T-nonl.at:27' \
- "entries with missing newlines" " " 3
+#AT_STOP_36
+#AT_START_37
+at_fn_group_banner 37 'T-nonl.at:27' \
+ "entries with missing newlines" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "26. $at_setup_line: testing $at_desc ..."
+ $as_echo "37. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5294,9 +6105,8 @@ export TAR_OPTIONS
rm -rf *
genfile --length=0 --file empty
-\$as_echo_n c > 1.nonl
-echo d > 2.nonl
-\$as_echo_n e >> 2.nonl
+printf c > 1.nonl
+printf 'd\\ne' > 2.nonl
touch a b c d e
cat >filelist <<'_ATEOF'
a
@@ -5321,9 +6131,8 @@ export TAR_OPTIONS
rm -rf *
genfile --length=0 --file empty
-$as_echo_n c > 1.nonl
-echo d > 2.nonl
-$as_echo_n e >> 2.nonl
+printf c > 1.nonl
+printf 'd\ne' > 2.nonl
touch a b c d e
cat >filelist <<'_ATEOF'
a
@@ -5365,14 +6174,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_26
-#AT_START_27
-at_fn_group_banner 27 'T-dir00.at:28' \
- "recursive extraction from --files-from" " " 3
+#AT_STOP_37
+#AT_START_38
+at_fn_group_banner 38 'T-dir00.at:28' \
+ "recursive extraction from --files-from" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "27. $at_setup_line: testing $at_desc ..."
+ $as_echo "38. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5659,14 +6468,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_27
-#AT_START_28
-at_fn_group_banner 28 'T-dir01.at:28' \
- "trailing slash in --files-from" " " 3
+#AT_STOP_38
+#AT_START_39
+at_fn_group_banner 39 'T-dir01.at:28' \
+ "trailing slash in --files-from" " " 6
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "28. $at_setup_line: testing $at_desc ..."
+ $as_echo "39. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5953,14 +6762,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_28
-#AT_START_29
-at_fn_group_banner 29 'indexfile.at:27' \
- "tar --index-file=FILE --file=-" " " 4
+#AT_STOP_39
+#AT_START_40
+at_fn_group_banner 40 'indexfile.at:26' \
+ "tar --index-file=FILE --file=-" " " 7
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "29. $at_setup_line: testing $at_desc ..."
+ $as_echo "40. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5968,7 +6777,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/indexfile.at:30:
+$as_echo "$at_srcdir/indexfile.at:29:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -5987,7 +6796,7 @@ tar -c -v -f - --index-file=idx directory > archive
echo \"Testing the archive\"
tar -tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:29"
( $at_check_trace;
mkdir v7
(cd v7
@@ -6017,12 +6826,12 @@ directory/
directory/a
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/indexfile.at:30:
+$as_echo "$at_srcdir/indexfile.at:29:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -6041,7 +6850,7 @@ tar -c -v -f - --index-file=idx directory > archive
echo \"Testing the archive\"
tar -tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:29"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -6071,12 +6880,12 @@ directory/
directory/a
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/indexfile.at:30:
+$as_echo "$at_srcdir/indexfile.at:29:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -6095,7 +6904,7 @@ tar -c -v -f - --index-file=idx directory > archive
echo \"Testing the archive\"
tar -tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:29"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -6125,12 +6934,12 @@ directory/
directory/a
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/indexfile.at:30:
+$as_echo "$at_srcdir/indexfile.at:29:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -6149,7 +6958,7 @@ tar -c -v -f - --index-file=idx directory > archive
echo \"Testing the archive\"
tar -tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:29"
( $at_check_trace;
mkdir posix
(cd posix
@@ -6179,12 +6988,12 @@ directory/
directory/a
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/indexfile.at:30:
+$as_echo "$at_srcdir/indexfile.at:29:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -6203,7 +7012,7 @@ tar -c -v -f - --index-file=idx directory > archive
echo \"Testing the archive\"
tar -tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "indexfile.at:29"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -6233,7 +7042,7 @@ directory/
directory/a
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/indexfile.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6244,14 +7053,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_29
-#AT_START_30
-at_fn_group_banner 30 'verbose.at:27' \
- "tar cvf -" " " 4
+#AT_STOP_40
+#AT_START_41
+at_fn_group_banner 41 'verbose.at:26' \
+ "tar cvf -" " " 7
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "30. $at_setup_line: testing $at_desc ..."
+ $as_echo "41. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6259,7 +7068,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/verbose.at:30:
+$as_echo "$at_srcdir/verbose.at:29:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -6274,7 +7083,7 @@ tar cvf - file > archive
echo Testing the archive
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:29"
( $at_check_trace;
mkdir v7
(cd v7
@@ -6301,12 +7110,12 @@ Testing the archive
file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/verbose.at:30:
+$as_echo "$at_srcdir/verbose.at:29:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -6321,7 +7130,7 @@ tar cvf - file > archive
echo Testing the archive
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:29"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -6348,12 +7157,12 @@ Testing the archive
file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/verbose.at:30:
+$as_echo "$at_srcdir/verbose.at:29:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -6368,7 +7177,7 @@ tar cvf - file > archive
echo Testing the archive
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:29"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -6395,12 +7204,12 @@ Testing the archive
file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/verbose.at:30:
+$as_echo "$at_srcdir/verbose.at:29:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -6415,7 +7224,7 @@ tar cvf - file > archive
echo Testing the archive
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:29"
( $at_check_trace;
mkdir posix
(cd posix
@@ -6442,12 +7251,12 @@ Testing the archive
file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/verbose.at:30:
+$as_echo "$at_srcdir/verbose.at:29:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -6462,7 +7271,7 @@ tar cvf - file > archive
echo Testing the archive
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "verbose.at:29"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -6489,7 +7298,7 @@ Testing the archive
file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/verbose.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6500,13 +7309,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_30
-#AT_START_31
-at_fn_group_banner 31 'gzip.at:24' \
- "gzip" " " 4
+#AT_STOP_41
+#AT_START_42
+at_fn_group_banner 42 'gzip.at:23' \
+ "gzip" " " 7
at_xfail=no
(
- $as_echo "31. $at_setup_line: testing $at_desc ..."
+ $as_echo "42. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6514,7 +7323,7 @@ at_xfail=no
unset TAR_OPTIONS
{ set +x
-$as_echo "$at_srcdir/gzip.at:29:
+$as_echo "$at_srcdir/gzip.at:28:
cat /dev/null | gzip - > /dev/null 2>&1 || exit 77
@@ -6523,7 +7332,7 @@ RC=\$?
sed -n '/^tar:/p' err >&2
exit \$RC
"
-at_fn_check_prepare_notrace 'an embedded newline' "gzip.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "gzip.at:28"
( $at_check_trace;
cat /dev/null | gzip - > /dev/null 2>&1 || exit 77
@@ -6541,7 +7350,7 @@ tar: Error is not recoverable: exiting now
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/gzip.at:29"
+at_fn_check_status 2 $at_status "$at_srcdir/gzip.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6550,14 +7359,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_31
-#AT_START_32
-at_fn_group_banner 32 'recurse.at:22' \
- "recurse" " " 4
+#AT_STOP_42
+#AT_START_43
+at_fn_group_banner 43 'recurse.at:21' \
+ "recurse" " " 7
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "32. $at_setup_line: testing $at_desc ..."
+ $as_echo "43. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6565,7 +7374,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/recurse.at:25:
+$as_echo "$at_srcdir/recurse.at:24:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -6579,7 +7388,7 @@ touch directory/file
tar --create --file archive --no-recursion directory || exit 1
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:24"
( $at_check_trace;
mkdir v7
(cd v7
@@ -6601,12 +7410,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/recurse.at:25:
+$as_echo "$at_srcdir/recurse.at:24:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -6620,7 +7429,7 @@ touch directory/file
tar --create --file archive --no-recursion directory || exit 1
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:24"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -6642,12 +7451,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/recurse.at:25:
+$as_echo "$at_srcdir/recurse.at:24:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -6661,7 +7470,7 @@ touch directory/file
tar --create --file archive --no-recursion directory || exit 1
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:24"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -6683,12 +7492,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/recurse.at:25:
+$as_echo "$at_srcdir/recurse.at:24:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -6702,7 +7511,7 @@ touch directory/file
tar --create --file archive --no-recursion directory || exit 1
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:24"
( $at_check_trace;
mkdir posix
(cd posix
@@ -6724,12 +7533,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/recurse.at:25:
+$as_echo "$at_srcdir/recurse.at:24:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -6743,7 +7552,7 @@ touch directory/file
tar --create --file archive --no-recursion directory || exit 1
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "recurse.at:24"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -6765,7 +7574,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/recurse.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6776,14 +7585,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_32
-#AT_START_33
-at_fn_group_banner 33 'recurs02.at:30' \
- "recurse: toggle" " " 4
+#AT_STOP_43
+#AT_START_44
+at_fn_group_banner 44 'recurs02.at:30' \
+ "recurse: toggle" " " 7
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "33. $at_setup_line: testing $at_desc ..."
+ $as_echo "44. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7087,14 +7896,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_33
-#AT_START_34
-at_fn_group_banner 34 'shortrec.at:26' \
- "short records" " " 4
+#AT_STOP_44
+#AT_START_45
+at_fn_group_banner 45 'shortrec.at:25' \
+ "short records" " " 7
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "34. $at_setup_line: testing $at_desc ..."
+ $as_echo "45. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7102,7 +7911,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/shortrec.at:29:
+$as_echo "$at_srcdir/shortrec.at:28:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -7120,7 +7929,7 @@ tar -t -f - < archive > /dev/null
rm -r directory
)"
-at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:28"
( $at_check_trace;
mkdir v7
(cd v7
@@ -7144,12 +7953,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/shortrec.at:29:
+$as_echo "$at_srcdir/shortrec.at:28:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -7167,7 +7976,7 @@ tar -t -f - < archive > /dev/null
rm -r directory
)"
-at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:28"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -7191,12 +8000,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/shortrec.at:29:
+$as_echo "$at_srcdir/shortrec.at:28:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -7214,7 +8023,7 @@ tar -t -f - < archive > /dev/null
rm -r directory
)"
-at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:28"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -7238,12 +8047,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/shortrec.at:29:
+$as_echo "$at_srcdir/shortrec.at:28:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -7261,7 +8070,7 @@ tar -t -f - < archive > /dev/null
rm -r directory
)"
-at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:28"
( $at_check_trace;
mkdir posix
(cd posix
@@ -7285,12 +8094,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/shortrec.at:29:
+$as_echo "$at_srcdir/shortrec.at:28:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -7308,7 +8117,7 @@ tar -t -f - < archive > /dev/null
rm -r directory
)"
-at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "shortrec.at:28"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -7332,7 +8141,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/shortrec.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7343,14 +8152,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_34
-#AT_START_35
-at_fn_group_banner 35 'numeric.at:18' \
- "--numeric-owner basic tests" " " 4
+#AT_STOP_45
+#AT_START_46
+at_fn_group_banner 46 'numeric.at:18' \
+ "--numeric-owner basic tests" " " 7
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "35. $at_setup_line: testing $at_desc ..."
+ $as_echo "46. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7369,14 +8178,17 @@ TAR_OPTIONS=\"-H posix\"
export TAR_OPTIONS
rm -rf *
-mkdir dir
-genfile --file dir/file
-
MYUID=\$(id -u) || exit 77
MYGID=\$(id -g) || exit 77
MYUSR=\$(id -un) || exit 77
MYGRP=\$(id -gn) || exit 77
+mkdir dir
+# Ensure correct group id on BSDs.
+chown :\$MYGID dir >/dev/null 2>/dev/null
+genfile --file dir/file
+
+
decho --create
tar --create -vvf a dir --numeric-owner | awk '$2==\"'\"\$MYUID/\$MYGID\"'\" {print \"OK\"; next} {print}'
@@ -7408,14 +8220,17 @@ TAR_OPTIONS="-H posix"
export TAR_OPTIONS
rm -rf *
-mkdir dir
-genfile --file dir/file
-
MYUID=$(id -u) || exit 77
MYGID=$(id -g) || exit 77
MYUSR=$(id -un) || exit 77
MYGRP=$(id -gn) || exit 77
+mkdir dir
+# Ensure correct group id on BSDs.
+chown :$MYGID dir >/dev/null 2>/dev/null
+genfile --file dir/file
+
+
decho --create
tar --create -vvf a dir --numeric-owner | awk '$2=="'"$MYUID/$MYGID"'" {print "OK"; next} {print}'
@@ -7482,14 +8297,17 @@ TAR_OPTIONS=\"-H gnu\"
export TAR_OPTIONS
rm -rf *
-mkdir dir
-genfile --file dir/file
-
MYUID=\$(id -u) || exit 77
MYGID=\$(id -g) || exit 77
MYUSR=\$(id -un) || exit 77
MYGRP=\$(id -gn) || exit 77
+mkdir dir
+# Ensure correct group id on BSDs.
+chown :\$MYGID dir >/dev/null 2>/dev/null
+genfile --file dir/file
+
+
decho --create
tar --create -vvf a dir --numeric-owner | awk '$2==\"'\"\$MYUID/\$MYGID\"'\" {print \"OK\"; next} {print}'
@@ -7521,14 +8339,17 @@ TAR_OPTIONS="-H gnu"
export TAR_OPTIONS
rm -rf *
-mkdir dir
-genfile --file dir/file
-
MYUID=$(id -u) || exit 77
MYGID=$(id -g) || exit 77
MYUSR=$(id -un) || exit 77
MYGRP=$(id -gn) || exit 77
+mkdir dir
+# Ensure correct group id on BSDs.
+chown :$MYGID dir >/dev/null 2>/dev/null
+genfile --file dir/file
+
+
decho --create
tar --create -vvf a dir --numeric-owner | awk '$2=="'"$MYUID/$MYGID"'" {print "OK"; next} {print}'
@@ -7595,14 +8416,17 @@ TAR_OPTIONS=\"-H ustar\"
export TAR_OPTIONS
rm -rf *
-mkdir dir
-genfile --file dir/file
-
MYUID=\$(id -u) || exit 77
MYGID=\$(id -g) || exit 77
MYUSR=\$(id -un) || exit 77
MYGRP=\$(id -gn) || exit 77
+mkdir dir
+# Ensure correct group id on BSDs.
+chown :\$MYGID dir >/dev/null 2>/dev/null
+genfile --file dir/file
+
+
decho --create
tar --create -vvf a dir --numeric-owner | awk '$2==\"'\"\$MYUID/\$MYGID\"'\" {print \"OK\"; next} {print}'
@@ -7634,14 +8458,17 @@ TAR_OPTIONS="-H ustar"
export TAR_OPTIONS
rm -rf *
-mkdir dir
-genfile --file dir/file
-
MYUID=$(id -u) || exit 77
MYGID=$(id -g) || exit 77
MYUSR=$(id -un) || exit 77
MYGRP=$(id -gn) || exit 77
+mkdir dir
+# Ensure correct group id on BSDs.
+chown :$MYGID dir >/dev/null 2>/dev/null
+genfile --file dir/file
+
+
decho --create
tar --create -vvf a dir --numeric-owner | awk '$2=="'"$MYUID/$MYGID"'" {print "OK"; next} {print}'
@@ -7708,14 +8535,17 @@ TAR_OPTIONS=\"-H oldgnu\"
export TAR_OPTIONS
rm -rf *
-mkdir dir
-genfile --file dir/file
-
MYUID=\$(id -u) || exit 77
MYGID=\$(id -g) || exit 77
MYUSR=\$(id -un) || exit 77
MYGRP=\$(id -gn) || exit 77
+mkdir dir
+# Ensure correct group id on BSDs.
+chown :\$MYGID dir >/dev/null 2>/dev/null
+genfile --file dir/file
+
+
decho --create
tar --create -vvf a dir --numeric-owner | awk '$2==\"'\"\$MYUID/\$MYGID\"'\" {print \"OK\"; next} {print}'
@@ -7747,14 +8577,17 @@ TAR_OPTIONS="-H oldgnu"
export TAR_OPTIONS
rm -rf *
-mkdir dir
-genfile --file dir/file
-
MYUID=$(id -u) || exit 77
MYGID=$(id -g) || exit 77
MYUSR=$(id -un) || exit 77
MYGRP=$(id -gn) || exit 77
+mkdir dir
+# Ensure correct group id on BSDs.
+chown :$MYGID dir >/dev/null 2>/dev/null
+genfile --file dir/file
+
+
decho --create
tar --create -vvf a dir --numeric-owner | awk '$2=="'"$MYUID/$MYGID"'" {print "OK"; next} {print}'
@@ -7818,14 +8651,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_35
-#AT_START_36
-at_fn_group_banner 36 'same-order01.at:27' \
- "working -C with --same-order" " " 5
+#AT_STOP_46
+#AT_START_47
+at_fn_group_banner 47 'same-order01.at:26' \
+ "working -C with --same-order" " " 8
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "36. $at_setup_line: testing $at_desc ..."
+ $as_echo "47. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7833,7 +8666,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/same-order01.at:30:
+$as_echo "$at_srcdir/same-order01.at:29:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -7855,7 +8688,7 @@ tar -xf archive --same-order -C directory --warning=no-timestamp || exit 1
ls directory|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:30"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:29"
( $at_check_trace;
mkdir v7
(cd v7
@@ -7886,12 +8719,12 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/same-order01.at:30:
+$as_echo "$at_srcdir/same-order01.at:29:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -7913,7 +8746,7 @@ tar -xf archive --same-order -C directory --warning=no-timestamp || exit 1
ls directory|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:30"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:29"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -7944,12 +8777,12 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/same-order01.at:30:
+$as_echo "$at_srcdir/same-order01.at:29:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -7971,7 +8804,7 @@ tar -xf archive --same-order -C directory --warning=no-timestamp || exit 1
ls directory|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:30"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:29"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -8002,12 +8835,12 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/same-order01.at:30:
+$as_echo "$at_srcdir/same-order01.at:29:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -8029,7 +8862,7 @@ tar -xf archive --same-order -C directory --warning=no-timestamp || exit 1
ls directory|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:30"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:29"
( $at_check_trace;
mkdir posix
(cd posix
@@ -8060,12 +8893,12 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/same-order01.at:30:
+$as_echo "$at_srcdir/same-order01.at:29:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -8087,7 +8920,7 @@ tar -xf archive --same-order -C directory --warning=no-timestamp || exit 1
ls directory|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:30"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order01.at:29"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -8118,7 +8951,7 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order01.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8129,14 +8962,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_36
-#AT_START_37
-at_fn_group_banner 37 'same-order02.at:26' \
- "multiple -C options" " " 5
+#AT_STOP_47
+#AT_START_48
+at_fn_group_banner 48 'same-order02.at:25' \
+ "multiple -C options" " " 8
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "37. $at_setup_line: testing $at_desc ..."
+ $as_echo "48. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8144,7 +8977,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/same-order02.at:29:
+$as_echo "$at_srcdir/same-order02.at:28:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -8169,7 +9002,7 @@ ls en
echo separator
ls to
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:29"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:28"
( $at_check_trace;
mkdir v7
(cd v7
@@ -8204,12 +9037,12 @@ separator
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/same-order02.at:29:
+$as_echo "$at_srcdir/same-order02.at:28:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -8234,7 +9067,7 @@ ls en
echo separator
ls to
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:29"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:28"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -8269,12 +9102,12 @@ separator
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/same-order02.at:29:
+$as_echo "$at_srcdir/same-order02.at:28:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -8299,7 +9132,7 @@ ls en
echo separator
ls to
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:29"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:28"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -8334,12 +9167,12 @@ separator
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/same-order02.at:29:
+$as_echo "$at_srcdir/same-order02.at:28:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -8364,7 +9197,7 @@ ls en
echo separator
ls to
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:29"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:28"
( $at_check_trace;
mkdir posix
(cd posix
@@ -8399,12 +9232,12 @@ separator
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/same-order02.at:29:
+$as_echo "$at_srcdir/same-order02.at:28:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -8429,7 +9262,7 @@ ls en
echo separator
ls to
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:29"
+at_fn_check_prepare_notrace 'a `...` command substitution' "same-order02.at:28"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -8464,7 +9297,7 @@ separator
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/same-order02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8475,14 +9308,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_37
-#AT_START_38
-at_fn_group_banner 38 'append.at:22' \
- "append" " " 6
+#AT_STOP_48
+#AT_START_49
+at_fn_group_banner 49 'append.at:21' \
+ "append" " " 9
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "38. $at_setup_line: testing $at_desc ..."
+ $as_echo "49. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8490,7 +9323,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/append.at:25:
+$as_echo "$at_srcdir/append.at:24:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -8503,7 +9336,7 @@ touch file1
tar cf archive file1
tar rf archive file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "append.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "append.at:24"
( $at_check_trace;
mkdir v7
(cd v7
@@ -8525,12 +9358,12 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/append.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append.at:25:
+$as_echo "$at_srcdir/append.at:24:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -8543,7 +9376,7 @@ touch file1
tar cf archive file1
tar rf archive file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "append.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "append.at:24"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -8565,12 +9398,12 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/append.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append.at:25:
+$as_echo "$at_srcdir/append.at:24:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -8583,7 +9416,7 @@ touch file1
tar cf archive file1
tar rf archive file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "append.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "append.at:24"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -8605,12 +9438,12 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/append.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append.at:25:
+$as_echo "$at_srcdir/append.at:24:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -8623,7 +9456,7 @@ touch file1
tar cf archive file1
tar rf archive file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "append.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "append.at:24"
( $at_check_trace;
mkdir posix
(cd posix
@@ -8645,12 +9478,12 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/append.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append.at:25:
+$as_echo "$at_srcdir/append.at:24:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -8663,7 +9496,7 @@ touch file1
tar cf archive file1
tar rf archive file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "append.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "append.at:24"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -8685,7 +9518,7 @@ echo >>"$at_stdout"; $as_echo "file1
file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/append.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8696,14 +9529,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_38
-#AT_START_39
-at_fn_group_banner 39 'append01.at:30' \
- "appending files with long names" " " 6
+#AT_STOP_49
+#AT_START_50
+at_fn_group_banner 50 'append01.at:29' \
+ "appending files with long names" " " 9
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "39. $at_setup_line: testing $at_desc ..."
+ $as_echo "50. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8713,7 +9546,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/append01.at:35:
+$as_echo "$at_srcdir/append01.at:34:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -8728,7 +9561,7 @@ tar cf archive This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_pr
tar rf archive This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_appending_long_file_names_that_run_into_a_limit_of_the_ustar_tarX/file2
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "append01.at:35"
+at_fn_check_prepare_notrace 'an embedded newline' "append01.at:34"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -8752,12 +9585,12 @@ echo >>"$at_stdout"; $as_echo "This_is_a_very_long_file_name_prefix_that_is_desi
This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_appending_long_file_names_that_run_into_a_limit_of_the_ustar_tarX/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append01.at:35"
+at_fn_check_status 0 $at_status "$at_srcdir/append01.at:34"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append01.at:35:
+$as_echo "$at_srcdir/append01.at:34:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -8772,7 +9605,7 @@ tar cf archive This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_pr
tar rf archive This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_appending_long_file_names_that_run_into_a_limit_of_the_ustar_tarX/file2
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "append01.at:35"
+at_fn_check_prepare_notrace 'an embedded newline' "append01.at:34"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -8796,12 +9629,12 @@ echo >>"$at_stdout"; $as_echo "This_is_a_very_long_file_name_prefix_that_is_desi
This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_appending_long_file_names_that_run_into_a_limit_of_the_ustar_tarX/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append01.at:35"
+at_fn_check_status 0 $at_status "$at_srcdir/append01.at:34"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append01.at:35:
+$as_echo "$at_srcdir/append01.at:34:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -8816,7 +9649,7 @@ tar cf archive This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_pr
tar rf archive This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_appending_long_file_names_that_run_into_a_limit_of_the_ustar_tarX/file2
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "append01.at:35"
+at_fn_check_prepare_notrace 'an embedded newline' "append01.at:34"
( $at_check_trace;
mkdir posix
(cd posix
@@ -8840,12 +9673,12 @@ echo >>"$at_stdout"; $as_echo "This_is_a_very_long_file_name_prefix_that_is_desi
This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_appending_long_file_names_that_run_into_a_limit_of_the_ustar_tarX/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append01.at:35"
+at_fn_check_status 0 $at_status "$at_srcdir/append01.at:34"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append01.at:35:
+$as_echo "$at_srcdir/append01.at:34:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -8860,7 +9693,7 @@ tar cf archive This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_pr
tar rf archive This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_appending_long_file_names_that_run_into_a_limit_of_the_ustar_tarX/file2
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "append01.at:35"
+at_fn_check_prepare_notrace 'an embedded newline' "append01.at:34"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -8884,7 +9717,7 @@ echo >>"$at_stdout"; $as_echo "This_is_a_very_long_file_name_prefix_that_is_desi
This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_appending_long_file_names_that_run_into_a_limit_of_the_ustar_tarX/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append01.at:35"
+at_fn_check_status 0 $at_status "$at_srcdir/append01.at:34"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8896,14 +9729,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_39
-#AT_START_40
-at_fn_group_banner 40 'append02.at:55' \
- "append vs. create" " " 6
+#AT_STOP_50
+#AT_START_51
+at_fn_group_banner 51 'append02.at:54' \
+ "append vs. create" " " 9
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "40. $at_setup_line: testing $at_desc ..."
+ $as_echo "51. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8911,7 +9744,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/append02.at:58:
+$as_echo "$at_srcdir/append02.at:57:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -8943,7 +9776,7 @@ tar \$MTIME -rf archive.2 file2
echo Comparing archives
cmp archive.1 archive.2
)"
-at_fn_check_prepare_notrace 'an embedded newline' "append02.at:58"
+at_fn_check_prepare_notrace 'an embedded newline' "append02.at:57"
( $at_check_trace;
mkdir v7
(cd v7
@@ -8985,12 +9818,12 @@ Creating archive.2
Comparing archives
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append02.at:58"
+at_fn_check_status 0 $at_status "$at_srcdir/append02.at:57"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append02.at:58:
+$as_echo "$at_srcdir/append02.at:57:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -9022,7 +9855,7 @@ tar \$MTIME -rf archive.2 file2
echo Comparing archives
cmp archive.1 archive.2
)"
-at_fn_check_prepare_notrace 'an embedded newline' "append02.at:58"
+at_fn_check_prepare_notrace 'an embedded newline' "append02.at:57"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -9064,12 +9897,12 @@ Creating archive.2
Comparing archives
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append02.at:58"
+at_fn_check_status 0 $at_status "$at_srcdir/append02.at:57"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append02.at:58:
+$as_echo "$at_srcdir/append02.at:57:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -9101,7 +9934,7 @@ tar \$MTIME -rf archive.2 file2
echo Comparing archives
cmp archive.1 archive.2
)"
-at_fn_check_prepare_notrace 'an embedded newline' "append02.at:58"
+at_fn_check_prepare_notrace 'an embedded newline' "append02.at:57"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -9143,12 +9976,12 @@ Creating archive.2
Comparing archives
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append02.at:58"
+at_fn_check_status 0 $at_status "$at_srcdir/append02.at:57"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append02.at:58:
+$as_echo "$at_srcdir/append02.at:57:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -9180,7 +10013,7 @@ tar \$MTIME -rf archive.2 file2
echo Comparing archives
cmp archive.1 archive.2
)"
-at_fn_check_prepare_notrace 'an embedded newline' "append02.at:58"
+at_fn_check_prepare_notrace 'an embedded newline' "append02.at:57"
( $at_check_trace;
mkdir posix
(cd posix
@@ -9222,12 +10055,12 @@ Creating archive.2
Comparing archives
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append02.at:58"
+at_fn_check_status 0 $at_status "$at_srcdir/append02.at:57"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/append02.at:58:
+$as_echo "$at_srcdir/append02.at:57:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -9259,7 +10092,7 @@ tar \$MTIME -rf archive.2 file2
echo Comparing archives
cmp archive.1 archive.2
)"
-at_fn_check_prepare_notrace 'an embedded newline' "append02.at:58"
+at_fn_check_prepare_notrace 'an embedded newline' "append02.at:57"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -9301,7 +10134,7 @@ Creating archive.2
Comparing archives
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/append02.at:58"
+at_fn_check_status 0 $at_status "$at_srcdir/append02.at:57"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9312,14 +10145,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_40
-#AT_START_41
-at_fn_group_banner 41 'append03.at:21' \
- "append with name transformation" " " 6
+#AT_STOP_51
+#AT_START_52
+at_fn_group_banner 52 'append03.at:21' \
+ "append with name transformation" " " 9
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "41. $at_setup_line: testing $at_desc ..."
+ $as_echo "52. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9605,14 +10438,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_41
-#AT_START_42
-at_fn_group_banner 42 'append04.at:29' \
- "append with verify" " " 6
+#AT_STOP_52
+#AT_START_53
+at_fn_group_banner 53 'append04.at:29' \
+ "append with verify" " " 9
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "42. $at_setup_line: testing $at_desc ..."
+ $as_echo "53. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9986,14 +10819,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_42
-#AT_START_43
-at_fn_group_banner 43 'append05.at:32' \
- "append after changed blocking" " " 6
+#AT_STOP_53
+#AT_START_54
+at_fn_group_banner 54 'append05.at:32' \
+ "append after changed blocking" " " 9
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "43. $at_setup_line: testing $at_desc ..."
+ $as_echo "54. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10537,14 +11370,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_43
-#AT_START_44
-at_fn_group_banner 44 'xform-h.at:31' \
- "transforming hard links on create" " " 7
+#AT_STOP_54
+#AT_START_55
+at_fn_group_banner 55 'xform-h.at:30' \
+ "transforming hard links on create" " " 10
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "44. $at_setup_line: testing $at_desc ..."
+ $as_echo "55. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10554,7 +11387,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/xform-h.at:40:
+$as_echo "$at_srcdir/xform-h.at:39:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -10583,7 +11416,7 @@ tar cf archive --transform=\"s,^basedir/,,H\" basedir/test basedir/test_link
tar tvf archive | sed -n 's/.*test_link link to //p'
)"
-at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:40"
+at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:39"
( $at_check_trace;
mkdir v7
(cd v7
@@ -10625,12 +11458,12 @@ Not transforming hard links
basedir/test
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:40"
+at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:39"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/xform-h.at:40:
+$as_echo "$at_srcdir/xform-h.at:39:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -10659,7 +11492,7 @@ tar cf archive --transform=\"s,^basedir/,,H\" basedir/test basedir/test_link
tar tvf archive | sed -n 's/.*test_link link to //p'
)"
-at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:40"
+at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:39"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -10701,12 +11534,12 @@ Not transforming hard links
basedir/test
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:40"
+at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:39"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/xform-h.at:40:
+$as_echo "$at_srcdir/xform-h.at:39:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -10735,7 +11568,7 @@ tar cf archive --transform=\"s,^basedir/,,H\" basedir/test basedir/test_link
tar tvf archive | sed -n 's/.*test_link link to //p'
)"
-at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:40"
+at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:39"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -10777,12 +11610,12 @@ Not transforming hard links
basedir/test
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:40"
+at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:39"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/xform-h.at:40:
+$as_echo "$at_srcdir/xform-h.at:39:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -10811,7 +11644,7 @@ tar cf archive --transform=\"s,^basedir/,,H\" basedir/test basedir/test_link
tar tvf archive | sed -n 's/.*test_link link to //p'
)"
-at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:40"
+at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:39"
( $at_check_trace;
mkdir posix
(cd posix
@@ -10853,12 +11686,12 @@ Not transforming hard links
basedir/test
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:40"
+at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:39"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/xform-h.at:40:
+$as_echo "$at_srcdir/xform-h.at:39:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -10887,7 +11720,7 @@ tar cf archive --transform=\"s,^basedir/,,H\" basedir/test basedir/test_link
tar tvf archive | sed -n 's/.*test_link link to //p'
)"
-at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:40"
+at_fn_check_prepare_notrace 'an embedded newline' "xform-h.at:39"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -10929,7 +11762,7 @@ Not transforming hard links
basedir/test
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:40"
+at_fn_check_status 0 $at_status "$at_srcdir/xform-h.at:39"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10942,14 +11775,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_44
-#AT_START_45
-at_fn_group_banner 45 'xform01.at:26' \
- "transformations and GNU volume labels" " " 7
+#AT_STOP_55
+#AT_START_56
+at_fn_group_banner 56 'xform01.at:26' \
+ "transformations and GNU volume labels" " " 10
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "45. $at_setup_line: testing $at_desc ..."
+ $as_echo "56. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11003,14 +11836,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_45
-#AT_START_46
-at_fn_group_banner 46 'xform02.at:21' \
- "transforming escaped delimiters on create" " " 7
+#AT_STOP_56
+#AT_START_57
+at_fn_group_banner 57 'xform02.at:21' \
+ "transforming escaped delimiters on create" " " 10
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "46. $at_setup_line: testing $at_desc ..."
+ $as_echo "57. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11229,20 +12062,22 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_46
-#AT_START_47
-at_fn_group_banner 47 'xform03.at:21' \
- "transforming hard link targets" " " 7
+#AT_STOP_57
+#AT_START_58
+at_fn_group_banner 58 'xform03.at:21' \
+ "transforming hard link targets" " " 10
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "47. $at_setup_line: testing $at_desc ..."
+ $as_echo "58. $at_setup_line: testing $at_desc ..."
$at_traceon
+
+
{ set +x
$as_echo "$at_srcdir/xform03.at:24:
mkdir v7
@@ -11256,8 +12091,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=\$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b
+dir=\$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11275,8 +12110,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b
+dir=$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11284,10 +12119,7 @@ find t -type f
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo >>"$at_stderr"; $as_echo "tar: Removing leading \`/' from member names
-tar: Removing leading \`/' from hard link targets
-" | \
- $at_diff - "$at_stderr" || at_failed=:
+echo stderr:; tee stderr <"$at_stderr"
echo >>"$at_stdout"; $as_echo "t/dir/c/b
" | \
$at_diff - "$at_stdout" || at_failed=:
@@ -11296,6 +12128,18 @@ $at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
+$as_echo "$at_srcdir/xform03.at:24: sed \"/tar: Removing leading \\\`\\/*\\/' from/d\" stderr"
+at_fn_check_prepare_notrace 'a `...` command substitution' "xform03.at:24"
+( $at_check_trace; sed "/tar: Removing leading \`\/*\/' from/d" stderr
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/xform03.at:24"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+{ set +x
$as_echo "$at_srcdir/xform03.at:24:
mkdir oldgnu
(cd oldgnu
@@ -11308,8 +12152,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=\$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b
+dir=\$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11327,8 +12171,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b
+dir=$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11336,10 +12180,7 @@ find t -type f
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo >>"$at_stderr"; $as_echo "tar: Removing leading \`/' from member names
-tar: Removing leading \`/' from hard link targets
-" | \
- $at_diff - "$at_stderr" || at_failed=:
+echo stderr:; tee stderr <"$at_stderr"
echo >>"$at_stdout"; $as_echo "t/dir/c/b
" | \
$at_diff - "$at_stdout" || at_failed=:
@@ -11348,6 +12189,18 @@ $at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
+$as_echo "$at_srcdir/xform03.at:24: sed \"/tar: Removing leading \\\`\\/*\\/' from/d\" stderr"
+at_fn_check_prepare_notrace 'a `...` command substitution' "xform03.at:24"
+( $at_check_trace; sed "/tar: Removing leading \`\/*\/' from/d" stderr
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/xform03.at:24"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+{ set +x
$as_echo "$at_srcdir/xform03.at:24:
mkdir ustar
(cd ustar
@@ -11360,8 +12213,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=\$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b
+dir=\$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11379,8 +12232,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b
+dir=$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11388,10 +12241,7 @@ find t -type f
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo >>"$at_stderr"; $as_echo "tar: Removing leading \`/' from member names
-tar: Removing leading \`/' from hard link targets
-" | \
- $at_diff - "$at_stderr" || at_failed=:
+echo stderr:; tee stderr <"$at_stderr"
echo >>"$at_stdout"; $as_echo "t/dir/c/b
" | \
$at_diff - "$at_stdout" || at_failed=:
@@ -11400,6 +12250,18 @@ $at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
+$as_echo "$at_srcdir/xform03.at:24: sed \"/tar: Removing leading \\\`\\/*\\/' from/d\" stderr"
+at_fn_check_prepare_notrace 'a `...` command substitution' "xform03.at:24"
+( $at_check_trace; sed "/tar: Removing leading \`\/*\/' from/d" stderr
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/xform03.at:24"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+{ set +x
$as_echo "$at_srcdir/xform03.at:24:
mkdir posix
(cd posix
@@ -11412,8 +12274,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=\$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b
+dir=\$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11431,8 +12293,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b
+dir=$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11440,10 +12302,7 @@ find t -type f
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo >>"$at_stderr"; $as_echo "tar: Removing leading \`/' from member names
-tar: Removing leading \`/' from hard link targets
-" | \
- $at_diff - "$at_stderr" || at_failed=:
+echo stderr:; tee stderr <"$at_stderr"
echo >>"$at_stdout"; $as_echo "t/dir/c/b
" | \
$at_diff - "$at_stdout" || at_failed=:
@@ -11452,6 +12311,18 @@ $at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
+$as_echo "$at_srcdir/xform03.at:24: sed \"/tar: Removing leading \\\`\\/*\\/' from/d\" stderr"
+at_fn_check_prepare_notrace 'a `...` command substitution' "xform03.at:24"
+( $at_check_trace; sed "/tar: Removing leading \`\/*\/' from/d" stderr
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/xform03.at:24"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+{ set +x
$as_echo "$at_srcdir/xform03.at:24:
mkdir gnu
(cd gnu
@@ -11464,8 +12335,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=\$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b
+dir=\$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform=\"s|^\$dir/a|dir/c|\" /\$dir/a/b /\$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11483,8 +12354,8 @@ rm -rf *
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b
+dir=$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -11492,10 +12363,7 @@ find t -type f
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo >>"$at_stderr"; $as_echo "tar: Removing leading \`/' from member names
-tar: Removing leading \`/' from hard link targets
-" | \
- $at_diff - "$at_stderr" || at_failed=:
+echo stderr:; tee stderr <"$at_stderr"
echo >>"$at_stdout"; $as_echo "t/dir/c/b
" | \
$at_diff - "$at_stdout" || at_failed=:
@@ -11503,20 +12371,34 @@ at_fn_check_status 0 $at_status "$at_srcdir/xform03.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
+ { set +x
+$as_echo "$at_srcdir/xform03.at:24: sed \"/tar: Removing leading \\\`\\/*\\/' from/d\" stderr"
+at_fn_check_prepare_notrace 'a `...` command substitution' "xform03.at:24"
+( $at_check_trace; sed "/tar: Removing leading \`\/*\/' from/d" stderr
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/xform03.at:24"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
set +x
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_47
-#AT_START_48
-at_fn_group_banner 48 'exclude.at:23' \
- "exclude" " " 8
+#AT_STOP_58
+#AT_START_59
+at_fn_group_banner 59 'exclude.at:23' \
+ "exclude" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "48. $at_setup_line: testing $at_desc ..."
+ $as_echo "59. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11726,14 +12608,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_48
-#AT_START_49
-at_fn_group_banner 49 'exclude01.at:19' \
- "exclude wildcards" " " 8
+#AT_STOP_59
+#AT_START_60
+at_fn_group_banner 60 'exclude01.at:19' \
+ "exclude wildcards" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "49. $at_setup_line: testing $at_desc ..."
+ $as_echo "60. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12307,14 +13189,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_49
-#AT_START_50
-at_fn_group_banner 50 'exclude02.at:19' \
- "exclude: anchoring" " " 8
+#AT_STOP_60
+#AT_START_61
+at_fn_group_banner 61 'exclude02.at:19' \
+ "exclude: anchoring" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "50. $at_setup_line: testing $at_desc ..."
+ $as_echo "61. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12948,14 +13830,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_50
-#AT_START_51
-at_fn_group_banner 51 'exclude03.at:19' \
- "exclude: wildcards match slash" " " 8
+#AT_STOP_61
+#AT_START_62
+at_fn_group_banner 62 'exclude03.at:19' \
+ "exclude: wildcards match slash" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "51. $at_setup_line: testing $at_desc ..."
+ $as_echo "62. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13549,14 +14431,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_51
-#AT_START_52
-at_fn_group_banner 52 'exclude04.at:19' \
- "exclude: case insensitive" " " 8
+#AT_STOP_62
+#AT_START_63
+at_fn_group_banner 63 'exclude04.at:19' \
+ "exclude: case insensitive" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "52. $at_setup_line: testing $at_desc ..."
+ $as_echo "63. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14165,14 +15047,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_52
-#AT_START_53
-at_fn_group_banner 53 'exclude05.at:22' \
- "exclude: lots of excludes" " " 8
+#AT_STOP_63
+#AT_START_64
+at_fn_group_banner 64 'exclude05.at:21' \
+ "exclude: lots of excludes" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "53. $at_setup_line: testing $at_desc ..."
+ $as_echo "64. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14180,7 +15062,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/exclude05.at:25:
+$as_echo "$at_srcdir/exclude05.at:24:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -14215,7 +15097,7 @@ tar tf archive | sort
rm -rf testdir exclfile
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:25"
+at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:24"
( $at_check_trace;
mkdir v7
(cd v7
@@ -14266,12 +15148,12 @@ testdir/file11
testdir/file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/exclude05.at:25:
+$as_echo "$at_srcdir/exclude05.at:24:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -14306,7 +15188,7 @@ tar tf archive | sort
rm -rf testdir exclfile
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:25"
+at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:24"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -14357,12 +15239,12 @@ testdir/file11
testdir/file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/exclude05.at:25:
+$as_echo "$at_srcdir/exclude05.at:24:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -14397,7 +15279,7 @@ tar tf archive | sort
rm -rf testdir exclfile
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:25"
+at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:24"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -14448,12 +15330,12 @@ testdir/file11
testdir/file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/exclude05.at:25:
+$as_echo "$at_srcdir/exclude05.at:24:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -14488,7 +15370,7 @@ tar tf archive | sort
rm -rf testdir exclfile
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:25"
+at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:24"
( $at_check_trace;
mkdir posix
(cd posix
@@ -14539,12 +15421,12 @@ testdir/file11
testdir/file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/exclude05.at:25:
+$as_echo "$at_srcdir/exclude05.at:24:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -14579,7 +15461,7 @@ tar tf archive | sort
rm -rf testdir exclfile
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:25"
+at_fn_check_prepare_notrace 'a `...` command substitution' "exclude05.at:24"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -14630,7 +15512,7 @@ testdir/file11
testdir/file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/exclude05.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -14641,14 +15523,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_53
-#AT_START_54
-at_fn_group_banner 54 'exclude06.at:26' \
- "exclude: long files in pax archives" " " 8
+#AT_STOP_64
+#AT_START_65
+at_fn_group_banner 65 'exclude06.at:26' \
+ "exclude: long files in pax archives" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "54. $at_setup_line: testing $at_desc ..."
+ $as_echo "65. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14716,14 +15598,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_54
-#AT_START_55
-at_fn_group_banner 55 'exclude07.at:19' \
- "exclude: --exclude-backups option" " " 8
+#AT_STOP_65
+#AT_START_66
+at_fn_group_banner 66 'exclude07.at:19' \
+ "exclude: --exclude-backups option" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "55. $at_setup_line: testing $at_desc ..."
+ $as_echo "66. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14977,14 +15859,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_55
-#AT_START_56
-at_fn_group_banner 56 'exclude08.at:36' \
- "--exclude-tag option" " " 8
+#AT_STOP_66
+#AT_START_67
+at_fn_group_banner 67 'exclude08.at:36' \
+ "--exclude-tag option" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "56. $at_setup_line: testing $at_desc ..."
+ $as_echo "67. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15238,14 +16120,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_56
-#AT_START_57
-at_fn_group_banner 57 'exclude09.at:37' \
- "--exclude-tag option and --listed-incremental" " " 8
+#AT_STOP_67
+#AT_START_68
+at_fn_group_banner 68 'exclude09.at:37' \
+ "--exclude-tag option and --listed-incremental" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "57. $at_setup_line: testing $at_desc ..."
+ $as_echo "68. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15309,14 +16191,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_57
-#AT_START_58
-at_fn_group_banner 58 'exclude10.at:38' \
- "--exclude-tag option in incremental pass" " " 8
+#AT_STOP_68
+#AT_START_69
+at_fn_group_banner 69 'exclude10.at:38' \
+ "--exclude-tag option in incremental pass" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "58. $at_setup_line: testing $at_desc ..."
+ $as_echo "69. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15403,14 +16285,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_58
-#AT_START_59
-at_fn_group_banner 59 'exclude11.at:36' \
- "--exclude-tag-under option" " " 8
+#AT_STOP_69
+#AT_START_70
+at_fn_group_banner 70 'exclude11.at:36' \
+ "--exclude-tag-under option" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "59. $at_setup_line: testing $at_desc ..."
+ $as_echo "70. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15659,14 +16541,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_59
-#AT_START_60
-at_fn_group_banner 60 'exclude12.at:37' \
- "--exclude-tag-under and --listed-incremental" " " 8
+#AT_STOP_70
+#AT_START_71
+at_fn_group_banner 71 'exclude12.at:37' \
+ "--exclude-tag-under and --listed-incremental" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "60. $at_setup_line: testing $at_desc ..."
+ $as_echo "71. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15729,14 +16611,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_60
-#AT_START_61
-at_fn_group_banner 61 'exclude13.at:39' \
- "--exclude-tag-under option in incremental pass" " " 8
+#AT_STOP_71
+#AT_START_72
+at_fn_group_banner 72 'exclude13.at:39' \
+ "--exclude-tag-under option in incremental pass" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "61. $at_setup_line: testing $at_desc ..."
+ $as_echo "72. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15822,14 +16704,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_61
-#AT_START_62
-at_fn_group_banner 62 'exclude14.at:36' \
- "--exclude-tag-all option" " " 8
+#AT_STOP_72
+#AT_START_73
+at_fn_group_banner 73 'exclude14.at:36' \
+ "--exclude-tag-all option" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "62. $at_setup_line: testing $at_desc ..."
+ $as_echo "73. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16073,14 +16955,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_62
-#AT_START_63
-at_fn_group_banner 63 'exclude15.at:36' \
- "--exclude-tag-all and --listed-incremental" " " 8
+#AT_STOP_73
+#AT_START_74
+at_fn_group_banner 74 'exclude15.at:36' \
+ "--exclude-tag-all and --listed-incremental" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "63. $at_setup_line: testing $at_desc ..."
+ $as_echo "74. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16142,14 +17024,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_63
-#AT_START_64
-at_fn_group_banner 64 'exclude16.at:38' \
- "--exclude-tag-all option in incremental pass" " " 8
+#AT_STOP_74
+#AT_START_75
+at_fn_group_banner 75 'exclude16.at:38' \
+ "--exclude-tag-all option in incremental pass" " " 11
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "64. $at_setup_line: testing $at_desc ..."
+ $as_echo "75. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16234,14 +17116,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_64
-#AT_START_65
-at_fn_group_banner 65 'delete01.at:24' \
- "deleting a member after a big one" " " 9
+#AT_STOP_75
+#AT_START_76
+at_fn_group_banner 76 'delete01.at:23' \
+ "deleting a member after a big one" " " 12
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "65. $at_setup_line: testing $at_desc ..."
+ $as_echo "76. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16249,7 +17131,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/delete01.at:27:
+$as_echo "$at_srcdir/delete01.at:26:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -16263,7 +17145,7 @@ genfile -l 1024 --file file2
tar cf archive file1 file2
tar f archive --delete file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:26"
( $at_check_trace;
mkdir v7
(cd v7
@@ -16285,12 +17167,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete01.at:27:
+$as_echo "$at_srcdir/delete01.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -16304,7 +17186,7 @@ genfile -l 1024 --file file2
tar cf archive file1 file2
tar f archive --delete file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -16326,12 +17208,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete01.at:27:
+$as_echo "$at_srcdir/delete01.at:26:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -16345,7 +17227,7 @@ genfile -l 1024 --file file2
tar cf archive file1 file2
tar f archive --delete file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:26"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -16367,12 +17249,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete01.at:27:
+$as_echo "$at_srcdir/delete01.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -16386,7 +17268,7 @@ genfile -l 1024 --file file2
tar cf archive file1 file2
tar f archive --delete file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -16408,12 +17290,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete01.at:27:
+$as_echo "$at_srcdir/delete01.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -16427,7 +17309,7 @@ genfile -l 1024 --file file2
tar cf archive file1 file2
tar f archive --delete file2
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete01.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -16449,7 +17331,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -16460,14 +17342,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_65
-#AT_START_66
-at_fn_group_banner 66 'delete02.at:24' \
- "deleting a member from stdin archive" " " 9
+#AT_STOP_76
+#AT_START_77
+at_fn_group_banner 77 'delete02.at:23' \
+ "deleting a member from stdin archive" " " 12
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "66. $at_setup_line: testing $at_desc ..."
+ $as_echo "77. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16475,7 +17357,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/delete02.at:27:
+$as_echo "$at_srcdir/delete02.at:26:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -16492,7 +17374,7 @@ tar tf archive
cat archive | tar f - --delete 2 > archive2
echo separator
tar tf archive2)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:26"
( $at_check_trace;
mkdir v7
(cd v7
@@ -16522,12 +17404,12 @@ separator
3
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete02.at:27:
+$as_echo "$at_srcdir/delete02.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -16544,7 +17426,7 @@ tar tf archive
cat archive | tar f - --delete 2 > archive2
echo separator
tar tf archive2)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -16574,12 +17456,12 @@ separator
3
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete02.at:27:
+$as_echo "$at_srcdir/delete02.at:26:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -16596,7 +17478,7 @@ tar tf archive
cat archive | tar f - --delete 2 > archive2
echo separator
tar tf archive2)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:26"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -16626,12 +17508,12 @@ separator
3
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete02.at:27:
+$as_echo "$at_srcdir/delete02.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -16648,7 +17530,7 @@ tar tf archive
cat archive | tar f - --delete 2 > archive2
echo separator
tar tf archive2)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -16678,12 +17560,12 @@ separator
3
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete02.at:27:
+$as_echo "$at_srcdir/delete02.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -16700,7 +17582,7 @@ tar tf archive
cat archive | tar f - --delete 2 > archive2
echo separator
tar tf archive2)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete02.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -16730,7 +17612,7 @@ separator
3
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete02.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -16741,14 +17623,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_66
-#AT_START_67
-at_fn_group_banner 67 'delete03.at:22' \
- "deleting members with long names" " " 9
+#AT_STOP_77
+#AT_START_78
+at_fn_group_banner 78 'delete03.at:21' \
+ "deleting members with long names" " " 12
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "67. $at_setup_line: testing $at_desc ..."
+ $as_echo "78. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16758,7 +17640,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/delete03.at:27:
+$as_echo "$at_srcdir/delete03.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -16777,7 +17659,7 @@ tar -cf archive ./\$prefix* &&
tar --delete -f archive ./\${prefix}5 &&
tar -tf archive
)"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "delete03.at:27"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "delete03.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -16811,12 +17693,12 @@ echo >>"$at_stdout"; $as_echo "./This_is_a_very_long_file_name_prefix_that_is_de
./This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_file_names_that_run_into_a_limit_of_the_posix_tar_formatXX9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete03.at:27:
+$as_echo "$at_srcdir/delete03.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -16835,7 +17717,7 @@ tar -cf archive ./\$prefix* &&
tar --delete -f archive ./\${prefix}5 &&
tar -tf archive
)"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "delete03.at:27"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "delete03.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -16869,12 +17751,12 @@ echo >>"$at_stdout"; $as_echo "./This_is_a_very_long_file_name_prefix_that_is_de
./This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_file_names_that_run_into_a_limit_of_the_posix_tar_formatXX9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete03.at:27:
+$as_echo "$at_srcdir/delete03.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -16893,7 +17775,7 @@ tar -cf archive ./\$prefix* &&
tar --delete -f archive ./\${prefix}5 &&
tar -tf archive
)"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "delete03.at:27"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "delete03.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -16927,7 +17809,7 @@ echo >>"$at_stdout"; $as_echo "./This_is_a_very_long_file_name_prefix_that_is_de
./This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_file_names_that_run_into_a_limit_of_the_posix_tar_formatXX9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -16939,14 +17821,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_67
-#AT_START_68
-at_fn_group_banner 68 'delete04.at:24' \
- "deleting a large last member" " " 9
+#AT_STOP_78
+#AT_START_79
+at_fn_group_banner 79 'delete04.at:23' \
+ "deleting a large last member" " " 12
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "68. $at_setup_line: testing $at_desc ..."
+ $as_echo "79. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16954,7 +17836,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/delete04.at:27:
+$as_echo "$at_srcdir/delete04.at:26:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -16977,7 +17859,7 @@ tar cf archive file1 file2 file3 file4 file5 file6 file7 file8 file9 file10
tar f archive --delete file10
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:26"
( $at_check_trace;
mkdir v7
(cd v7
@@ -17016,12 +17898,12 @@ file8
file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete04.at:27:
+$as_echo "$at_srcdir/delete04.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -17044,7 +17926,7 @@ tar cf archive file1 file2 file3 file4 file5 file6 file7 file8 file9 file10
tar f archive --delete file10
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -17083,12 +17965,12 @@ file8
file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete04.at:27:
+$as_echo "$at_srcdir/delete04.at:26:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -17111,7 +17993,7 @@ tar cf archive file1 file2 file3 file4 file5 file6 file7 file8 file9 file10
tar f archive --delete file10
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:26"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -17150,12 +18032,12 @@ file8
file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete04.at:27:
+$as_echo "$at_srcdir/delete04.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -17178,7 +18060,7 @@ tar cf archive file1 file2 file3 file4 file5 file6 file7 file8 file9 file10
tar f archive --delete file10
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -17217,12 +18099,12 @@ file8
file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete04.at:27:
+$as_echo "$at_srcdir/delete04.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -17245,7 +18127,7 @@ tar cf archive file1 file2 file3 file4 file5 file6 file7 file8 file9 file10
tar f archive --delete file10
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "delete04.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -17284,7 +18166,7 @@ file8
file9
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/delete04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -17295,14 +18177,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_68
-#AT_START_69
-at_fn_group_banner 69 'delete05.at:28' \
- "deleting non-existing member" " " 9
+#AT_STOP_79
+#AT_START_80
+at_fn_group_banner 80 'delete05.at:27' \
+ "deleting non-existing member" " " 12
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "69. $at_setup_line: testing $at_desc ..."
+ $as_echo "80. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17310,7 +18192,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/delete05.at:31:
+$as_echo "$at_srcdir/delete05.at:30:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -17328,7 +18210,7 @@ tar cf archive en to
tar --file archive --blocking-factor=20 --delete tre
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:30"
( $at_check_trace;
mkdir v7
(cd v7
@@ -17358,12 +18240,12 @@ echo >>"$at_stdout"; $as_echo "en
to
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete05.at:31:
+$as_echo "$at_srcdir/delete05.at:30:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -17381,7 +18263,7 @@ tar cf archive en to
tar --file archive --blocking-factor=20 --delete tre
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:30"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -17411,12 +18293,12 @@ echo >>"$at_stdout"; $as_echo "en
to
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete05.at:31:
+$as_echo "$at_srcdir/delete05.at:30:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -17434,7 +18316,7 @@ tar cf archive en to
tar --file archive --blocking-factor=20 --delete tre
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:30"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -17464,12 +18346,12 @@ echo >>"$at_stdout"; $as_echo "en
to
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete05.at:31:
+$as_echo "$at_srcdir/delete05.at:30:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -17487,7 +18369,7 @@ tar cf archive en to
tar --file archive --blocking-factor=20 --delete tre
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:30"
( $at_check_trace;
mkdir posix
(cd posix
@@ -17517,12 +18399,12 @@ echo >>"$at_stdout"; $as_echo "en
to
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/delete05.at:31:
+$as_echo "$at_srcdir/delete05.at:30:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -17540,7 +18422,7 @@ tar cf archive en to
tar --file archive --blocking-factor=20 --delete tre
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "delete05.at:30"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -17570,7 +18452,7 @@ echo >>"$at_stdout"; $as_echo "en
to
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/delete05.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -17581,14 +18463,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_69
-#AT_START_70
-at_fn_group_banner 70 'extrac01.at:24' \
- "extract over an existing directory" " " 10
+#AT_STOP_80
+#AT_START_81
+at_fn_group_banner 81 'extrac01.at:23' \
+ "extract over an existing directory" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "70. $at_setup_line: testing $at_desc ..."
+ $as_echo "81. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17596,7 +18478,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/extrac01.at:27:
+$as_echo "$at_srcdir/extrac01.at:26:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -17610,7 +18492,7 @@ touch directory/file
tar cf archive directory || exit 1
tar xf archive --warning=no-timestamp || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:26"
( $at_check_trace;
mkdir v7
(cd v7
@@ -17630,12 +18512,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac01.at:27:
+$as_echo "$at_srcdir/extrac01.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -17649,7 +18531,7 @@ touch directory/file
tar cf archive directory || exit 1
tar xf archive --warning=no-timestamp || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -17669,12 +18551,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac01.at:27:
+$as_echo "$at_srcdir/extrac01.at:26:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -17688,7 +18570,7 @@ touch directory/file
tar cf archive directory || exit 1
tar xf archive --warning=no-timestamp || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:26"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -17708,12 +18590,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac01.at:27:
+$as_echo "$at_srcdir/extrac01.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -17727,7 +18609,7 @@ touch directory/file
tar cf archive directory || exit 1
tar xf archive --warning=no-timestamp || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -17747,12 +18629,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac01.at:27:
+$as_echo "$at_srcdir/extrac01.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -17766,7 +18648,7 @@ touch directory/file
tar cf archive directory || exit 1
tar xf archive --warning=no-timestamp || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac01.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -17786,7 +18668,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac01.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -17797,14 +18679,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_70
-#AT_START_71
-at_fn_group_banner 71 'extrac02.at:24' \
- "extracting symlinks over an existing file" " " 10
+#AT_STOP_81
+#AT_START_82
+at_fn_group_banner 82 'extrac02.at:23' \
+ "extracting symlinks over an existing file" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "71. $at_setup_line: testing $at_desc ..."
+ $as_echo "82. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17814,7 +18696,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/extrac02.at:29:
+$as_echo "$at_srcdir/extrac02.at:28:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -17830,7 +18712,7 @@ rm link
touch link
tar xf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:28"
( $at_check_trace;
mkdir v7
(cd v7
@@ -17852,12 +18734,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac02.at:29:
+$as_echo "$at_srcdir/extrac02.at:28:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -17873,7 +18755,7 @@ rm link
touch link
tar xf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:28"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -17895,12 +18777,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac02.at:29:
+$as_echo "$at_srcdir/extrac02.at:28:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -17916,7 +18798,7 @@ rm link
touch link
tar xf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:28"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -17938,12 +18820,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac02.at:29:
+$as_echo "$at_srcdir/extrac02.at:28:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -17959,7 +18841,7 @@ rm link
touch link
tar xf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:28"
( $at_check_trace;
mkdir posix
(cd posix
@@ -17981,12 +18863,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac02.at:29:
+$as_echo "$at_srcdir/extrac02.at:28:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -18002,7 +18884,7 @@ rm link
touch link
tar xf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac02.at:28"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -18024,7 +18906,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -18035,14 +18917,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_71
-#AT_START_72
-at_fn_group_banner 72 'extrac03.at:24' \
- "extraction loops" " " 10
+#AT_STOP_82
+#AT_START_83
+at_fn_group_banner 83 'extrac03.at:23' \
+ "extraction loops" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "72. $at_setup_line: testing $at_desc ..."
+ $as_echo "83. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18050,7 +18932,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/extrac03.at:27:
+$as_echo "$at_srcdir/extrac03.at:26:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -18063,7 +18945,7 @@ mkdir directory
tar -cPvf archive directory/../directory
echo separator
tar -xPvf archive --warning=no-timestamp)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:26"
( $at_check_trace;
mkdir v7
(cd v7
@@ -18086,12 +18968,12 @@ separator
directory/../directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac03.at:27:
+$as_echo "$at_srcdir/extrac03.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -18104,7 +18986,7 @@ mkdir directory
tar -cPvf archive directory/../directory
echo separator
tar -xPvf archive --warning=no-timestamp)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -18127,12 +19009,12 @@ separator
directory/../directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac03.at:27:
+$as_echo "$at_srcdir/extrac03.at:26:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -18145,7 +19027,7 @@ mkdir directory
tar -cPvf archive directory/../directory
echo separator
tar -xPvf archive --warning=no-timestamp)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:26"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -18168,12 +19050,12 @@ separator
directory/../directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac03.at:27:
+$as_echo "$at_srcdir/extrac03.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -18186,7 +19068,7 @@ mkdir directory
tar -cPvf archive directory/../directory
echo separator
tar -xPvf archive --warning=no-timestamp)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -18209,12 +19091,12 @@ separator
directory/../directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac03.at:27:
+$as_echo "$at_srcdir/extrac03.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -18227,7 +19109,7 @@ mkdir directory
tar -cPvf archive directory/../directory
echo separator
tar -xPvf archive --warning=no-timestamp)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac03.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -18250,7 +19132,7 @@ separator
directory/../directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -18261,14 +19143,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_72
-#AT_START_73
-at_fn_group_banner 73 'extrac04.at:24' \
- "extract + fnmatch" " " 10
+#AT_STOP_83
+#AT_START_84
+at_fn_group_banner 84 'extrac04.at:23' \
+ "extract + fnmatch" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "73. $at_setup_line: testing $at_desc ..."
+ $as_echo "84. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18276,7 +19158,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/extrac04.at:27:
+$as_echo "$at_srcdir/extrac04.at:26:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -18301,7 +19183,7 @@ tar -tf archive \\
--exclude='d*/*1' \\
--exclude='d*/s*/*2' | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:27"
+at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:26"
( $at_check_trace;
mkdir v7
(cd v7
@@ -18336,12 +19218,12 @@ directory/file2
directory/subdirectory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac04.at:27:
+$as_echo "$at_srcdir/extrac04.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -18366,7 +19248,7 @@ tar -tf archive \\
--exclude='d*/*1' \\
--exclude='d*/s*/*2' | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:27"
+at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -18401,12 +19283,12 @@ directory/file2
directory/subdirectory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac04.at:27:
+$as_echo "$at_srcdir/extrac04.at:26:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -18431,7 +19313,7 @@ tar -tf archive \\
--exclude='d*/*1' \\
--exclude='d*/s*/*2' | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:27"
+at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:26"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -18466,12 +19348,12 @@ directory/file2
directory/subdirectory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac04.at:27:
+$as_echo "$at_srcdir/extrac04.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -18496,7 +19378,7 @@ tar -tf archive \\
--exclude='d*/*1' \\
--exclude='d*/s*/*2' | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:27"
+at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -18531,12 +19413,12 @@ directory/file2
directory/subdirectory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac04.at:27:
+$as_echo "$at_srcdir/extrac04.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -18561,7 +19443,7 @@ tar -tf archive \\
--exclude='d*/*1' \\
--exclude='d*/s*/*2' | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:27"
+at_fn_check_prepare_notrace 'a `...` command substitution' "extrac04.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -18596,7 +19478,7 @@ directory/file2
directory/subdirectory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac04.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -18607,14 +19489,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_73
-#AT_START_74
-at_fn_group_banner 74 'extrac05.at:31' \
- "extracting selected members from pax" " " 10
+#AT_STOP_84
+#AT_START_85
+at_fn_group_banner 85 'extrac05.at:30' \
+ "extracting selected members from pax" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "74. $at_setup_line: testing $at_desc ..."
+ $as_echo "85. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18628,7 +19510,7 @@ _ATEOF
{ set +x
-$as_echo "$at_srcdir/extrac05.at:39:
+$as_echo "$at_srcdir/extrac05.at:38:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -18652,7 +19534,7 @@ tar xvfT ../archive ../../list --warning=no-timestamp || exit 1
cd ..
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac05.at:39"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac05.at:38"
( $at_check_trace;
mkdir posix
(cd posix
@@ -18685,7 +19567,7 @@ echo >>"$at_stdout"; $as_echo "jeden
cztery
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac05.at:39"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac05.at:38"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -18696,14 +19578,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_74
-#AT_START_75
-at_fn_group_banner 75 'extrac06.at:35' \
- "mode of extracted directories" " " 10
+#AT_STOP_85
+#AT_START_86
+at_fn_group_banner 86 'extrac06.at:34' \
+ "mode of extracted directories" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "75. $at_setup_line: testing $at_desc ..."
+ $as_echo "86. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18711,7 +19593,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/extrac06.at:38:
+$as_echo "$at_srcdir/extrac06.at:37:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -18748,7 +19630,7 @@ genfile --stat=mode:777 directory
# After both restores, the directory mode should be 755
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:38"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:37"
( $at_check_trace;
mkdir v7
(cd v7
@@ -18796,12 +19678,12 @@ echo >>"$at_stdout"; $as_echo "777
755
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:38"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:37"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac06.at:38:
+$as_echo "$at_srcdir/extrac06.at:37:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -18838,7 +19720,7 @@ genfile --stat=mode:777 directory
# After both restores, the directory mode should be 755
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:38"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:37"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -18886,12 +19768,12 @@ echo >>"$at_stdout"; $as_echo "777
755
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:38"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:37"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac06.at:38:
+$as_echo "$at_srcdir/extrac06.at:37:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -18928,7 +19810,7 @@ genfile --stat=mode:777 directory
# After both restores, the directory mode should be 755
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:38"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:37"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -18976,12 +19858,12 @@ echo >>"$at_stdout"; $as_echo "777
755
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:38"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:37"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac06.at:38:
+$as_echo "$at_srcdir/extrac06.at:37:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -19018,7 +19900,7 @@ genfile --stat=mode:777 directory
# After both restores, the directory mode should be 755
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:38"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:37"
( $at_check_trace;
mkdir posix
(cd posix
@@ -19066,12 +19948,12 @@ echo >>"$at_stdout"; $as_echo "777
755
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:38"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:37"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/extrac06.at:38:
+$as_echo "$at_srcdir/extrac06.at:37:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -19108,7 +19990,7 @@ genfile --stat=mode:777 directory
# After both restores, the directory mode should be 755
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:38"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac06.at:37"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -19156,7 +20038,7 @@ echo >>"$at_stdout"; $as_echo "777
755
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:38"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac06.at:37"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -19167,14 +20049,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_75
-#AT_START_76
-at_fn_group_banner 76 'extrac07.at:28' \
- "extracting symlinks to a read-only dir" " " 10
+#AT_STOP_86
+#AT_START_87
+at_fn_group_banner 87 'extrac07.at:27' \
+ "extracting symlinks to a read-only dir" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "76. $at_setup_line: testing $at_desc ..."
+ $as_echo "87. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19182,7 +20064,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/extrac07.at:31:
+$as_echo "$at_srcdir/extrac07.at:30:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -19217,7 +20099,7 @@ echo Extract
mkdir out
tar -C out -xvf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "extrac07.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "extrac07.at:30"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -19264,7 +20146,7 @@ dir/
dir/foo
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/extrac07.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/extrac07.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -19275,14 +20157,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_76
-#AT_START_77
-at_fn_group_banner 77 'extrac08.at:33' \
- "restoring mode on existing directory" " " 10
+#AT_STOP_87
+#AT_START_88
+at_fn_group_banner 88 'extrac08.at:33' \
+ "restoring mode on existing directory" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "77. $at_setup_line: testing $at_desc ..."
+ $as_echo "88. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19551,14 +20433,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_77
-#AT_START_78
-at_fn_group_banner 78 'extrac09.at:34' \
- "extracting even when . and .. are unreadable" " " 10
+#AT_STOP_88
+#AT_START_89
+at_fn_group_banner 89 'extrac09.at:34' \
+ "extracting even when . and .. are unreadable" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "78. $at_setup_line: testing $at_desc ..."
+ $as_echo "89. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19651,14 +20533,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_78
-#AT_START_79
-at_fn_group_banner 79 'extrac10.at:29' \
- "-C and delayed setting of metadata" " " 10
+#AT_STOP_89
+#AT_START_90
+at_fn_group_banner 90 'extrac10.at:29' \
+ "-C and delayed setting of metadata" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "79. $at_setup_line: testing $at_desc ..."
+ $as_echo "90. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19719,14 +20601,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_79
-#AT_START_80
-at_fn_group_banner 80 'extrac11.at:25' \
- "scarce file descriptors" " " 10
+#AT_STOP_90
+#AT_START_91
+at_fn_group_banner 91 'extrac11.at:25' \
+ "scarce file descriptors" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "80. $at_setup_line: testing $at_desc ..."
+ $as_echo "91. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19879,14 +20761,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_80
-#AT_START_81
-at_fn_group_banner 81 'extrac12.at:25' \
- "extract dot permissions" " " 10
+#AT_STOP_91
+#AT_START_92
+at_fn_group_banner 92 'extrac12.at:25' \
+ "extract dot permissions" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "81. $at_setup_line: testing $at_desc ..."
+ $as_echo "92. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19949,14 +20831,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_81
-#AT_START_82
-at_fn_group_banner 82 'extrac13.at:26' \
- "extract over symlinks" " " 10
+#AT_STOP_92
+#AT_START_93
+at_fn_group_banner 93 'extrac13.at:26' \
+ "extract over symlinks" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "82. $at_setup_line: testing $at_desc ..."
+ $as_echo "93. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20045,14 +20927,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_82
-#AT_START_83
-at_fn_group_banner 83 'extrac14.at:25' \
- "extract -C symlink" " " 10
+#AT_STOP_93
+#AT_START_94
+at_fn_group_banner 94 'extrac14.at:25' \
+ "extract -C symlink" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "83. $at_setup_line: testing $at_desc ..."
+ $as_echo "94. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20109,14 +20991,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_83
-#AT_START_84
-at_fn_group_banner 84 'extrac15.at:25' \
- "extract parent mkdir failure" " " 10
+#AT_STOP_94
+#AT_START_95
+at_fn_group_banner 95 'extrac15.at:25' \
+ "extract parent mkdir failure" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "84. $at_setup_line: testing $at_desc ..."
+ $as_echo "95. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20201,14 +21083,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_84
-#AT_START_85
-at_fn_group_banner 85 'extrac16.at:26' \
- "extract empty directory with -C" " " 10
+#AT_STOP_95
+#AT_START_96
+at_fn_group_banner 96 'extrac16.at:26' \
+ "extract empty directory with -C" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "85. $at_setup_line: testing $at_desc ..."
+ $as_echo "96. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20263,14 +21145,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_85
-#AT_START_86
-at_fn_group_banner 86 'extrac17.at:21' \
- "name matching/transformation ordering" " " 10
+#AT_STOP_96
+#AT_START_97
+at_fn_group_banner 97 'extrac17.at:21' \
+ "name matching/transformation ordering" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "86. $at_setup_line: testing $at_desc ..."
+ $as_echo "97. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20539,14 +21421,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_86
-#AT_START_87
-at_fn_group_banner 87 'extrac18.at:34' \
- "keep-old-files" " " 10
+#AT_STOP_97
+#AT_START_98
+at_fn_group_banner 98 'extrac18.at:34' \
+ "keep-old-files" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "87. $at_setup_line: testing $at_desc ..."
+ $as_echo "98. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20885,14 +21767,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_87
-#AT_START_88
-at_fn_group_banner 88 'extrac19.at:21' \
- "skip-old-files" " " 10
+#AT_STOP_98
+#AT_START_99
+at_fn_group_banner 99 'extrac19.at:21' \
+ "skip-old-files" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "88. $at_setup_line: testing $at_desc ..."
+ $as_echo "99. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21216,14 +22098,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_88
-#AT_START_89
-at_fn_group_banner 89 'extrac20.at:21' \
- "keep-directory-symlink" " " 10
+#AT_STOP_99
+#AT_START_100
+at_fn_group_banner 100 'extrac20.at:21' \
+ "keep-directory-symlink" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "89. $at_setup_line: testing $at_desc ..."
+ $as_echo "100. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22322,14 +23204,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_89
-#AT_START_90
-at_fn_group_banner 90 'extrac21.at:31' \
- "delay-directory-restore" " " 10
+#AT_STOP_100
+#AT_START_101
+at_fn_group_banner 101 'extrac21.at:31' \
+ "delay-directory-restore" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "90. $at_setup_line: testing $at_desc ..."
+ $as_echo "101. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22418,14 +23300,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_90
-#AT_START_91
-at_fn_group_banner 91 'backup01.at:34' \
- "extracting existing dir with --backup" " " 10
+#AT_STOP_101
+#AT_START_102
+at_fn_group_banner 102 'backup01.at:33' \
+ "extracting existing dir with --backup" " " 13
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "91. $at_setup_line: testing $at_desc ..."
+ $as_echo "102. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22433,7 +23315,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/backup01.at:37:
+$as_echo "$at_srcdir/backup01.at:36:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -22448,7 +23330,7 @@ echo bla > dir1/file1
tar cf test.tar dir1 dir2
tar xfv test.tar --backup --warning=no-timestamp
)"
-at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:36"
( $at_check_trace;
mkdir v7
(cd v7
@@ -22474,12 +23356,12 @@ Renaming 'dir1/file1' to 'dir1/file1~'
dir2/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/backup01.at:37:
+$as_echo "$at_srcdir/backup01.at:36:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -22494,7 +23376,7 @@ echo bla > dir1/file1
tar cf test.tar dir1 dir2
tar xfv test.tar --backup --warning=no-timestamp
)"
-at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:36"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -22520,12 +23402,12 @@ Renaming 'dir1/file1' to 'dir1/file1~'
dir2/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/backup01.at:37:
+$as_echo "$at_srcdir/backup01.at:36:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -22540,7 +23422,7 @@ echo bla > dir1/file1
tar cf test.tar dir1 dir2
tar xfv test.tar --backup --warning=no-timestamp
)"
-at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:36"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -22566,12 +23448,12 @@ Renaming 'dir1/file1' to 'dir1/file1~'
dir2/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/backup01.at:37:
+$as_echo "$at_srcdir/backup01.at:36:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -22586,7 +23468,7 @@ echo bla > dir1/file1
tar cf test.tar dir1 dir2
tar xfv test.tar --backup --warning=no-timestamp
)"
-at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:36"
( $at_check_trace;
mkdir posix
(cd posix
@@ -22612,12 +23494,12 @@ Renaming 'dir1/file1' to 'dir1/file1~'
dir2/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/backup01.at:37:
+$as_echo "$at_srcdir/backup01.at:36:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -22632,7 +23514,7 @@ echo bla > dir1/file1
tar cf test.tar dir1 dir2
tar xfv test.tar --backup --warning=no-timestamp
)"
-at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "backup01.at:36"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -22658,7 +23540,7 @@ Renaming 'dir1/file1' to 'dir1/file1~'
dir2/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/backup01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -22669,14 +23551,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_91
-#AT_START_92
-at_fn_group_banner 92 'difflink.at:17' \
- "link mismatch" " " 11
+#AT_STOP_102
+#AT_START_103
+at_fn_group_banner 103 'difflink.at:17' \
+ "link mismatch" " " 14
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "92. $at_setup_line: testing $at_desc ..."
+ $as_echo "103. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22695,8 +23577,8 @@ rm -rf *
mkdir a
genfile -f a/x
ln -s x a/y
-ln a/y a/z
-tar cf a.tar a
+ln a/x a/z
+tar cf a.tar a/x a/y a/z
rm a/z
ln -s x a/z
tar df a.tar
@@ -22714,8 +23596,8 @@ rm -rf *
mkdir a
genfile -f a/x
ln -s x a/y
-ln a/y a/z
-tar cf a.tar a
+ln a/x a/z
+tar cf a.tar a/x a/y a/z
rm a/z
ln -s x a/z
tar df a.tar
@@ -22724,7 +23606,7 @@ tar df a.tar
at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "a/z: Not linked to a/y
+echo >>"$at_stdout"; $as_echo "a/z: Not linked to a/x
" | \
$at_diff - "$at_stdout" || at_failed=:
at_fn_check_status 1 $at_status "$at_srcdir/difflink.at:19"
@@ -22737,14 +23619,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_92
-#AT_START_93
-at_fn_group_banner 93 'label01.at:21' \
- "single-volume label" " " 12
+#AT_STOP_103
+#AT_START_104
+at_fn_group_banner 104 'label01.at:21' \
+ "single-volume label" " " 15
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "93. $at_setup_line: testing $at_desc ..."
+ $as_echo "104. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22887,14 +23769,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_93
-#AT_START_94
-at_fn_group_banner 94 'label02.at:21' \
- "multi-volume label" " " 12
+#AT_STOP_104
+#AT_START_105
+at_fn_group_banner 105 'label02.at:21' \
+ "multi-volume label" " " 15
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "94. $at_setup_line: testing $at_desc ..."
+ $as_echo "105. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23052,14 +23934,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_94
-#AT_START_95
-at_fn_group_banner 95 'label03.at:27' \
- "test-label option" " " 12
+#AT_STOP_105
+#AT_START_106
+at_fn_group_banner 106 'label03.at:27' \
+ "test-label option" " " 15
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "95. $at_setup_line: testing $at_desc ..."
+ $as_echo "106. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23397,14 +24279,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_95
-#AT_START_96
-at_fn_group_banner 96 'label04.at:27' \
- "label with non-create option" " " 12
+#AT_STOP_106
+#AT_START_107
+at_fn_group_banner 107 'label04.at:27' \
+ "label with non-create option" " " 15
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "96. $at_setup_line: testing $at_desc ..."
+ $as_echo "107. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23592,14 +24474,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_96
-#AT_START_97
-at_fn_group_banner 97 'label05.at:24' \
- "label with non-create option" " " 12
+#AT_STOP_107
+#AT_START_108
+at_fn_group_banner 108 'label05.at:24' \
+ "label with non-create option" " " 15
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "97. $at_setup_line: testing $at_desc ..."
+ $as_echo "108. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23787,14 +24669,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_97
-#AT_START_98
-at_fn_group_banner 98 'incremental.at:24' \
- "incremental" " " 13
+#AT_STOP_108
+#AT_START_109
+at_fn_group_banner 109 'incremental.at:23' \
+ "incremental" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "98. $at_setup_line: testing $at_desc ..."
+ $as_echo "109. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23802,7 +24684,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/incremental.at:27:
+$as_echo "$at_srcdir/incremental.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -23840,7 +24722,7 @@ sleep 2
echo y >structure/file
tar cfv archive --listed=list structure
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incremental.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "incremental.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -23889,12 +24771,12 @@ structure/
structure/file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incremental.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/incremental.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incremental.at:27:
+$as_echo "$at_srcdir/incremental.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -23932,7 +24814,7 @@ sleep 2
echo y >structure/file
tar cfv archive --listed=list structure
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incremental.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "incremental.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -23981,12 +24863,12 @@ structure/
structure/file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incremental.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/incremental.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incremental.at:27:
+$as_echo "$at_srcdir/incremental.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -24024,7 +24906,7 @@ sleep 2
echo y >structure/file
tar cfv archive --listed=list structure
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incremental.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "incremental.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -24073,7 +24955,7 @@ structure/
structure/file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incremental.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/incremental.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -24084,14 +24966,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_98
-#AT_START_99
-at_fn_group_banner 99 'incr01.at:28' \
- "restore broken symlinks from incremental" " " 13
+#AT_STOP_109
+#AT_START_110
+at_fn_group_banner 110 'incr01.at:27' \
+ "restore broken symlinks from incremental" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "99. $at_setup_line: testing $at_desc ..."
+ $as_echo "110. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24099,7 +24981,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/incr01.at:31:
+$as_echo "$at_srcdir/incr01.at:30:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -24123,7 +25005,7 @@ tar xvfg archive.0 /dev/null --warning=no-timestamp
echo separator
tar xvfg archive.1 /dev/null --warning=no-timestamp
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incr01.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "incr01.at:30"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -24159,12 +25041,12 @@ directory/
tar: Deleting 'directory/bar'
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr01.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/incr01.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incr01.at:31:
+$as_echo "$at_srcdir/incr01.at:30:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -24188,7 +25070,7 @@ tar xvfg archive.0 /dev/null --warning=no-timestamp
echo separator
tar xvfg archive.1 /dev/null --warning=no-timestamp
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incr01.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "incr01.at:30"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -24224,12 +25106,12 @@ directory/
tar: Deleting 'directory/bar'
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr01.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/incr01.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incr01.at:31:
+$as_echo "$at_srcdir/incr01.at:30:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -24253,7 +25135,7 @@ tar xvfg archive.0 /dev/null --warning=no-timestamp
echo separator
tar xvfg archive.1 /dev/null --warning=no-timestamp
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incr01.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "incr01.at:30"
( $at_check_trace;
mkdir posix
(cd posix
@@ -24289,7 +25171,7 @@ directory/
tar: Deleting 'directory/bar'
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr01.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/incr01.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -24300,14 +25182,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_99
-#AT_START_100
-at_fn_group_banner 100 'incr02.at:33' \
- "restoring timestamps from incremental" " " 13
+#AT_STOP_110
+#AT_START_111
+at_fn_group_banner 111 'incr02.at:32' \
+ "restoring timestamps from incremental" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "100. $at_setup_line: testing $at_desc ..."
+ $as_echo "111. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24315,7 +25197,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/incr02.at:36:
+$as_echo "$at_srcdir/incr02.at:35:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -24361,7 +25243,7 @@ tar -xf archive dir
# Check the timestamp
genfile --stat=mtime dir/subdir1 | diff ts -
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incr02.at:36"
+at_fn_check_prepare_notrace 'an embedded newline' "incr02.at:35"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -24413,12 +25295,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr02.at:36"
+at_fn_check_status 0 $at_status "$at_srcdir/incr02.at:35"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incr02.at:36:
+$as_echo "$at_srcdir/incr02.at:35:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -24464,7 +25346,7 @@ tar -xf archive dir
# Check the timestamp
genfile --stat=mtime dir/subdir1 | diff ts -
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incr02.at:36"
+at_fn_check_prepare_notrace 'an embedded newline' "incr02.at:35"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -24516,12 +25398,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr02.at:36"
+at_fn_check_status 0 $at_status "$at_srcdir/incr02.at:35"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incr02.at:36:
+$as_echo "$at_srcdir/incr02.at:35:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -24567,7 +25449,7 @@ tar -xf archive dir
# Check the timestamp
genfile --stat=mtime dir/subdir1 | diff ts -
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incr02.at:36"
+at_fn_check_prepare_notrace 'an embedded newline' "incr02.at:35"
( $at_check_trace;
mkdir posix
(cd posix
@@ -24619,7 +25501,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr02.at:36"
+at_fn_check_status 0 $at_status "$at_srcdir/incr02.at:35"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -24630,14 +25512,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_100
-#AT_START_101
-at_fn_group_banner 101 'listed01.at:27' \
- "--listed for individual files" " " 13
+#AT_STOP_111
+#AT_START_112
+at_fn_group_banner 112 'listed01.at:26' \
+ "--listed for individual files" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "101. $at_setup_line: testing $at_desc ..."
+ $as_echo "112. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24645,7 +25527,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/listed01.at:30:
+$as_echo "$at_srcdir/listed01.at:29:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -24681,7 +25563,7 @@ tar --create \\
tar tf archive.2 || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "listed01.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "listed01.at:29"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -24727,12 +25609,12 @@ separator
directory/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/listed01.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/listed01.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/listed01.at:30:
+$as_echo "$at_srcdir/listed01.at:29:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -24768,7 +25650,7 @@ tar --create \\
tar tf archive.2 || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "listed01.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "listed01.at:29"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -24814,7 +25696,7 @@ separator
directory/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/listed01.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/listed01.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -24825,14 +25707,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_101
-#AT_START_102
-at_fn_group_banner 102 'listed02.at:29' \
- "working --listed" " " 13
+#AT_STOP_112
+#AT_START_113
+at_fn_group_banner 113 'listed02.at:28' \
+ "working --listed" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "102. $at_setup_line: testing $at_desc ..."
+ $as_echo "113. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24840,7 +25722,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/listed02.at:32:
+$as_echo "$at_srcdir/listed02.at:31:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -24909,7 +25791,7 @@ tar -x -v --listed-incremental=tart.incr2 -f archive.2 | sort 2>/dev/null
echo Final files:
find tart -print | sort 2>/dev/null
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "listed02.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "listed02.at:31"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -25049,12 +25931,12 @@ tart/c2/ca2
tart/c2/ca3
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/listed02.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/listed02.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/listed02.at:32:
+$as_echo "$at_srcdir/listed02.at:31:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -25123,7 +26005,7 @@ tar -x -v --listed-incremental=tart.incr2 -f archive.2 | sort 2>/dev/null
echo Final files:
find tart -print | sort 2>/dev/null
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "listed02.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "listed02.at:31"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -25263,7 +26145,7 @@ tart/c2/ca2
tart/c2/ca3
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/listed02.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/listed02.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -25274,14 +26156,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_102
-#AT_START_103
-at_fn_group_banner 103 'listed03.at:24' \
- "incremental dump when the parent directory is unreadable" "" 13
+#AT_STOP_113
+#AT_START_114
+at_fn_group_banner 114 'listed03.at:24' \
+ "incremental dump when the parent directory is unreadable" "" 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "103. $at_setup_line: testing $at_desc ..."
+ $as_echo "114. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25381,14 +26263,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_103
-#AT_START_104
-at_fn_group_banner 104 'listed04.at:26' \
- "--listed-incremental and --one-file-system" " " 13
+#AT_STOP_114
+#AT_START_115
+at_fn_group_banner 115 'listed04.at:26' \
+ "--listed-incremental and --one-file-system" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "104. $at_setup_line: testing $at_desc ..."
+ $as_echo "115. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25456,14 +26338,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_104
-#AT_START_105
-at_fn_group_banner 105 'listed05.at:33' \
- "--listed-incremental and remounted directories" " " 13
+#AT_STOP_115
+#AT_START_116
+at_fn_group_banner 116 'listed05.at:33' \
+ "--listed-incremental and remounted directories" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "105. $at_setup_line: testing $at_desc ..."
+ $as_echo "116. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25586,14 +26468,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_105
-#AT_START_106
-at_fn_group_banner 106 'incr03.at:29' \
- "renamed files in incrementals" " " 13
+#AT_STOP_116
+#AT_START_117
+at_fn_group_banner 117 'incr03.at:28' \
+ "renamed files in incrementals" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "106. $at_setup_line: testing $at_desc ..."
+ $as_echo "117. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25601,7 +26483,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/incr03.at:32:
+$as_echo "$at_srcdir/incr03.at:31:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -25641,7 +26523,7 @@ echo Directory after second restore
tar -xf archive.2 -g db --warning=no-timestamp
find directory | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "incr03.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "incr03.at:31"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -25703,12 +26585,12 @@ directory/y
directory/z
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr03.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/incr03.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incr03.at:32:
+$as_echo "$at_srcdir/incr03.at:31:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -25748,7 +26630,7 @@ echo Directory after second restore
tar -xf archive.2 -g db --warning=no-timestamp
find directory | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "incr03.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "incr03.at:31"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -25810,12 +26692,12 @@ directory/y
directory/z
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr03.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/incr03.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incr03.at:32:
+$as_echo "$at_srcdir/incr03.at:31:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -25855,7 +26737,7 @@ echo Directory after second restore
tar -xf archive.2 -g db --warning=no-timestamp
find directory | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "incr03.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "incr03.at:31"
( $at_check_trace;
mkdir posix
(cd posix
@@ -25917,7 +26799,7 @@ directory/y
directory/z
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr03.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/incr03.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -25928,14 +26810,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_106
-#AT_START_107
-at_fn_group_banner 107 'incr04.at:30' \
- "proper icontents initialization" " " 13
+#AT_STOP_117
+#AT_START_118
+at_fn_group_banner 118 'incr04.at:29' \
+ "proper icontents initialization" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "107. $at_setup_line: testing $at_desc ..."
+ $as_echo "118. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25945,7 +26827,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/incr04.at:35:
+$as_echo "$at_srcdir/incr04.at:34:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -25970,7 +26852,7 @@ mv a/b a/c
echo \"Incremental dump\"
tar cvf a1.tar -g a.sna a
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incr04.at:35"
+at_fn_check_prepare_notrace 'an embedded newline' "incr04.at:34"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -26154,12 +27036,12 @@ a/
a/c/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr04.at:35"
+at_fn_check_status 0 $at_status "$at_srcdir/incr04.at:34"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incr04.at:35:
+$as_echo "$at_srcdir/incr04.at:34:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -26184,7 +27066,7 @@ mv a/b a/c
echo \"Incremental dump\"
tar cvf a1.tar -g a.sna a
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incr04.at:35"
+at_fn_check_prepare_notrace 'an embedded newline' "incr04.at:34"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -26368,12 +27250,12 @@ a/
a/c/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr04.at:35"
+at_fn_check_status 0 $at_status "$at_srcdir/incr04.at:34"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/incr04.at:35:
+$as_echo "$at_srcdir/incr04.at:34:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -26398,7 +27280,7 @@ mv a/b a/c
echo \"Incremental dump\"
tar cvf a1.tar -g a.sna a
)"
-at_fn_check_prepare_notrace 'an embedded newline' "incr04.at:35"
+at_fn_check_prepare_notrace 'an embedded newline' "incr04.at:34"
( $at_check_trace;
mkdir posix
(cd posix
@@ -26582,7 +27464,7 @@ a/
a/c/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/incr04.at:35"
+at_fn_check_status 0 $at_status "$at_srcdir/incr04.at:34"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -26594,14 +27476,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_107
-#AT_START_108
-at_fn_group_banner 108 'incr05.at:21' \
- "incremental dumps with -C" " " 13
+#AT_STOP_118
+#AT_START_119
+at_fn_group_banner 119 'incr05.at:21' \
+ "incremental dumps with -C" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "108. $at_setup_line: testing $at_desc ..."
+ $as_echo "119. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26810,14 +27692,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_108
-#AT_START_109
-at_fn_group_banner 109 'incr06.at:21' \
- "incremental dumps of nested directories" " " 13
+#AT_STOP_119
+#AT_START_120
+at_fn_group_banner 120 'incr06.at:21' \
+ "incremental dumps of nested directories" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "109. $at_setup_line: testing $at_desc ..."
+ $as_echo "120. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27143,14 +28025,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_109
-#AT_START_110
-at_fn_group_banner 110 'incr07.at:18' \
- "incremental restores with -C" " " 13
+#AT_STOP_120
+#AT_START_121
+at_fn_group_banner 121 'incr07.at:18' \
+ "incremental restores with -C" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "110. $at_setup_line: testing $at_desc ..."
+ $as_echo "121. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27591,20 +28473,22 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_110
-#AT_START_111
-at_fn_group_banner 111 'incr08.at:38' \
- "filename normalization" " " 13
+#AT_STOP_121
+#AT_START_122
+at_fn_group_banner 122 'incr08.at:38' \
+ "filename normalization" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "111. $at_setup_line: testing $at_desc ..."
+ $as_echo "122. $at_setup_line: testing $at_desc ..."
$at_traceon
+
+
{ set +x
$as_echo "$at_srcdir/incr08.at:41:
mkdir gnu
@@ -27631,9 +28515,7 @@ find .|sort
decho B
DIR=\`pwd\`
-tar -cvf ../foo.tar --listed-incremental=../foo.snar -C foo . \$DIR 2>../err |\\
- sed \"s|\$DIR|ABSPATH|\"
-sed \"s|\$DIR|ABSPATH|\" ../err >&2
+tar -cvf ../foo.tar --listed-incremental=../foo.snar -C foo . \$DIR
)"
at_fn_check_prepare_notrace 'a `...` command substitution' "incr08.at:41"
( $at_check_trace;
@@ -27661,24 +28543,31 @@ find .|sort
decho B
DIR=`pwd`
-tar -cvf ../foo.tar --listed-incremental=../foo.snar -C foo . $DIR 2>../err |\
- sed "s|$DIR|ABSPATH|"
-sed "s|$DIR|ABSPATH|" ../err >&2
+tar -cvf ../foo.tar --listed-incremental=../foo.snar -C foo . $DIR
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo >>"$at_stderr"; $as_echo "A
-B
-tar: .: Directory is new
-tar: ./subdir: Directory is new
-tar: ./subdir/dir1: Directory is new
-tar: ABSPATH: Directory is new
-tar: ABSPATH/subdir: Directory is new
-tar: ABSPATH/subdir/dir2: Directory is new
-tar: Removing leading \`/' from member names
-" | \
- $at_diff - "$at_stderr" || at_failed=:
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/incr08.at:41"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ { set +x
+$as_echo "$at_srcdir/incr08.at:41:
+DIR=\`pwd\`/gnu/tartest
+sed \"s|\$DIR|ABSPATH|\" stdout
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "incr08.at:41"
+( $at_check_trace;
+DIR=`pwd`/gnu/tartest
+sed "s|$DIR|ABSPATH|" stdout
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "A
.
./foo
@@ -27700,20 +28589,48 @@ $at_failed && at_fn_log_failure
$at_traceon; }
+{ set +x
+$as_echo "$at_srcdir/incr08.at:41:
+DIR=\`pwd\`/gnu/tartest
+sed \"/tar: Removing leading \\\`\\/*\\/' from/d;s|\$DIR|ABSPATH|\" stderr"
+at_fn_check_prepare_notrace 'a `...` command substitution' "incr08.at:41"
+( $at_check_trace;
+DIR=`pwd`/gnu/tartest
+sed "/tar: Removing leading \`\/*\/' from/d;s|$DIR|ABSPATH|" stderr
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "A
+B
+tar: .: Directory is new
+tar: ./subdir: Directory is new
+tar: ./subdir/dir1: Directory is new
+tar: ABSPATH: Directory is new
+tar: ABSPATH/subdir: Directory is new
+tar: ABSPATH/subdir/dir2: Directory is new
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/incr08.at:41"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
set +x
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_111
-#AT_START_112
-at_fn_group_banner 112 'incr09.at:26' \
- "incremental with alternating -C" " " 13
+#AT_STOP_122
+#AT_START_123
+at_fn_group_banner 123 'incr09.at:26' \
+ "incremental with alternating -C" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "112. $at_setup_line: testing $at_desc ..."
+ $as_echo "123. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27810,14 +28727,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_112
-#AT_START_113
-at_fn_group_banner 113 'incr10.at:18' \
- "concatenated incremental archives (deletes)" " " 13
+#AT_STOP_123
+#AT_START_124
+at_fn_group_banner 124 'incr10.at:18' \
+ "concatenated incremental archives (deletes)" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "113. $at_setup_line: testing $at_desc ..."
+ $as_echo "124. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27916,14 +28833,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_113
-#AT_START_114
-at_fn_group_banner 114 'incr11.at:25' \
- "concatenated incremental archives (renames)" " " 13
+#AT_STOP_124
+#AT_START_125
+at_fn_group_banner 125 'incr11.at:25' \
+ "concatenated incremental archives (renames)" " " 16
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "114. $at_setup_line: testing $at_desc ..."
+ $as_echo "125. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28034,14 +28951,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_114
-#AT_START_115
-at_fn_group_banner 115 'filerem01.at:36' \
- "file removed as we read it (ca. 22 seconds)" " " 14
+#AT_STOP_125
+#AT_START_126
+at_fn_group_banner 126 'filerem01.at:36' \
+ "file removed as we read it" " " 17
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "115. $at_setup_line: testing $at_desc ..."
+ $as_echo "126. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28064,8 +28981,7 @@ genfile --file dir/file1
genfile --file dir/sub/file2
genfile --run --checkpoint=3 --unlink dir/file1 -- \\
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \\
- --checkpoint-action='echo' -c -f archive.tar \\
+ tar --blocking-factor=1 -c -f archive.tar \\
--listed-incremental db -v dir >/dev/null
)"
at_fn_check_prepare_notrace 'an embedded newline' "filerem01.at:39"
@@ -28084,8 +29000,7 @@ genfile --file dir/file1
genfile --file dir/sub/file2
genfile --run --checkpoint=3 --unlink dir/file1 -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
+ tar --blocking-factor=1 -c -f archive.tar \
--listed-incremental db -v dir >/dev/null
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -28117,8 +29032,7 @@ genfile --file dir/file1
genfile --file dir/sub/file2
genfile --run --checkpoint=3 --unlink dir/file1 -- \\
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \\
- --checkpoint-action='echo' -c -f archive.tar \\
+ tar --blocking-factor=1 -c -f archive.tar \\
--listed-incremental db -v dir >/dev/null
)"
at_fn_check_prepare_notrace 'an embedded newline' "filerem01.at:39"
@@ -28137,8 +29051,7 @@ genfile --file dir/file1
genfile --file dir/sub/file2
genfile --run --checkpoint=3 --unlink dir/file1 -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
+ tar --blocking-factor=1 -c -f archive.tar \
--listed-incremental db -v dir >/dev/null
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -28206,14 +29119,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_115
-#AT_START_116
-at_fn_group_banner 116 'filerem02.at:26' \
- "toplevel file removed (ca. 24 seconds)" " " 14
+#AT_STOP_126
+#AT_START_127
+at_fn_group_banner 127 'filerem02.at:26' \
+ "toplevel file removed" " " 17
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "116. $at_setup_line: testing $at_desc ..."
+ $as_echo "127. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28238,8 +29151,7 @@ mkdir dir2
genfile --file dir2/file1
genfile --run --checkpoint=3 --exec 'rm -rf dir2' -- \\
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \\
- --checkpoint-action='echo' -c -f archive.tar \\
+ tar --blocking-factor=1 -c -f archive.tar \\
--listed-incremental db -v --warning=no-new-dir dir dir2 >/dev/null
)"
at_fn_check_prepare_notrace 'an embedded newline' "filerem02.at:29"
@@ -28260,8 +29172,7 @@ mkdir dir2
genfile --file dir2/file1
genfile --run --checkpoint=3 --exec 'rm -rf dir2' -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
+ tar --blocking-factor=1 -c -f archive.tar \
--listed-incremental db -v --warning=no-new-dir dir dir2 >/dev/null
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -28291,8 +29202,7 @@ mkdir dir2
genfile --file dir2/file1
genfile --run --checkpoint=3 --exec 'rm -rf dir2' -- \\
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \\
- --checkpoint-action='echo' -c -f archive.tar \\
+ tar --blocking-factor=1 -c -f archive.tar \\
--listed-incremental db -v --warning=no-new-dir dir dir2 >/dev/null
)"
at_fn_check_prepare_notrace 'an embedded newline' "filerem02.at:29"
@@ -28313,8 +29223,7 @@ mkdir dir2
genfile --file dir2/file1
genfile --run --checkpoint=3 --exec 'rm -rf dir2' -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
+ tar --blocking-factor=1 -c -f archive.tar \
--listed-incremental db -v --warning=no-new-dir dir dir2 >/dev/null
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -28338,14 +29247,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_116
-#AT_START_117
-at_fn_group_banner 117 'dirrem01.at:34' \
- "directory removed before reading" " " 15
+#AT_STOP_127
+#AT_START_128
+at_fn_group_banner 128 'dirrem01.at:38' \
+ "directory removed before reading" " " 18
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "117. $at_setup_line: testing $at_desc ..."
+ $as_echo "128. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28353,7 +29262,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/dirrem01.at:37:
+$as_echo "$at_srcdir/dirrem01.at:41:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -28374,11 +29283,12 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=\$CPT --unlink dir/sub/file2 --unlink dir/sub -- \\
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \\
- --checkpoint-action='echo' -c -f archive.tar \\
- --listed-incremental db -v dir >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \\
+ --listed-incremental db \\
+ --warning=no-file-changed \\
+ -v dir >/dev/null
)"
-at_fn_check_prepare_notrace 'an embedded newline' "dirrem01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "dirrem01.at:41"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -28400,9 +29310,10 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
- --listed-incremental db -v dir >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \
+ --listed-incremental db \
+ --warning=no-file-changed \
+ -v dir >/dev/null
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -28413,12 +29324,12 @@ tar: dir/sub: File removed before we read it
" | \
$at_diff - "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/dirrem01.at:37"
+at_fn_check_status 1 $at_status "$at_srcdir/dirrem01.at:41"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/dirrem01.at:37:
+$as_echo "$at_srcdir/dirrem01.at:41:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -28439,11 +29350,12 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=\$CPT --unlink dir/sub/file2 --unlink dir/sub -- \\
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \\
- --checkpoint-action='echo' -c -f archive.tar \\
- --listed-incremental db -v dir >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \\
+ --listed-incremental db \\
+ --warning=no-file-changed \\
+ -v dir >/dev/null
)"
-at_fn_check_prepare_notrace 'an embedded newline' "dirrem01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "dirrem01.at:41"
( $at_check_trace;
mkdir posix
(cd posix
@@ -28465,9 +29377,10 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
- --listed-incremental db -v dir >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \
+ --listed-incremental db \
+ --warning=no-file-changed \
+ -v dir >/dev/null
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -28478,7 +29391,7 @@ tar: dir/sub: File removed before we read it
" | \
$at_diff - "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/dirrem01.at:37"
+at_fn_check_status 1 $at_status "$at_srcdir/dirrem01.at:41"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -28489,14 +29402,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_117
-#AT_START_118
-at_fn_group_banner 118 'dirrem02.at:31' \
- "explicitly named directory removed before reading" "" 15
+#AT_STOP_128
+#AT_START_129
+at_fn_group_banner 129 'dirrem02.at:31' \
+ "explicitly named directory removed before reading" "" 18
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "118. $at_setup_line: testing $at_desc ..."
+ $as_echo "129. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28525,9 +29438,10 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=\$CPT --unlink dir/sub/file2 --unlink dir/sub -- \\
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \\
- --checkpoint-action='echo' -c -f archive.tar \\
- --listed-incremental db -v dir dir/sub >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \\
+ --listed-incremental db \\
+ --warning=no-file-changed \\
+ -v dir dir/sub >/dev/null
)"
at_fn_check_prepare_notrace 'an embedded newline' "dirrem02.at:34"
( $at_check_trace;
@@ -28551,9 +29465,10 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
- --listed-incremental db -v dir dir/sub >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \
+ --listed-incremental db \
+ --warning=no-file-changed \
+ -v dir dir/sub >/dev/null
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -28591,9 +29506,10 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=\$CPT --unlink dir/sub/file2 --unlink dir/sub -- \\
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \\
- --checkpoint-action='echo' -c -f archive.tar \\
- --listed-incremental db -v dir dir/sub >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \\
+ --listed-incremental db \\
+ --warning=no-file-changed \\
+ -v dir dir/sub >/dev/null
)"
at_fn_check_prepare_notrace 'an embedded newline' "dirrem02.at:34"
( $at_check_trace;
@@ -28617,9 +29533,10 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
- --listed-incremental db -v dir dir/sub >/dev/null
+ tar --blocking-factor=1 -c -f archive.tar \
+ --listed-incremental db \
+ --warning=no-file-changed \
+ -v dir dir/sub >/dev/null
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -28642,14 +29559,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_118
-#AT_START_119
-at_fn_group_banner 119 'rename01.at:25' \
- "renamed dirs in incrementals" " " 16
+#AT_STOP_129
+#AT_START_130
+at_fn_group_banner 130 'rename01.at:24' \
+ "renamed dirs in incrementals" " " 19
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "119. $at_setup_line: testing $at_desc ..."
+ $as_echo "130. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28657,7 +29574,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/rename01.at:28:
+$as_echo "$at_srcdir/rename01.at:27:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -28697,7 +29614,7 @@ echo Begin directory listing 2
find foo | sort
echo End directory listing 2
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rename01.at:28"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rename01.at:27"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -28771,12 +29688,12 @@ foo/file2
End directory listing 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rename01.at:28"
+at_fn_check_status 0 $at_status "$at_srcdir/rename01.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rename01.at:28:
+$as_echo "$at_srcdir/rename01.at:27:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -28816,7 +29733,7 @@ echo Begin directory listing 2
find foo | sort
echo End directory listing 2
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rename01.at:28"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rename01.at:27"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -28890,12 +29807,12 @@ foo/file2
End directory listing 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rename01.at:28"
+at_fn_check_status 0 $at_status "$at_srcdir/rename01.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rename01.at:28:
+$as_echo "$at_srcdir/rename01.at:27:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -28935,7 +29852,7 @@ echo Begin directory listing 2
find foo | sort
echo End directory listing 2
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rename01.at:28"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rename01.at:27"
( $at_check_trace;
mkdir posix
(cd posix
@@ -29009,7 +29926,7 @@ foo/file2
End directory listing 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rename01.at:28"
+at_fn_check_status 0 $at_status "$at_srcdir/rename01.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29020,14 +29937,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_119
-#AT_START_120
-at_fn_group_banner 120 'rename02.at:25' \
- "move between hierarchies" " " 16
+#AT_STOP_130
+#AT_START_131
+at_fn_group_banner 131 'rename02.at:24' \
+ "move between hierarchies" " " 19
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "120. $at_setup_line: testing $at_desc ..."
+ $as_echo "131. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -29035,7 +29952,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/rename02.at:28:
+$as_echo "$at_srcdir/rename02.at:27:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -29079,7 +29996,7 @@ echo Begin directory listing 2
find foo | sort
echo End directory listing 2
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rename02.at:28"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rename02.at:27"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -29168,12 +30085,12 @@ foo/file2
End directory listing 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rename02.at:28"
+at_fn_check_status 0 $at_status "$at_srcdir/rename02.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rename02.at:28:
+$as_echo "$at_srcdir/rename02.at:27:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -29217,7 +30134,7 @@ echo Begin directory listing 2
find foo | sort
echo End directory listing 2
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rename02.at:28"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rename02.at:27"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -29306,12 +30223,12 @@ foo/file2
End directory listing 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rename02.at:28"
+at_fn_check_status 0 $at_status "$at_srcdir/rename02.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rename02.at:28:
+$as_echo "$at_srcdir/rename02.at:27:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -29355,7 +30272,7 @@ echo Begin directory listing 2
find foo | sort
echo End directory listing 2
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rename02.at:28"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rename02.at:27"
( $at_check_trace;
mkdir posix
(cd posix
@@ -29444,7 +30361,7 @@ foo/file2
End directory listing 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rename02.at:28"
+at_fn_check_status 0 $at_status "$at_srcdir/rename02.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29455,14 +30372,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_120
-#AT_START_121
-at_fn_group_banner 121 'rename03.at:24' \
- "cyclic renames" " " 16
+#AT_STOP_131
+#AT_START_132
+at_fn_group_banner 132 'rename03.at:23' \
+ "cyclic renames" " " 19
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "121. $at_setup_line: testing $at_desc ..."
+ $as_echo "132. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -29470,7 +30387,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/rename03.at:27:
+$as_echo "$at_srcdir/rename03.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -29526,7 +30443,7 @@ echo Begin directory listing 2
find foo | sort
echo End directory listing 2
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rename03.at:27"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rename03.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -29640,12 +30557,12 @@ foo/file2
End directory listing 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rename03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/rename03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rename03.at:27:
+$as_echo "$at_srcdir/rename03.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -29701,7 +30618,7 @@ echo Begin directory listing 2
find foo | sort
echo End directory listing 2
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rename03.at:27"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rename03.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -29815,12 +30732,12 @@ foo/file2
End directory listing 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rename03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/rename03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rename03.at:27:
+$as_echo "$at_srcdir/rename03.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -29876,7 +30793,7 @@ echo Begin directory listing 2
find foo | sort
echo End directory listing 2
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rename03.at:27"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rename03.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -29990,7 +30907,7 @@ foo/file2
End directory listing 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rename03.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/rename03.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -30001,14 +30918,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_121
-#AT_START_122
-at_fn_group_banner 122 'rename04.at:27' \
- "renamed directory containing subdirectories" " " 16
+#AT_STOP_132
+#AT_START_133
+at_fn_group_banner 133 'rename04.at:27' \
+ "renamed directory containing subdirectories" " " 19
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "122. $at_setup_line: testing $at_desc ..."
+ $as_echo "133. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -30340,14 +31257,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_122
-#AT_START_123
-at_fn_group_banner 123 'rename05.at:24' \
- "renamed subdirectories" " " 16
+#AT_STOP_133
+#AT_START_134
+at_fn_group_banner 134 'rename05.at:24' \
+ "renamed subdirectories" " " 19
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "123. $at_setup_line: testing $at_desc ..."
+ $as_echo "134. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -30685,14 +31602,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_123
-#AT_START_124
-at_fn_group_banner 124 'chtype.at:28' \
- "changed file types in incrementals" " " 16
+#AT_STOP_134
+#AT_START_135
+at_fn_group_banner 135 'chtype.at:27' \
+ "changed file types in incrementals" " " 19
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "124. $at_setup_line: testing $at_desc ..."
+ $as_echo "135. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -30700,7 +31617,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/chtype.at:31:
+$as_echo "$at_srcdir/chtype.at:30:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -30740,7 +31657,7 @@ echo Restore archive.2
tar -xf archive.2 --listed-incremental=/dev/null --warning=no-timestamp
find directory | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "chtype.at:31"
+at_fn_check_prepare_notrace 'a `...` command substitution' "chtype.at:30"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -30796,12 +31713,12 @@ directory/a/b
directory/b
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/chtype.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/chtype.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/chtype.at:31:
+$as_echo "$at_srcdir/chtype.at:30:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -30841,7 +31758,7 @@ echo Restore archive.2
tar -xf archive.2 --listed-incremental=/dev/null --warning=no-timestamp
find directory | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "chtype.at:31"
+at_fn_check_prepare_notrace 'a `...` command substitution' "chtype.at:30"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -30897,12 +31814,12 @@ directory/a/b
directory/b
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/chtype.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/chtype.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/chtype.at:31:
+$as_echo "$at_srcdir/chtype.at:30:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -30942,7 +31859,7 @@ echo Restore archive.2
tar -xf archive.2 --listed-incremental=/dev/null --warning=no-timestamp
find directory | sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "chtype.at:31"
+at_fn_check_prepare_notrace 'a `...` command substitution' "chtype.at:30"
( $at_check_trace;
mkdir posix
(cd posix
@@ -30998,7 +31915,7 @@ directory/a/b
directory/b
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/chtype.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/chtype.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -31009,14 +31926,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_124
-#AT_START_125
-at_fn_group_banner 125 'ignfail.at:24' \
- "ignfail" " " 17
+#AT_STOP_135
+#AT_START_136
+at_fn_group_banner 136 'ignfail.at:23' \
+ "ignfail" " " 20
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "125. $at_setup_line: testing $at_desc ..."
+ $as_echo "136. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -31024,7 +31941,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/ignfail.at:27:
+$as_echo "$at_srcdir/ignfail.at:26:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -31075,7 +31992,7 @@ status=\$?
chmod 700 directory
test \$status = 0
)"
-at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:26"
( $at_check_trace;
mkdir v7
(cd v7
@@ -31143,12 +32060,12 @@ tar: directory: Warning: Cannot open: Permission denied
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/ignfail.at:27:
+$as_echo "$at_srcdir/ignfail.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -31199,7 +32116,7 @@ status=\$?
chmod 700 directory
test \$status = 0
)"
-at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -31267,12 +32184,12 @@ tar: directory: Warning: Cannot open: Permission denied
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/ignfail.at:27:
+$as_echo "$at_srcdir/ignfail.at:26:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -31323,7 +32240,7 @@ status=\$?
chmod 700 directory
test \$status = 0
)"
-at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:26"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -31391,12 +32308,12 @@ tar: directory: Warning: Cannot open: Permission denied
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/ignfail.at:27:
+$as_echo "$at_srcdir/ignfail.at:26:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -31447,7 +32364,7 @@ status=\$?
chmod 700 directory
test \$status = 0
)"
-at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:26"
( $at_check_trace;
mkdir posix
(cd posix
@@ -31515,12 +32432,12 @@ tar: directory: Warning: Cannot open: Permission denied
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/ignfail.at:27:
+$as_echo "$at_srcdir/ignfail.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -31571,7 +32488,7 @@ status=\$?
chmod 700 directory
test \$status = 0
)"
-at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "ignfail.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -31639,7 +32556,7 @@ tar: directory: Warning: Cannot open: Permission denied
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/ignfail.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -31650,14 +32567,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_125
-#AT_START_126
-at_fn_group_banner 126 'link01.at:34' \
- "link count gt 2" " " 18
+#AT_STOP_136
+#AT_START_137
+at_fn_group_banner 137 'link01.at:33' \
+ "link count gt 2" " " 21
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "126. $at_setup_line: testing $at_desc ..."
+ $as_echo "137. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -31665,7 +32582,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/link01.at:37:
+$as_echo "$at_srcdir/link01.at:36:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -31688,7 +32605,7 @@ tar xf archive --warning=no-timestamp
ls directory/test1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "link01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "link01.at:36"
( $at_check_trace;
mkdir v7
(cd v7
@@ -31719,12 +32636,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "test.txt
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/link01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/link01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/link01.at:37:
+$as_echo "$at_srcdir/link01.at:36:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -31747,7 +32664,7 @@ tar xf archive --warning=no-timestamp
ls directory/test1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "link01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "link01.at:36"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -31778,12 +32695,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "test.txt
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/link01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/link01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/link01.at:37:
+$as_echo "$at_srcdir/link01.at:36:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -31806,7 +32723,7 @@ tar xf archive --warning=no-timestamp
ls directory/test1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "link01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "link01.at:36"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -31837,12 +32754,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "test.txt
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/link01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/link01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/link01.at:37:
+$as_echo "$at_srcdir/link01.at:36:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -31865,7 +32782,7 @@ tar xf archive --warning=no-timestamp
ls directory/test1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "link01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "link01.at:36"
( $at_check_trace;
mkdir posix
(cd posix
@@ -31896,12 +32813,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "test.txt
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/link01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/link01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/link01.at:37:
+$as_echo "$at_srcdir/link01.at:36:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -31924,7 +32841,7 @@ tar xf archive --warning=no-timestamp
ls directory/test1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "link01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "link01.at:36"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -31955,7 +32872,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "test.txt
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/link01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/link01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -31966,14 +32883,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_126
-#AT_START_127
-at_fn_group_banner 127 'link02.at:32' \
- "preserve hard links with --remove-files" " " 18
+#AT_STOP_137
+#AT_START_138
+at_fn_group_banner 138 'link02.at:32' \
+ "preserve hard links with --remove-files" " " 21
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "127. $at_setup_line: testing $at_desc ..."
+ $as_echo "138. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -32222,14 +33139,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_127
-#AT_START_128
-at_fn_group_banner 128 'link03.at:24' \
- "working -l with --remove-files" " " 18
+#AT_STOP_138
+#AT_START_139
+at_fn_group_banner 139 'link03.at:24' \
+ "working -l with --remove-files" " " 21
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "128. $at_setup_line: testing $at_desc ..."
+ $as_echo "139. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -32621,14 +33538,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_128
-#AT_START_129
-at_fn_group_banner 129 'link04.at:29' \
- "link count is 1 but multiple occurrences" " " 18
+#AT_STOP_139
+#AT_START_140
+at_fn_group_banner 140 'link04.at:29' \
+ "link count is 1 but multiple occurrences" " " 21
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "129. $at_setup_line: testing $at_desc ..."
+ $as_echo "140. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -33067,14 +33984,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_129
-#AT_START_130
-at_fn_group_banner 130 'longv7.at:25' \
- "long names in V7 archives" " " 19
+#AT_STOP_140
+#AT_START_141
+at_fn_group_banner 141 'longv7.at:24' \
+ "long names in V7 archives" " " 22
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "130. $at_setup_line: testing $at_desc ..."
+ $as_echo "141. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -33085,7 +34002,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/longv7.at:31:
+$as_echo "$at_srcdir/longv7.at:30:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -33101,7 +34018,7 @@ tar cf archive this_is_a_very_long_name_for_a_directory_which_causes_problems
echo separator
tar tf archive
)"
-at_fn_check_prepare_notrace 'an embedded newline' "longv7.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "longv7.at:30"
( $at_check_trace;
mkdir v7
(cd v7
@@ -33129,7 +34046,7 @@ echo >>"$at_stdout"; $as_echo "separator
this_is_a_very_long_name_for_a_directory_which_causes_problems/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/longv7.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/longv7.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -33142,14 +34059,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_130
-#AT_START_131
-at_fn_group_banner 131 'long01.at:29' \
- "long file names divisible by block size" " " 19
+#AT_STOP_141
+#AT_START_142
+at_fn_group_banner 142 'long01.at:28' \
+ "long file names divisible by block size" " " 22
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "131. $at_setup_line: testing $at_desc ..."
+ $as_echo "142. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -33161,7 +34078,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/long01.at:37:
+$as_echo "$at_srcdir/long01.at:36:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -33176,7 +34093,7 @@ echo test > endfile
tar cf archive 0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde endfile
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "long01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "long01.at:36"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -33200,12 +34117,12 @@ echo >>"$at_stdout"; $as_echo "0123456789abcde/0123456789abcde/0123456789abcde/0
endfile
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/long01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/long01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/long01.at:37:
+$as_echo "$at_srcdir/long01.at:36:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -33220,7 +34137,7 @@ echo test > endfile
tar cf archive 0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde/0123456789abcde endfile
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "long01.at:37"
+at_fn_check_prepare_notrace 'an embedded newline' "long01.at:36"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -33244,7 +34161,7 @@ echo >>"$at_stdout"; $as_echo "0123456789abcde/0123456789abcde/0123456789abcde/0
endfile
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/long01.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/long01.at:36"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -33257,14 +34174,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_131
-#AT_START_132
-at_fn_group_banner 132 'lustar01.at:22' \
- "ustar: unsplittable file name" " " 19
+#AT_STOP_142
+#AT_START_143
+at_fn_group_banner 143 'lustar01.at:21' \
+ "ustar: unsplittable file name" " " 22
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "132. $at_setup_line: testing $at_desc ..."
+ $as_echo "143. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -33274,7 +34191,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/lustar01.at:28:
+$as_echo "$at_srcdir/lustar01.at:27:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -33286,7 +34203,7 @@ rm -rf *
genfile --file=this_is_a_very_long_name_for_a_file_designed_to_test_generation_of_ustar_archives_by_gnu_tar_semicolon_it_will_not_fit_the_name_field_and_cannot_be_split_between_name_and_prefix || exit 77
tar cf archive this_is_a_very_long_name_for_a_file_designed_to_test_generation_of_ustar_archives_by_gnu_tar_semicolon_it_will_not_fit_the_name_field_and_cannot_be_split_between_name_and_prefix
)"
-at_fn_check_prepare_notrace 'an embedded newline' "lustar01.at:28"
+at_fn_check_prepare_notrace 'an embedded newline' "lustar01.at:27"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -33307,7 +34224,7 @@ tar: Exiting with failure status due to previous errors
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/lustar01.at:28"
+at_fn_check_status 2 $at_status "$at_srcdir/lustar01.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -33319,14 +34236,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_132
-#AT_START_133
-at_fn_group_banner 133 'lustar02.at:22' \
- "ustar: unsplittable path name" " " 19
+#AT_STOP_143
+#AT_START_144
+at_fn_group_banner 144 'lustar02.at:21' \
+ "ustar: unsplittable path name" " " 22
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "133. $at_setup_line: testing $at_desc ..."
+ $as_echo "144. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -33340,7 +34257,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/lustar02.at:33:
+$as_echo "$at_srcdir/lustar02.at:32:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -33353,7 +34270,7 @@ rm -rf *
install-sh -d this_is_a_very_long_name_for_a_file_designed_to_test_generation_of_ustar_archives_by_gnu_tar_semicolon_it_will_not_fit_the_name_field_and_cannot_be_split_be >/dev/null && genfile --file this_is_a_very_long_name_for_a_file_designed_to_test_generation_of_ustar_archives_by_gnu_tar_semicolon_it_will_not_fit_the_name_field_and_cannot_be_split_be/tween_name_and_prefix || exit 77
tar cf archive this_is_a_very_long_name_for_a_file_designed_to_test_generation_of_ustar_archives_by_gnu_tar_semicolon_it_will_not_fit_the_name_field_and_cannot_be_split_be
)"
-at_fn_check_prepare_notrace 'an embedded newline' "lustar02.at:33"
+at_fn_check_prepare_notrace 'an embedded newline' "lustar02.at:32"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -33375,7 +34292,7 @@ tar: Exiting with failure status due to previous errors
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/lustar02.at:33"
+at_fn_check_status 2 $at_status "$at_srcdir/lustar02.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -33390,14 +34307,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_133
-#AT_START_134
-at_fn_group_banner 134 'lustar03.at:22' \
- "ustar: splitting long names" " " 19
+#AT_STOP_144
+#AT_START_145
+at_fn_group_banner 145 'lustar03.at:21' \
+ "ustar: splitting long names" " " 22
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "134. $at_setup_line: testing $at_desc ..."
+ $as_echo "145. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -33409,7 +34326,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/lustar03.at:30:
+$as_echo "$at_srcdir/lustar03.at:29:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -33424,7 +34341,7 @@ echo \"Create archive\"
tar cf archive this_is_a_very_long_name_for_a_file_designed_to_test_generation/of_ustar_archives_by_gnu_tar_semicolon_it_will_not_fit_the_name_field_and_cannot_be_split_be
echo \"List archive\"
tar tf archive)"
-at_fn_check_prepare_notrace 'an embedded newline' "lustar03.at:30"
+at_fn_check_prepare_notrace 'an embedded newline' "lustar03.at:29"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -33450,7 +34367,7 @@ this_is_a_very_long_name_for_a_file_designed_to_test_generation/of_ustar_archive
this_is_a_very_long_name_for_a_file_designed_to_test_generation/of_ustar_archives_by_gnu_tar_semicolon_it_will_not_fit_the_name_field_and_cannot_be_split_be/file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/lustar03.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/lustar03.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -33463,25 +34380,25 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_134
-#AT_START_135
-at_fn_group_banner 135 'old.at:24' \
- "old archives" " " 19
+#AT_STOP_145
+#AT_START_146
+at_fn_group_banner 146 'old.at:23' \
+ "old archives" " " 22
at_xfail=no
(
- $as_echo "135. $at_setup_line: testing $at_desc ..."
+ $as_echo "146. $at_setup_line: testing $at_desc ..."
$at_traceon
unset TAR_OPTIONS
{ set +x
-$as_echo "$at_srcdir/old.at:28:
+$as_echo "$at_srcdir/old.at:27:
mkdir directory
tar cfvo archive directory || exit 1
tar tf archive
"
-at_fn_check_prepare_notrace 'an embedded newline' "old.at:28"
+at_fn_check_prepare_notrace 'an embedded newline' "old.at:27"
( $at_check_trace;
mkdir directory
tar cfvo archive directory || exit 1
@@ -33495,7 +34412,7 @@ echo >>"$at_stdout"; $as_echo "directory/
directory/
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/old.at:28"
+at_fn_check_status 0 $at_status "$at_srcdir/old.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -33504,14 +34421,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_135
-#AT_START_136
-at_fn_group_banner 136 'time01.at:20' \
- "time: tricky time stamps" " " 19
+#AT_STOP_146
+#AT_START_147
+at_fn_group_banner 147 'time01.at:20' \
+ "time: tricky time stamps" " " 22
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "136. $at_setup_line: testing $at_desc ..."
+ $as_echo "147. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -33638,14 +34555,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_136
-#AT_START_137
-at_fn_group_banner 137 'time02.at:20' \
- "time: clamping mtime" " " 19
+#AT_STOP_147
+#AT_START_148
+at_fn_group_banner 148 'time02.at:20' \
+ "time: clamping mtime" " " 22
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "137. $at_setup_line: testing $at_desc ..."
+ $as_echo "148. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -33719,14 +34636,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_137
-#AT_START_138
-at_fn_group_banner 138 'multiv01.at:24' \
- "multivolume dumps from pipes" " " 20
+#AT_STOP_148
+#AT_START_149
+at_fn_group_banner 149 'multiv01.at:23' \
+ "multivolume dumps from pipes" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "138. $at_setup_line: testing $at_desc ..."
+ $as_echo "149. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -33738,7 +34655,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/multiv01.at:31:
+$as_echo "$at_srcdir/multiv01.at:30:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -33776,7 +34693,7 @@ PATH=\$PATH \${TRUSS} tar -f t1-pipe.tar -f - \\
cmp file1 extract-dir-pipe/file1
cmp file2 extract-dir-pipe/file2
)"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:31"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:30"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -33820,12 +34737,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/multiv01.at:31:
+$as_echo "$at_srcdir/multiv01.at:30:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -33863,7 +34780,7 @@ PATH=\$PATH \${TRUSS} tar -f t1-pipe.tar -f - \\
cmp file1 extract-dir-pipe/file1
cmp file2 extract-dir-pipe/file2
)"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:31"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:30"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -33907,12 +34824,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/multiv01.at:31:
+$as_echo "$at_srcdir/multiv01.at:30:
mkdir pax
(cd pax
TEST_TAR_FORMAT=pax
@@ -33950,7 +34867,7 @@ PATH=\$PATH \${TRUSS} tar -f t1-pipe.tar -f - \\
cmp file1 extract-dir-pipe/file1
cmp file2 extract-dir-pipe/file2
)"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:31"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:30"
( $at_check_trace;
mkdir pax
(cd pax
@@ -33994,7 +34911,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -34005,14 +34922,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_138
-#AT_START_139
-at_fn_group_banner 139 'multiv02.at:29' \
- "skipping a straddling member" " " 20
+#AT_STOP_149
+#AT_START_150
+at_fn_group_banner 150 'multiv02.at:28' \
+ "skipping a straddling member" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "139. $at_setup_line: testing $at_desc ..."
+ $as_echo "150. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -34020,7 +34937,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/multiv02.at:32:
+$as_echo "$at_srcdir/multiv02.at:31:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -34040,7 +34957,7 @@ tar -c -f A.tar -f B.tar -f C.tar -M -L 30 en to tre fire || exit 1
echo separator
tar -v -x -f A.tar -f B.tar -f C.tar -M en --warning=no-timestamp || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "multiv02.at:32"
+at_fn_check_prepare_notrace 'an embedded newline' "multiv02.at:31"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -34069,12 +34986,12 @@ echo >>"$at_stdout"; $as_echo "separator
en
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv02.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv02.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/multiv02.at:32:
+$as_echo "$at_srcdir/multiv02.at:31:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -34094,7 +35011,7 @@ tar -c -f A.tar -f B.tar -f C.tar -M -L 30 en to tre fire || exit 1
echo separator
tar -v -x -f A.tar -f B.tar -f C.tar -M en --warning=no-timestamp || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "multiv02.at:32"
+at_fn_check_prepare_notrace 'an embedded newline' "multiv02.at:31"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -34123,12 +35040,12 @@ echo >>"$at_stdout"; $as_echo "separator
en
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv02.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv02.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/multiv02.at:32:
+$as_echo "$at_srcdir/multiv02.at:31:
mkdir pax
(cd pax
TEST_TAR_FORMAT=pax
@@ -34148,7 +35065,7 @@ tar -c -f A.tar -f B.tar -f C.tar -M -L 30 en to tre fire || exit 1
echo separator
tar -v -x -f A.tar -f B.tar -f C.tar -M en --warning=no-timestamp || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "multiv02.at:32"
+at_fn_check_prepare_notrace 'an embedded newline' "multiv02.at:31"
( $at_check_trace;
mkdir pax
(cd pax
@@ -34177,7 +35094,7 @@ echo >>"$at_stdout"; $as_echo "separator
en
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv02.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv02.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -34188,14 +35105,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_139
-#AT_START_140
-at_fn_group_banner 140 'multiv03.at:31' \
- "MV archive & long filenames" " " 20
+#AT_STOP_150
+#AT_START_151
+at_fn_group_banner 151 'multiv03.at:30' \
+ "MV archive & long filenames" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "140. $at_setup_line: testing $at_desc ..."
+ $as_echo "151. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -34203,7 +35120,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/multiv03.at:34:
+$as_echo "$at_srcdir/multiv03.at:33:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -34243,7 +35160,7 @@ mv \$BFILE bfile
tar -M -x -f arch.1 -f arch.2 --warning=no-timestamp || exit 1
cmp \$BFILE bfile
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "multiv03.at:34"
+at_fn_check_prepare_notrace 'a `...` command substitution' "multiv03.at:33"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -34289,12 +35206,12 @@ at_status=$? at_failed=false
$at_check_filter
$at_diff experr "$at_stderr" || at_failed=:
$at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv03.at:34"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv03.at:33"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/multiv03.at:34:
+$as_echo "$at_srcdir/multiv03.at:33:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -34334,7 +35251,7 @@ mv \$BFILE bfile
tar -M -x -f arch.1 -f arch.2 --warning=no-timestamp || exit 1
cmp \$BFILE bfile
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "multiv03.at:34"
+at_fn_check_prepare_notrace 'a `...` command substitution' "multiv03.at:33"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -34380,7 +35297,7 @@ at_status=$? at_failed=false
$at_check_filter
$at_diff experr "$at_stderr" || at_failed=:
$at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv03.at:34"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv03.at:33"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -34391,14 +35308,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_140
-#AT_START_141
-at_fn_group_banner 141 'multiv04.at:37' \
- "split directory members in a MV archive" " " 20
+#AT_STOP_151
+#AT_START_152
+at_fn_group_banner 152 'multiv04.at:36' \
+ "split directory members in a MV archive" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "141. $at_setup_line: testing $at_desc ..."
+ $as_echo "152. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -34406,7 +35323,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/multiv04.at:40:
+$as_echo "$at_srcdir/multiv04.at:39:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -34432,7 +35349,7 @@ tar --listed-incremental=list -c --record-size 1024 -L 16 -f arc.1 -f arc.2 -v d
echo separator
tar -MRt -f arc.1 -f arc.2)"
-at_fn_check_prepare_notrace 'an embedded newline' "multiv04.at:40"
+at_fn_check_prepare_notrace 'an embedded newline' "multiv04.at:39"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -34469,12 +35386,12 @@ block 0: directory/
block 35: ** Block of NULs **
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv04.at:40"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv04.at:39"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/multiv04.at:40:
+$as_echo "$at_srcdir/multiv04.at:39:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -34500,7 +35417,7 @@ tar --listed-incremental=list -c --record-size 1024 -L 16 -f arc.1 -f arc.2 -v d
echo separator
tar -MRt -f arc.1 -f arc.2)"
-at_fn_check_prepare_notrace 'an embedded newline' "multiv04.at:40"
+at_fn_check_prepare_notrace 'an embedded newline' "multiv04.at:39"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -34537,7 +35454,7 @@ block 0: directory/
block 35: ** Block of NULs **
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv04.at:40"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv04.at:39"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -34548,14 +35465,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_141
-#AT_START_142
-at_fn_group_banner 142 'multiv05.at:27' \
- "Restoring after an out of sync volume" " " 20
+#AT_STOP_152
+#AT_START_153
+at_fn_group_banner 153 'multiv05.at:26' \
+ "Restoring after an out of sync volume" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "142. $at_setup_line: testing $at_desc ..."
+ $as_echo "153. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -34564,7 +35481,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/multiv05.at:31:
+$as_echo "$at_srcdir/multiv05.at:30:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -34602,7 +35519,7 @@ echo Diffing piec
echo Diffing szesc
cmp bak/szesc szesc || exit 1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "multiv05.at:31"
+at_fn_check_prepare_notrace 'an embedded newline' "multiv05.at:30"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -34663,7 +35580,7 @@ Diffing piec
Diffing szesc
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multiv05.at:31"
+at_fn_check_status 0 $at_status "$at_srcdir/multiv05.at:30"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -34675,14 +35592,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_142
-#AT_START_143
-at_fn_group_banner 143 'multiv06.at:27' \
- "Multivolumes with L=record_size" " " 20
+#AT_STOP_153
+#AT_START_154
+at_fn_group_banner 154 'multiv06.at:27' \
+ "Multivolumes with L=record_size" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "143. $at_setup_line: testing $at_desc ..."
+ $as_echo "154. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -34800,14 +35717,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_143
-#AT_START_144
-at_fn_group_banner 144 'multiv07.at:28' \
- "volumes split at an extended header" " " 20
+#AT_STOP_154
+#AT_START_155
+at_fn_group_banner 155 'multiv07.at:28' \
+ "volumes split at an extended header" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "144. $at_setup_line: testing $at_desc ..."
+ $as_echo "155. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -34860,14 +35777,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_144
-#AT_START_145
-at_fn_group_banner 145 'multiv08.at:25' \
- "multivolume header creation" " " 20
+#AT_STOP_155
+#AT_START_156
+at_fn_group_banner 156 'multiv08.at:25' \
+ "multivolume header creation" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "145. $at_setup_line: testing $at_desc ..."
+ $as_echo "156. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -34933,14 +35850,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_145
-#AT_START_146
-at_fn_group_banner 146 'multiv09.at:26' \
- "bad next volume" " " 20
+#AT_STOP_156
+#AT_START_157
+at_fn_group_banner 157 'multiv09.at:26' \
+ "bad next volume" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "146. $at_setup_line: testing $at_desc ..."
+ $as_echo "157. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -35192,14 +36109,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_146
-#AT_START_147
-at_fn_group_banner 147 'multiv10.at:37' \
- "file start at the beginning of a posix volume" " " 20
+#AT_STOP_157
+#AT_START_158
+at_fn_group_banner 158 'multiv10.at:37' \
+ "file start at the beginning of a posix volume" " " 23
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "147. $at_setup_line: testing $at_desc ..."
+ $as_echo "158. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -35267,14 +36184,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_147
-#AT_START_148
-at_fn_group_banner 148 'owner.at:21' \
- "--owner and --group" " " 21
+#AT_STOP_158
+#AT_START_159
+at_fn_group_banner 159 'owner.at:21' \
+ "--owner and --group" " " 24
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "148. $at_setup_line: testing $at_desc ..."
+ $as_echo "159. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -35346,14 +36263,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_148
-#AT_START_149
-at_fn_group_banner 149 'map.at:21' \
- "--owner-map and --group-map" " " 21
+#AT_STOP_159
+#AT_START_160
+at_fn_group_banner 160 'map.at:21' \
+ "--owner-map and --group-map" " " 24
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "149. $at_setup_line: testing $at_desc ..."
+ $as_echo "160. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -35477,14 +36394,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_149
-#AT_START_150
-at_fn_group_banner 150 'sparse01.at:22' \
- "sparse files" " " 22
+#AT_STOP_160
+#AT_START_161
+at_fn_group_banner 161 'sparse01.at:21' \
+ "sparse files" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "150. $at_setup_line: testing $at_desc ..."
+ $as_echo "161. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -35492,7 +36409,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/sparse01.at:25:
+$as_echo "$at_srcdir/sparse01.at:24:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -35514,7 +36431,7 @@ tar Cxf directory archive --warning=no-timestamp
genfile --stat=name,size sparsefile
cmp sparsefile directory/sparsefile
)"
-at_fn_check_prepare_notrace 'an embedded newline' "sparse01.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "sparse01.at:24"
( $at_check_trace;
mkdir posix
(cd posix
@@ -35542,12 +36459,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/sparse01.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/sparse01.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/sparse01.at:25:
+$as_echo "$at_srcdir/sparse01.at:24:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -35569,7 +36486,7 @@ tar Cxf directory archive --warning=no-timestamp
genfile --stat=name,size sparsefile
cmp sparsefile directory/sparsefile
)"
-at_fn_check_prepare_notrace 'an embedded newline' "sparse01.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "sparse01.at:24"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -35597,12 +36514,12 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/sparse01.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/sparse01.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/sparse01.at:25:
+$as_echo "$at_srcdir/sparse01.at:24:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -35624,7 +36541,7 @@ tar Cxf directory archive --warning=no-timestamp
genfile --stat=name,size sparsefile
cmp sparsefile directory/sparsefile
)"
-at_fn_check_prepare_notrace 'an embedded newline' "sparse01.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "sparse01.at:24"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -35652,7 +36569,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/sparse01.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/sparse01.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -35681,14 +36598,14 @@ done
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_150
-#AT_START_151
-at_fn_group_banner 151 'sparse02.at:22' \
- "extracting sparse file over a pipe" " " 22
+#AT_STOP_161
+#AT_START_162
+at_fn_group_banner 162 'sparse02.at:21' \
+ "extracting sparse file over a pipe" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "151. $at_setup_line: testing $at_desc ..."
+ $as_echo "162. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -35700,7 +36617,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/sparse02.at:29:
+$as_echo "$at_srcdir/sparse02.at:28:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -35716,7 +36633,7 @@ echo separator
tar xfO archive | cat - > sparsecopy || exit 1
cmp sparsefile sparsecopy
)"
-at_fn_check_prepare_notrace 'an embedded newline' "sparse02.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "sparse02.at:28"
( $at_check_trace;
mkdir posix
(cd posix
@@ -35740,12 +36657,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "separator
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/sparse02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/sparse02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/sparse02.at:29:
+$as_echo "$at_srcdir/sparse02.at:28:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -35761,7 +36678,7 @@ echo separator
tar xfO archive | cat - > sparsecopy || exit 1
cmp sparsefile sparsecopy
)"
-at_fn_check_prepare_notrace 'an embedded newline' "sparse02.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "sparse02.at:28"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -35785,12 +36702,12 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "separator
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/sparse02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/sparse02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/sparse02.at:29:
+$as_echo "$at_srcdir/sparse02.at:28:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -35806,7 +36723,7 @@ echo separator
tar xfO archive | cat - > sparsecopy || exit 1
cmp sparsefile sparsecopy
)"
-at_fn_check_prepare_notrace 'an embedded newline' "sparse02.at:29"
+at_fn_check_prepare_notrace 'an embedded newline' "sparse02.at:28"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -35830,7 +36747,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "separator
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/sparse02.at:29"
+at_fn_check_status 0 $at_status "$at_srcdir/sparse02.at:28"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -35841,14 +36758,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_151
-#AT_START_152
-at_fn_group_banner 152 'sparse03.at:22' \
- "storing sparse files > 8G" " " 22
+#AT_STOP_162
+#AT_START_163
+at_fn_group_banner 163 'sparse03.at:21' \
+ "storing sparse files > 8G" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "152. $at_setup_line: testing $at_desc ..."
+ $as_echo "163. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -35861,7 +36778,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/sparse03.at:30:
+$as_echo "$at_srcdir/sparse03.at:29:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -35870,6 +36787,7 @@ TAR_OPTIONS=\"-H posix\"
export TAR_OPTIONS
rm -rf *
+test \"\${TARTEST_SKIP_LARGE_FILES:-0}\" != 0 && exit 77
genfile --length 1000 --file begin
genfile --length 1000 --file end
genfile --sparse --file sparsefile --block-size 512 8G A || exit 77
@@ -35883,7 +36801,7 @@ tar Cxf directory archive
genfile --stat=name,size sparsefile
cmp sparsefile directory/sparsefile
)"
-at_fn_check_prepare_notrace 'an embedded newline' "sparse03.at:30"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "sparse03.at:29"
( $at_check_trace;
mkdir posix
(cd posix
@@ -35893,6 +36811,7 @@ TAR_OPTIONS="-H posix"
export TAR_OPTIONS
rm -rf *
+test "${TARTEST_SKIP_LARGE_FILES:-0}" != 0 && exit 77
genfile --length 1000 --file begin
genfile --length 1000 --file end
genfile --sparse --file sparsefile --block-size 512 8G A || exit 77
@@ -35911,7 +36830,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/sparse03.at:30"
+at_fn_check_status 0 $at_status "$at_srcdir/sparse03.at:29"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -35940,14 +36859,14 @@ done
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_152
-#AT_START_153
-at_fn_group_banner 153 'sparse04.at:21' \
- "storing long sparse file names" " " 22
+#AT_STOP_163
+#AT_START_164
+at_fn_group_banner 164 'sparse04.at:21' \
+ "storing long sparse file names" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "153. $at_setup_line: testing $at_desc ..."
+ $as_echo "164. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -36009,14 +36928,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_153
-#AT_START_154
-at_fn_group_banner 154 'sparse05.at:21' \
- "listing sparse files bigger than 2^33 B" " " 22
+#AT_STOP_164
+#AT_START_165
+at_fn_group_banner 165 'sparse05.at:21' \
+ "listing sparse files bigger than 2^33 B" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "154. $at_setup_line: testing $at_desc ..."
+ $as_echo "165. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -36040,6 +36959,7 @@ TAR_OPTIONS=\"-H pax\"
export TAR_OPTIONS
rm -rf *
+test \"\${TARTEST_SKIP_LARGE_FILES:-0}\" != 0 && exit 77
cat >mapfile <<'_ATEOF'
0 =2560
10M =2560
@@ -37056,6 +37976,7 @@ TAR_OPTIONS="-H pax"
export TAR_OPTIONS
rm -rf *
+test "${TARTEST_SKIP_LARGE_FILES:-0}" != 0 && exit 77
cat >mapfile <<'_ATEOF'
0 =2560
10M =2560
@@ -38080,14 +39001,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_154
-#AT_START_155
-at_fn_group_banner 155 'sparse06.at:21' \
- "storing sparse file using seek method" " " 22
+#AT_STOP_165
+#AT_START_166
+at_fn_group_banner 166 'sparse06.at:21' \
+ "storing sparse file using seek method" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "155. $at_setup_line: testing $at_desc ..."
+ $as_echo "166. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -38256,14 +39177,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_155
-#AT_START_156
-at_fn_group_banner 156 'sparse07.at:21' \
- "sparse files with unicode names" " " 22
+#AT_STOP_166
+#AT_START_167
+at_fn_group_banner 167 'sparse07.at:21' \
+ "sparse files with unicode names" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "156. $at_setup_line: testing $at_desc ..."
+ $as_echo "167. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -38400,14 +39321,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_156
-#AT_START_157
-at_fn_group_banner 157 'sparsemv.at:22' \
- "sparse files in MV archives" " " 22
+#AT_STOP_167
+#AT_START_168
+at_fn_group_banner 168 'sparsemv.at:21' \
+ "sparse files in MV archives" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "157. $at_setup_line: testing $at_desc ..."
+ $as_echo "168. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -38422,7 +39343,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/sparsemv.at:32:
+$as_echo "$at_srcdir/sparsemv.at:31:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -38451,7 +39372,7 @@ tar --record-size=512 -t -M -f arc.1 -f arc.2
echo \"Compare archive\"
tar --record-size=512 -d -M -f arc.1 -f arc.2
)"
-at_fn_check_prepare_notrace 'an embedded newline' "sparsemv.at:32"
+at_fn_check_prepare_notrace 'an embedded newline' "sparsemv.at:31"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -38497,12 +39418,12 @@ sparsefile
Compare archive
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/sparsemv.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/sparsemv.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/sparsemv.at:32:
+$as_echo "$at_srcdir/sparsemv.at:31:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -38531,7 +39452,7 @@ tar --record-size=512 -t -M -f arc.1 -f arc.2
echo \"Compare archive\"
tar --record-size=512 -d -M -f arc.1 -f arc.2
)"
-at_fn_check_prepare_notrace 'an embedded newline' "sparsemv.at:32"
+at_fn_check_prepare_notrace 'an embedded newline' "sparsemv.at:31"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -38577,7 +39498,7 @@ sparsefile
Compare archive
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/sparsemv.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/sparsemv.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -38588,14 +39509,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_157
-#AT_START_158
-at_fn_group_banner 158 'spmvp00.at:22' \
- "sparse files in PAX MV archives, v.0.0" " " 22
+#AT_STOP_168
+#AT_START_169
+at_fn_group_banner 169 'spmvp00.at:21' \
+ "sparse files in PAX MV archives, v.0.0" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "158. $at_setup_line: testing $at_desc ..."
+ $as_echo "169. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -38604,7 +39525,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/spmvp00.at:25:
+$as_echo "$at_srcdir/spmvp00.at:24:
mkdir pax
(cd pax
TEST_TAR_FORMAT=pax
@@ -38633,7 +39554,7 @@ tar -t -M -f arc.1 -f arc.2 -f arc.3
echo \"Compare archive\"
tar -d -M -f arc.1 -f arc.2 -f arc.3
)"
-at_fn_check_prepare_notrace 'an embedded newline' "spmvp00.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "spmvp00.at:24"
( $at_check_trace;
mkdir pax
(cd pax
@@ -38679,7 +39600,7 @@ sparsefile
Compare archive
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/spmvp00.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/spmvp00.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -38690,14 +39611,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_158
-#AT_START_159
-at_fn_group_banner 159 'spmvp01.at:22' \
- "sparse files in PAX MV archives, v.0.1" " " 22
+#AT_STOP_169
+#AT_START_170
+at_fn_group_banner 170 'spmvp01.at:21' \
+ "sparse files in PAX MV archives, v.0.1" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "159. $at_setup_line: testing $at_desc ..."
+ $as_echo "170. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -38706,7 +39627,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/spmvp01.at:25:
+$as_echo "$at_srcdir/spmvp01.at:24:
mkdir pax
(cd pax
TEST_TAR_FORMAT=pax
@@ -38735,7 +39656,7 @@ tar -t -M -f arc.1 -f arc.2 -f arc.3
echo \"Compare archive\"
tar -d -M -f arc.1 -f arc.2 -f arc.3
)"
-at_fn_check_prepare_notrace 'an embedded newline' "spmvp01.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "spmvp01.at:24"
( $at_check_trace;
mkdir pax
(cd pax
@@ -38781,7 +39702,7 @@ sparsefile
Compare archive
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/spmvp01.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/spmvp01.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -38792,14 +39713,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_159
-#AT_START_160
-at_fn_group_banner 160 'spmvp10.at:22' \
- "sparse files in PAX MV archives, v.1.0" " " 22
+#AT_STOP_170
+#AT_START_171
+at_fn_group_banner 171 'spmvp10.at:21' \
+ "sparse files in PAX MV archives, v.1.0" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "160. $at_setup_line: testing $at_desc ..."
+ $as_echo "171. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -38808,7 +39729,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/spmvp10.at:25:
+$as_echo "$at_srcdir/spmvp10.at:24:
mkdir pax
(cd pax
TEST_TAR_FORMAT=pax
@@ -38837,7 +39758,7 @@ tar -t -M -f arc.1 -f arc.2 -f arc.3
echo \"Compare archive\"
tar -d -M -f arc.1 -f arc.2 -f arc.3
)"
-at_fn_check_prepare_notrace 'an embedded newline' "spmvp10.at:25"
+at_fn_check_prepare_notrace 'an embedded newline' "spmvp10.at:24"
( $at_check_trace;
mkdir pax
(cd pax
@@ -38883,7 +39804,7 @@ sparsefile
Compare archive
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/spmvp10.at:25"
+at_fn_check_status 0 $at_status "$at_srcdir/spmvp10.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -38894,22 +39815,585 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_160
-#AT_START_161
-at_fn_group_banner 161 'update.at:29' \
- "update unchanged directories" " " 23
+#AT_STOP_171
+#AT_START_172
+at_fn_group_banner 172 'sptrcreat.at:33' \
+ "sparse file truncated while archiving" " " 25
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "161. $at_setup_line: testing $at_desc ..."
+ $as_echo "172. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+
+
+ { set +x
+$as_echo "$at_srcdir/sptrcreat.at:36:
+mkdir posix
+(cd posix
+TEST_TAR_FORMAT=posix
+export TEST_TAR_FORMAT
+TAR_OPTIONS=\"-H posix\"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \\
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \\
+ tar --sparse -vcf bar foo baz
+echo Exit status: \$?
+echo separator
+genfile --file foo --seek 200m --length 11575296 --pattern=zeros
+tar dvf bar | sed '/foo: Mod time differs/d')"
+at_fn_check_prepare_notrace 'an embedded newline' "sptrcreat.at:36"
+( $at_check_trace;
+mkdir posix
+(cd posix
+TEST_TAR_FORMAT=posix
+export TEST_TAR_FORMAT
+TAR_OPTIONS="-H posix"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \
+ tar --sparse -vcf bar foo baz
+echo Exit status: $?
+echo separator
+genfile --file foo --seek 200m --length 11575296 --pattern=zeros
+tar dvf bar | sed '/foo: Mod time differs/d')
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "tar: foo: File shrank by 11575296 bytes; padding with zeros
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "foo
+baz
+Exit status: 1
+separator
+foo
+baz
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/sptrcreat.at:36"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ { set +x
+$as_echo "$at_srcdir/sptrcreat.at:36:
+mkdir gnu
+(cd gnu
+TEST_TAR_FORMAT=gnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS=\"-H gnu\"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \\
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \\
+ tar --sparse -vcf bar foo baz
+echo Exit status: \$?
+echo separator
+genfile --file foo --seek 200m --length 11575296 --pattern=zeros
+tar dvf bar | sed '/foo: Mod time differs/d')"
+at_fn_check_prepare_notrace 'an embedded newline' "sptrcreat.at:36"
+( $at_check_trace;
+mkdir gnu
+(cd gnu
+TEST_TAR_FORMAT=gnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS="-H gnu"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \
+ tar --sparse -vcf bar foo baz
+echo Exit status: $?
+echo separator
+genfile --file foo --seek 200m --length 11575296 --pattern=zeros
+tar dvf bar | sed '/foo: Mod time differs/d')
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "tar: foo: File shrank by 11575296 bytes; padding with zeros
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "foo
+baz
+Exit status: 1
+separator
+foo
+baz
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/sptrcreat.at:36"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ { set +x
+$as_echo "$at_srcdir/sptrcreat.at:36:
+mkdir oldgnu
+(cd oldgnu
+TEST_TAR_FORMAT=oldgnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS=\"-H oldgnu\"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \\
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \\
+ tar --sparse -vcf bar foo baz
+echo Exit status: \$?
+echo separator
+genfile --file foo --seek 200m --length 11575296 --pattern=zeros
+tar dvf bar | sed '/foo: Mod time differs/d')"
+at_fn_check_prepare_notrace 'an embedded newline' "sptrcreat.at:36"
+( $at_check_trace;
+mkdir oldgnu
+(cd oldgnu
+TEST_TAR_FORMAT=oldgnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS="-H oldgnu"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \
+ tar --sparse -vcf bar foo baz
+echo Exit status: $?
+echo separator
+genfile --file foo --seek 200m --length 11575296 --pattern=zeros
+tar dvf bar | sed '/foo: Mod time differs/d')
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "tar: foo: File shrank by 11575296 bytes; padding with zeros
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "foo
+baz
+Exit status: 1
+separator
+foo
+baz
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/sptrcreat.at:36"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_172
+#AT_START_173
+at_fn_group_banner 173 'sptrdiff00.at:26' \
+ "file truncated in sparse region while comparing" "" 25
+at_xfail=no
+ test -f $XFAILFILE && at_xfail=yes
+(
+ $as_echo "173. $at_setup_line: testing $at_desc ..."
$at_traceon
+# This triggers short read in check_sparse_region.
{ set +x
-$as_echo "$at_srcdir/update.at:32:
+$as_echo "$at_srcdir/sptrdiff00.at:30:
+mkdir posix
+(cd posix
+TEST_TAR_FORMAT=posix
+export TEST_TAR_FORMAT
+TAR_OPTIONS=\"-H posix\"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \\
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \\
+ tar --sparse -vdf bar
+)"
+at_fn_check_prepare_notrace 'an embedded newline' "sptrdiff00.at:30"
+( $at_check_trace;
+mkdir posix
+(cd posix
+TEST_TAR_FORMAT=posix
+export TEST_TAR_FORMAT
+TAR_OPTIONS="-H posix"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \
+ tar --sparse -vdf bar
+)
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "creating
+foo
+baz
+comparing
+foo
+foo: Size differs
+baz
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/sptrdiff00.at:30"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ { set +x
+$as_echo "$at_srcdir/sptrdiff00.at:30:
+mkdir gnu
+(cd gnu
+TEST_TAR_FORMAT=gnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS=\"-H gnu\"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \\
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \\
+ tar --sparse -vdf bar
+)"
+at_fn_check_prepare_notrace 'an embedded newline' "sptrdiff00.at:30"
+( $at_check_trace;
+mkdir gnu
+(cd gnu
+TEST_TAR_FORMAT=gnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS="-H gnu"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \
+ tar --sparse -vdf bar
+)
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "creating
+foo
+baz
+comparing
+foo
+foo: Size differs
+baz
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/sptrdiff00.at:30"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ { set +x
+$as_echo "$at_srcdir/sptrdiff00.at:30:
+mkdir oldgnu
+(cd oldgnu
+TEST_TAR_FORMAT=oldgnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS=\"-H oldgnu\"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \\
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \\
+ tar --sparse -vdf bar
+)"
+at_fn_check_prepare_notrace 'an embedded newline' "sptrdiff00.at:30"
+( $at_check_trace;
+mkdir oldgnu
+(cd oldgnu
+TEST_TAR_FORMAT=oldgnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS="-H oldgnu"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 3 --length 200m --truncate foo -- \
+ tar --sparse -vdf bar
+)
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "creating
+foo
+baz
+comparing
+foo
+foo: Size differs
+baz
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/sptrdiff00.at:30"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_173
+#AT_START_174
+at_fn_group_banner 174 'sptrdiff01.at:26' \
+ "file truncated in data region while comparing" " " 25
+at_xfail=no
+ test -f $XFAILFILE && at_xfail=yes
+(
+ $as_echo "174. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+# This triggers short read in check_data_region.
+
+
+ { set +x
+$as_echo "$at_srcdir/sptrdiff01.at:30:
+mkdir posix
+(cd posix
+TEST_TAR_FORMAT=posix
+export TEST_TAR_FORMAT
+TAR_OPTIONS=\"-H posix\"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \\
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 5 --length 221278210 --truncate foo -- \\
+ tar --sparse -vdf bar
+)"
+at_fn_check_prepare_notrace 'an embedded newline' "sptrdiff01.at:30"
+( $at_check_trace;
+mkdir posix
+(cd posix
+TEST_TAR_FORMAT=posix
+export TEST_TAR_FORMAT
+TAR_OPTIONS="-H posix"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 5 --length 221278210 --truncate foo -- \
+ tar --sparse -vdf bar
+)
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "creating
+foo
+baz
+comparing
+foo
+foo: Size differs
+baz
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/sptrdiff01.at:30"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ { set +x
+$as_echo "$at_srcdir/sptrdiff01.at:30:
+mkdir gnu
+(cd gnu
+TEST_TAR_FORMAT=gnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS=\"-H gnu\"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \\
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 5 --length 221278210 --truncate foo -- \\
+ tar --sparse -vdf bar
+)"
+at_fn_check_prepare_notrace 'an embedded newline' "sptrdiff01.at:30"
+( $at_check_trace;
+mkdir gnu
+(cd gnu
+TEST_TAR_FORMAT=gnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS="-H gnu"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 5 --length 221278210 --truncate foo -- \
+ tar --sparse -vdf bar
+)
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "creating
+foo
+baz
+comparing
+foo
+foo: Size differs
+baz
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/sptrdiff01.at:30"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ { set +x
+$as_echo "$at_srcdir/sptrdiff01.at:30:
+mkdir oldgnu
+(cd oldgnu
+TEST_TAR_FORMAT=oldgnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS=\"-H oldgnu\"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \\
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 5 --length 221278210 --truncate foo -- \\
+ tar --sparse -vdf bar
+)"
+at_fn_check_prepare_notrace 'an embedded newline' "sptrdiff01.at:30"
+( $at_check_trace;
+mkdir oldgnu
+(cd oldgnu
+TEST_TAR_FORMAT=oldgnu
+export TEST_TAR_FORMAT
+TAR_OPTIONS="-H oldgnu"
+export TAR_OPTIONS
+rm -rf *
+
+genfile --sparse --block-size=1024 --file foo \
+ 0 ABCDEFGHIJ 1M ABCDEFGHIJ 10M ABCDEFGHIJ 200M ABCDEFGHIJ
+genfile --file baz
+echo creating
+tar --sparse -vcf bar foo baz
+echo comparing
+genfile --run --checkpoint 5 --length 221278210 --truncate foo -- \
+ tar --sparse -vdf bar
+)
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "creating
+foo
+baz
+comparing
+foo
+foo: Size differs
+baz
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/sptrdiff01.at:30"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_174
+#AT_START_175
+at_fn_group_banner 175 'update.at:28' \
+ "update unchanged directories" " " 26
+at_xfail=no
+ test -f $XFAILFILE && at_xfail=yes
+(
+ $as_echo "175. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+
+
+ { set +x
+$as_echo "$at_srcdir/update.at:31:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -38931,7 +40415,7 @@ tar uf archive directory || exit 1
echo separator
tar tf archive | sort || exit 1
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:31"
( $at_check_trace;
mkdir v7
(cd v7
@@ -38965,12 +40449,12 @@ directory/file1
directory/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/update.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/update.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/update.at:32:
+$as_echo "$at_srcdir/update.at:31:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -38992,7 +40476,7 @@ tar uf archive directory || exit 1
echo separator
tar tf archive | sort || exit 1
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:31"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -39026,12 +40510,12 @@ directory/file1
directory/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/update.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/update.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/update.at:32:
+$as_echo "$at_srcdir/update.at:31:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -39053,7 +40537,7 @@ tar uf archive directory || exit 1
echo separator
tar tf archive | sort || exit 1
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:31"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -39087,12 +40571,12 @@ directory/file1
directory/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/update.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/update.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/update.at:32:
+$as_echo "$at_srcdir/update.at:31:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -39114,7 +40598,7 @@ tar uf archive directory || exit 1
echo separator
tar tf archive | sort || exit 1
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:31"
( $at_check_trace;
mkdir posix
(cd posix
@@ -39148,12 +40632,12 @@ directory/file1
directory/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/update.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/update.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/update.at:32:
+$as_echo "$at_srcdir/update.at:31:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -39175,7 +40659,7 @@ tar uf archive directory || exit 1
echo separator
tar tf archive | sort || exit 1
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:32"
+at_fn_check_prepare_notrace 'a `...` command substitution' "update.at:31"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -39209,7 +40693,7 @@ directory/file1
directory/file2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/update.at:32"
+at_fn_check_status 0 $at_status "$at_srcdir/update.at:31"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -39220,14 +40704,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_161
-#AT_START_162
-at_fn_group_banner 162 'update01.at:29' \
- "update directories" " " 23
+#AT_STOP_175
+#AT_START_176
+at_fn_group_banner 176 'update01.at:29' \
+ "update directories" " " 26
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "162. $at_setup_line: testing $at_desc ..."
+ $as_echo "176. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -39591,14 +41075,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_162
-#AT_START_163
-at_fn_group_banner 163 'update02.at:26' \
- "update changed files" " " 23
+#AT_STOP_176
+#AT_START_177
+at_fn_group_banner 177 'update02.at:26' \
+ "update changed files" " " 26
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "163. $at_setup_line: testing $at_desc ..."
+ $as_echo "177. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -39962,14 +41446,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_163
-#AT_START_164
-at_fn_group_banner 164 'update03.at:20' \
- "update with chdir" " " 23
+#AT_STOP_177
+#AT_START_178
+at_fn_group_banner 178 'update03.at:20' \
+ "update with chdir" " " 26
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "164. $at_setup_line: testing $at_desc ..."
+ $as_echo "178. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -40297,14 +41781,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_164
-#AT_START_165
-at_fn_group_banner 165 'verify.at:25' \
- "verify" " " 24
+#AT_STOP_178
+#AT_START_179
+at_fn_group_banner 179 'verify.at:25' \
+ "verify" " " 27
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "165. $at_setup_line: testing $at_desc ..."
+ $as_echo "179. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -40508,14 +41992,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_165
-#AT_START_166
-at_fn_group_banner 166 'volume.at:24' \
- "volume" " " 25
+#AT_STOP_179
+#AT_START_180
+at_fn_group_banner 180 'volume.at:23' \
+ "volume" " " 28
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "166. $at_setup_line: testing $at_desc ..."
+ $as_echo "180. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -40523,7 +42007,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/volume.at:27:
+$as_echo "$at_srcdir/volume.at:26:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -40548,7 +42032,7 @@ echo 1>&2 -----
tar xfV archive babel
test \$? = 2
)"
-at_fn_check_prepare_notrace 'an embedded newline' "volume.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "volume.at:26"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -40589,12 +42073,12 @@ tar: Error is not recoverable: exiting now
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/volume.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/volume.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/volume.at:27:
+$as_echo "$at_srcdir/volume.at:26:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -40619,7 +42103,7 @@ echo 1>&2 -----
tar xfV archive babel
test \$? = 2
)"
-at_fn_check_prepare_notrace 'an embedded newline' "volume.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "volume.at:26"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -40660,7 +42144,7 @@ tar: Error is not recoverable: exiting now
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/volume.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/volume.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -40671,14 +42155,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_166
-#AT_START_167
-at_fn_group_banner 167 'volsize.at:30' \
- "volume header size" " " 25
+#AT_STOP_180
+#AT_START_181
+at_fn_group_banner 181 'volsize.at:29' \
+ "volume header size" " " 28
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "167. $at_setup_line: testing $at_desc ..."
+ $as_echo "181. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -40686,7 +42170,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/volsize.at:33:
+$as_echo "$at_srcdir/volsize.at:32:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -40710,7 +42194,7 @@ echo Extracted directory
tar xf \$TEST_DATA_DIR/abc.tar
find abc|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:33"
+at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:32"
( $at_check_trace;
mkdir v7
(cd v7
@@ -40750,12 +42234,12 @@ abc
abc/CCC
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/volsize.at:33:
+$as_echo "$at_srcdir/volsize.at:32:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -40779,7 +42263,7 @@ echo Extracted directory
tar xf \$TEST_DATA_DIR/abc.tar
find abc|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:33"
+at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:32"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -40819,12 +42303,12 @@ abc
abc/CCC
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/volsize.at:33:
+$as_echo "$at_srcdir/volsize.at:32:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -40848,7 +42332,7 @@ echo Extracted directory
tar xf \$TEST_DATA_DIR/abc.tar
find abc|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:33"
+at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:32"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -40888,12 +42372,12 @@ abc
abc/CCC
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/volsize.at:33:
+$as_echo "$at_srcdir/volsize.at:32:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -40917,7 +42401,7 @@ echo Extracted directory
tar xf \$TEST_DATA_DIR/abc.tar
find abc|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:33"
+at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:32"
( $at_check_trace;
mkdir posix
(cd posix
@@ -40957,12 +42441,12 @@ abc
abc/CCC
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/volsize.at:33:
+$as_echo "$at_srcdir/volsize.at:32:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -40986,7 +42470,7 @@ echo Extracted directory
tar xf \$TEST_DATA_DIR/abc.tar
find abc|sort
)"
-at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:33"
+at_fn_check_prepare_notrace 'a `...` command substitution' "volsize.at:32"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -41026,7 +42510,7 @@ abc
abc/CCC
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/volsize.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -41037,14 +42521,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_167
-#AT_START_168
-at_fn_group_banner 168 'comprec.at:22' \
- "compressed format recognition" " " 26
+#AT_STOP_181
+#AT_START_182
+at_fn_group_banner 182 'comprec.at:21' \
+ "compressed format recognition" " " 29
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "168. $at_setup_line: testing $at_desc ..."
+ $as_echo "182. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -41053,7 +42537,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/comprec.at:26:
+$as_echo "$at_srcdir/comprec.at:25:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -41073,7 +42557,7 @@ mv file1 orig
tar xfv archive --warning=no-timestamp
cmp orig file1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:26"
+at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:25"
( $at_check_trace;
mkdir v7
(cd v7
@@ -41103,12 +42587,12 @@ separator
file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:26"
+at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:25"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/comprec.at:26:
+$as_echo "$at_srcdir/comprec.at:25:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -41128,7 +42612,7 @@ mv file1 orig
tar xfv archive --warning=no-timestamp
cmp orig file1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:26"
+at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:25"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -41158,12 +42642,12 @@ separator
file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:26"
+at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:25"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/comprec.at:26:
+$as_echo "$at_srcdir/comprec.at:25:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -41183,7 +42667,7 @@ mv file1 orig
tar xfv archive --warning=no-timestamp
cmp orig file1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:26"
+at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:25"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -41213,12 +42697,12 @@ separator
file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:26"
+at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:25"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/comprec.at:26:
+$as_echo "$at_srcdir/comprec.at:25:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -41238,7 +42722,7 @@ mv file1 orig
tar xfv archive --warning=no-timestamp
cmp orig file1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:26"
+at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:25"
( $at_check_trace;
mkdir posix
(cd posix
@@ -41268,12 +42752,12 @@ separator
file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:26"
+at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:25"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/comprec.at:26:
+$as_echo "$at_srcdir/comprec.at:25:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -41293,7 +42777,7 @@ mv file1 orig
tar xfv archive --warning=no-timestamp
cmp orig file1
)"
-at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:26"
+at_fn_check_prepare_notrace 'an embedded newline' "comprec.at:25"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -41323,7 +42807,7 @@ separator
file1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:26"
+at_fn_check_status 0 $at_status "$at_srcdir/comprec.at:25"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -41334,14 +42818,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_168
-#AT_START_169
-at_fn_group_banner 169 'shortfile.at:26' \
- "short input files" " " 26
+#AT_STOP_182
+#AT_START_183
+at_fn_group_banner 183 'shortfile.at:26' \
+ "short input files" " " 29
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "169. $at_setup_line: testing $at_desc ..."
+ $as_echo "183. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -41393,14 +42877,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_169
-#AT_START_170
-at_fn_group_banner 170 'shortupd.at:31' \
- "updating short archives" " " 26
+#AT_STOP_183
+#AT_START_184
+at_fn_group_banner 184 'shortupd.at:31' \
+ "updating short archives" " " 29
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "170. $at_setup_line: testing $at_desc ..."
+ $as_echo "184. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -41589,14 +43073,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_170
-#AT_START_171
-at_fn_group_banner 171 'truncate.at:30' \
- "truncate" " " 26
+#AT_STOP_184
+#AT_START_185
+at_fn_group_banner 185 'truncate.at:29' \
+ "truncate" " " 29
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "171. $at_setup_line: testing $at_desc ..."
+ $as_echo "185. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -41604,7 +43088,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/truncate.at:33:
+$as_echo "$at_srcdir/truncate.at:32:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -41615,12 +43099,13 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \\
+ tar -vcf bar foo baz
echo Exit status: \$?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)"
-at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:33"
+tar dvf bar|sed '/foo: Mod time differs/d')"
+at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:32"
( $at_check_trace;
mkdir v7
(cd v7
@@ -41632,11 +43117,12 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \
+ tar -vcf bar foo baz
echo Exit status: $?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)
+tar dvf bar|sed '/foo: Mod time differs/d')
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
@@ -41648,16 +43134,15 @@ baz
Exit status: 1
separator
foo
-foo: Mod time differs
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/truncate.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/truncate.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/truncate.at:33:
+$as_echo "$at_srcdir/truncate.at:32:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -41668,12 +43153,13 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \\
+ tar -vcf bar foo baz
echo Exit status: \$?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)"
-at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:33"
+tar dvf bar|sed '/foo: Mod time differs/d')"
+at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:32"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -41685,11 +43171,12 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \
+ tar -vcf bar foo baz
echo Exit status: $?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)
+tar dvf bar|sed '/foo: Mod time differs/d')
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
@@ -41701,16 +43188,15 @@ baz
Exit status: 1
separator
foo
-foo: Mod time differs
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/truncate.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/truncate.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/truncate.at:33:
+$as_echo "$at_srcdir/truncate.at:32:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -41721,12 +43207,13 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \\
+ tar -vcf bar foo baz
echo Exit status: \$?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)"
-at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:33"
+tar dvf bar|sed '/foo: Mod time differs/d')"
+at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:32"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -41738,11 +43225,12 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \
+ tar -vcf bar foo baz
echo Exit status: $?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)
+tar dvf bar|sed '/foo: Mod time differs/d')
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
@@ -41754,16 +43242,15 @@ baz
Exit status: 1
separator
foo
-foo: Mod time differs
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/truncate.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/truncate.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/truncate.at:33:
+$as_echo "$at_srcdir/truncate.at:32:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -41774,12 +43261,13 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \\
+ tar -vcf bar foo baz
echo Exit status: \$?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)"
-at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:33"
+tar dvf bar|sed '/foo: Mod time differs/d')"
+at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:32"
( $at_check_trace;
mkdir posix
(cd posix
@@ -41791,11 +43279,12 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \
+ tar -vcf bar foo baz
echo Exit status: $?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)
+tar dvf bar|sed '/foo: Mod time differs/d')
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
@@ -41807,16 +43296,15 @@ baz
Exit status: 1
separator
foo
-foo: Mod time differs
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/truncate.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/truncate.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/truncate.at:33:
+$as_echo "$at_srcdir/truncate.at:32:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -41827,12 +43315,13 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \\
+ tar -vcf bar foo baz
echo Exit status: \$?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)"
-at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:33"
+tar dvf bar|sed '/foo: Mod time differs/d')"
+at_fn_check_prepare_notrace 'an embedded newline' "truncate.at:32"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -41844,11 +43333,12 @@ rm -rf *
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \
+ tar -vcf bar foo baz
echo Exit status: $?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar)
+tar dvf bar|sed '/foo: Mod time differs/d')
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
@@ -41860,11 +43350,10 @@ baz
Exit status: 1
separator
foo
-foo: Mod time differs
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/truncate.at:33"
+at_fn_check_status 0 $at_status "$at_srcdir/truncate.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -41875,14 +43364,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_171
-#AT_START_172
-at_fn_group_banner 172 'grow.at:25' \
- "grow" " " 26
+#AT_STOP_185
+#AT_START_186
+at_fn_group_banner 186 'grow.at:24' \
+ "grow" " " 29
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "172. $at_setup_line: testing $at_desc ..."
+ $as_echo "186. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -41890,7 +43379,7 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/grow.at:28:
+$as_echo "$at_srcdir/grow.at:27:
mkdir v7
(cd v7
TEST_TAR_FORMAT=v7
@@ -41901,9 +43390,9 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)"
-at_fn_check_prepare_notrace 'an embedded newline' "grow.at:28"
+at_fn_check_prepare_notrace 'an embedded newline' "grow.at:27"
( $at_check_trace;
mkdir v7
(cd v7
@@ -41915,7 +43404,7 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -41927,12 +43416,12 @@ echo >>"$at_stdout"; $as_echo "foo
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/grow.at:28"
+at_fn_check_status 1 $at_status "$at_srcdir/grow.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/grow.at:28:
+$as_echo "$at_srcdir/grow.at:27:
mkdir oldgnu
(cd oldgnu
TEST_TAR_FORMAT=oldgnu
@@ -41943,9 +43432,9 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)"
-at_fn_check_prepare_notrace 'an embedded newline' "grow.at:28"
+at_fn_check_prepare_notrace 'an embedded newline' "grow.at:27"
( $at_check_trace;
mkdir oldgnu
(cd oldgnu
@@ -41957,7 +43446,7 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -41969,12 +43458,12 @@ echo >>"$at_stdout"; $as_echo "foo
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/grow.at:28"
+at_fn_check_status 1 $at_status "$at_srcdir/grow.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/grow.at:28:
+$as_echo "$at_srcdir/grow.at:27:
mkdir ustar
(cd ustar
TEST_TAR_FORMAT=ustar
@@ -41985,9 +43474,9 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)"
-at_fn_check_prepare_notrace 'an embedded newline' "grow.at:28"
+at_fn_check_prepare_notrace 'an embedded newline' "grow.at:27"
( $at_check_trace;
mkdir ustar
(cd ustar
@@ -41999,7 +43488,7 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -42011,12 +43500,12 @@ echo >>"$at_stdout"; $as_echo "foo
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/grow.at:28"
+at_fn_check_status 1 $at_status "$at_srcdir/grow.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/grow.at:28:
+$as_echo "$at_srcdir/grow.at:27:
mkdir posix
(cd posix
TEST_TAR_FORMAT=posix
@@ -42027,9 +43516,9 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)"
-at_fn_check_prepare_notrace 'an embedded newline' "grow.at:28"
+at_fn_check_prepare_notrace 'an embedded newline' "grow.at:27"
( $at_check_trace;
mkdir posix
(cd posix
@@ -42041,7 +43530,7 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -42053,12 +43542,12 @@ echo >>"$at_stdout"; $as_echo "foo
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/grow.at:28"
+at_fn_check_status 1 $at_status "$at_srcdir/grow.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/grow.at:28:
+$as_echo "$at_srcdir/grow.at:27:
mkdir gnu
(cd gnu
TEST_TAR_FORMAT=gnu
@@ -42069,9 +43558,9 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)"
-at_fn_check_prepare_notrace 'an embedded newline' "grow.at:28"
+at_fn_check_prepare_notrace 'an embedded newline' "grow.at:27"
( $at_check_trace;
mkdir gnu
(cd gnu
@@ -42083,7 +43572,7 @@ rm -rf *
genfile --file foo --length 50000k
genfile --file baz
-genfile --run --checkpoint 10 --length 1024 --append foo -- tar --checkpoint -vcf bar foo baz
+genfile --run=10 --checkpoint 10 --length 1024 --append foo -- tar -vcf bar foo baz
)
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -42095,7 +43584,7 @@ echo >>"$at_stdout"; $as_echo "foo
baz
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/grow.at:28"
+at_fn_check_status 1 $at_status "$at_srcdir/grow.at:27"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -42106,13 +43595,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_172
-#AT_START_173
-at_fn_group_banner 173 'sigpipe.at:21' \
- "sigpipe handling" " " 26
+#AT_STOP_186
+#AT_START_187
+at_fn_group_banner 187 'sigpipe.at:21' \
+ "sigpipe handling" " " 29
at_xfail=no
(
- $as_echo "173. $at_setup_line: testing $at_desc ..."
+ $as_echo "187. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -42171,14 +43660,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_173
-#AT_START_174
-at_fn_group_banner 174 'comperr.at:18' \
- "compressor program failure" " " 26
+#AT_STOP_187
+#AT_START_188
+at_fn_group_banner 188 'comperr.at:18' \
+ "compressor program failure" " " 29
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "174. $at_setup_line: testing $at_desc ..."
+ $as_echo "188. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -42404,13 +43893,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_174
-#AT_START_175
-at_fn_group_banner 175 'remfiles01.at:28' \
- "remove-files with compression" " " 27
+#AT_STOP_188
+#AT_START_189
+at_fn_group_banner 189 'remfiles01.at:28' \
+ "remove-files with compression" " " 30
at_xfail=no
(
- $as_echo "175. $at_setup_line: testing $at_desc ..."
+ $as_echo "189. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -42530,13 +44019,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_175
-#AT_START_176
-at_fn_group_banner 176 'remfiles02.at:28' \
- "remove-files with compression: grand-child" " " 27
+#AT_STOP_189
+#AT_START_190
+at_fn_group_banner 190 'remfiles02.at:28' \
+ "remove-files with compression: grand-child" " " 30
at_xfail=no
(
- $as_echo "176. $at_setup_line: testing $at_desc ..."
+ $as_echo "190. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -42608,13 +44097,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_176
-#AT_START_177
-at_fn_group_banner 177 'remfiles03.at:28' \
- "remove-files with symbolic links" " " 27
+#AT_STOP_190
+#AT_START_191
+at_fn_group_banner 191 'remfiles03.at:28' \
+ "remove-files with symbolic links" " " 30
at_xfail=no
(
- $as_echo "177. $at_setup_line: testing $at_desc ..."
+ $as_echo "191. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -42651,14 +44140,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_177
-#AT_START_178
-at_fn_group_banner 178 'remfiles04a.at:25' \
- "remove-files with -C:rel in -c/non-incr. mode" " " 27
+#AT_STOP_191
+#AT_START_192
+at_fn_group_banner 192 'remfiles04a.at:25' \
+ "remove-files with -C:rel in -c/non-incr. mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "178. $at_setup_line: testing $at_desc ..."
+ $as_echo "192. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -42727,14 +44216,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_178
-#AT_START_179
-at_fn_group_banner 179 'remfiles04b.at:33' \
- "remove-files with -C:rel in -c/incr. mode" " " 27
+#AT_STOP_192
+#AT_START_193
+at_fn_group_banner 193 'remfiles04b.at:33' \
+ "remove-files with -C:rel in -c/incr. mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "179. $at_setup_line: testing $at_desc ..."
+ $as_echo "193. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -42803,14 +44292,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_179
-#AT_START_180
-at_fn_group_banner 180 'remfiles04c.at:33' \
- "remove-files with -C:rel in -r mode" " " 27
+#AT_STOP_193
+#AT_START_194
+at_fn_group_banner 194 'remfiles04c.at:33' \
+ "remove-files with -C:rel in -r mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "180. $at_setup_line: testing $at_desc ..."
+ $as_echo "194. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -42891,14 +44380,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_180
-#AT_START_181
-at_fn_group_banner 181 'remfiles05a.at:34' \
- "remove-files with -C:rel,rel in -c/non-incr. mode" "" 27
+#AT_STOP_194
+#AT_START_195
+at_fn_group_banner 195 'remfiles05a.at:34' \
+ "remove-files with -C:rel,rel in -c/non-incr. mode" "" 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "181. $at_setup_line: testing $at_desc ..."
+ $as_echo "195. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -42980,14 +44469,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_181
-#AT_START_182
-at_fn_group_banner 182 'remfiles05b.at:25' \
- "remove-files with -C:rel,rel in -c/incr. mode" " " 27
+#AT_STOP_195
+#AT_START_196
+at_fn_group_banner 196 'remfiles05b.at:25' \
+ "remove-files with -C:rel,rel in -c/incr. mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "182. $at_setup_line: testing $at_desc ..."
+ $as_echo "196. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43069,14 +44558,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_182
-#AT_START_183
-at_fn_group_banner 183 'remfiles05c.at:25' \
- "remove-files with -C:rel,rel in -r mode" " " 27
+#AT_STOP_196
+#AT_START_197
+at_fn_group_banner 197 'remfiles05c.at:25' \
+ "remove-files with -C:rel,rel in -r mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "183. $at_setup_line: testing $at_desc ..."
+ $as_echo "197. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43173,14 +44662,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_183
-#AT_START_184
-at_fn_group_banner 184 'remfiles06a.at:25' \
- "remove-files with -C:rel,abs in -c/non-incr. mode" "" 27
+#AT_STOP_197
+#AT_START_198
+at_fn_group_banner 198 'remfiles06a.at:25' \
+ "remove-files with -C:rel,abs in -c/non-incr. mode" "" 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "184. $at_setup_line: testing $at_desc ..."
+ $as_echo "198. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43264,14 +44753,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_184
-#AT_START_185
-at_fn_group_banner 185 'remfiles06b.at:25' \
- "remove-files with -C:rel,abs in -c/incr. mode" " " 27
+#AT_STOP_198
+#AT_START_199
+at_fn_group_banner 199 'remfiles06b.at:25' \
+ "remove-files with -C:rel,abs in -c/incr. mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "185. $at_setup_line: testing $at_desc ..."
+ $as_echo "199. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43355,14 +44844,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_185
-#AT_START_186
-at_fn_group_banner 186 'remfiles06c.at:25' \
- "remove-files with -C:rel,abs in -r mode" " " 27
+#AT_STOP_199
+#AT_START_200
+at_fn_group_banner 200 'remfiles06c.at:25' \
+ "remove-files with -C:rel,abs in -r mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "186. $at_setup_line: testing $at_desc ..."
+ $as_echo "200. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43461,14 +44950,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_186
-#AT_START_187
-at_fn_group_banner 187 'remfiles07a.at:25' \
- "remove-files with -C:abs,rel in -c/non-incr. mode" "" 27
+#AT_STOP_200
+#AT_START_201
+at_fn_group_banner 201 'remfiles07a.at:25' \
+ "remove-files with -C:abs,rel in -c/non-incr. mode" "" 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "187. $at_setup_line: testing $at_desc ..."
+ $as_echo "201. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43552,14 +45041,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_187
-#AT_START_188
-at_fn_group_banner 188 'remfiles07b.at:25' \
- "remove-files with -C:abs,rel in -c/incr. mode" " " 27
+#AT_STOP_201
+#AT_START_202
+at_fn_group_banner 202 'remfiles07b.at:25' \
+ "remove-files with -C:abs,rel in -c/incr. mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "188. $at_setup_line: testing $at_desc ..."
+ $as_echo "202. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43643,14 +45132,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_188
-#AT_START_189
-at_fn_group_banner 189 'remfiles07c.at:25' \
- "remove-files with -C:abs,rel in -r mode" " " 27
+#AT_STOP_202
+#AT_START_203
+at_fn_group_banner 203 'remfiles07c.at:25' \
+ "remove-files with -C:abs,rel in -r mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "189. $at_setup_line: testing $at_desc ..."
+ $as_echo "203. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43749,14 +45238,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_189
-#AT_START_190
-at_fn_group_banner 190 'remfiles08a.at:28' \
- "remove-files deleting two subdirs in -c/non-incr. mode" "" 27
+#AT_STOP_203
+#AT_START_204
+at_fn_group_banner 204 'remfiles08a.at:28' \
+ "remove-files deleting two subdirs in -c/non-incr. mode" "" 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "190. $at_setup_line: testing $at_desc ..."
+ $as_echo "204. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43829,14 +45318,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_190
-#AT_START_191
-at_fn_group_banner 191 'remfiles08b.at:31' \
- "remove-files deleting two subdirs in -c/incr. mode" "" 27
+#AT_STOP_204
+#AT_START_205
+at_fn_group_banner 205 'remfiles08b.at:31' \
+ "remove-files deleting two subdirs in -c/incr. mode" "" 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "191. $at_setup_line: testing $at_desc ..."
+ $as_echo "205. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -43911,14 +45400,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_191
-#AT_START_192
-at_fn_group_banner 192 'remfiles08c.at:28' \
- "remove-files deleting two subdirs in -r mode" " " 27
+#AT_STOP_205
+#AT_START_206
+at_fn_group_banner 206 'remfiles08c.at:28' \
+ "remove-files deleting two subdirs in -r mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "192. $at_setup_line: testing $at_desc ..."
+ $as_echo "206. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -44011,14 +45500,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_192
-#AT_START_193
-at_fn_group_banner 193 'remfiles09a.at:25' \
- "remove-files on full directory in -c/non-incr. mode" "" 27
+#AT_STOP_206
+#AT_START_207
+at_fn_group_banner 207 'remfiles09a.at:25' \
+ "remove-files on full directory in -c/non-incr. mode" "" 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "193. $at_setup_line: testing $at_desc ..."
+ $as_echo "207. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -44085,14 +45574,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_193
-#AT_START_194
-at_fn_group_banner 194 'remfiles09b.at:29' \
- "remove-files on full directory in -c/incr. mode" "" 27
+#AT_STOP_207
+#AT_START_208
+at_fn_group_banner 208 'remfiles09b.at:29' \
+ "remove-files on full directory in -c/incr. mode" "" 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "194. $at_setup_line: testing $at_desc ..."
+ $as_echo "208. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -44160,14 +45649,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_194
-#AT_START_195
-at_fn_group_banner 195 'remfiles09c.at:25' \
- "remove-files on full directory in -r mode" " " 27
+#AT_STOP_208
+#AT_START_209
+at_fn_group_banner 209 'remfiles09c.at:25' \
+ "remove-files on full directory in -r mode" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "195. $at_setup_line: testing $at_desc ..."
+ $as_echo "209. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -44252,14 +45741,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_195
-#AT_START_196
-at_fn_group_banner 196 'remfiles10.at:20' \
- "remove-files" " " 27
+#AT_STOP_209
+#AT_START_210
+at_fn_group_banner 210 'remfiles10.at:20' \
+ "remove-files" " " 30
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "196. $at_setup_line: testing $at_desc ..."
+ $as_echo "210. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -44331,14 +45820,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_196
-#AT_START_197
-at_fn_group_banner 197 'xattr01.at:25' \
- "xattrs: basic functionality" " " 28
+#AT_STOP_210
+#AT_START_211
+at_fn_group_banner 211 'xattr01.at:25' \
+ "xattrs: basic functionality" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "197. $at_setup_line: testing $at_desc ..."
+ $as_echo "211. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -44892,14 +46381,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_197
-#AT_START_198
-at_fn_group_banner 198 'xattr02.at:25' \
- "xattrs: change directory with -C option" " " 28
+#AT_STOP_211
+#AT_START_212
+at_fn_group_banner 212 'xattr02.at:25' \
+ "xattrs: change directory with -C option" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "198. $at_setup_line: testing $at_desc ..."
+ $as_echo "212. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -45528,14 +47017,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_198
-#AT_START_199
-at_fn_group_banner 199 'xattr03.at:25' \
- "xattrs: trusted.* attributes" " " 28
+#AT_STOP_212
+#AT_START_213
+at_fn_group_banner 213 'xattr03.at:25' \
+ "xattrs: trusted.* attributes" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "199. $at_setup_line: testing $at_desc ..."
+ $as_echo "213. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -46244,14 +47733,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_199
-#AT_START_200
-at_fn_group_banner 200 'xattr04.at:26' \
- "xattrs: s/open/openat/ regression" " " 28
+#AT_STOP_213
+#AT_START_214
+at_fn_group_banner 214 'xattr04.at:26' \
+ "xattrs: s/open/openat/ regression" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "200. $at_setup_line: testing $at_desc ..."
+ $as_echo "214. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -46810,14 +48299,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_200
-#AT_START_201
-at_fn_group_banner 201 'xattr05.at:28' \
- "xattrs: keywords with '=' and '%'" " " 28
+#AT_STOP_214
+#AT_START_215
+at_fn_group_banner 215 'xattr05.at:28' \
+ "xattrs: keywords with '=' and '%'" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "201. $at_setup_line: testing $at_desc ..."
+ $as_echo "215. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -47366,14 +48855,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_201
-#AT_START_202
-at_fn_group_banner 202 'xattr06.at:27' \
- "xattrs: exclude xattrs on create " " " 28
+#AT_STOP_215
+#AT_START_216
+at_fn_group_banner 216 'xattr06.at:27' \
+ "xattrs: exclude xattrs on create " " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "202. $at_setup_line: testing $at_desc ..."
+ $as_echo "216. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -47982,14 +49471,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_202
-#AT_START_203
-at_fn_group_banner 203 'xattr07.at:26' \
- "xattrs: xattrs and --skip-old-files" " " 28
+#AT_STOP_216
+#AT_START_217
+at_fn_group_banner 217 'xattr07.at:26' \
+ "xattrs: xattrs and --skip-old-files" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "203. $at_setup_line: testing $at_desc ..."
+ $as_echo "217. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -48703,14 +50192,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_203
-#AT_START_204
-at_fn_group_banner 204 'acls01.at:25' \
- "acls: basic functionality" " " 28
+#AT_STOP_217
+#AT_START_218
+at_fn_group_banner 218 'acls01.at:25' \
+ "acls: basic functionality" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "204. $at_setup_line: testing $at_desc ..."
+ $as_echo "218. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -49469,14 +50958,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_204
-#AT_START_205
-at_fn_group_banner 205 'acls02.at:25' \
- "acls: work with -C" " " 28
+#AT_STOP_218
+#AT_START_219
+at_fn_group_banner 219 'acls02.at:25' \
+ "acls: work with -C" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "205. $at_setup_line: testing $at_desc ..."
+ $as_echo "219. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -50295,14 +51784,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_205
-#AT_START_206
-at_fn_group_banner 206 'acls03.at:30' \
- "acls: default ACLs" " " 28
+#AT_STOP_219
+#AT_START_220
+at_fn_group_banner 220 'acls03.at:30' \
+ "acls: default ACLs" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "206. $at_setup_line: testing $at_desc ..."
+ $as_echo "220. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -52545,14 +54034,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_206
-#AT_START_207
-at_fn_group_banner 207 'selnx01.at:25' \
- "selinux: basic store/restore" " " 28
+#AT_STOP_220
+#AT_START_221
+at_fn_group_banner 221 'selnx01.at:25' \
+ "selinux: basic store/restore" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "207. $at_setup_line: testing $at_desc ..."
+ $as_echo "221. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -53721,14 +55210,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_207
-#AT_START_208
-at_fn_group_banner 208 'selacl01.at:25' \
- "acls/selinux: special files & fifos" " " 28
+#AT_STOP_221
+#AT_START_222
+at_fn_group_banner 222 'selacl01.at:25' \
+ "acls/selinux: special files & fifos" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "208. $at_setup_line: testing $at_desc ..."
+ $as_echo "222. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -54887,14 +56376,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_208
-#AT_START_209
-at_fn_group_banner 209 'capabs_raw01.at:25' \
- "capabilities: binary store/restore" " " 28
+#AT_STOP_222
+#AT_START_223
+at_fn_group_banner 223 'capabs_raw01.at:25' \
+ "capabilities: binary store/restore" " " 31
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "209. $at_setup_line: testing $at_desc ..."
+ $as_echo "223. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -55713,14 +57202,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_209
-#AT_START_210
-at_fn_group_banner 210 'onetop01.at:21' \
- "tar --one-top-level" " " 29
+#AT_STOP_223
+#AT_START_224
+at_fn_group_banner 224 'onetop01.at:21' \
+ "tar --one-top-level" " " 32
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "210. $at_setup_line: testing $at_desc ..."
+ $as_echo "224. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -56024,14 +57513,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_210
-#AT_START_211
-at_fn_group_banner 211 'onetop02.at:21' \
- "tar --one-top-level --show-transformed" " " 29
+#AT_STOP_224
+#AT_START_225
+at_fn_group_banner 225 'onetop02.at:21' \
+ "tar --one-top-level --show-transformed" " " 32
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "211. $at_setup_line: testing $at_desc ..."
+ $as_echo "225. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -56350,14 +57839,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_211
-#AT_START_212
-at_fn_group_banner 212 'onetop03.at:21' \
- "tar --one-top-level --transform" " " 29
+#AT_STOP_225
+#AT_START_226
+at_fn_group_banner 226 'onetop03.at:21' \
+ "tar --one-top-level --transform" " " 32
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "212. $at_setup_line: testing $at_desc ..."
+ $as_echo "226. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -56661,14 +58150,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_212
-#AT_START_213
-at_fn_group_banner 213 'onetop04.at:21' \
- "tar --one-top-level --transform" " " 29
+#AT_STOP_226
+#AT_START_227
+at_fn_group_banner 227 'onetop04.at:21' \
+ "tar --one-top-level --transform" " " 32
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "213. $at_setup_line: testing $at_desc ..."
+ $as_echo "227. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -56937,14 +58426,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_213
-#AT_START_214
-at_fn_group_banner 214 'onetop05.at:21' \
- "tar --one-top-level restoring permissions" " " 29
+#AT_STOP_227
+#AT_START_228
+at_fn_group_banner 228 'onetop05.at:21' \
+ "tar --one-top-level restoring permissions" " " 32
at_xfail=no
test -f $XFAILFILE && at_xfail=yes
(
- $as_echo "214. $at_setup_line: testing $at_desc ..."
+ $as_echo "228. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -57507,13 +58996,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_214
-#AT_START_215
-at_fn_group_banner 215 'gtarfail.at:22' \
- "gtarfail" " " 30
+#AT_STOP_228
+#AT_START_229
+at_fn_group_banner 229 'gtarfail.at:21' \
+ "gtarfail" " " 33
at_xfail=no
(
- $as_echo "215. $at_setup_line: testing $at_desc ..."
+ $as_echo "229. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -57521,7 +59010,7 @@ at_xfail=no
unset TAR_OPTIONS
{ set +x
-$as_echo "$at_srcdir/gtarfail.at:27:
+$as_echo "$at_srcdir/gtarfail.at:26:
test -z \"\$STAR_TESTSCRIPTS\" && exit 77
tarball_prereq gtarfail.tar bf7612e401aaa679edbb07ae1183811b \$STAR_TESTSCRIPTS \$STAR_DATA_URL || exit 77
@@ -57529,7 +59018,7 @@ tarball_prereq gtarfail.tar bf7612e401aaa679edbb07ae1183811b \$STAR_TESTSCRIPTS
tar --utc -tvf \$STAR_TESTSCRIPTS/gtarfail.tar
"
-at_fn_check_prepare_notrace 'an embedded newline' "gtarfail.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "gtarfail.at:26"
( $at_check_trace;
test -z "$STAR_TESTSCRIPTS" && exit 77
@@ -57550,7 +59039,7 @@ echo >>"$at_stdout"; $as_echo "-rw-r--r-- jes/glone 518 2001-05-25 14:41 v
-rw-rw-rw- jes/glone 148753 1998-09-15 13:08 billyboy.jpg
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/gtarfail.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/gtarfail.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -57559,13 +59048,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_215
-#AT_START_216
-at_fn_group_banner 216 'gtarfail2.at:22' \
- "gtarfail2" " " 30
+#AT_STOP_229
+#AT_START_230
+at_fn_group_banner 230 'gtarfail2.at:21' \
+ "gtarfail2" " " 33
at_xfail=no
(
- $as_echo "216. $at_setup_line: testing $at_desc ..."
+ $as_echo "230. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -57573,14 +59062,14 @@ at_xfail=no
unset TAR_OPTIONS
{ set +x
-$as_echo "$at_srcdir/gtarfail2.at:27:
+$as_echo "$at_srcdir/gtarfail2.at:26:
test -z \"\$STAR_TESTSCRIPTS\" && exit 77
tarball_prereq gtarfail2.tar 6b607d1faec14b82f69525d9c5b66e53 \$STAR_TESTSCRIPTS \$STAR_DATA_URL || exit 77
tar --utc -tvf \$STAR_TESTSCRIPTS/gtarfail2.tar
"
-at_fn_check_prepare_notrace 'an embedded newline' "gtarfail2.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "gtarfail2.at:26"
( $at_check_trace;
test -z "$STAR_TESTSCRIPTS" && exit 77
@@ -57604,7 +59093,7 @@ lrwxrwxrwx jes/glone 0 2001-08-29 10:53 build/psmake/archconf.c -> ../ar
lrwxrwxrwx jes/glone 0 2001-08-29 10:54 build/psmake/astoi.c -> ../../lib/astoi.c
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/gtarfail2.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/gtarfail2.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -57613,13 +59102,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_216
-#AT_START_217
-at_fn_group_banner 217 'multi-fail.at:22' \
- "multi-fail" " " 30
+#AT_STOP_230
+#AT_START_231
+at_fn_group_banner 231 'multi-fail.at:21' \
+ "multi-fail" " " 33
at_xfail=no
(
- $as_echo "217. $at_setup_line: testing $at_desc ..."
+ $as_echo "231. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -57627,7 +59116,7 @@ at_xfail=no
unset TAR_OPTIONS
{ set +x
-$as_echo "$at_srcdir/multi-fail.at:27:
+$as_echo "$at_srcdir/multi-fail.at:26:
test -z \"\$STAR_TESTSCRIPTS\" && exit 77
tarball_prereq gnu-multi-fail-volume1.gtar 7c28663dd98b0bd91ceb4be7af55254e \$STAR_TESTSCRIPTS \$STAR_DATA_URL || exit 77
@@ -57640,7 +59129,7 @@ tarball_prereq gnu-multi-fail-volume2.gtar b5d41c4c3ec440687d4a44957b5079a8 \$ST
tar --utc -tvM -f \$STAR_TESTSCRIPTS/gnu-multi-fail-volume1.gtar \\
-f \$STAR_TESTSCRIPTS/gnu-multi-fail-volume2.gtar <&-
"
-at_fn_check_prepare_notrace 'an embedded newline' "multi-fail.at:27"
+at_fn_check_prepare_notrace 'an embedded newline' "multi-fail.at:26"
( $at_check_trace;
test -z "$STAR_TESTSCRIPTS" && exit 77
@@ -57712,7 +59201,7 @@ echo >>"$at_stdout"; $as_echo "drwxrwsr-x joerg/bs 0 2003-10-11 14:32 O
-rw-r--r-- joerg/bs 2756 2003-10-07 17:53 OBJ/i386-sunos5-gcc/table.o
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/multi-fail.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/multi-fail.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -57721,13 +59210,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_217
-#AT_START_218
-at_fn_group_banner 218 'ustar-big-2g.at:22' \
- "ustar-big-2g" " " 30
+#AT_STOP_231
+#AT_START_232
+at_fn_group_banner 232 'ustar-big-2g.at:21' \
+ "ustar-big-2g" " " 33
at_xfail=no
(
- $as_echo "218. $at_setup_line: testing $at_desc ..."
+ $as_echo "232. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -57735,7 +59224,8 @@ at_xfail=no
unset TAR_OPTIONS
{ set +x
-$as_echo "$at_srcdir/ustar-big-2g.at:27:
+$as_echo "$at_srcdir/ustar-big-2g.at:26:
+test \"\${TARTEST_SKIP_LARGE_FILES:-0}\" != 0 && exit 77
cat /dev/null | bzip2 - > /dev/null 2>&1 || exit 77
@@ -57746,8 +59236,9 @@ tarball_prereq ustar-big-2g.tar.bz2 b63979733629c8fcdf40b60065422767 \$STAR_TEST
tar --utc -tvjf \$STAR_TESTSCRIPTS/ustar-big-2g.tar.bz2
"
-at_fn_check_prepare_notrace 'an embedded newline' "ustar-big-2g.at:27"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ustar-big-2g.at:26"
( $at_check_trace;
+test "${TARTEST_SKIP_LARGE_FILES:-0}" != 0 && exit 77
cat /dev/null | bzip2 - > /dev/null 2>&1 || exit 77
@@ -57766,7 +59257,7 @@ echo >>"$at_stdout"; $as_echo "-rw------- jes/glone 2147483647 2002-06-15 14:53
-rw-r--r-- jes/glone 0 2002-06-15 14:53 file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ustar-big-2g.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/ustar-big-2g.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -57788,13 +59279,13 @@ done
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_218
-#AT_START_219
-at_fn_group_banner 219 'ustar-big-8g.at:22' \
- "ustar-big-8g" " " 30
+#AT_STOP_232
+#AT_START_233
+at_fn_group_banner 233 'ustar-big-8g.at:21' \
+ "ustar-big-8g" " " 33
at_xfail=no
(
- $as_echo "219. $at_setup_line: testing $at_desc ..."
+ $as_echo "233. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -57802,7 +59293,8 @@ at_xfail=no
unset TAR_OPTIONS
{ set +x
-$as_echo "$at_srcdir/ustar-big-8g.at:27:
+$as_echo "$at_srcdir/ustar-big-8g.at:26:
+test \"\${TARTEST_SKIP_LARGE_FILES:-0}\" != 0 && exit 77
cat /dev/null | bzip2 - > /dev/null 2>&1 || exit 77
@@ -57813,8 +59305,9 @@ tarball_prereq ustar-big-8g.tar.bz2 60ff503fa4b8288bef7ada89e9c91b0f \$STAR_TEST
tar --utc -tvjf \$STAR_TESTSCRIPTS/ustar-big-8g.tar.bz2
"
-at_fn_check_prepare_notrace 'an embedded newline' "ustar-big-8g.at:27"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ustar-big-8g.at:26"
( $at_check_trace;
+test "${TARTEST_SKIP_LARGE_FILES:-0}" != 0 && exit 77
cat /dev/null | bzip2 - > /dev/null 2>&1 || exit 77
@@ -57833,7 +59326,7 @@ echo >>"$at_stdout"; $as_echo "-rw------- jes/glone 8589934591 2002-06-15 15:08
-rw-r--r-- jes/glone 0 2002-06-15 14:53 file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ustar-big-8g.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/ustar-big-8g.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -57855,13 +59348,13 @@ done
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_219
-#AT_START_220
-at_fn_group_banner 220 'pax-big-10g.at:22' \
- "pax-big-10g" " " 30
+#AT_STOP_233
+#AT_START_234
+at_fn_group_banner 234 'pax-big-10g.at:21' \
+ "pax-big-10g" " " 33
at_xfail=no
(
- $as_echo "220. $at_setup_line: testing $at_desc ..."
+ $as_echo "234. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -57869,7 +59362,8 @@ at_xfail=no
unset TAR_OPTIONS
{ set +x
-$as_echo "$at_srcdir/pax-big-10g.at:27:
+$as_echo "$at_srcdir/pax-big-10g.at:26:
+test \"\${TARTEST_SKIP_LARGE_FILES:-0}\" != 0 && exit 77
cat /dev/null | bzip2 - > /dev/null 2>&1 || exit 77
@@ -57880,8 +59374,9 @@ tarball_prereq pax-big-10g.tar.bz2 ca15c23acc8d8bb1f27e60113a5f8bff \$STAR_TESTS
tar --utc -tvjf \$STAR_TESTSCRIPTS/pax-big-10g.tar.bz2
"
-at_fn_check_prepare_notrace 'an embedded newline' "pax-big-10g.at:27"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "pax-big-10g.at:26"
( $at_check_trace;
+test "${TARTEST_SKIP_LARGE_FILES:-0}" != 0 && exit 77
cat /dev/null | bzip2 - > /dev/null 2>&1 || exit 77
@@ -57900,7 +59395,7 @@ echo >>"$at_stdout"; $as_echo "-rw------- jes/glone 10737418240 2002-06-15 21:18
-rw-r--r-- jes/glone 0 2002-06-15 14:53 file
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/pax-big-10g.at:27"
+at_fn_check_status 0 $at_status "$at_srcdir/pax-big-10g.at:26"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -57922,4 +59417,4 @@ done
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_220
+#AT_STOP_234
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 2a83757667c7e39a562d3a9f44c8a7e4585dd17f..6b804d58358cf9e28ecfb8d229701d614762ac44 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004-2008, 2010-2017 Free Software Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -60,6 +60,8 @@ done
m4_define([AT_SKIP_TEST],[exit 77])
+m4_define([AT_SKIP_LARGE_FILES],[test "${TARTEST_SKIP_LARGE_FILES:-0}" != 0 && AT_SKIP_TEST])
+
dnl AT_TARBALL_PREREQ(tarball, md5sum) - Check if test tarball exists
dnl in $TEST_DATA_DIR. If it does not, try to download it from
dnl $TEST_DATA_URL. If download fails, or it the file's md5 sum does not
@@ -202,6 +204,7 @@ m4_include([version.at])
m4_include([pipe.at])
+AT_BANNER([Options])
m4_include([options.at])
m4_include([options02.at])
m4_include([options03.at])
@@ -214,6 +217,36 @@ m4_include([opcomp04.at])
m4_include([opcomp05.at])
m4_include([opcomp06.at])
+AT_BANNER([Checkpoints])
+m4_pushdef([CPT_CHECK],
+[AT_CHECK([
+mkdir t
+cd t
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+ genfile --length 10240 --file $i
+done
+TAR_OPTIONS=-Hgnu
+export TAR_OPTIONS
+$1
+],m4_shift($@))])
+m4_include([checkpoint/defaults.at])
+m4_include([checkpoint/interval.at])
+m4_include([checkpoint/dot.at])
+m4_include([checkpoint/dot-compat.at])
+m4_include([checkpoint/dot-int.at])
+m4_popdef([CPT_CHECK])
+
+AT_BANNER([Compression])
+m4_include([compress.m4])
+TAR_CHECK_COMPRESS(gzip, gz, tgz)
+TAR_CHECK_COMPRESS(bzip2, bz2, tbz2)
+TAR_CHECK_COMPRESS(xz, xz, txz)
+dnl: omit lzma, because it would fail due to magic number mismatch
+TAR_CHECK_COMPRESS(lzip, lz)
+TAR_CHECK_COMPRESS(lzop, lzo)
+TAR_CHECK_COMPRESS(zstd, zst, tzst)
+
AT_BANNER([Positional options])
m4_include([positional01.at])
m4_include([positional02.at])
@@ -405,6 +438,9 @@ m4_include([sparsemv.at])
m4_include([spmvp00.at])
m4_include([spmvp01.at])
m4_include([spmvp10.at])
+m4_include([sptrcreat.at])
+m4_include([sptrdiff00.at])
+m4_include([sptrdiff01.at])
AT_BANNER([Updates])
m4_include([update.at])
@@ -488,4 +524,3 @@ m4_include([star/ustar-big-2g.at])
m4_include([star/ustar-big-8g.at])
m4_include([star/pax-big-10g.at])
-
diff --git a/tests/time01.at b/tests/time01.at
index 5846ad07c2b5ca3a922f4f9c95f5e1a6d2e81a2f..758c6013d15520b41211b738fe28bf051bbb809b 100644
--- a/tests/time01.at
+++ b/tests/time01.at
@@ -1,6 +1,6 @@
# Test time stamps for GNU tar. -*- Autotest -*-
#
-# Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2012-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/time02.at b/tests/time02.at
index 5285b9efa3ceda882b7bde0209555fe13ebdfdcd..be6c600b36774d07df0a721b788956209dd0dda8 100644
--- a/tests/time02.at
+++ b/tests/time02.at
@@ -1,6 +1,6 @@
# Test clamping mtime GNU tar. -*- Autotest -*-
#
-# Copyright 2016-2017 Free Software Foundation, Inc.
+# Copyright 2016-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/truncate.at b/tests/truncate.at
index a743e4b796efe52b9906bfb713ac1e619593224a..823545d8173e415e4d9573a283f6cacbef3206c2 100644
--- a/tests/truncate.at
+++ b/tests/truncate.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005, 2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
@@ -33,18 +32,18 @@ AT_KEYWORDS([truncate filechange])
AT_TAR_CHECK([
genfile --file foo --length 200k
genfile --file baz
-genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz
+genfile --run --checkpoint 10 --length 195k --truncate foo -- \
+ tar -vcf bar foo baz
echo Exit status: $?
echo separator
genfile --file foo --seek 195k --length 5k --pattern=zeros
-tar dvf bar],
-[1],
+tar dvf bar|sed '/foo: Mod time differs/d'],
+[0],
[foo
baz
Exit status: 1
separator
foo
-foo: Mod time differs
baz
],
[tar: foo: File shrank by 5120 bytes; padding with zeros
diff --git a/tests/update.at b/tests/update.at
index 95a3bd1c9defa21ba66b08b1dba7b329ceacb8f0..5ea5373d7e36ef1821dd3e1af0bdd0526c09c16a 100644
--- a/tests/update.at
+++ b/tests/update.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2005-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2005-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/update01.at b/tests/update01.at
index 9a2f5b015f52dfcadc1ded66b7956d64f822ed3b..0bdea89832c729e58d6565b5a240e327662fb309 100644
--- a/tests/update01.at
+++ b/tests/update01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/update02.at b/tests/update02.at
index 43e90dc1166f97ecf674c499a4ec9b4a01310c4f..b8cddafc623feb8123ea70fd0ab83932a6e140e3 100644
--- a/tests/update02.at
+++ b/tests/update02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/update03.at b/tests/update03.at
index 1171581a43b4857ef780f1a02e6edd8c2f3b3123..192134f45158aa56a19c88491c860c22a5882914 100644
--- a/tests/update03.at
+++ b/tests/update03.at
@@ -1,6 +1,6 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2016-2017 Free Software Foundation, Inc.
+# Copyright 2016-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
diff --git a/tests/verbose.at b/tests/verbose.at
index 82da8827c8146c49ec7900b23d64df2007555063..ea7d1bebe709b4e8ac79d4f0ad55b3f3c5c0cd6c 100644
--- a/tests/verbose.at
+++ b/tests/verbose.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2007, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/verify.at b/tests/verify.at
index b3503522b4c3cb4dca1f3ef53a288b3bf4cdd851..2590c79710a2aaebb630f2826ffad01851491475 100644
--- a/tests/verify.at
+++ b/tests/verify.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/version.at b/tests/version.at
index 2d49752334650ccc7b8fdf024169b4cbf4931f24..c166307d3e400c0ff5c8214668e775722f94fe76 100644
--- a/tests/version.at
+++ b/tests/version.at
@@ -1,6 +1,5 @@
# Checking tar version -*- Autotest -*-
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/volsize.at b/tests/volsize.at
index 9587cb0a79ffaeeca5ef0f1d28859f27ca6dc172..764a781006aebfa14aff3ab52e911a8117e8c8e8 100644
--- a/tests/volsize.at
+++ b/tests/volsize.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2006-2009, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2006-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/volume.at b/tests/volume.at
index e7c12aca302e9c60a2a40323067637a365bb925b..0cc8987d0c49ef7a7e1cb3b616905b2f5c15cb2d 100644
--- a/tests/volume.at
+++ b/tests/volume.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2004, 2006-2007, 2013-2014, 2016-2017 Free Software
-# Foundation, Inc.
+# Copyright 2004-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xattr01.at b/tests/xattr01.at
index a53d3d0d386c3a2059c6afc9c714aea468a758fe..2276d7c8e67a669723628ff962646f789159ef25 100644
--- a/tests/xattr01.at
+++ b/tests/xattr01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2011, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2011-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xattr02.at b/tests/xattr02.at
index c0ea1943600702f28a198561a836c4c03f7ea114..4dc5efa2671a66a8f44413c844a3c1243df0d2f5 100644
--- a/tests/xattr02.at
+++ b/tests/xattr02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2011, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2011-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xattr03.at b/tests/xattr03.at
index b637705b1dbae009c9fcdb2ab3731c0253386392..71d2486760dc267065d4c34f314123b93eb5e497 100644
--- a/tests/xattr03.at
+++ b/tests/xattr03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2012-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xattr04.at b/tests/xattr04.at
index d9dc201abb16c0ac8bfa494de321dd0f637f5891..520ddce4ba2c1d8a7c400a8751f0e79ce8e943df 100644
--- a/tests/xattr04.at
+++ b/tests/xattr04.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2012-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xattr05.at b/tests/xattr05.at
index 462bd32841d9b5e92d6861486f9eb2bca15ee38e..6c2762b1820c25cb84ceadf239520084cc08f1d5 100644
--- a/tests/xattr05.at
+++ b/tests/xattr05.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2012-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xattr06.at b/tests/xattr06.at
index c314fcfc102450cdf14c3ab4271e2f75f3959abe..7ecf9d39ffff901a328b27e3cd8d95854727fa1a 100644
--- a/tests/xattr06.at
+++ b/tests/xattr06.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2012-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2012-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xattr07.at b/tests/xattr07.at
index 3a97118dcdf26eae55ecc78e4a74618527192131..f7f3a6d4ff4f1308f931fcb59576ea551a15c42f 100644
--- a/tests/xattr07.at
+++ b/tests/xattr07.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2011, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2011-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xform-h.at b/tests/xform-h.at
index 3ca2b32e4f2d2f660ab428e7a36b69d4101fdb24..8729dbf8e759b0c5186225fe460e0bc16f50abd0 100644
--- a/tests/xform-h.at
+++ b/tests/xform-h.at
@@ -1,8 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009-2010, 2013-2014, 2016-2017 Free Software Foundation,
-# Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xform01.at b/tests/xform01.at
index 83a3e55178533cdaf946f790a20a11721f48ff24..6f4d3bac5af7ec1ce967837654db2cc5c52f1348 100644
--- a/tests/xform01.at
+++ b/tests/xform01.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2010, 2013-2014, 2016-2017 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xform02.at b/tests/xform02.at
index e7ea1a03e7f941341072256dc19549bb94c5918c..85d1df57592c7d00016def174dcf351231c71469 100644
--- a/tests/xform02.at
+++ b/tests/xform02.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright 2009-2010, 2013-2017 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
# This file is part of GNU tar.
diff --git a/tests/xform03.at b/tests/xform03.at
index 47f52f148fe8e1a4d2d356a9438e571fff227c6f..e8f358c0971aa432941f6cc7ec344554b04c5626 100644
--- a/tests/xform03.at
+++ b/tests/xform03.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
#
# Test suite for GNU tar.
-# Copyright 2017 Free Software Foundation, Inc.
+# Copyright 2017-2019 Free Software Foundation, Inc.
#
# This file is part of GNU tar.
#
@@ -21,12 +21,14 @@
AT_SETUP([transforming hard link targets])
AT_KEYWORDS([transform xform link])
-AT_TAR_CHECK([
+AT_TAR_WITH_HOOK(
+[AT_CHECK([sed "/tar: Removing leading \`\/*\/' from/d" stderr])],
+[AT_TAR_CHECK([
mkdir d
mkdir d/a
genfile --file d/a/b
-dir=$(pwd|sed s,^/,,)/d
-tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b
+dir=$(pwd|sed s,^//*,,)/d
+tar -cf a.tar --xform="s|^$dir/a|dir/c|" /$dir/a/b /$dir/a/b 2>err
mkdir t
tar -C t -xf a.tar
find t -type f
@@ -34,8 +36,6 @@ find t -type f
[0],
[t/dir/c/b
],
-[tar: Removing leading `/' from member names
-tar: Removing leading `/' from hard link targets
-])
+[stderr])])
AT_CLEANUP