diff -Nru xz-utils-5.6.0/AUTHORS xz-utils-5.6.1+really5.4.5/AUTHORS --- xz-utils-5.6.0/AUTHORS 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/AUTHORS 2023-10-31 14:24:02.000000000 +0000 @@ -9,13 +9,15 @@ specifically the LZMA SDK . Without this code, XZ Utils wouldn't exist. - The SHA-256 implementation in liblzma is based on code written by - Wei Dai in Crypto++ Library . - - A few scripts have been adapted from GNU gzip. The original - versions were written by Jean-loup Gailly, Charles Levert, and - Paul Eggert. Andrew Dudman helped adapting the scripts and their - man pages for XZ Utils. + The SHA-256 implementation in liblzma is based on the code found from + 7-Zip , which has a modified version of the SHA-256 + code found from Crypto++ . The SHA-256 code + in Crypto++ was written by Kevin Springle and Wei Dai. + + Some scripts have been adapted from gzip. The original versions + were written by Jean-loup Gailly, Charles Levert, and Paul Eggert. + Andrew Dudman helped adapting the scripts and their man pages for + XZ Utils. The initial version of the threaded .xz decompressor was written by Sebastian Andrzej Siewior. @@ -23,31 +25,15 @@ The initial version of the .lz (lzip) decoder was written by Michał Górny. - Architecture-specific CRC optimizations were contributed by - Ilya Kurdyukov, Hans Jansen, and Chenxi Mao. + CLMUL-accelerated CRC code was contributed by Ilya Kurdyukov. Other authors: - Jonathan Nieder - Joachim Henke - Many people have contributed improvements or reported bugs. - Most of these people are mentioned in the file THANKS. - - The translations of the command line tools and man pages have been - contributed by many people via the Translation Project: - - - https://translationproject.org/domain/xz.html - - https://translationproject.org/domain/xz-man.html - - The authors of the translated man pages are in the header comments - of the man page files. In the source package, the authors of the - translations are in po/*.po and po4a/*.po files. - - Third-party code whose authors aren't listed here: - - - GNU getopt_long() in the 'lib' directory is included for - platforms that don't have a usable getopt_long(). + The GNU Autotools-based build system contains files from many authors, + which I'm not trying to list here. - - The build system files from GNU Autoconf, GNU Automake, - GNU Libtool, GNU Gettext, Autoconf Archive, and related files. + Several people have contributed fixes or reported bugs. Most of them + are mentioned in the file THANKS. diff -Nru xz-utils-5.6.0/CMakeLists.txt xz-utils-5.6.1+really5.4.5/CMakeLists.txt --- xz-utils-5.6.0/CMakeLists.txt 2024-02-24 08:21:29.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/CMakeLists.txt 2023-11-01 12:19:29.000000000 +0000 @@ -1,84 +1,32 @@ -# SPDX-License-Identifier: 0BSD - ############################################################################# # -# CMake support for building XZ Utils -# -# The complete CMake-based build hasn't been tested much yet and -# thus it's still slightly experimental. Testing this especially -# outside GNU/Linux and Windows would be great now. -# -# A few things are still missing compared to the Autotools-based build: -# -# - A few tests aren't CMake compatible yet and thus aren't run! -# -# - 32-bit x86 assembly code for CRC32 and CRC64 isn't used. -# -# - External SHA-256 code isn't supported but it's disabled by -# default in the Autotools build too (--enable-external-sha256). -# -# - Extra compiler warning flags aren't added by default. -# -# About CMAKE_BUILD_TYPE: -# -# - CMake's standard choices are fine to use for production builds, -# including "Release" and "RelWithDebInfo". -# -# NOTE: While "Release" uses -O3 by default with some compilers, -# this file overrides -O3 to -O2 for "Release" builds if -# CMAKE_C_FLAGS_RELEASE is not defined by the user. At least -# with GCC and Clang/LLVM, -O3 doesn't seem useful for this -# package as it can result in bigger binaries without any -# improvement in speed compared to -O2. -# -# - Empty value (the default) is handled slightly specially: It -# adds -DNDEBUG to disable debugging code (assert() and a few -# other things). No optimization flags are added so an empty -# CMAKE_BUILD_TYPE is an easy way to build with whatever -# optimization flags one wants, and so this method is also -# suitable for production builds. -# -# If debugging is wanted when using empty CMAKE_BUILD_TYPE, -# include -UNDEBUG in the CFLAGS environment variable or -# in the CMAKE_C_FLAGS CMake variable to override -DNDEBUG. -# With empty CMAKE_BUILD_TYPE, the -UNDEBUG option will go -# after the -DNDEBUG option on the compiler command line and -# thus NDEBUG will be undefined. +# Very limited CMake support for building some parts of XZ Utils # -# - Non-standard build types like "None" aren't treated specially -# and thus won't have -DNEBUG. Such non-standard build types -# SHOULD BE AVOIDED FOR PRODUCTION BUILDS. Or at least one -# should remember to add -DNDEBUG. -# -# If building from xz.git instead of a release tarball, consider -# the following *before* running cmake: -# -# - To get translated messages, install GNU gettext tools (the -# command msgfmt is needed). Alternatively disable translations -# by setting ENABLE_NLS=OFF. -# -# - To get translated man pages, run po4a/update-po which requires -# the po4a tool. The build works without this step too. -# -# - To get Doxygen-generated liblzma API docs in HTML format, -# run doxygen/update-doxygen which requires the doxygen tool. -# The build works without this step too. +# For now, this is intended to be useful to build static or shared liblzma +# on Windows with MSVC (to avoid the need to maintain Visual Studio project +# files). Building liblzma on a few other platforms should work too but it +# is somewhat experimental and not as portable as using ./configure. +# +# On some platforms this builds also xz and xzdec, but these are +# highly experimental and meant for testing only: +# - No replacement getopt_long(), libc must have it +# - No sandboxing support +# - No translations +# +# Other missing things: +# - No xzgrep or other scripts or their symlinks +# - No xz tests (liblzma tests only) +# +# NOTE: Even if the code compiles without warnings, the end result may be +# different than via ./configure. Specifically, the list of #defines +# may be different (if so, probably this CMakeLists.txt got them wrong). # # This file provides the following installation components (if you only # need liblzma, install only its components!): -# - liblzma_Runtime (shared library only) +# - liblzma_Runtime # - liblzma_Development -# - liblzma_Documentation (examples and Doxygen-generated API docs as HTML) -# - xz_Runtime (xz, the symlinks, and possibly translation files) -# - xz_Documentation (xz man pages and the symlinks) -# - xzdec_Runtime -# - xzdec_Documentation (xzdec *and* lzmadec man pages) -# - lzmadec_Runtime -# - lzmainfo_Runtime -# - lzmainfo_Documentation (lzmainfo man pages) -# - scripts_Runtime (xzdiff, xzgrep, xzless, xzmore) -# - scripts_Documentation (their man pages) -# - Documentation (generic docs like README and licenses) +# - xz (on some platforms only) +# - xzdec (on some platforms only) # # To find the target liblzma::liblzma from other packages, use the CONFIG # option with find_package() to avoid a conflict with the FindLibLZMA module @@ -92,10 +40,12 @@ # # Author: Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################# -# NOTE: Translation support is disabled with CMake older than 3.20. -cmake_minimum_required(VERSION 3.14...3.28 FATAL_ERROR) +cmake_minimum_required(VERSION 3.13...3.27 FATAL_ERROR) include(CMakePushCheckState) include(CheckIncludeFile) @@ -111,7 +61,7 @@ set(PACKAGE_NAME "XZ Utils") set(PACKAGE_BUGREPORT "xz@tukaani.org") -set(PACKAGE_URL "https://xz.tukaani.org/xz-utils/") +set(PACKAGE_URL "https://tukaani.org/xz/") # Get the package version from version.h into PACKAGE_VERSION variable. file(READ src/liblzma/api/lzma/version.h PACKAGE_VERSION) @@ -125,28 +75,9 @@ .*$" "\\1.\\2.\\3" PACKAGE_VERSION "${PACKAGE_VERSION}") -# With several compilers, CMAKE_BUILD_TYPE=Release uses -O3 optimization -# which results in bigger code without a clear difference in speed. If -# no user-defined CMAKE_C_FLAGS_RELEASE is present, override -O3 to -O2 -# to make it possible to recommend CMAKE_BUILD_TYPE=Release. -if(NOT DEFINED CMAKE_C_FLAGS_RELEASE) - set(OVERRIDE_O3_IN_C_FLAGS_RELEASE ON) -endif() - # Among other things, this gives us variables xz_VERSION and xz_VERSION_MAJOR. project(xz VERSION "${PACKAGE_VERSION}" LANGUAGES C) -if(OVERRIDE_O3_IN_C_FLAGS_RELEASE) - # Looking at CMake's source, there aren't any _FLAGS_RELEASE_INIT - # entries where "-O3" would appear as part of some other option, - # thus a simple search and replace should be fine. - string(REPLACE -O3 -O2 CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") - - # Update the cache value while keeping its docstring unchanged. - set_property(CACHE CMAKE_C_FLAGS_RELEASE - PROPERTY VALUE "${CMAKE_C_FLAGS_RELEASE}") -endif() - # We need a compiler that supports enough C99 or newer (variable-length arrays # aren't needed, those are optional in C17). Setting CMAKE_C_STANDARD here # makes it the default for all targets. It doesn't affect the INTERFACE so @@ -158,10 +89,6 @@ # On Apple OSes, don't build executables as bundles: set(CMAKE_MACOSX_BUNDLE OFF) -# Set CMAKE_INSTALL_LIBDIR and friends. This needs to be done before -# the LOCALEDIR_DEFINITION workaround below. -include(GNUInstallDirs) - # windres from GNU binutils can be tricky with command line arguments # that contain spaces or other funny characters. Unfortunately we need # a space in PACKAGE_NAME. Using \x20 to encode the US-ASCII space seems @@ -189,15 +116,10 @@ # Keep the original PACKAGE_NAME intact for generation of liblzma.pc. string(APPEND CMAKE_RC_FLAGS " --use-temp-file") string(REPLACE " " "\\x20" PACKAGE_NAME_DEFINITION "${PACKAGE_NAME}") - - # Use octal because "Program Files" would become \x20F. - string(REPLACE " " "\\040" LOCALEDIR_DEFINITION - "${CMAKE_INSTALL_FULL_LOCALEDIR}") else() # Elsewhere a space is safe. This also keeps things compatible with # EBCDIC in case CMake-based build is ever done on such a system. set(PACKAGE_NAME_DEFINITION "${PACKAGE_NAME}") - set(LOCALEDIR_DEFINITION "${CMAKE_INSTALL_FULL_LOCALEDIR}") endif() # Definitions common to all targets: @@ -243,46 +165,32 @@ # Check for clock_gettime(). Do this before checking for threading so # that we know there if CLOCK_MONOTONIC is available. -check_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME) +if(NOT WIN32) + check_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME) -if(NOT HAVE_CLOCK_GETTIME) - # With glibc <= 2.17 or Solaris 10 this needs librt. - # Add librt for the next check for HAVE_CLOCK_GETTIME. If it is - # found after including the library, we know that librt is required. - list(INSERT CMAKE_REQUIRED_LIBRARIES 0 rt) - check_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME_LIBRT) - - # If it was found now, add librt to all targets and keep it in - # CMAKE_REQUIRED_LIBRARIES for further tests too. - if(HAVE_CLOCK_GETTIME_LIBRT) - link_libraries(rt) - set(LIBS "-lrt") # For liblzma.pc - else() - list(REMOVE_AT CMAKE_REQUIRED_LIBRARIES 0) + if(NOT HAVE_CLOCK_GETTIME) + # With glibc <= 2.17 or Solaris 10 this needs librt. + # Add librt for the next check for HAVE_CLOCK_GETTIME. If it is + # found after including the library, we know that librt is required. + list(INSERT CMAKE_REQUIRED_LIBRARIES 0 rt) + check_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME_LIBRT) + + # If it was found now, add librt to all targets and keep it in + # CMAKE_REQUIRED_LIBRARIES for further tests too. + if(HAVE_CLOCK_GETTIME_LIBRT) + link_libraries(rt) + set(LIBS "-lrt") # For liblzma.pc + else() + list(REMOVE_AT CMAKE_REQUIRED_LIBRARIES 0) + endif() endif() -endif() - -if(HAVE_CLOCK_GETTIME OR HAVE_CLOCK_GETTIME_LIBRT) - add_compile_definitions(HAVE_CLOCK_GETTIME) - - # Check if CLOCK_MONOTONIC is available for clock_gettime(). - check_symbol_exists(CLOCK_MONOTONIC time.h HAVE_CLOCK_MONOTONIC) - tuklib_add_definition_if(ALL HAVE_CLOCK_MONOTONIC) -endif() -# Translation support requires CMake 3.20 because it added the Intl::Intl -# target so we don't need to play with the individual variables. -# -# The defintion ENABLE_NLS is added only to those targets that use it, thus -# it's not done here. (xz has translations, xzdec doesn't.) -if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20") - find_package(Intl) - find_package(Gettext) - if(Intl_FOUND) - option(ENABLE_NLS "Native Language Support (translated messages)" ON) + if(HAVE_CLOCK_GETTIME OR HAVE_CLOCK_GETTIME_LIBRT) + add_compile_definitions(HAVE_CLOCK_GETTIME) - # The *installed* name of the translation files is "xz.mo". - set(TRANSLATION_DOMAIN "xz") + # Check if CLOCK_MONOTONIC is available for clock_gettime(). + check_symbol_exists(CLOCK_MONOTONIC time.h HAVE_CLOCK_MONOTONIC) + tuklib_add_definition_if(ALL HAVE_CLOCK_MONOTONIC) endif() endif() @@ -324,9 +232,7 @@ src/liblzma/api/lzma/vli.h src/liblzma/check/check.c src/liblzma/check/check.h - src/liblzma/check/crc_common.h - src/liblzma/check/crc_x86_clmul.h - src/liblzma/check/crc32_arm64.h + src/liblzma/check/crc_macros.h src/liblzma/common/block_util.c src/liblzma/common/common.c src/liblzma/common/common.h @@ -545,7 +451,6 @@ powerpc ia64 sparc - riscv ) # The SUPPORTED_FILTERS are shared between Encoders and Decoders @@ -819,10 +724,6 @@ target_sources(liblzma PRIVATE src/liblzma/common/microlzma_decoder.c) endif() -if (MICROLZMA_ENCODER OR MICROLZMA_DECODER) - add_compile_definitions(HAVE_MICROLZMA) -endif() - ############################# # lzip (.lz) format support # @@ -845,95 +746,6 @@ ) endif() - -############## -# Sandboxing # -############## - -# ON Use sandboxing if a supported method is available in the OS. -# OFF Disable sandboxing. -# capsicum Require Capsicum (FreeBSD >= 10.2) and fail if not found. -# pledge Require pledge(2) (OpenBSD >= 5.9) and fail if not found. -# landlock Require Landlock (Linux >= 5.13) and fail if not found. -set(SUPPORTED_SANDBOX_METHODS ON OFF capsicum pledge landlock) - -set(ENABLE_SANDBOX ON CACHE STRING - "Sandboxing method to use in 'xz', 'xzdec', and 'lzmadec'") - -set_property(CACHE ENABLE_SANDBOX - PROPERTY STRINGS "${SUPPORTED_SANDBOX_METHODS}") - -if(NOT ENABLE_SANDBOX IN_LIST SUPPORTED_SANDBOX_METHODS) - message(FATAL_ERROR "'${ENABLE_SANDBOX}' is not a supported " - "sandboxing method") -endif() - -# When autodetecting, the search order is fixed and we must not find -# more than one method. -if(ENABLE_SANDBOX STREQUAL "OFF") - set(SANDBOX_FOUND ON) -else() - set(SANDBOX_FOUND OFF) -endif() - -# Since xz and xzdec can both use sandboxing, the compile definition needed -# to use the sandbox must be added to both targets. -set(SANDBOX_COMPILE_DEFINITION OFF) - -# Sandboxing: Capsicum -if(NOT SANDBOX_FOUND AND ENABLE_SANDBOX MATCHES "^ON$|^capsicum$") - check_symbol_exists(cap_rights_limit sys/capsicum.h - HAVE_CAP_RIGHTS_LIMIT) - if(HAVE_CAP_RIGHTS_LIMIT) - set(SANDBOX_COMPILE_DEFINITION "HAVE_CAP_RIGHTS_LIMIT") - set(SANDBOX_FOUND ON) - endif() -endif() - -# Sandboxing: pledge(2) -if(NOT SANDBOX_FOUND AND ENABLE_SANDBOX MATCHES "^ON$|^pledge$") - check_symbol_exists(pledge unistd.h HAVE_PLEDGE) - if(HAVE_PLEDGE) - set(SANDBOX_COMPILE_DEFINITION "HAVE_PLEDGE") - set(SANDBOX_FOUND ON) - endif() -endif() - -# Sandboxing: Landlock -if(NOT SANDBOX_FOUND AND ENABLE_SANDBOX MATCHES "^ON$|^landlock$") - check_include_file(linux/landlock.h HAVE_LINUX_LANDLOCK_H) - - if(HAVE_LINUX_LANDLOCK_H) - set(SANDBOX_COMPILE_DEFINITION "HAVE_LINUX_LANDLOCK_H") - set(SANDBOX_FOUND ON) - - # Of our three sandbox methods, only Landlock is incompatible - # with -fsanitize. FreeBSD 13.2 with Capsicum was tested with - # -fsanitize=address,undefined and had no issues. OpenBSD (as - # of version 7.4) has minimal support for process instrumentation. - # OpenBSD does not distribute the additional libraries needed - # (libasan, libubsan, etc.) with GCC or Clang needed for runtime - # sanitization support and instead only support - # -fsanitize-minimal-runtime for minimal undefined behavior - # sanitization. This minimal support is compatible with our use - # of the Pledge sandbox. So only Landlock will result in a - # build that cannot compress or decompress a single file to - # standard out. - if(CMAKE_C_FLAGS MATCHES "-fsanitize=") - message(SEND_ERROR - "CMAKE_C_FLAGS or the environment variable CFLAGS " - "contains '-fsanitize=' which is incompatible " - "with Landlock sandboxing. Use -DENABLE_SANDBOX=OFF " - "as an argument to 'cmake' when using '-fsanitize'.") - endif() - endif() -endif() - -if(NOT SANDBOX_FOUND AND NOT ENABLE_SANDBOX MATCHES "^ON$|^OFF$") - message(SEND_ERROR "ENABLE_SANDBOX=${ENABLE_SANDBOX} was used but " - "support for the sandboxing method wasn't found.") -endif() - ### # Put the tuklib functions under the lzma_ namespace. @@ -986,79 +798,6 @@ "__attribute__((__constructor__))") endif() - -# Check for __attribute__((__ifunc__())) support. -# Supported values for USE_ATTR_IFUNC: -# -# auto (default) - Detect ifunc support with a compile test. -# ON - Always enable ifunc. -# OFF - Disable ifunc usage. -set(USE_ATTR_IFUNC "auto" CACHE STRING "Use __attribute__((__ifunc__())).") - -set(SUPPORTED_USE_ATTR_IFUNC auto ON OFF) - -if(NOT USE_ATTR_IFUNC IN_LIST SUPPORTED_USE_ATTR_IFUNC) - message(FATAL_ERROR "'${USE_ATTR_IFUNC}' is not a supported value for" - "USE_ATTR_IFUNC") -endif() - -# When USE_ATTR_IFUNC is 'auto', allow the use of __attribute__((__ifunc__())) -# if compiler support is detected and we are building for GNU/Linux (glibc) -# or FreeBSD. uClibc and musl don't support ifunc in their dynamic linkers -# but some compilers still accept the attribute when compiling for these -# C libraries, which results in broken binaries. That's why we need to -# check which libc is being used. -if(USE_ATTR_IFUNC STREQUAL "auto") - cmake_push_check_state() - set(CMAKE_REQUIRED_FLAGS "-Werror") - - check_c_source_compiles(" - /* - * Force a compilation error when not using glibc on Linux - * or if we are not using FreeBSD. uClibc will define - * __GLIBC__ but does not support ifunc, so we must have - * an extra check to disable with uClibc. - */ - #if defined(__linux__) - # include - # if !defined(__GLIBC__) || defined(__UCLIBC__) - compile error - # endif - #elif !defined(__FreeBSD__) - compile error - #endif - - static void func(void) { return; } - static void (*resolve_func(void)) (void) { return func; } - void func_ifunc(void) - __attribute__((__ifunc__(\"resolve_func\"))); - int main(void) { return 0; } - /* - * 'clang -Wall' incorrectly warns that resolve_func is - * unused (-Wunused-function). Correct assembly output is - * still produced. This problem exists at least in Clang - * versions 4 to 17. The following silences the bogus warning: - */ - void make_clang_quiet(void); - void make_clang_quiet(void) { resolve_func()(); } - " - SYSTEM_SUPPORTS_IFUNC) - - cmake_pop_check_state() -endif() - -if(USE_ATTR_IFUNC STREQUAL "ON" OR SYSTEM_SUPPORTS_IFUNC) - tuklib_add_definitions(liblzma HAVE_FUNC_ATTRIBUTE_IFUNC) - - if(CMAKE_C_FLAGS MATCHES "-fsanitize=") - message(SEND_ERROR - "CMAKE_C_FLAGS or the environment variable CFLAGS " - "contains '-fsanitize=' which is incompatible " - "with ifunc. Use -DUSE_ATTR_IFUNC=OFF " - "as an argument to 'cmake' when using '-fsanitize'.") - endif() -endif() - # cpuid.h check_include_file(cpuid.h HAVE_CPUID_H) tuklib_add_definition_if(liblzma HAVE_CPUID_H) @@ -1101,84 +840,16 @@ return _mm_clmulepi64_si128(a, b, 0); } int main(void) { return 0; } - " - HAVE_USABLE_CLMUL) - tuklib_add_definition_if(liblzma HAVE_USABLE_CLMUL) - endif() -endif() - -# ARM64 C Language Extensions define CRC32 functions in arm_acle.h. -# These are supported by at least GCC and Clang which both need -# __attribute__((__target__("+crc"))), unless the needed compiler flags -# are used to support the CRC instruction. -option(ALLOW_ARM64_CRC32 "Allow ARM64 CRC32 instruction if supported by \ -the system" ON) - -if(ALLOW_ARM64_CRC32) - check_c_source_compiles(" - #include - - #ifndef _MSC_VER - #include - #endif - - #if (defined(__GNUC__) || defined(__clang__)) && !defined(__EDG__) - __attribute__((__target__(\"+crc\"))) - #endif - uint32_t my_crc(uint32_t a, uint64_t b) - { - return __crc32d(a, b); - } - int main(void) { return 0; } " - HAVE_ARM64_CRC32) - - if(HAVE_ARM64_CRC32) - target_compile_definitions(liblzma PRIVATE HAVE_ARM64_CRC32) - - # Check for ARM64 CRC32 instruction runtime detection. - # getauxval() is supported on Linux. - check_symbol_exists(getauxval sys/auxv.h HAVE_GETAUXVAL) - tuklib_add_definition_if(liblzma HAVE_GETAUXVAL) - - # elf_aux_info() is supported on FreeBSD. - check_symbol_exists(elf_aux_info sys/auxv.h HAVE_ELF_AUX_INFO) - tuklib_add_definition_if(liblzma HAVE_ELF_AUX_INFO) - - # sysctlbyname("hw.optional.armv8_crc32", ...) is supported on Darwin - # (macOS, iOS, etc.). Note that sysctlbyname() is supported on FreeBSD, - # NetBSD, and possibly others too but the string is specific to - # Apple OSes. The C code is responsible for checking - # defined(__APPLE__) before using - # sysctlbyname("hw.optional.armv8_crc32", ...). - check_symbol_exists(sysctlbyname sys/sysctl.h HAVE_SYSCTLBYNAME) - tuklib_add_definition_if(liblzma HAVE_SYSCTLBYNAME) + HAVE_USABLE_CLMUL) + tuklib_add_definition_if(liblzma HAVE_USABLE_CLMUL) endif() endif() - -# Symbol visibility support: -# -# The C_VISIBILITY_PRESET property takes care of adding the compiler -# option -fvisibility=hidden (or equivalent) if and only if it is supported. -# -# HAVE_VISIBILITY should always be defined to 0 or 1. It tells liblzma -# if __attribute__((__visibility__("default"))) -# and __attribute__((__visibility__("hidden"))) are supported. -# Those are useful only when the compiler supports -fvisibility=hidden -# or such option so HAVE_VISIBILITY should be 1 only when both option and -# the attribute support are present. HAVE_VISIBILITY is ignored on Windows -# and Cygwin by the liblzma C code; __declspec(dllexport) is used instead. -# -# CMake's GenerateExportHeader module is too fancy since liblzma already -# has the necessary macros. Instead, check CMake's internal variable -# CMAKE_C_COMPILE_OPTIONS_VISIBILITY (it's the C-specific variant of -# CMAKE__COMPILE_OPTIONS_VISIBILITY) which contains the compiler -# command line option for visibility support. It's empty or unset when -# visibility isn't supported. (It was added to CMake 2.8.12 in the commit -# 0e9f4bc00c6b26f254e74063e4026ac33b786513 in 2013.) This way we don't -# set HAVE_VISIBILITY to 1 when visibility isn't actually supported. -if(BUILD_SHARED_LIBS AND CMAKE_C_COMPILE_OPTIONS_VISIBILITY) +# Support -fvisiblity=hidden when building shared liblzma. +# These lines do nothing on Windows (even under Cygwin). +# HAVE_VISIBILITY should always be defined to 0 or 1. +if(BUILD_SHARED_LIBS) set_target_properties(liblzma PROPERTIES C_VISIBILITY_PRESET hidden) target_compile_definitions(liblzma PRIVATE HAVE_VISIBILITY=1) else() @@ -1220,22 +891,8 @@ # Disable __declspec(dllimport) when linking against static liblzma. target_compile_definitions(liblzma INTERFACE LZMA_API_STATIC) endif() -elseif(BUILD_SHARED_LIBS AND CMAKE_SYSTEM_NAME STREQUAL "Linux" AND - NOT CMAKE_SYSTEM_PROCESSOR MATCHES "[Mm]icro[Bb]laze") +elseif(BUILD_SHARED_LIBS AND CMAKE_SYSTEM_NAME STREQUAL "Linux") # GNU/Linux-specific symbol versioning for shared liblzma. - # This includes a few extra compatibility symbols for RHEL/CentOS 7 - # which are pointless on non-glibc non-Linux systems. - # - # As a special case, GNU/Linux on MicroBlaze gets the generic - # symbol versioning because GCC 12 doesn't support the __symver__ - # attribute on MicroBlaze. On Linux, CMAKE_SYSTEM_PROCESSOR comes - # from "uname -m" for native builds (should be "microblaze") or from - # the CMake toolchain file (not perfectly standardized but it very - # likely has "microblaze" in lower case or mixed case somewhere in - # the string). - # - # FIXME? Avoid symvers on Linux with non-glibc like musl? - # # Note that adding link options doesn't affect static builds # but HAVE_SYMBOL_VERSIONS_LINUX must not be used with static builds # because it would put symbol versions into the static library which @@ -1251,10 +908,9 @@ set_target_properties(liblzma PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/liblzma/liblzma_linux.map" ) -elseif(BUILD_SHARED_LIBS AND (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR - CMAKE_SYSTEM_NAME STREQUAL "Linux")) - # Generic symbol versioning for shared liblzma is used on FreeBSD and - # also on GNU/Linux on MicroBlaze. +elseif(BUILD_SHARED_LIBS AND CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + # Symbol versioning for shared liblzma for non-GNU/Linux. + # FIXME? What about Solaris? target_link_options(liblzma PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/src/liblzma/liblzma_generic.map" ) @@ -1319,6 +975,9 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/liblzma-config.cmake" "${LZMA_CONFIG_CONTENTS}") +# Set CMAKE_INSTALL_LIBDIR and friends. +include(GNUInstallDirs) + # Create liblzma.pc. set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "${CMAKE_INSTALL_PREFIX}") @@ -1372,204 +1031,19 @@ ############################################################################# -# Helper functions for installing files +# getopt_long ############################################################################# -# For each non-empty element in the list LINK_NAMES, creates symbolic links -# ${LINK_NAME}${LINK_SUFFIX} -> ${TARGET_NAME} in the directory ${DIR}. -# The target file should exist because on Cygwin and MSYS2 symlink creation -# can fail under certain conditions if the target doesn't exist. -function(my_install_symlinks COMPONENT DIR TARGET_NAME LINK_SUFFIX LINK_NAMES) - install(CODE "set(D \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DIR}\") - foreach(L ${LINK_NAMES}) - file(CREATE_LINK \"${TARGET_NAME}\" - \"\${D}/\${L}${LINK_SUFFIX}\" - SYMBOLIC) - endforeach()" - COMPONENT "${COMPONENT}") -endfunction() - -# Installs a man page file of a given language ("" for the untranslated file) -# and optionally its alternative names as symlinks. This is a helper function -# for my_install_man() below. -function(my_install_man_lang COMPONENT SRC_FILE MAN_LANG LINK_NAMES) - # Get the man page section from the filename suffix. - string(REGEX REPLACE "^.*\.([^/.]+)$" "\\1" MAN_SECTION "${SRC_FILE}") - - # A few man pages might be missing from translations. - # Don't attempt to install them or create the related symlinks. - if(NOT MAN_LANG STREQUAL "" AND NOT EXISTS "${SRC_FILE}") - return() - endif() - - # Installing the file must be done before creating the symlinks - # due to Cygwin and MSYS2. - install(FILES "${SRC_FILE}" - DESTINATION "${CMAKE_INSTALL_MANDIR}/${MAN_LANG}/man${MAN_SECTION}" - COMPONENT "${COMPONENT}") - - # Get the basename of the file to be used as the symlink target. - get_filename_component(BASENAME "${SRC_FILE}" NAME) - - # LINK_NAMES don't contain the man page filename suffix (like ".1") - # so it needs to be told to my_install_symlinks. - my_install_symlinks("${COMPONENT}" - "${CMAKE_INSTALL_MANDIR}/${MAN_LANG}/man${MAN_SECTION}" - "${BASENAME}" ".${MAN_SECTION}" "${LINK_NAMES}") -endfunction() - -# Installs a man page file and optionally its alternative names as symlinks. -# Does the same for translations if ENABLE_NLS. -function(my_install_man COMPONENT SRC_FILE LINK_NAMES) - my_install_man_lang("${COMPONENT}" "${SRC_FILE}" "" "${LINK_NAMES}") - - if(ENABLE_NLS) - # Find the translated versions of this man page. - get_filename_component(BASENAME "${SRC_FILE}" NAME) - file(GLOB MAN_FILES "po4a/man/*/${BASENAME}") - - foreach(F ${MAN_FILES}) - get_filename_component(MAN_LANG "${F}" DIRECTORY) - get_filename_component(MAN_LANG "${MAN_LANG}" NAME) - my_install_man_lang("${COMPONENT}" "${F}" "${MAN_LANG}" - "${LINK_NAMES}") - endforeach() - endif() -endfunction() - - -############################################################################# -# libgnu (getopt_long) -############################################################################# - -# This mirrors how the Autotools build system handles the getopt_long -# replacement, calling the object library libgnu since the replacement -# version comes from Gnulib. -add_library(libgnu OBJECT) - -# CMake requires that even an object library must have at least once source -# file. So we give it a header file that results in no output files. -# -# NOTE: Using a file outside the lib directory makes it possible to -# delete lib/*.h and lib/*.c and still keep the build working if -# getopt_long replacement isn't needed. It's convenient if one wishes -# to be certain that no GNU LGPL code gets included in the binaries. -target_sources(libgnu PRIVATE src/common/sysdefs.h) - -# The Ninja Generator requires setting the linker language since it cannot -# guess the programming language of just a header file. Setting this -# property avoids needing an empty .c file or an non-empty unnecessary .c -# file. -set_target_properties(libgnu PROPERTIES LINKER_LANGUAGE C) - -# Create /lib directory in the build directory and add it to the include path. -file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib") -target_include_directories(libgnu PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/lib") - -# Include /lib from the source directory. It does no harm even if none of -# the Gnulib replacements are used. -target_include_directories(libgnu PUBLIC lib) - -# The command line tools need getopt_long in order to parse arguments. If -# the system does not have a getopt_long implementation we can use the one -# from Gnulib instead. +# The command line tools needs this. check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG) -if(NOT HAVE_GETOPT_LONG) - # Set the __GETOPT_PREFIX definition to "rpl_" (replacement) to avoid - # name conflicts with libc symbols. The same prefix is set if using - # the Autotools build (m4/getopt.m4). - target_compile_definitions(libgnu PUBLIC "__GETOPT_PREFIX=rpl_") - - # Create a custom copy command to copy the getopt header to the build - # directory and re-copy it if it is updated. (Gnulib does it this way - # because it allows choosing which .in.h files to actually use in the - # build. We need just getopt.h so this is a bit overcomplicated for - # a single header file only.) - add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/lib/getopt.h" - COMMAND "${CMAKE_COMMAND}" -E copy - "${CMAKE_CURRENT_SOURCE_DIR}/lib/getopt.in.h" - "${CMAKE_CURRENT_BINARY_DIR}/lib/getopt.h" - MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/lib/getopt.in.h" - VERBATIM) - - target_sources(libgnu PRIVATE - lib/getopt1.c - lib/getopt.c - lib/getopt_int.h - lib/getopt-cdefs.h - lib/getopt-core.h - lib/getopt-ext.h - lib/getopt-pfx-core.h - lib/getopt-pfx-ext.h - "${CMAKE_CURRENT_BINARY_DIR}/lib/getopt.h" - ) -endif() - - -############################################################################# -# xzdec and lzmadec -############################################################################# - -if(HAVE_DECODERS AND (NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900)) - foreach(XZDEC xzdec lzmadec) - add_executable("${XZDEC}" - src/common/sysdefs.h - src/common/tuklib_common.h - src/common/tuklib_config.h - src/common/tuklib_exit.c - src/common/tuklib_exit.h - src/common/tuklib_gettext.h - src/common/tuklib_progname.c - src/common/tuklib_progname.h - src/xzdec/xzdec.c - ) - - target_include_directories("${XZDEC}" PRIVATE - src/common - src/liblzma/api - ) - - target_link_libraries("${XZDEC}" PRIVATE liblzma libgnu) - - if(WIN32) - # Add the Windows resource file for xzdec.exe or lzmadec.exe. - target_sources("${XZDEC}" PRIVATE src/xzdec/xzdec_w32res.rc) - set_target_properties("${XZDEC}" PROPERTIES - LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" - ) - endif() - - if(SANDBOX_COMPILE_DEFINITION) - target_compile_definitions("${XZDEC}" PRIVATE - "${SANDBOX_COMPILE_DEFINITION}") - endif() - - tuklib_progname("${XZDEC}") - - install(TARGETS "${XZDEC}" - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT "${XZDEC}_Runtime") - endforeach() - - # This is the only build-time difference with lzmadec. - target_compile_definitions(lzmadec PRIVATE "LZMADEC") - - if(UNIX) - # NOTE: This puts the lzmadec.1 symlinks into xzdec_Documentation. - # This isn't great but doing them separately with translated - # man pages would require extra code. So this has to suffice for now. - my_install_man(xzdec_Documentation src/xzdec/xzdec.1 lzmadec) - endif() -endif() - ############################################################################# -# lzmainfo +# xzdec ############################################################################# -if(HAVE_DECODERS AND (NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900)) - add_executable(lzmainfo +if(HAVE_GETOPT_LONG AND HAVE_DECODERS) + add_executable(xzdec src/common/sysdefs.h src/common/tuklib_common.h src/common/tuklib_config.h @@ -1578,44 +1052,34 @@ src/common/tuklib_gettext.h src/common/tuklib_progname.c src/common/tuklib_progname.h - src/lzmainfo/lzmainfo.c + src/xzdec/xzdec.c ) - target_include_directories(lzmainfo PRIVATE + target_include_directories(xzdec PRIVATE src/common src/liblzma/api ) - target_link_libraries(lzmainfo PRIVATE liblzma libgnu) + target_link_libraries(xzdec PRIVATE liblzma) if(WIN32) - # Add the Windows resource file for lzmainfo.exe. - target_sources(lzmainfo PRIVATE src/lzmainfo/lzmainfo_w32res.rc) - set_target_properties(lzmainfo PROPERTIES + # Add the Windows resource file for xzdec.exe. + target_sources(xzdec PRIVATE src/xzdec/xzdec_w32res.rc) + set_target_properties(xzdec PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" ) endif() - tuklib_progname(lzmainfo) - - # NOTE: The translations are in the "xz" domain and the .mo files are - # installed as part of the "xz" target. - if(ENABLE_NLS) - target_link_libraries(lzmainfo PRIVATE Intl::Intl) - - target_compile_definitions(lzmainfo PRIVATE - ENABLE_NLS - PACKAGE="${TRANSLATION_DOMAIN}" - LOCALEDIR="${LOCALEDIR_DEFINITION}" - ) - endif() + tuklib_progname(xzdec) - install(TARGETS lzmainfo + install(TARGETS xzdec RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT lzmainfo_Runtime) + COMPONENT xzdec) if(UNIX) - my_install_man(lzmainfo_Documentation src/lzmainfo/lzmainfo.1 "") + install(FILES src/xzdec/xzdec.1 + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + COMPONENT xzdec) endif() endif() @@ -1624,7 +1088,7 @@ # xz ############################################################################# -if(NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900) +if(NOT MSVC AND HAVE_GETOPT_LONG) add_executable(xz src/common/mythread.h src/common/sysdefs.h @@ -1658,8 +1122,6 @@ src/xz/options.c src/xz/options.h src/xz/private.h - src/xz/sandbox.c - src/xz/sandbox.h src/xz/signals.c src/xz/signals.h src/xz/suffix.c @@ -1680,7 +1142,7 @@ ) endif() - target_link_libraries(xz PRIVATE liblzma libgnu) + target_link_libraries(xz PRIVATE liblzma) target_compile_definitions(xz PRIVATE ASSUME_RAM=128) @@ -1692,10 +1154,6 @@ ) endif() - if(SANDBOX_COMPILE_DEFINITION) - target_compile_definitions(xz PRIVATE "${SANDBOX_COMPILE_DEFINITION}") - endif() - tuklib_progname(xz) tuklib_mbstr(xz) @@ -1754,76 +1212,15 @@ endif() endif() - if(ENABLE_NLS) - target_link_libraries(xz PRIVATE Intl::Intl) - - target_compile_definitions(xz PRIVATE - ENABLE_NLS - PACKAGE="${TRANSLATION_DOMAIN}" - LOCALEDIR="${LOCALEDIR_DEFINITION}" - ) - - file(STRINGS po/LINGUAS LINGUAS) - - # Where to find .gmo files. If msgfmt is available, the .po files - # will be converted as part of the build. Otherwise we will use - # the pre-generated .gmo files which are included in XZ Utils - # tarballs by Autotools. - set(GMO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/po") - - if(GETTEXT_FOUND) - # NOTE: gettext_process_po_files' INSTALL_DESTINATION is - # incompatible with how Autotools requires the .po files to - # be named. CMake would require each .po file to be named with - # the translation domain and thus each .po file would need its - # own language-specific directory (like "po/fi/xz.po"). On top - # of this, INSTALL_DESTINATION doesn't allow specifying COMPONENT - # and thus the .mo files go into "Unspecified" component. So we - # can use gettext_process_po_files to convert the .po files but - # installation needs to be done with our own code. - # - # Also, the .gmo files will go to root of the build directory - # instead of neatly into a subdirectory. This is hardcoded in - # CMake's FindGettext.cmake. - foreach(LANG IN LISTS LINGUAS) - gettext_process_po_files("${LANG}" ALL - PO_FILES "${CMAKE_CURRENT_SOURCE_DIR}/po/${LANG}.po") - endforeach() - - set(GMO_DIR "${CMAKE_CURRENT_BINARY_DIR}") - endif() - - foreach(LANG IN LISTS LINGUAS) - install( - FILES "${GMO_DIR}/${LANG}.gmo" - DESTINATION "${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES" - RENAME "${TRANSLATION_DOMAIN}.mo" - COMPONENT xz_Runtime) - endforeach() - endif() - - # This command must be before the symlink creation to keep things working - # on Cygwin and MSYS2 in all cases. - # - # - Cygwin can encode symlinks in multiple ways. This can be - # controlled via the environment variable "CYGWIN". If it contains - # "winsymlinks:nativestrict" then symlink creation will fail if - # the link target doesn't exist. This mode isn't the default though. - # See: https://cygwin.com/faq.html#faq.api.symlinks - # - # - MSYS2 supports the same winsymlinks option in the environment - # variable "MSYS" (not "MSYS2). The default in MSYS2 is to make - # a copy of the file instead of any kind of symlink. Thus the link - # target must exist or the creation of the "symlink" (copy) will fail. - # - # Our installation order must be such that when a symbolic link is created - # its target must already exists. There is no race condition for parallel - # builds because the generated cmake_install.cmake executes serially. install(TARGETS xz RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT xz_Runtime) + COMPONENT xz) if(UNIX) + install(FILES src/xz/xz.1 + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + COMPONENT xz) + option(CREATE_XZ_SYMLINKS "Create unxz and xzcat symlinks" ON) option(CREATE_LZMA_SYMLINKS "Create lzma, unlzma, and lzcat symlinks" ON) @@ -1837,136 +1234,101 @@ list(APPEND XZ_LINKS "lzma" "unlzma" "lzcat") endif() - # On Cygwin, don't add the .exe suffix to the symlinks. - # - # FIXME? Does this make sense on MSYS & MSYS2 where "ln -s" - # by default makes copies? Inside MSYS & MSYS2 it is possible - # to execute files without the .exe suffix but not outside - # (like in Command Prompt). Omitting the suffix matches - # what configure.ac has done for many years though. - my_install_symlinks(xz_Runtime "${CMAKE_INSTALL_BINDIR}" - "xz${CMAKE_EXECUTABLE_SUFFIX}" "" "${XZ_LINKS}") - - # Install the man pages and (optionally) their symlinks - # and translations. - my_install_man(xz_Documentation src/xz/xz.1 "${XZ_LINKS}") - endif() -endif() - - -############################################################################# -# Scripts -############################################################################# - -if(UNIX) - # NOTE: This isn't as sophisticated as in the Autotools build which - # uses posix-shell.m4 but hopefully this doesn't need to be either. - # CMake likely won't be used on as many (old) obscure systems as the - # Autotools-based builds are. - if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND EXISTS "/usr/xpg4/bin/sh") - set(POSIX_SHELL_DEFAULT "/usr/xpg4/bin/sh") - else() - set(POSIX_SHELL_DEFAULT "/bin/sh") - endif() - - set(POSIX_SHELL "${POSIX_SHELL_DEFAULT}" CACHE STRING - "Shell to use for scripts (xzgrep and others)") - - # Guess the extra path to add from POSIX_SHELL. Autotools-based build - # has a separate option --enable-path-for-scripts=PREFIX but this is - # enough for Solaris. - set(enable_path_for_scripts) - get_filename_component(POSIX_SHELL_DIR "${POSIX_SHELL}" DIRECTORY) - - if(NOT POSIX_SHELL_DIR STREQUAL "/bin" AND - NOT POSIX_SHELL_DIR STREQUAL "/usr/bin") - set(enable_path_for_scripts "PATH=${POSIX_SHELL_DIR}:\$PATH") - endif() + # With Windows Cygwin and MSYS2 the symlinking is complicated. Both + # of these environments set the UNIX variable so they will try to + # make the symlinks. The ability for Cygwin and MSYS2 to make + # broken symlinks is determined by the CYGWIN and MSYS2 environment + # variables, respectively. Broken symlinks are needed for the man + # page symlinks and for determining if the xz and lzma symlinks need + # to depend on the xz target or not. If broken symlinks cannot be + # made then the xz binary must be created before the symlinks. + set(ALLOW_BROKEN_SYMLINKS ON) - set(XZDIFF_LINKS xzcmp) - set(XZGREP_LINKS xzegrep xzfgrep) - set(XZMORE_LINKS) - set(XZLESS_LINKS) + if(CMAKE_SYSTEM_NAME STREQUAL "CYGWIN") + # The Cygwin env variable can be set to four possible values: + # + # 1. "lnk". Create symlinks as Windows shortcuts. + # + # 2. "native". Create symlinks as native Windows symlinks + # if supported by the system. Fallback to "lnk" if native + # symlinks are not supported. + # + # 3. "nativestrict". Create symlinks as native Windows symlinks + # if supported by the system. If the target of the symlink + # does not exist or the creation of the symlink fails for any + # reason, do not create the symlink. + # + # 4. "sys". Create symlinks as plain files with a special + # system attribute containing the path to the symlink target. + # + # So, the only case we care about for broken symlinks is + # "nativestrict" since all other values mean that broken + # symlinks are allowed. If the env variable is not set the + # default is "native". If the env variable is set but not + # assigned one of the four values, then the default is the same + # as option 1 "lnk". + string(FIND "$ENV{CYGWIN}" "winsymlinks:nativestrict" SYMLINK_POS) + if(SYMLINK_POS GREATER -1) + set(ALLOW_BROKEN_SYMLINKS OFF) + endif() + elseif(CMAKE_SYSTEM_NAME STREQUAL "MSYS") + # The MSYS env variable behaves similar to the CYGWIN but has a + # different default behavior. If winsymlinks is set but not + # assigned one of the four supported values, the default is to + # *copy* the target to the symlink destination. This will fail + # if the target does not exist so broken symlinks cannot be + # allowed. + string(FIND "$ENV{MSYS}" "winsymlinks" SYMLINK_POS) + if(SYMLINK_POS GREATER -1) + string(FIND "$ENV{MSYS}" "winsymlinks:nativestrict" + SYMLINK_POS) + if(SYMLINK_POS GREATER -1) + set(ALLOW_BROKEN_SYMLINKS OFF) + endif() + else() + set(ALLOW_BROKEN_SYMLINKS OFF) + endif() + endif() - if(CREATE_LZMA_SYMLINKS) - list(APPEND XZDIFF_LINKS lzdiff lzcmp) - list(APPEND XZGREP_LINKS lzgrep lzegrep lzfgrep) - list(APPEND XZMORE_LINKS lzmore) - list(APPEND XZLESS_LINKS lzless) + # Create symlinks in the build directory and then install them. + # + # The symlinks do not likely need any special extension since + # even on Windows the symlink can still be executed without + # the .exe extension. + foreach(LINK IN LISTS XZ_LINKS) + add_custom_target("create_${LINK}" ALL + "${CMAKE_COMMAND}" -E create_symlink + "$" "${LINK}" + BYPRODUCTS "${LINK}" + VERBATIM) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LINK}" + DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT xz) + + # Only create the man page symlinks if the symlinks can be + # created broken. The symlinks will not be valid until install + # so they cannot be created on these system environments. + if(ALLOW_BROKEN_SYMLINKS) + add_custom_target("create_${LINK}.1" ALL + "${CMAKE_COMMAND}" -E create_symlink "xz.1" "${LINK}.1" + BYPRODUCTS "${LINK}.1" + VERBATIM) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LINK}.1" + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + COMPONENT xz) + else() + # Add the xz target as dependency when broken symlinks + # cannot be made. This ensures parallel builds do not fail + # since it will enforce the order of creating xz first, then + # the symlinks. + add_dependencies("create_${LINK}" xz) + endif() + endforeach() endif() - - set(xz "xz") - - foreach(S xzdiff xzgrep xzmore xzless) - configure_file("src/scripts/${S}.in" "${S}" - @ONLY - NEWLINE_STYLE LF) - - install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${S}" - DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT scripts_Runtime) - endforeach() - - # file(CHMOD ...) would need CMake 3.19 so use execute_process instead. - # Using +x is fine even if umask was 077. If execute bit is set at all - # then "make install" will set it for group and other access bits too. - execute_process(COMMAND chmod +x xzdiff xzgrep xzmore xzless - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") - - unset(xz) - unset(POSIX_SHELL) - unset(enable_path_for_scripts) - - my_install_symlinks(scripts_Runtime "${CMAKE_INSTALL_BINDIR}" xzdiff "" - "${XZDIFF_LINKS}") - - my_install_symlinks(scripts_Runtime "${CMAKE_INSTALL_BINDIR}" xzgrep "" - "${XZGREP_LINKS}") - - my_install_symlinks(scripts_Runtime "${CMAKE_INSTALL_BINDIR}" xzmore "" - "${XZMORE_LINKS}") - - my_install_symlinks(scripts_Runtime "${CMAKE_INSTALL_BINDIR}" xzless "" - "${XZLESS_LINKS}") - - my_install_man(scripts_Documentation src/scripts/xzdiff.1 "${XZDIFF_LINKS}") - my_install_man(scripts_Documentation src/scripts/xzgrep.1 "${XZGREP_LINKS}") - my_install_man(scripts_Documentation src/scripts/xzmore.1 "${XZMORE_LINKS}") - my_install_man(scripts_Documentation src/scripts/xzless.1 "${XZLESS_LINKS}") endif() ############################################################################# -# Documentation -############################################################################# - -# Use OPTIONAL because doc/api might not exist. The liblzma API docs -# can be generated by running "doxygen/update-doxygen". -install(DIRECTORY doc/api doc/examples - DESTINATION "${CMAKE_INSTALL_DOCDIR}" - COMPONENT liblzma_Documentation - OPTIONAL) - -# GPLv2 applies to the scripts. If GNU getopt_long is used then -# LGPLv2.1 applies to the command line tools but, using the -# section 3 of LGPLv2.1, GNU getopt_long can be handled as GPLv2 too. -# Thus GPLv2 should be enough here. -install(FILES AUTHORS - COPYING - COPYING.0BSD - COPYING.GPLv2 - NEWS - README - THANKS - doc/faq.txt - doc/history.txt - doc/lzma-file-format.txt - doc/xz-file-format.txt - DESTINATION "${CMAKE_INSTALL_DOCDIR}" - COMPONENT Documentation) - - -############################################################################# # Tests ############################################################################# @@ -2018,18 +1380,4 @@ SKIP_RETURN_CODE 77 ) endforeach() - - if(UNIX AND HAVE_DECODERS) - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test_scripts") - - add_test(NAME test_scripts.sh - COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_scripts.sh" ".." - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test_scripts" - ) - - set_tests_properties(test_scripts.sh PROPERTIES - ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}/tests" - SKIP_RETURN_CODE 77 - ) - endif() endif() diff -Nru xz-utils-5.6.0/COPYING xz-utils-5.6.1+really5.4.5/COPYING --- xz-utils-5.6.0/COPYING 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/COPYING 2023-10-31 14:24:02.000000000 +0000 @@ -6,95 +6,71 @@ is a rough summary of which licenses apply to which parts of this package (but check the individual files to be sure!): - - liblzma is under the BSD Zero Clause License (0BSD). + - liblzma is in the public domain. - - The command line tools xz, xzdec, lzmadec, and lzmainfo are - under 0BSD except that, on systems that don't have a usable - getopt_long, GNU getopt_long is compiled and linked in from the - 'lib' directory. The getopt_long code is under GNU LGPLv2.1+. + - xz, xzdec, and lzmadec command line tools are in the public + domain unless GNU getopt_long had to be compiled and linked + in from the lib directory. The getopt_long code is under + GNU LGPLv2.1+. - The scripts to grep, diff, and view compressed files have been - adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless, - and xzmore) are under GNU GPLv2+. The man pages of the scripts - are under 0BSD; they aren't based on the man pages of GNU gzip. - - - Most of the XZ Utils specific documentation that is in - plain text files (like README, INSTALL, PACKAGERS, NEWS, - and ChangeLog) are under 0BSD unless stated otherwise in - the file itself. The files xz-file-format.txt and - lzma-file-format.xt are in the public domain but may - be distributed under the terms of 0BSD too. - - - Doxygen-generated HTML version of the liblzma API documentation: - While Doxygen is under the GNU GPLv2, the license information - in Doxygen includes the following exception: + adapted from gzip. These scripts and their documentation are + under GNU GPLv2+. - Documents produced by doxygen are derivative works - derived from the input used in their production; - they are not affected by this license. + - All the documentation in the doc directory and most of the + XZ Utils specific documentation files in other directories + are in the public domain. Note: The JavaScript files (under the MIT license) have - been removed from the Doxygen output. + been removed from the Doxygen-generated HTML version of the + liblzma API documentation. Doxygen itself is under the GNU GPL + but the remaining files generated by Doxygen are not affected + by the licenses used in Doxygen because Doxygen licensing has + the following exception: - - The XZ logo (xz-logo.png) included in the Doxygen-generated - documentation is under the Creative Commons BY-SA 4.0 license. + "Documents produced by doxygen are derivative works + derived from the input used in their production; + they are not affected by this license." - - Translated messages and man pages are under 0BSD except that - some old translations are in the public domain. + - Translated messages are in the public domain. - - Test files and test code in the 'tests' directory, and - debugging utilities in the 'debug' directory are under - the BSD Zero Clause License (0BSD). + - The build system contains public domain files, and files that + are under GNU GPLv2+ or GNU GPLv3+. None of these files end up + in the binaries being built. - - The GNU Autotools based build system contains files that are - under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses. - These files don't affect the licensing of the binaries being - built. + - Test files and test code in the tests directory, and debugging + utilities in the debug directory are in the public domain. - - The extra directory contain files that are under various - free software licenses. + - The extra directory may contain public domain files, and files + that are under various free software licenses. - For the files under the BSD Zero Clause License (0BSD), if - a copyright notice is needed, the following is sufficient: + You can do whatever you want with the files that have been put into + the public domain. If you find public domain legally problematic, + take the previous sentence as a license grant. If you still find + the lack of copyright legally problematic, you have too many + lawyers. - Copyright (C) The XZ Utils authors and contributors + As usual, this software is provided "as is", without any warranty. - If you copy significant amounts of 0BSD-licensed code from XZ Utils + If you copy significant amounts of public domain code from XZ Utils into your project, acknowledging this somewhere in your software is polite (especially if it is proprietary, non-free software), but - it is not legally required by the license terms. Here is an example - of a good notice to put into "about box" or into documentation: + naturally it is not legally required. Here is an example of a good + notice to put into "about box" or into documentation: - This software includes code from XZ Utils - . + This software includes code from XZ Utils . The following license texts are included in the following files: - - COPYING.0BSD: BSD Zero Clause License - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1 - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 - - COPYING.CC-BY-SA-4.0: Creative Commons Attribution-ShareAlike 4.0 - International Public License - - A note about old XZ Utils releases: - XZ Utils releases 5.4.6 and older and 5.5.1alpha have a - significant amount of code put into the public domain and - that obviously remains so. The switch from public domain to - 0BSD for newer releases was made in Febrary 2024 because - public domain has (real or perceived) legal ambiguities in - some jurisdictions. - - There is very little *practical* difference between public - domain and 0BSD. The main difference likely is that one - shouldn't claim that 0BSD-licensed code is in the public - domain; 0BSD-licensed code is copyrighted but available under - an extremely permissive license. Neither 0BSD nor public domain - require retaining or reproducing author, copyright holder, or - license notices when distributing the software. (Compare to, - for example, BSD 2-Clause "Simplified" License which does have - such requirements.) + Note that the toolchain (compiler, linker etc.) may add some code + pieces that are copyrighted. Thus, it is possible that e.g. liblzma + binary wouldn't actually be in the public domain in its entirety + even though it contains no copyrighted code from the XZ Utils source + package. - If you have questions, don't hesitate to ask for more information. - The contact information is in the README file. + If you have questions, don't hesitate to ask the author(s) for more + information. diff -Nru xz-utils-5.6.0/COPYING.0BSD xz-utils-5.6.1+really5.4.5/COPYING.0BSD --- xz-utils-5.6.0/COPYING.0BSD 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/COPYING.0BSD 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Permission to use, copy, modify, and/or distribute this -software for any purpose with or without fee is hereby granted. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL -WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL -THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff -Nru xz-utils-5.6.0/COPYING.CC-BY-SA-4.0 xz-utils-5.6.1+really5.4.5/COPYING.CC-BY-SA-4.0 --- xz-utils-5.6.0/COPYING.CC-BY-SA-4.0 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/COPYING.CC-BY-SA-4.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,427 +0,0 @@ -Attribution-ShareAlike 4.0 International - -======================================================================= - -Creative Commons Corporation ("Creative Commons") is not a law firm and -does not provide legal services or legal advice. Distribution of -Creative Commons public licenses does not create a lawyer-client or -other relationship. Creative Commons makes its licenses and related -information available on an "as-is" basis. Creative Commons gives no -warranties regarding its licenses, any material licensed under their -terms and conditions, or any related information. Creative Commons -disclaims all liability for damages resulting from their use to the -fullest extent possible. - -Using Creative Commons Public Licenses - -Creative Commons public licenses provide a standard set of terms and -conditions that creators and other rights holders may use to share -original works of authorship and other material subject to copyright -and certain other rights specified in the public license below. The -following considerations are for informational purposes only, are not -exhaustive, and do not form part of our licenses. - - Considerations for licensors: Our public licenses are - intended for use by those authorized to give the public - permission to use material in ways otherwise restricted by - copyright and certain other rights. Our licenses are - irrevocable. Licensors should read and understand the terms - and conditions of the license they choose before applying it. - Licensors should also secure all rights necessary before - applying our licenses so that the public can reuse the - material as expected. Licensors should clearly mark any - material not subject to the license. This includes other CC- - licensed material, or material used under an exception or - limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors - - Considerations for the public: By using one of our public - licenses, a licensor grants the public permission to use the - licensed material under specified terms and conditions. If - the licensor's permission is not necessary for any reason--for - example, because of any applicable exception or limitation to - copyright--then that use is not regulated by the license. Our - licenses grant only permissions under copyright and certain - other rights that a licensor has authority to grant. Use of - the licensed material may still be restricted for other - reasons, including because others have copyright or other - rights in the material. A licensor may make special requests, - such as asking that all changes be marked or described. - Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More considerations - for the public: - wiki.creativecommons.org/Considerations_for_licensees - -======================================================================= - -Creative Commons Attribution-ShareAlike 4.0 International Public -License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution-ShareAlike 4.0 International Public License ("Public -License"). To the extent this Public License may be interpreted as a -contract, You are granted the Licensed Rights in consideration of Your -acceptance of these terms and conditions, and the Licensor grants You -such rights in consideration of benefits the Licensor receives from -making the Licensed Material available under these terms and -conditions. - - -Section 1 -- Definitions. - - a. Adapted Material means material subject to Copyright and Similar - Rights that is derived from or based upon the Licensed Material - and in which the Licensed Material is translated, altered, - arranged, transformed, or otherwise modified in a manner requiring - permission under the Copyright and Similar Rights held by the - Licensor. For purposes of this Public License, where the Licensed - Material is a musical work, performance, or sound recording, - Adapted Material is always produced where the Licensed Material is - synched in timed relation with a moving image. - - b. Adapter's License means the license You apply to Your Copyright - and Similar Rights in Your contributions to Adapted Material in - accordance with the terms and conditions of this Public License. - - c. BY-SA Compatible License means a license listed at - creativecommons.org/compatiblelicenses, approved by Creative - Commons as essentially the equivalent of this Public License. - - d. Copyright and Similar Rights means copyright and/or similar rights - closely related to copyright including, without limitation, - performance, broadcast, sound recording, and Sui Generis Database - Rights, without regard to how the rights are labeled or - categorized. For purposes of this Public License, the rights - specified in Section 2(b)(1)-(2) are not Copyright and Similar - Rights. - - e. Effective Technological Measures means those measures that, in the - absence of proper authority, may not be circumvented under laws - fulfilling obligations under Article 11 of the WIPO Copyright - Treaty adopted on December 20, 1996, and/or similar international - agreements. - - f. Exceptions and Limitations means fair use, fair dealing, and/or - any other exception or limitation to Copyright and Similar Rights - that applies to Your use of the Licensed Material. - - g. License Elements means the license attributes listed in the name - of a Creative Commons Public License. The License Elements of this - Public License are Attribution and ShareAlike. - - h. Licensed Material means the artistic or literary work, database, - or other material to which the Licensor applied this Public - License. - - i. Licensed Rights means the rights granted to You subject to the - terms and conditions of this Public License, which are limited to - all Copyright and Similar Rights that apply to Your use of the - Licensed Material and that the Licensor has authority to license. - - j. Licensor means the individual(s) or entity(ies) granting rights - under this Public License. - - k. Share means to provide material to the public by any means or - process that requires permission under the Licensed Rights, such - as reproduction, public display, public performance, distribution, - dissemination, communication, or importation, and to make material - available to the public including in ways that members of the - public may access the material from a place and at a time - individually chosen by them. - - l. Sui Generis Database Rights means rights other than copyright - resulting from Directive 96/9/EC of the European Parliament and of - the Council of 11 March 1996 on the legal protection of databases, - as amended and/or succeeded, as well as other essentially - equivalent rights anywhere in the world. - - m. You means the individual or entity exercising the Licensed Rights - under this Public License. Your has a corresponding meaning. - - -Section 2 -- Scope. - - a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Material to: - - a. reproduce and Share the Licensed Material, in whole or - in part; and - - b. produce, reproduce, and Share Adapted Material. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Material. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Material. Every - recipient of the Licensed Material automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. Additional offer from the Licensor -- Adapted Material. - Every recipient of Adapted Material from You - automatically receives an offer from the Licensor to - exercise the Licensed Rights in the Adapted Material - under the conditions of the Adapter's License You apply. - - c. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Material if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Material. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Material is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - - b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties. - - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - - a. Attribution. - - 1. If You Share the Licensed Material (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Material: - - i. identification of the creator(s) of the Licensed - Material and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Material to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Material and - retain an indication of any previous modifications; and - - c. indicate the Licensed Material is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Material. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - - b. ShareAlike. - - In addition to the conditions in Section 3(a), if You Share - Adapted Material You produce, the following conditions also apply. - - 1. The Adapter's License You apply must be a Creative Commons - license with the same License Elements, this version or - later, or a BY-SA Compatible License. - - 2. You must include the text of, or the URI or hyperlink to, the - Adapter's License You apply. You may satisfy this condition - in any reasonable manner based on the medium, means, and - context in which You Share Adapted Material. - - 3. You may not offer or impose any additional or different terms - or conditions on, or apply any Effective Technological - Measures to, Adapted Material that restrict exercise of the - rights granted under the Adapter's License You apply. - - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Material: - - a. for the avoidance of doubt, Section 2(a)(1) grants You the right - to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database; - - b. if You include all or a substantial portion of the database - contents in a database in which You have Sui Generis Database - Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Material, - including for purposes of Section 3(b); and - - c. You must comply with the conditions in Section 3(a) if You Share - all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - - a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE - EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS - AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF - ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, - IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, - WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, - ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT - KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT - ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - - b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE - TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, - NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, - COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR - USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR - DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR - IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - - c. The disclaimer of warranties and limitation of liability provided - above shall be interpreted in a manner that, to the extent - possible, most closely approximates an absolute disclaimer and - waiver of all liability. - - -Section 6 -- Term and Termination. - - a. This Public License applies for the term of the Copyright and - Similar Rights licensed here. However, if You fail to comply with - this Public License, then Your rights under this Public License - terminate automatically. - - b. Where Your right to use the Licensed Material has terminated under - Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - - c. For the avoidance of doubt, the Licensor may also offer the - Licensed Material under separate terms or conditions or stop - distributing the Licensed Material at any time; however, doing so - will not terminate this Public License. - - d. Sections 1, 5, 6, 7, and 8 survive termination of this Public - License. - - -Section 7 -- Other Terms and Conditions. - - a. The Licensor shall not be bound by any additional or different - terms or conditions communicated by You unless expressly agreed. - - b. Any arrangements, understandings, or agreements regarding the - Licensed Material not stated herein are separate from and - independent of the terms and conditions of this Public License. - - -Section 8 -- Interpretation. - - a. For the avoidance of doubt, this Public License does not, and - shall not be interpreted to, reduce, limit, restrict, or impose - conditions on any use of the Licensed Material that could lawfully - be made without permission under this Public License. - - b. To the extent possible, if any provision of this Public License is - deemed unenforceable, it shall be automatically reformed to the - minimum extent necessary to make it enforceable. If the provision - cannot be reformed, it shall be severed from this Public License - without affecting the enforceability of the remaining terms and - conditions. - - c. No term or condition of this Public License will be waived and no - failure to comply consented to unless expressly agreed to by the - Licensor. - - d. Nothing in this Public License constitutes or may be interpreted - as a limitation upon, or waiver of, any privileges and immunities - that apply to the Licensor or You, including from the legal - processes of any jurisdiction or authority. - - -======================================================================= - -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. - -Creative Commons may be contacted at creativecommons.org. diff -Nru xz-utils-5.6.0/ChangeLog xz-utils-5.6.1+really5.4.5/ChangeLog --- xz-utils-5.6.0/ChangeLog 2024-02-24 08:32:15.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/ChangeLog 2023-11-01 12:27:58.000000000 +0000 @@ -1,3582 +1,14 @@ -commit 2d7d862e3ffa8cec4fd3fdffcd84e984a17aa429 +commit 49053c0a649f4c8bd2b8d97ce915f401fbc0f3d9 Author: Jia Tan -Date: 2024-02-24 15:55:08 +0800 +Date: 2023-10-31 22:30:29 +0800 - Bump version and soname for 5.6.0. + Bump version and soname for 5.4.5. - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/version.h | 6 +++--- - src/liblzma/liblzma_generic.map | 2 +- - src/liblzma/liblzma_linux.map | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) - -commit a18fb1edef0d0aac12a09eed05e9c448c777af7b -Author: Jia Tan -Date: 2024-02-24 15:50:36 +0800 - - Add NEWS for 5.6.0. - - NEWS | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 143 insertions(+) - -commit 24355c5280bc95e3d594432d60bb8432aa6af173 -Author: Jia Tan -Date: 2024-02-22 22:27:01 +0800 - - Translations: Remove obsolete and fuzzy matches from some translations. - - The French and Brazilian Portuguese man page translations have not been - updated since the switch from public domain to 0BSD. The old GPLv2 - strings have now been removed from these files. - - po4a/fr.po | 4702 +++++++++++++++++++++++++++++++++++++---------------- - po4a/pt_BR.po | 4987 ++++++++++++++++++++++++++++++++++++++++----------------- - 2 files changed, 6832 insertions(+), 2857 deletions(-) - -commit 02ca4a7d7b703e2ec63e00b70feec825e919dbc1 -Author: Jia Tan -Date: 2024-02-21 00:31:54 +0800 - - Translations: Patch man pages to avoid fuzzy matches. - - This will be fixed in the next round of translations, but this avoids - having a fuzzy match or not fixing the English version. - - po4a/de.po | 2 +- - po4a/ko.po | 2 +- - po4a/ro.po | 2 +- - po4a/uk.po | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 898aad9fc711e03452d24d9e2c5b7f77a6f9ce64 -Author: Jia Tan -Date: 2024-02-21 00:30:43 +0800 - - xzmore: Fix typo in xzmore.1. - - Thanks to Yuri Chornoivan. - - src/scripts/xzmore.1 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 5631aa206c8d16b4eeab85a46b8b698f4fc4cdba -Author: Jia Tan -Date: 2024-02-24 12:12:16 +0800 - - Translations: Update the Vietnamese translation. - - po/vi.po | 505 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 309 insertions(+), 196 deletions(-) - -commit a65fd7ce9d6228e87faf61dc56a35984d0088248 -Author: Jia Tan -Date: 2024-02-24 12:06:40 +0800 - - Translations: Update the Esperanto translation. - - po/eo.po | 502 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 306 insertions(+), 196 deletions(-) - -commit cf44e4b7f5dfdbf8c78aef377c10f71e274f63c0 -Author: Jia Tan -Date: 2024-02-23 23:09:59 +0800 - - Tests: Add a few test files. - - tests/files/README | 19 +++++++++++++++++++ - tests/files/bad-3-corrupt_lzma2.xz | Bin 0 -> 484 bytes - tests/files/bad-dict_size.lzma | Bin 0 -> 41 bytes - tests/files/good-2cat.xz | Bin 0 -> 136 bytes - tests/files/good-large_compressed.lzma | Bin 0 -> 35430 bytes - tests/files/good-small_compressed.lzma | Bin 0 -> 258 bytes - 6 files changed, 19 insertions(+) - -commit 39f4a1a86ad80b2d064b812cee42668e6c8b8c73 -Author: Jia Tan -Date: 2024-02-23 20:58:36 +0800 - - Tests: Add MicroLZMA test. - - tests/Makefile.am | 4 +- - tests/test_microlzma.c | 548 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 551 insertions(+), 1 deletion(-) - -commit adaacafde6661496ca2814b1e94a3ba5186428cb -Author: Jia Tan -Date: 2024-02-23 20:57:59 +0800 - - Build: Define HAVE_MICROLZMA when it is configured. - - CMakeLists.txt | 4 ++++ - configure.ac | 9 +++++++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -commit eea78216d27182ca917bf00e02feaab058a4d21e -Author: Jia Tan -Date: 2024-02-23 20:27:15 +0800 - - xz: Fix Capsicum sandbox compile error. - - user_abort_pipe[] was still being used instead of the parameters. - - src/xz/sandbox.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 32b0a3ce19224f9074d01a4ffbc1655b05fcb82d -Author: Jia Tan -Date: 2024-02-23 16:12:32 +0800 - - Build: Fix ARM64 CRC32 instruction feature test. - - Old versions of Clang reported the unsupported function attribute and - __crc32d() function as warnings instead of errors, so the feature test - passed when it shouldn't have, causing a compile error at build time. - -Werror was added to this feature test to fix this. The change is not - needed for CMake because check_c_source_compiles() also performs - linking and the error is caught then. - - Thanks to Sebastian Andrzej Siewior for reporting this. - - configure.ac | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit 4c81c9611f8b2e1ad65eb7fa166afc570c58607e -Author: Lasse Collin -Date: 2024-02-22 19:16:35 +0200 - - CMake: Add LOCALEDIR to the windres workaround. - - LOCALEDIR may contain spaces like in "C:\Program Files". - - CMakeLists.txt | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -commit de4337fd89ca7db5feb97b5c40143404f6e22986 -Author: Lasse Collin -Date: 2024-02-22 15:18:25 +0200 - - xz: Landlock: Fix error message if input file is a directory. - - If xz is given a directory, it should look like this: - - $ xz /usr/bin - xz: /usr/bin: Is a directory, skipping - - The Landlock rules didn't allow opening directories for reading: - - $ xz /usr/bin - xz: /usr/bin: Permission denied - - The simplest fix was to allow opening directories for reading. - While it's a bit silly to allow it solely for the error message, - it shouldn't make the sandbox significantly weaker. - - The single-file use case (like when called from GNU tar) is - still as strict as possible: all Landlock restrictions are - enabled before (de)compression starts. - - src/xz/sandbox.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -commit 120da10ae139ea52ca4275452adf8eda02d07cc8 -Author: Lasse Collin -Date: 2024-02-22 14:41:29 +0200 - - liblzma: Disable branchless C version in range decoder. - - Thanks to Sebastian Andrzej Siewior and Sam James for - benchmarking on various systems. - - src/liblzma/rangecoder/range_decoder.h | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -commit 00440f52be9ac2c7438c7b0cb1082f12399632c6 -Author: Lasse Collin -Date: 2024-02-21 17:41:32 +0200 - - INSTALL: Clarify that --disable-assembler affects only 32-bit x86. - - INSTALL | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -commit 11405be84ea294497e12d03d7219f607063f4a00 -Author: Lasse Collin -Date: 2024-02-19 18:41:37 +0200 - - Windows: build.bash: Include COPYING.0BSD in the package. - - windows/build.bash | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit c27cf64e3e27f4968431d65be7098a12a3a80d30 -Author: Lasse Collin -Date: 2024-02-18 17:59:46 +0200 - - Windows: build.bash: include liblzma-crt-mixing.txt in the package. - - windows/build.bash | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit 8d38941baed05de4ff7cc775de14833108f62184 -Author: Lasse Collin -Date: 2024-02-18 17:17:43 +0200 - - Windows: Major update to Windows build instructions. - - INSTALL | 68 ++++----- - windows/INSTALL-MSVC.txt | 23 +-- - windows/INSTALL-MinGW-w64_with_Autotools.txt | 49 +++++++ - windows/INSTALL-MinGW-w64_with_CMake.txt | 203 +++++++++++++++++++++++++++ - windows/INSTALL-MinGW.txt | 138 ------------------ - windows/README-Windows.txt | 2 + - windows/build-with-cmake.bat | 35 +++++ - windows/liblzma-crt-mixing.txt | 70 +++++++++ - 8 files changed, 404 insertions(+), 184 deletions(-) - -commit 4b5b0d352348ff510ffb50a3b5b71788857d37a1 -Author: Lasse Collin -Date: 2024-02-18 15:15:04 +0200 - - Windows: Update windows/README-Windows.txt. - - It's for binary packages built with windows/build.bash. - - windows/README-Windows.txt | 104 ++++++++++++++++++--------------------------- - 1 file changed, 41 insertions(+), 63 deletions(-) - -commit 1ee716f74085223c8fbcae1d5a384e6bf53c0f6a -Author: Lasse Collin -Date: 2024-02-18 15:15:04 +0200 - - Windows: Update windows/build.bash. - - Support for the old MinGW was dropped. Only MinGW-w64 with GCC - is supported now. - - The script now supports also cross-compilation from GNU/Linux - (tests are not run). MSYS2 and also the old MSYS 1.0.11 work - for building on Windows. The i686 and x86_64 toolchains must - be in PATH to build both 32-bit and 64-bit versions. - - Parallel builds are done if "nproc" from GNU coreutils is available. - - MinGW-w64 runtime copyright information file was renamed from - COPYING-Windows.txt to COPYING.MinGW-w64-runtime.txt which - is the filename used by MinGW-w64 itself. Its existence - is now mandatory, it's checked at the beginning of the script. - - The file TODO is no longer copied to the package. - - windows/build.bash | 191 +++++++++++++++++++++++++++++++---------------------- - 1 file changed, 112 insertions(+), 79 deletions(-) - -commit 60462e42609a1d961868a1d1ebecc713c6d27e2e -Author: Jia Tan -Date: 2024-02-20 23:32:22 +0800 - - Translations: Update the Romanian man page translations. - - po4a/ro.po | 1715 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 875 insertions(+), 840 deletions(-) - -commit 10d733e5b8929c642e00891cfa9ead9c2cdd2e05 -Author: Jia Tan -Date: 2024-02-20 23:30:25 +0800 - - Translations: Update the Korean man page translations. - - po4a/ko.po | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 797a34b72ac6baff237d7a546fa941d8f78f2f62 -Author: Jia Tan -Date: 2024-02-20 21:03:53 +0800 - - Translations: Update the Spanish translation. - - po/es.po | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 5c3751d019f023e091df9a653e2bb1f6ea8b0d49 -Author: Jia Tan -Date: 2024-02-20 20:18:07 +0800 - - Translations: Update the Romanian translation. - - po/ro.po | 470 ++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 227 insertions(+), 243 deletions(-) - -commit e2d31154ecc750935436e8b62c6b073b2cfa84e3 -Author: Jia Tan -Date: 2024-02-20 20:15:50 +0800 - - Translations: Update the Croatian translation. - - po/hr.po | 648 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 355 insertions(+), 293 deletions(-) - -commit 704500f994d5ac271bfcfd592275c5a7da4dc8d2 -Author: Jia Tan -Date: 2024-02-20 20:05:44 +0800 - - Translations: Update the German man page translations. - - po4a/de.po | 1696 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 873 insertions(+), 823 deletions(-) - -commit 1cfd3dca3fef321b06db73c3c9e13f347c2e2f5f -Author: Jia Tan -Date: 2024-02-20 19:58:25 +0800 - - Translations: Update the German translation. - - po/de.po | 427 +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 225 insertions(+), 202 deletions(-) - -commit 28b9b3f16cc7c6e5b42e691994569c17f4561c9a -Author: Jia Tan -Date: 2024-02-20 19:56:52 +0800 - - Translations: Update the Hungarian translation. - - po/hu.po | 556 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 338 insertions(+), 218 deletions(-) - -commit 00b06cd0af6ad2ee93d3006bf80417db060c2b04 -Author: Lasse Collin -Date: 2024-02-19 16:48:05 +0200 - - CMake: Fix building of lzmainfo when translations are enabled. - - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -commit b0d1422b6037bfea6f6723683bd82a8e6d77026c -Author: Lasse Collin -Date: 2024-02-19 13:38:42 +0200 - - CMake: Don't assume that -fvisibility=hidden is supported outside Windows. - - The original code was good enough for supporting GNU/Linux - and a few others but it wasn't very portable. - - CMake doesn't support Solaris Studio's -xldscope=hidden. - If it ever does, things should still work with this commit - as Solaris Studio supports not only its own __global but also - the GNU C __attribute__((visibility("default"))). Support for the - attribute was added in 2007 to Sun Studio 12 compiler version 5.9. - - CMakeLists.txt | 26 ++++++++++++++++++++++---- - 1 file changed, 22 insertions(+), 4 deletions(-) - -commit 2ced9d34bef4dce52ecbbf84d0903ab0aae1442c -Author: Lasse Collin -Date: 2024-02-19 12:20:59 +0200 - - CMake: Revise the component splitting. - - CMakeLists.txt | 57 +++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 31 insertions(+), 26 deletions(-) - -commit 426bdc709c169d39b31dec410016779de117ef69 -Author: Lasse Collin -Date: 2024-02-17 21:45:07 +0200 - - CMake: Update the main comment and document CMAKE_BUILD_TYPE=Release. - - CMakeLists.txt | 79 ++++++++++++++++++++++++++++++++++++++++++++++------------ - 1 file changed, 63 insertions(+), 16 deletions(-) - -commit 4430e075f7ccfc47972d6ca0aa1c3779fc265e10 -Author: Lasse Collin -Date: 2024-02-17 21:27:48 +0200 - - CMake: Use -O2 instead of -O3 in CMAKE_BUILD_TYPE=Release. - - -O3 doesn't seem useful for speed but it makes the code bigger. - CMake makes is difficult for users to simply override the - optimization level: CFLAGS / CMAKE_C_FLAGS aren't helpful because - they go before CMAKE_C_FLAGS_RELEASE. Of course, users can override - CMAKE_C_FLAGS_RELEASE directly but then they have to remember to - add also -DNDEBUG to disable assertions. - - This commit changes -O3 to -O2 in CMAKE_C_FLAGS_RELEASE if and only if - CMAKE_C_FLAGS_RELEASE cache variable doesn't already exist. So if - a custom value is passed on the command line (or reconfiguring an - already-configured build), the cache variable won't be modified. - - CMakeLists.txt | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -commit 025eb6d7879e4c4e8cb29716b371e0f4c1aea660 -Author: Lasse Collin -Date: 2024-02-18 14:59:52 +0200 - - CMake: Handle symbol versioning on MicroBlaze specially. - - This is to match configure.ac. - - CMakeLists.txt | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -commit 2edd1a35b2507d1ce68b52dbaebe23c4850a74ce -Author: Lasse Collin -Date: 2024-02-17 22:18:12 +0200 - - CMake: Keep build working even if lib/*.[ch] are removed. - - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit d753e2ce4715552884afadc4ed6fbf8ccca6efac -Author: Lasse Collin -Date: 2024-02-17 18:10:40 +0200 - - CMake: Install documentation. - - CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -commit 7a0405bea9cb0df9318b70f779f82b2c473e98ac -Author: Lasse Collin -Date: 2024-02-17 15:35:35 +0200 - - CMake: Bump maximum policy version to 3.28. - - CMP0154 doesn't affect us since we don't use FILE_SET. - - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit c2264ffbe3892d28930b89b0123efc369cabc143 -Author: Lasse Collin -Date: 2024-02-17 15:35:35 +0200 - - CMake: Build lzmainfo. - - CMakeLists.txt | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 54 insertions(+) - -commit 998d0b29536094a89cf385a3b894e157db1ccefe -Author: Lasse Collin -Date: 2024-02-17 15:35:35 +0200 - - CMake: Build lzmadec. - - CMakeLists.txt | 76 ++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 42 insertions(+), 34 deletions(-) - -commit 74e8bc7417a0f37ca7ed5ee0127d33c69b3100b9 -Author: Lasse Collin -Date: 2024-02-17 15:35:35 +0200 - - CMake: Add test_scripts.sh to the tests. - - In contrast to Automake, skipping of this test when decoders - are disabled is handled at CMake side instead of test_scripts.sh - because CMake-build doesn't create config.h. - - CMakeLists.txt | 14 ++++++++++++++ - tests/test_scripts.sh | 13 ++++++++----- - 2 files changed, 22 insertions(+), 5 deletions(-) - -commit 4808f238a731befcd46c2117c62a1caaf4403989 -Author: Lasse Collin -Date: 2024-02-17 15:35:35 +0200 - - CMake: Install scripts. - - Compared to the Autotools-based build, this has simpler handling - for the shell (@POSIX_SHELL@) and extra PATH entry for the scripts - (configure has --enable-path-for-scripts=PREFIX). The simpler - metho should be enough for non-ancient systems and Solaris. - - CMakeLists.txt | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 82 insertions(+), 1 deletion(-) - -commit 3462362ebd94d835c664e94ad8f414cfe7590ca7 -Author: Lasse Collin -Date: 2024-02-17 15:35:35 +0200 - - Scripts: Use @PACKAGE_VERSION@ instead of @VERSION@. - - PACKAGE_VERSION was already used in liblzma.pc.in. - This way only one version @foo@ is used. - - src/scripts/xzdiff.in | 2 +- - src/scripts/xzgrep.in | 2 +- - src/scripts/xzless.in | 2 +- - src/scripts/xzmore.in | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 67610c245ba6c68cf65991693bab9312b7dc987b -Author: Lasse Collin -Date: 2024-02-17 15:35:35 +0200 - - CMake: Simplify symlink creation and install translated man pages. - - It helps that cmake_install.cmake doesn't parallelize installation - so symlinks can be created so that the target is always known to - exist (a requirement on Windows in some cases). - - This bumps the minimum CMake version from 3.13 to 3.14 to use - file(CREATE_LINK ...). It could be made to work on 3.13 by - calling "cmake -E create_symlink" but it's uglier code and - slower in "make install". 3.14 should be a reasonable version - to require nowadays, especially since the Autotools build - is still the primary build system for most OSes. - - CMakeLists.txt | 195 +++++++++++++++++++++++++++++---------------------------- - 1 file changed, 98 insertions(+), 97 deletions(-) - -commit 50cc1d8a5a8154428bf240c7e4972e32b17d99bf -Author: Lasse Collin -Date: 2024-02-17 15:35:35 +0200 - - CMake: Add support for building and installing xz with translations. - - If gettext tools are available, the .po files listed in po/LINGUAS - are converted using msgfmt. This allows building with translations - directly from xz.git without Autotools. - - If gettext tools aren't available, the Autotools-created .gmo files - in the "po" directory will be used. This allows CMake-based build - to use translations from Autotools-generated tarball. - - If translation support is found (Intl_FOUND) but both the - gettext tools and the pre-generated .gmo files are missing, - then "make" will fail. - - CMakeLists.txt | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 66 insertions(+), 2 deletions(-) - -commit 746c471643009947f94a3494a1148f74c7381b56 -Author: Lasse Collin -Date: 2024-02-19 11:58:33 +0200 - - liblzma: Remove commented-out code. - - src/liblzma/rangecoder/range_decoder.h | 3 --- - 1 file changed, 3 deletions(-) - -commit 4ce300ce0884c6e552de2af9ae8050b47b01f0e7 -Author: Lasse Collin -Date: 2024-02-17 23:07:35 +0200 - - xz: Delete old commented-out code. - - src/xz/message.c | 19 ------------------- - 1 file changed, 19 deletions(-) - -commit cae9a5e0bf422e6c5e64180805904f7ed02dc3aa -Author: Lasse Collin -Date: 2024-02-17 23:07:35 +0200 - - xz: Use stricter pledge(2) and Landlock sandbox. - - This makes these sandboxing methods stricter when no files are - created or deleted. That is, it's a middle ground between the - initial sandbox and the strictest single-file-to-stdout sandbox: - this allows opening files for reading but output has to go to stdout. - - src/xz/main.c | 46 +++++++++++++++++++++++++++++++++------------- - src/xz/sandbox.c | 32 ++++++++++++++++++++++++++++++++ - src/xz/sandbox.h | 4 ++++ - 3 files changed, 69 insertions(+), 13 deletions(-) - -commit 02e3505991233901575b7eabc06b2c6c62a96899 -Author: Lasse Collin -Date: 2024-02-17 23:07:35 +0200 - - xz: Support Landlock ABI version 4. - - Linux 6.7 added support for ABI version 4 which restricts - TCP connections which xz won't need and thus those can be - forbidden now. Since the ABI version is handled at runtime, - supporting version 4 won't cause any compatibility issues. - - Note that new enough kernel headers are required to get - version 4 support enabled at build time. - - src/xz/sandbox.c | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -commit 374868d81d473ab56556a1cfd6b1b36a1fab348b -Author: Lasse Collin -Date: 2024-02-17 23:07:35 +0200 - - xz: Move sandboxing code to sandbox.c and improve Landlock sandbox. - - Landlock is now always used just like pledge(2) is: first in more - permissive mode and later (under certain common conditions) in - a strict mode that doesn't allow opening more files. - - I put pledge(2) first in sandbox.c because it's the simplest API - to use and still somewhat fine-grained for basic applications. - So it's the simplest thing to understand for anyone reading sandbox.c. - - CMakeLists.txt | 2 + - src/xz/Makefile.am | 2 + - src/xz/file_io.c | 170 +----------------------------- - src/xz/file_io.h | 6 -- - src/xz/main.c | 50 +++------ - src/xz/private.h | 6 +- - src/xz/sandbox.c | 295 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/xz/sandbox.h | 39 +++++++ - 8 files changed, 357 insertions(+), 213 deletions(-) - -commit 7312dfbb02197c7f990c7a3cefd027a9387d1473 -Author: Lasse Collin -Date: 2024-02-17 23:07:35 +0200 - - xz: Tweak comments. - - src/xz/main.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit c701a5909ad9882469fbab4fab5d2d5556d3ba78 -Author: Lasse Collin -Date: 2024-02-17 23:07:35 +0200 - - xz: Fix message_init() description. - - Also explicitly initialize progress_automatic to make it clear - that it can be read before message_init() sets it. Static variable - was initialized to false by default already so this is only for - clarity. - - src/xz/main.c | 3 ++- - src/xz/message.c | 2 +- - src/xz/message.h | 5 ++++- - 3 files changed, 7 insertions(+), 3 deletions(-) - -commit 9466306719f3b76e92fac4e55fbfd89ec92295fa -Author: Lasse Collin -Date: 2024-02-17 19:35:47 +0200 - - Build: Makefile.am: Sort EXTRA_DIST. - - Dirs first, then files in case-sensitive ASCII order. - - Makefile.am | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -commit f3440e78c9517db75bfa52e1a378fad60b073bbe -Author: Lasse Collin -Date: 2024-02-17 19:25:05 +0200 - - Build: Don't install TODO. - - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit a7a3b62e2ab03c82b2bd5c78da1d1fb8b8490381 -Author: Jia Tan -Date: 2024-02-18 01:09:11 +0800 - - Translations: Update the Korean man page translations. - - po4a/ko.po | 1707 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 871 insertions(+), 836 deletions(-) - -commit 9b315db2d5e74700f3dc0755eb86c27947c0b393 -Author: Jia Tan -Date: 2024-02-18 01:08:32 +0800 - - Translations: Update the Korean translation. - - po/ko.po | 423 +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 223 insertions(+), 200 deletions(-) - -commit 56246607dff177b0410d140fcca4a42c865723dc -Author: Lasse Collin -Date: 2024-02-17 16:23:14 +0200 - - Build: Install translated lzmainfo man pages. - - All other translated man pages were being installed but - lzmainfo had been forgotten. - - src/lzmainfo/Makefile.am | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) - -commit f1d6b88aefcced538403c5c2606ba57065b16e70 -Author: Lasse Collin -Date: 2024-02-17 16:01:32 +0200 - - liblzma: Avoid implementation-defined behavior in the RISC-V filter. - - GCC docs promise that it works and a few other compilers do - too. Clang/LLVM is documented source code only but unsurprisingly - it behaves the same as others on x86-64 at least. But the - certainly-portable way is good enough here so use that. - - src/liblzma/simple/riscv.c | 30 ++++++++++++++++++++++-------- - 1 file changed, 22 insertions(+), 8 deletions(-) - -commit 843ddc5f617b91ae132d6bab0f2f2d9c9fcd214a -Author: Lasse Collin -Date: 2024-02-17 15:48:28 +0200 - - liblzma: Wrap a line exceeding 80 chars. - - src/liblzma/rangecoder/range_decoder.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit e9053c907250c70d98b319d95fa54cb94fc76869 -Author: Sebastian Andrzej Siewior -Date: 2024-02-16 21:50:15 +0100 - - liblzma/rangecoder: Exclude x32 from the x86-64 optimisation. - - The x32 port has a x86-64 ABI in term of all registers but uses only - 32bit pointer like x86-32. The assembly optimisation fails to compile on - x32. Given the state of x32 I suggest to exclude it from the - optimisation rather than trying to fix it. - - Signed-off-by: Sebastian Andrzej Siewior - - src/liblzma/rangecoder/range_decoder.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 3d198fb13b87f8803442e5799d465f7434a70555 -Author: Jia Tan -Date: 2024-02-17 21:05:07 +0800 - - Translations: Update the Spanish translation. - - po/es.po | 427 +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 226 insertions(+), 201 deletions(-) - -commit cf278bfe60a25b54b3786f06503bc61272970820 -Author: Jia Tan -Date: 2024-02-17 20:43:29 +0800 - - Translations: Update the Swedish translation. - - po/sv.po | 434 +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 230 insertions(+), 204 deletions(-) - -commit b0f1a41be50560cc6cb528e8e96b02b2067c52c2 -Author: Jia Tan -Date: 2024-02-17 20:41:38 +0800 - - Translations: Update the Polish translation. - - po/pl.po | 424 +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 224 insertions(+), 200 deletions(-) - -commit d74ed48b30c631b6a4c7e7858b06828293bf8520 -Author: Jia Tan -Date: 2024-02-17 20:41:02 +0800 - - Translations: Update the Ukrainian translation. - - po/uk.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 711e22d5c5f3bac39ac904efb3ede874a66e2045 -Author: Lasse Collin -Date: 2024-02-16 17:53:34 +0200 - - Translations: Use the same sentence in xz.pot-header that the TP uses. - - po/xz.pot-header | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit fb5f6aaf18584672d0fee5dbe41fd30fc6bf5422 -Author: Jia Tan -Date: 2024-02-16 22:53:46 +0800 - - Fix typos discovered by codespell. - - AUTHORS | 2 +- - NEWS | 2 +- - src/liblzma/rangecoder/range_decoder.h | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -commit c64723bbb094e29b4edd98f6fcce866e1b569b42 -Author: Jia Tan -Date: 2024-02-16 22:52:41 +0800 - - Translations: Update the Ukrainian man page translations. - - po4a/uk.po | 1710 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 873 insertions(+), 837 deletions(-) - -commit 2895195ed0f68b245c7bd568c126ba6e685fa1d6 -Author: Jia Tan -Date: 2024-02-16 22:51:04 +0800 - - Translations: Update the Ukrainian translation. - - po/uk.po | 466 ++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 225 insertions(+), 241 deletions(-) - -commit 4c20781f4c8f04879b64d631a4f44b4909147bde -Author: Lasse Collin -Date: 2024-02-15 22:32:52 +0200 - - Translations: Omit the generic copyright line from man page headers. - - po4a/update-po | 1 + - 1 file changed, 1 insertion(+) - -commit 4323bc3e0c1e1d2037d5e670a3bf6633e8a3031e -Author: Jia Tan -Date: 2024-02-15 22:26:43 +0800 - - Update m4/.gitignore. - - m4/.gitignore | 1 + - 1 file changed, 1 insertion(+) - -commit 5394a1665b7a108a54cb8b4ef3ebe59d3dbcca3a -Author: Lasse Collin -Date: 2024-02-14 21:11:49 +0200 - - Tests: tuktest.h: Treat Clang separately from GCC. - - Don't assume that Clang defines __GNUC__ as the extensions - are available in clang-cl as well (and possibly in some other - Clang variants?). - - tests/tuktest.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit cce7330b9f23485a0879422e0c3395a7065439ac -Author: Lasse Collin -Date: 2024-02-14 21:11:03 +0200 - - Tests: tuktest.h: Add a missing word to a comment. - - tests/tuktest.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 5dd8fc9452a3373cedc27379067ce638f992c741 -Author: Lasse Collin -Date: 2024-02-14 21:10:10 +0200 - - Tests: tuktest.h: Fix the comment about STest. - - tests/tuktest.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 6f1790254a03c5edf0f2976f773220f070450acd -Author: Jia Tan -Date: 2024-02-15 01:53:40 +0800 - - Bump version for 5.5.2beta. - - src/liblzma/api/lzma/version.h | 4 ++-- - src/liblzma/liblzma_generic.map | 2 +- - src/liblzma/liblzma_linux.map | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -commit 924fdeedf48113fb1e0646d86bd89a356d21a055 -Author: Lasse Collin -Date: 2024-02-14 19:46:11 +0200 - - liblzma: Fix validate_map.sh. - - Adding the SPDX license identifier changed the line numbers. - - src/liblzma/validate_map.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 22140a2df6161b0110e6b4afa5ea0a07c5b60b01 -Author: Lasse Collin -Date: 2024-02-14 19:38:34 +0200 - - Build: Start the generated ChangeLog from around 5.4.0 instead of 5.2.0. - - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 0b8cefa136c21d403a01b78517f4decb50172bdb -Author: Lasse Collin -Date: 2024-02-14 19:27:46 +0200 - - Fixed NEWS for 5.5.2beta. - - NEWS | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -commit a4557bad96361d93ea171ed859ac5a696fca824f -Author: Lasse Collin -Date: 2024-02-14 19:21:45 +0200 - - liblzma: Silence warnings in --enable-small build. - - src/liblzma/lzma/lzma_decoder.c | 2 ++ - src/liblzma/rangecoder/range_decoder.h | 1 + - 2 files changed, 3 insertions(+) - -commit 38edf473236d00b3e100dc4c4f0bf43a4993fed2 -Author: Lasse Collin -Date: 2024-02-14 19:15:58 +0200 - - Build: Install COPYING.0BSD as part of docs. - - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit b74e10bd839bcdc239afb5300ffaee195f34c217 -Author: Lasse Collin -Date: 2024-02-14 19:14:05 +0200 - - Docs: List COPYING.0BSD in README. - - README | 1 + - 1 file changed, 1 insertion(+) - -commit dfdb60ffe933a1f1497d300dbb4513ed17ec6f0e -Author: Lasse Collin -Date: 2024-02-14 19:11:48 +0200 - - Docs: Include doc/examples/11_file_info.c in tarballs. - - It was added in 2017 in c2e29f06a7d1e3ba242ac2fafc69f5d6e92f62cd - but it never got into any release tarballs because it was - forgotten to be added to Makefile.am. - - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit 160b6862646d95dfdbd73ab7f1031ede0f54992d -Author: Lasse Collin -Date: 2024-02-14 19:05:58 +0200 - - liblzma: Silence a warning. - - src/liblzma/rangecoder/range_decoder.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit eeedd4d0925ea417add04ceb42a6c0829244b50c -Author: Lasse Collin -Date: 2024-02-14 18:32:27 +0200 - - Add NEWS for 5.5.2beta. - - NEWS | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 60 insertions(+) - -commit 8af7db854f903068d72a9a0d21103cb0c5027fa8 -Author: Lasse Collin -Date: 2024-02-13 14:32:47 +0200 - - xz: Mention lzmainfo if trying to use 'lzma --list'. - - This kind of fixes the problem reported here: - https://bugs.launchpad.net/ubuntu/+source/xz-utils/+bug/1291020 - - src/xz/list.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -commit 0668907ff736e4cd16738c10d39a2bc9e851aefb -Author: Lasse Collin -Date: 2024-02-14 14:58:36 +0200 - - liblzma: Add comments. - - src/liblzma/lzma/lzma_decoder.c | 9 +++++++++ - src/liblzma/rangecoder/range_decoder.h | 11 +++++++++-- - 2 files changed, 18 insertions(+), 2 deletions(-) - -commit 109f1913d4824c8214d5bbd38ebebf62c37572da -Author: Lasse Collin -Date: 2024-02-13 17:00:17 +0200 - - Scripts: Add lz4 support to xzgrep and xzdiff. - - src/scripts/xzdiff.1 | 8 +++++--- - src/scripts/xzdiff.in | 14 +++++++++----- - src/scripts/xzgrep.1 | 6 ++++-- - src/scripts/xzgrep.in | 1 + - 4 files changed, 19 insertions(+), 10 deletions(-) - -commit de55485cb23af56c5adbe3239b935c957ff8ac4f -Author: Lasse Collin -Date: 2024-02-13 14:05:13 +0200 - - liblzma: Choose the range decoder variants using a bitmask macro. - - src/liblzma/rangecoder/range_decoder.h | 64 ++++++++++++++++++++++++++++------ - 1 file changed, 53 insertions(+), 11 deletions(-) - -commit 0709c2b2d7c1d8f437b003f691880fd7810e5be5 -Author: Lasse Collin -Date: 2024-02-13 11:38:10 +0200 - - xz: Fix outdated threading related info on the man page. - - src/xz/xz.1 | 22 ++++++++++++++-------- - 1 file changed, 14 insertions(+), 8 deletions(-) - -commit 3182a330c1512cc1f5c87b5c5a272578e60a5158 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: Range decoder: Add x86-64 inline assembly. - - It's compatible with GCC and Clang. - - src/liblzma/rangecoder/range_decoder.h | 491 +++++++++++++++++++++++++++++++++ - 1 file changed, 491 insertions(+) - -commit cba2edc991dffba7cd4891dbc1bd26cb950cf053 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: Range decoder: Add branchless C code. - - It's used only for basic bittrees and fixed-size reverse bittree - because those showed a clear benefit on x86-64 with GCC and Clang. - The other methods were more mixed and thus are commented out but - they should be tested on other archs. - - src/liblzma/rangecoder/range_decoder.h | 76 ++++++++++++++++++++++++++++++++++ - 1 file changed, 76 insertions(+) - -commit e290a72d6dee71faf3a90c9678b2f730083666a7 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: Clarify a comment. - - src/liblzma/lzma/lzma_decoder.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -commit 5e04706b91ca90d6befd4da24a588a55e631d4a9 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: LZMA decoder: Optimize loop comparison. - - But now it needs one more local variable. - - src/liblzma/lzma/lzma_decoder.c | 5 ++--- - src/liblzma/rangecoder/range_decoder.h | 10 +++++++++- - 2 files changed, 11 insertions(+), 4 deletions(-) - -commit 88276f9f2cb4871c7eb86952d93d07c1cf6caa66 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: Optimize literal_subcoder() macro slightly. - - src/liblzma/lzma/lzma_common.h | 22 ++++++++++++---------- - src/liblzma/lzma/lzma_decoder.c | 12 ++++++------ - src/liblzma/lzma/lzma_encoder.c | 6 +++--- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 2 +- - src/liblzma/lzma/lzma_encoder_private.h | 4 ++-- - 5 files changed, 24 insertions(+), 22 deletions(-) - -commit 5938f6de4d8ec9656776cd69e78ddfd6c3ad84e5 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: LZ decoder: Add unlikely(). - - src/liblzma/lz/lz_decoder.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9c252e3ed086c6b72590b2531586c42596d4a9d9 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: LZ decoder: Remove a useless unlikely(). - - src/liblzma/lz/lz_decoder.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f3872a59475456c5d365cad9f1c5be514cfa54b5 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: Optimize LZ decoder slightly. - - Now extra buffer space is reserved so that repeating bytes for - any single match will never need to copy from two places (both - the beginning and the end of the buffer). This simplifies - dict_repeat() and helps a little with speed. - - This seems to reduce .lzma decompression time about 2 %, so - with .xz and CRC it could be slightly less. The small things - add up still. - - src/liblzma/lz/lz_decoder.c | 43 ++++++++++++----- - src/liblzma/lz/lz_decoder.h | 101 +++++++++++++++++++++------------------- - src/liblzma/lzma/lzma_decoder.c | 4 +- - 3 files changed, 88 insertions(+), 60 deletions(-) - -commit eb518446e578acf079abae5f1ce28db7b6e59bc1 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: LZMA decoder: Get rid of next_state[]. - - It's not completely obvious if this is better in the decoder. - It should be good if compiler can avoid creating a branch - (like using CMOV on x86). - - This also makes lzma_encoder.c use the new macros. - - src/liblzma/lzma/lzma_common.h | 14 ++++++++++++++ - src/liblzma/lzma/lzma_decoder.c | 30 ++++++++---------------------- - src/liblzma/lzma/lzma_encoder.c | 4 ++-- - 3 files changed, 24 insertions(+), 24 deletions(-) - -commit e0c0ee475c0800c08291ae45e0d66aa00d5ce604 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: LZMA decoder improvements. - - This adds macros for bittree decoding which prepares the code - for alternative C versions and inline assembly. - - src/liblzma/lzma/lzma_decoder.c | 264 ++++++++++----------------------- - src/liblzma/rangecoder/range_common.h | 4 + - src/liblzma/rangecoder/range_decoder.h | 142 ++++++++++++++++-- - 3 files changed, 210 insertions(+), 200 deletions(-) - -commit de5c5e417645ad8906ef914bc059d08c1462fc29 -Author: Jia Tan -Date: 2024-02-12 17:09:10 +0200 - - liblzma: Creates Non-resumable and Resumable modes for lzma_decoder. - - The new decoder resumes the first decoder loop in the Resumable mode. - Then, the code executes in Non-resumable mode until it detects that it - cannot guarantee to have enough input/output to decode another symbol. - - The Resumable mode is how the decoder has always worked. Before decoding - every input bit, it checks if there is enough space and will save its - location to be resumed later. When the decoder has more input/output, - it jumps back to the correct sequence in the Resumable mode code. - - When the input/output buffers are large, the Resumable mode is much - slower than the Non-resumable because it has more branches and is harder - for the compiler to optimize since it is in a large switch block. - - Early benchmarking shows significant time improvement (8-10% on gcc and - clang x86) by using the Non-resumable code as much as possible. - - src/liblzma/lz/lz_decoder.h | 14 +- - src/liblzma/lzma/lzma_decoder.c | 720 ++++++++++++++++++++++++++++------------ - 2 files changed, 521 insertions(+), 213 deletions(-) - -commit e446ab7a18abfde18f8d1cf02a914df72b1370e3 -Author: Jia Tan -Date: 2024-02-12 17:09:10 +0200 - - liblzma: Creates separate "safe" range decoder mode. - - The new "safe" range decoder mode is the same as old range decoder, but - now the default behavior of the range decoder will not check if there is - enough input or output to complete the operation. When the buffers are - close to fully consumed, the "safe" operations must be used instead. This - will improve speed because it will reduce the number of branches needed - for most of the range decoder operations. - - src/liblzma/lzma/lzma_decoder.c | 108 ++++++++------------------------- - src/liblzma/rangecoder/range_decoder.h | 77 +++++++++++++++++------ - 2 files changed, 82 insertions(+), 103 deletions(-) - -commit 7f6d9ca329ff3e01d4b0be7366eb4f5c93da41b9 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - doxygen/footer.html: Add missing closing tags and don't open a new tab. - - The footer template from Doxygen has the closing - as Doxygen doesn't add them otherwise. - - target="_blank" was omitted as it's not useful here but - it can be slightly annoying as one cannot just go back - in the browser history. - - Since the footer links to the license file in the same - directory and not to CC website, the rel attributes - can be omitted. - - doxygen/footer.html | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit 26d1527d34d52b0f5d632d4fb636fb33d0867e92 -Author: Lasse Collin -Date: 2024-02-13 13:19:10 +0200 - - Tweak the expressions in AUTHORS. - - AUTHORS | 31 +++++++++++++++++++++++-------- - 1 file changed, 23 insertions(+), 8 deletions(-) - -commit d231d56580175fa040fdd3c6207a58243ce6217b -Author: Lasse Collin -Date: 2024-02-13 13:07:33 +0200 - - Translations: Add the man page translators into man page header comment. - - It looked odd to only have the original English authors listed - in the header comments of the translated files. - - po4a/.gitignore | 1 + - po4a/po4a.conf | 14 +++++++------- - po4a/update-po | 18 ++++++++++++++++++ - 3 files changed, 26 insertions(+), 7 deletions(-) - -commit 6d35fcb936474fca1acaebfd9502c097b6fde88e -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - Translations: Translate also messages of lzmainfo. - - lzmainfo has had translation support since 2009 at least but - it was never added to po/POTFILES.in so the messages weren't - translated. It's a very rarely needed tool so it's not too bad. - - This also adds src/xz/mytime.c to po/POTFILES.in although there - are no translatable strings. It's simpler this way so that it - won't be forgotten if strings were ever added to that file. - - po/POTFILES.in | 2 ++ - 1 file changed, 2 insertions(+) - -commit a9f369dd54b05f9ac4e00ead9d765d04fc259868 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - Translations: Add custom .pot header with SPDX license identifier. - - The same is used for both po/xz.pot and po4a/xz-man.pot. - - Makefile.am | 1 + - po/xz.pot-header | 7 +++++++ - po4a/update-po | 8 ++++++++ - 3 files changed, 16 insertions(+) - -commit 469cd6653bb96e83c5cf1031c204d34566b15f44 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - Translations: po4a/update-po: Add copyright notice to xz-man.pot. - - All man pages are under 0BSD now so this is simple now. - - po4a/update-po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 28ce45e38fbed4b5f54f2013e38dab47d22bf699 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - Update COPYING about the man pages of the scripts. - - COPYING | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit e48287bf51afd5184ea74de1dcade9e153f873f7 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - xzdiff, xzgrep, and xzmore: Rewrite the man pages. - - The main reason is a kind of silly one: - - xz-man.pot contains strings from all man pages in XZ Utils. - The man pages of xzdiff, xzgrep, and xzmore were under GPLv2 - and the rest under 0BSD. Thus xz-man.pot contained strings - under two licences. po4a creates the translated man pages - from the combined 0BSD+GPLv2 xz-man.pot. - - I haven't liked this mixing in xz-man.pot but the - Translation Project requires that all man pages must be - in the same .pot file. So a separate xz-man-gpl.pot - wasn't an option. - - Since these man pages are short, rewriting them was quick enough. - Now xz-man.pot is entirely under 0BSD and marking the per-file - licenses is simpler. - - As a bonus, some wording hopefully is now slightly better - although it's perhaps a matter of taste. - - NOTE: In xzgrep.1, the EXIT STATUS section was written by me - in the commit d796b6d7fdb8b7238b277056cf9146cce25db604 so that's - why that section could be taken as is from the old xzgrep.1. - - src/scripts/xzdiff.1 | 94 ++++++++++++++++++++++++----------------- - src/scripts/xzgrep.1 | 116 ++++++++++++++++++++++++++++++++------------------- - src/scripts/xzmore.1 | 79 ++++++++++++++++++++--------------- - 3 files changed, 173 insertions(+), 116 deletions(-) - -commit 3e551b111b8ae8150f1a1040364dbafc034f22be -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - xzless: Update man page slightly. - - The xz tool can decompress three file formats and xzless - has always supported uncompressed files too. - - src/scripts/xzless.1 | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 40f36da2262d13d6e1ba8449caa855512ae626d7 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - Translations: Change po/Makevars to add a copyright notice to po/xz.pot. - - po/Makevars | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 24192854e2ea5c06997431a98bda3c36c5da1497 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - Translations: Update po/Makevars to use the template from gettext 0.22.4. - - Also add SPDX license identifier now that there is a known license. - - po/Makevars | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 46 insertions(+), 5 deletions(-) - -commit b94154957370116480b43bcabca25fc52deb9853 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: Include the SPDX license identifier 0BSD to generated files. - - Perhaps the generated files aren't even copyrightable but - using the same license for them as for the rest of the liblzma - keeps things more consistent for tools that look for license info. - - src/liblzma/check/crc32_table_be.h | 4 +++- - src/liblzma/check/crc32_table_le.h | 4 +++- - src/liblzma/check/crc32_tablegen.c | 16 ++++++++++------ - src/liblzma/check/crc64_table_be.h | 4 +++- - src/liblzma/check/crc64_table_le.h | 4 +++- - src/liblzma/check/crc64_tablegen.c | 8 +++++--- - src/liblzma/lz/lz_encoder_hash_table.h | 4 +++- - src/liblzma/lzma/fastpos_table.c | 4 +++- - src/liblzma/lzma/fastpos_tablegen.c | 12 +++++++----- - src/liblzma/rangecoder/price_table.c | 4 +++- - src/liblzma/rangecoder/price_tablegen.c | 12 +++++++----- - 11 files changed, 50 insertions(+), 26 deletions(-) - -commit 8e4ec794836bc1701d8c9bd5e347b8ce8cc5bbb4 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - liblzma: Fix compilation of price_tablegen.c. - - It is built and run only manually so this didn't matter - unless one wanted to regenerate the price_table.c. - - src/liblzma/rangecoder/price_tablegen.c | 5 +++++ - src/liblzma/rangecoder/range_common.h | 5 ++++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -commit e99bff3ffbcdf2634fd5bd13887627ec7dbfecaf -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - Add SPDX license identifiers to GPL, LGPL, and FSFULLR files. - - extra/scanlzma/scanlzma.c | 2 ++ - lib/Makefile.am | 2 ++ - lib/getopt-cdefs.h | 2 ++ - lib/getopt-core.h | 2 ++ - lib/getopt-ext.h | 2 ++ - lib/getopt-pfx-core.h | 2 ++ - lib/getopt-pfx-ext.h | 2 ++ - lib/getopt.c | 2 ++ - lib/getopt.in.h | 2 ++ - lib/getopt1.c | 2 ++ - lib/getopt_int.h | 2 ++ - m4/ax_pthread.m4 | 2 ++ - m4/getopt.m4 | 2 ++ - m4/posix-shell.m4 | 2 ++ - m4/visibility.m4 | 2 ++ - src/scripts/xzdiff.1 | 3 +-- - src/scripts/xzdiff.in | 1 + - src/scripts/xzgrep.1 | 3 +-- - src/scripts/xzgrep.in | 1 + - src/scripts/xzless.in | 1 + - src/scripts/xzmore.1 | 3 +-- - src/scripts/xzmore.in | 1 + - 22 files changed, 37 insertions(+), 6 deletions(-) - -commit 22af94128b89a131f5e58ae69bee5e50227c15da -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - Add SPDX license identifier into 0BSD source code files. - - .github/workflows/ci.yml | 2 ++ - .github/workflows/windows-ci.yml | 2 ++ - CMakeLists.txt | 2 ++ - Makefile.am | 3 +-- - autogen.sh | 1 + - build-aux/ci_build.sh | 3 ++- - build-aux/manconv.sh | 3 ++- - build-aux/version.sh | 3 ++- - cmake/remove-ordinals.cmake | 2 ++ - cmake/tuklib_common.cmake | 4 ++++ - cmake/tuklib_cpucores.cmake | 4 ++++ - cmake/tuklib_integer.cmake | 4 ++++ - cmake/tuklib_large_file_support.cmake | 4 ++++ - cmake/tuklib_mbstr.cmake | 4 ++++ - cmake/tuklib_physmem.cmake | 4 ++++ - cmake/tuklib_progname.cmake | 4 ++++ - configure.ac | 4 +++- - debug/Makefile.am | 3 +-- - debug/crc32.c | 2 ++ - debug/full_flush.c | 2 ++ - debug/hex2bin.c | 2 ++ - debug/known_sizes.c | 2 ++ - debug/memusage.c | 2 ++ - debug/repeat.c | 2 ++ - debug/sync_flush.c | 2 ++ - debug/translation.bash | 1 + - doc/examples/01_compress_easy.c | 2 ++ - doc/examples/02_decompress.c | 2 ++ - doc/examples/03_compress_custom.c | 2 ++ - doc/examples/04_compress_easy_mt.c | 2 ++ - doc/examples/11_file_info.c | 2 ++ - doc/examples/Makefile | 3 +-- - dos/Makefile | 2 ++ - dos/config.h | 2 ++ - doxygen/update-doxygen | 3 ++- - extra/7z2lzma/7z2lzma.bash | 3 ++- - m4/tuklib_common.m4 | 8 ++++++-- - m4/tuklib_cpucores.m4 | 8 ++++++-- - m4/tuklib_integer.m4 | 8 ++++++-- - m4/tuklib_mbstr.m4 | 8 ++++++-- - m4/tuklib_physmem.m4 | 8 ++++++-- - m4/tuklib_progname.m4 | 8 ++++++-- - po/POTFILES.in | 2 ++ - po4a/po4a.conf | 2 ++ - po4a/update-po | 3 ++- - src/Makefile.am | 3 +-- - src/common/common_w32res.rc | 2 ++ - src/common/mythread.h | 2 ++ - src/common/sysdefs.h | 2 ++ - src/common/tuklib_common.h | 2 ++ - src/common/tuklib_config.h | 2 ++ - src/common/tuklib_cpucores.c | 2 ++ - src/common/tuklib_cpucores.h | 2 ++ - src/common/tuklib_exit.c | 2 ++ - src/common/tuklib_exit.h | 2 ++ - src/common/tuklib_gettext.h | 2 ++ - src/common/tuklib_integer.h | 2 ++ - src/common/tuklib_mbstr.h | 2 ++ - src/common/tuklib_mbstr_fw.c | 2 ++ - src/common/tuklib_mbstr_width.c | 2 ++ - src/common/tuklib_open_stdxxx.c | 2 ++ - src/common/tuklib_open_stdxxx.h | 2 ++ - src/common/tuklib_physmem.c | 2 ++ - src/common/tuklib_physmem.h | 2 ++ - src/common/tuklib_progname.c | 2 ++ - src/common/tuklib_progname.h | 2 ++ - src/liblzma/Makefile.am | 3 +-- - src/liblzma/api/Makefile.am | 3 +-- - src/liblzma/api/lzma.h | 2 ++ - src/liblzma/api/lzma/base.h | 2 ++ - src/liblzma/api/lzma/bcj.h | 2 ++ - src/liblzma/api/lzma/block.h | 2 ++ - src/liblzma/api/lzma/check.h | 2 ++ - src/liblzma/api/lzma/container.h | 2 ++ - src/liblzma/api/lzma/delta.h | 2 ++ - src/liblzma/api/lzma/filter.h | 2 ++ - src/liblzma/api/lzma/hardware.h | 2 ++ - src/liblzma/api/lzma/index.h | 2 ++ - src/liblzma/api/lzma/index_hash.h | 2 ++ - src/liblzma/api/lzma/lzma12.h | 2 ++ - src/liblzma/api/lzma/stream_flags.h | 2 ++ - src/liblzma/api/lzma/version.h | 2 ++ - src/liblzma/api/lzma/vli.h | 2 ++ - src/liblzma/check/Makefile.inc | 4 ++-- - src/liblzma/check/check.c | 2 ++ - src/liblzma/check/check.h | 2 ++ - src/liblzma/check/crc32_arm64.h | 2 ++ - src/liblzma/check/crc32_fast.c | 2 ++ - src/liblzma/check/crc32_small.c | 2 ++ - src/liblzma/check/crc32_table.c | 2 ++ - src/liblzma/check/crc32_tablegen.c | 2 ++ - src/liblzma/check/crc32_x86.S | 2 ++ - src/liblzma/check/crc64_fast.c | 2 ++ - src/liblzma/check/crc64_small.c | 2 ++ - src/liblzma/check/crc64_table.c | 2 ++ - src/liblzma/check/crc64_tablegen.c | 2 ++ - src/liblzma/check/crc64_x86.S | 2 ++ - src/liblzma/check/crc_common.h | 2 ++ - src/liblzma/check/crc_x86_clmul.h | 2 ++ - src/liblzma/check/sha256.c | 2 ++ - src/liblzma/common/Makefile.inc | 3 +-- - src/liblzma/common/alone_decoder.c | 2 ++ - src/liblzma/common/alone_decoder.h | 2 ++ - src/liblzma/common/alone_encoder.c | 2 ++ - src/liblzma/common/auto_decoder.c | 2 ++ - src/liblzma/common/block_buffer_decoder.c | 2 ++ - src/liblzma/common/block_buffer_encoder.c | 2 ++ - src/liblzma/common/block_buffer_encoder.h | 2 ++ - src/liblzma/common/block_decoder.c | 2 ++ - src/liblzma/common/block_decoder.h | 2 ++ - src/liblzma/common/block_encoder.c | 2 ++ - src/liblzma/common/block_encoder.h | 2 ++ - src/liblzma/common/block_header_decoder.c | 2 ++ - src/liblzma/common/block_header_encoder.c | 2 ++ - src/liblzma/common/block_util.c | 2 ++ - src/liblzma/common/common.c | 2 ++ - src/liblzma/common/common.h | 2 ++ - src/liblzma/common/easy_buffer_encoder.c | 2 ++ - src/liblzma/common/easy_decoder_memusage.c | 2 ++ - src/liblzma/common/easy_encoder.c | 2 ++ - src/liblzma/common/easy_encoder_memusage.c | 2 ++ - src/liblzma/common/easy_preset.c | 2 ++ - src/liblzma/common/easy_preset.h | 2 ++ - src/liblzma/common/file_info.c | 2 ++ - src/liblzma/common/filter_buffer_decoder.c | 2 ++ - src/liblzma/common/filter_buffer_encoder.c | 2 ++ - src/liblzma/common/filter_common.c | 2 ++ - src/liblzma/common/filter_common.h | 2 ++ - src/liblzma/common/filter_decoder.c | 2 ++ - src/liblzma/common/filter_decoder.h | 2 ++ - src/liblzma/common/filter_encoder.c | 2 ++ - src/liblzma/common/filter_encoder.h | 2 ++ - src/liblzma/common/filter_flags_decoder.c | 2 ++ - src/liblzma/common/filter_flags_encoder.c | 2 ++ - src/liblzma/common/hardware_cputhreads.c | 2 ++ - src/liblzma/common/hardware_physmem.c | 2 ++ - src/liblzma/common/index.c | 2 ++ - src/liblzma/common/index.h | 2 ++ - src/liblzma/common/index_decoder.c | 2 ++ - src/liblzma/common/index_decoder.h | 2 ++ - src/liblzma/common/index_encoder.c | 2 ++ - src/liblzma/common/index_encoder.h | 2 ++ - src/liblzma/common/index_hash.c | 2 ++ - src/liblzma/common/lzip_decoder.c | 2 ++ - src/liblzma/common/lzip_decoder.h | 2 ++ - src/liblzma/common/memcmplen.h | 2 ++ - src/liblzma/common/microlzma_decoder.c | 2 ++ - src/liblzma/common/microlzma_encoder.c | 2 ++ - src/liblzma/common/outqueue.c | 2 ++ - src/liblzma/common/outqueue.h | 2 ++ - src/liblzma/common/stream_buffer_decoder.c | 2 ++ - src/liblzma/common/stream_buffer_encoder.c | 2 ++ - src/liblzma/common/stream_decoder.c | 2 ++ - src/liblzma/common/stream_decoder.h | 2 ++ - src/liblzma/common/stream_decoder_mt.c | 2 ++ - src/liblzma/common/stream_encoder.c | 2 ++ - src/liblzma/common/stream_encoder_mt.c | 2 ++ - src/liblzma/common/stream_flags_common.c | 2 ++ - src/liblzma/common/stream_flags_common.h | 2 ++ - src/liblzma/common/stream_flags_decoder.c | 2 ++ - src/liblzma/common/stream_flags_encoder.c | 2 ++ - src/liblzma/common/string_conversion.c | 2 ++ - src/liblzma/common/vli_decoder.c | 2 ++ - src/liblzma/common/vli_encoder.c | 2 ++ - src/liblzma/common/vli_size.c | 2 ++ - src/liblzma/delta/Makefile.inc | 3 +-- - src/liblzma/delta/delta_common.c | 2 ++ - src/liblzma/delta/delta_common.h | 2 ++ - src/liblzma/delta/delta_decoder.c | 2 ++ - src/liblzma/delta/delta_decoder.h | 2 ++ - src/liblzma/delta/delta_encoder.c | 2 ++ - src/liblzma/delta/delta_encoder.h | 2 ++ - src/liblzma/delta/delta_private.h | 2 ++ - src/liblzma/liblzma.pc.in | 3 +-- - src/liblzma/liblzma_generic.map | 2 ++ - src/liblzma/liblzma_linux.map | 2 ++ - src/liblzma/liblzma_w32res.rc | 2 ++ - src/liblzma/lz/Makefile.inc | 3 +-- - src/liblzma/lz/lz_decoder.c | 2 ++ - src/liblzma/lz/lz_decoder.h | 2 ++ - src/liblzma/lz/lz_encoder.c | 2 ++ - src/liblzma/lz/lz_encoder.h | 2 ++ - src/liblzma/lz/lz_encoder_hash.h | 2 ++ - src/liblzma/lz/lz_encoder_mf.c | 2 ++ - src/liblzma/lzma/Makefile.inc | 3 +-- - src/liblzma/lzma/fastpos.h | 2 ++ - src/liblzma/lzma/fastpos_tablegen.c | 2 ++ - src/liblzma/lzma/lzma2_decoder.c | 2 ++ - src/liblzma/lzma/lzma2_decoder.h | 2 ++ - src/liblzma/lzma/lzma2_encoder.c | 2 ++ - src/liblzma/lzma/lzma2_encoder.h | 2 ++ - src/liblzma/lzma/lzma_common.h | 2 ++ - src/liblzma/lzma/lzma_decoder.c | 2 ++ - src/liblzma/lzma/lzma_decoder.h | 2 ++ - src/liblzma/lzma/lzma_encoder.c | 2 ++ - src/liblzma/lzma/lzma_encoder.h | 2 ++ - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 ++ - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 2 ++ - src/liblzma/lzma/lzma_encoder_presets.c | 2 ++ - src/liblzma/lzma/lzma_encoder_private.h | 2 ++ - src/liblzma/rangecoder/Makefile.inc | 3 +-- - src/liblzma/rangecoder/price.h | 2 ++ - src/liblzma/rangecoder/price_tablegen.c | 2 ++ - src/liblzma/rangecoder/range_common.h | 2 ++ - src/liblzma/rangecoder/range_decoder.h | 2 ++ - src/liblzma/rangecoder/range_encoder.h | 2 ++ - src/liblzma/simple/Makefile.inc | 3 +-- - src/liblzma/simple/arm.c | 2 ++ - src/liblzma/simple/arm64.c | 2 ++ - src/liblzma/simple/armthumb.c | 2 ++ - src/liblzma/simple/ia64.c | 2 ++ - src/liblzma/simple/powerpc.c | 2 ++ - src/liblzma/simple/riscv.c | 2 ++ - src/liblzma/simple/simple_coder.c | 2 ++ - src/liblzma/simple/simple_coder.h | 2 ++ - src/liblzma/simple/simple_decoder.c | 2 ++ - src/liblzma/simple/simple_decoder.h | 2 ++ - src/liblzma/simple/simple_encoder.c | 2 ++ - src/liblzma/simple/simple_encoder.h | 2 ++ - src/liblzma/simple/simple_private.h | 2 ++ - src/liblzma/simple/sparc.c | 2 ++ - src/liblzma/simple/x86.c | 2 ++ - src/liblzma/validate_map.sh | 1 + - src/lzmainfo/Makefile.am | 3 +-- - src/lzmainfo/lzmainfo.c | 2 ++ - src/lzmainfo/lzmainfo_w32res.rc | 2 ++ - src/scripts/Makefile.am | 3 +-- - src/xz/Makefile.am | 3 +-- - src/xz/args.c | 2 ++ - src/xz/args.h | 2 ++ - src/xz/coder.c | 2 ++ - src/xz/coder.h | 2 ++ - src/xz/file_io.c | 2 ++ - src/xz/file_io.h | 2 ++ - src/xz/hardware.c | 2 ++ - src/xz/hardware.h | 2 ++ - src/xz/list.c | 2 ++ - src/xz/list.h | 2 ++ - src/xz/main.c | 2 ++ - src/xz/main.h | 2 ++ - src/xz/message.c | 2 ++ - src/xz/message.h | 2 ++ - src/xz/mytime.c | 2 ++ - src/xz/mytime.h | 2 ++ - src/xz/options.c | 2 ++ - src/xz/options.h | 2 ++ - src/xz/private.h | 2 ++ - src/xz/signals.c | 2 ++ - src/xz/signals.h | 2 ++ - src/xz/suffix.c | 2 ++ - src/xz/suffix.h | 2 ++ - src/xz/util.c | 2 ++ - src/xz/util.h | 2 ++ - src/xz/xz_w32res.rc | 2 ++ - src/xzdec/Makefile.am | 3 +-- - src/xzdec/lzmadec_w32res.rc | 2 ++ - src/xzdec/xzdec.c | 2 ++ - src/xzdec/xzdec_w32res.rc | 2 ++ - tests/Makefile.am | 3 +-- - tests/bcj_test.c | 2 ++ - tests/code_coverage.sh | 1 + - tests/create_compress_files.c | 2 ++ - tests/ossfuzz/fuzz_common.h | 2 ++ - tests/ossfuzz/fuzz_decode_alone.c | 2 ++ - tests/ossfuzz/fuzz_decode_stream.c | 2 ++ - tests/ossfuzz/fuzz_encode_stream.c | 2 ++ - tests/test_bcj_exact_size.c | 2 ++ - tests/test_block_header.c | 2 ++ - tests/test_check.c | 2 ++ - tests/test_compress.sh | 1 + - tests/test_compress_generated_abc | 1 + - tests/test_compress_generated_random | 1 + - tests/test_compress_generated_text | 1 + - tests/test_compress_prepared_bcj_sparc | 1 + - tests/test_compress_prepared_bcj_x86 | 1 + - tests/test_files.sh | 1 + - tests/test_filter_flags.c | 2 ++ - tests/test_filter_str.c | 2 ++ - tests/test_hardware.c | 2 ++ - tests/test_index.c | 2 ++ - tests/test_index_hash.c | 2 ++ - tests/test_lzip_decoder.c | 2 ++ - tests/test_memlimit.c | 2 ++ - tests/test_scripts.sh | 1 + - tests/test_stream_flags.c | 2 ++ - tests/test_suffix.sh | 1 + - tests/test_vli.c | 2 ++ - tests/tests.h | 2 ++ - tests/tuktest.h | 2 ++ - windows/build.bash | 3 ++- - 290 files changed, 588 insertions(+), 58 deletions(-) - -commit 23de53421ea258cde6a3c33a038b1e9d08f771d1 -Author: Lasse Collin -Date: 2024-02-12 23:25:54 +0200 - - liblzma: Sync the AUTHORS fix about SHA-256 to lzma.h. - - src/liblzma/api/lzma.h | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -commit 689e0228baeb95232430e90d628379db89583d71 -Author: Lasse Collin -Date: 2024-02-12 17:09:10 +0200 - - Change most public domain parts to 0BSD. - - Translations and doc/xz-file-format.txt and doc/lzma-file-format.txt - were not touched. - - COPYING.0BSD was added. - - .github/workflows/ci.yml | 3 - - .github/workflows/windows-ci.yml | 3 - - CMakeLists.txt | 3 - - COPYING | 112 ++++++++++++++----------- - COPYING.0BSD | 11 +++ - Makefile.am | 3 - - PACKAGERS | 11 +-- - autogen.sh | 3 - - build-aux/ci_build.sh | 3 - - build-aux/manconv.sh | 3 - - build-aux/version.sh | 3 - - cmake/remove-ordinals.cmake | 3 - - cmake/tuklib_common.cmake | 3 - - cmake/tuklib_cpucores.cmake | 3 - - cmake/tuklib_integer.cmake | 3 - - cmake/tuklib_large_file_support.cmake | 3 - - cmake/tuklib_mbstr.cmake | 3 - - cmake/tuklib_physmem.cmake | 3 - - cmake/tuklib_progname.cmake | 3 - - configure.ac | 3 - - debug/Makefile.am | 3 - - debug/crc32.c | 3 - - debug/full_flush.c | 3 - - debug/hex2bin.c | 3 - - debug/known_sizes.c | 3 - - debug/memusage.c | 3 - - debug/repeat.c | 3 - - debug/sync_flush.c | 3 - - debug/translation.bash | 3 - - doc/examples/01_compress_easy.c | 3 - - doc/examples/02_decompress.c | 3 - - doc/examples/03_compress_custom.c | 3 - - doc/examples/04_compress_easy_mt.c | 3 - - doc/examples/11_file_info.c | 3 - - doc/examples/Makefile | 3 - - dos/Makefile | 3 - - doxygen/update-doxygen | 3 - - extra/7z2lzma/7z2lzma.bash | 3 - - m4/tuklib_common.m4 | 3 - - m4/tuklib_cpucores.m4 | 3 - - m4/tuklib_integer.m4 | 3 - - m4/tuklib_mbstr.m4 | 3 - - m4/tuklib_physmem.m4 | 3 - - m4/tuklib_progname.m4 | 3 - - po4a/update-po | 3 - - src/Makefile.am | 3 - - src/common/common_w32res.rc | 3 - - src/common/mythread.h | 3 - - src/common/sysdefs.h | 3 - - src/common/tuklib_common.h | 3 - - src/common/tuklib_cpucores.c | 3 - - src/common/tuklib_cpucores.h | 3 - - src/common/tuklib_exit.c | 3 - - src/common/tuklib_exit.h | 3 - - src/common/tuklib_gettext.h | 3 - - src/common/tuklib_integer.h | 3 - - src/common/tuklib_mbstr.h | 3 - - src/common/tuklib_mbstr_fw.c | 3 - - src/common/tuklib_mbstr_width.c | 3 - - src/common/tuklib_open_stdxxx.c | 3 - - src/common/tuklib_open_stdxxx.h | 3 - - src/common/tuklib_physmem.c | 3 - - src/common/tuklib_physmem.h | 3 - - src/common/tuklib_progname.c | 3 - - src/common/tuklib_progname.h | 3 - - src/liblzma/Makefile.am | 3 - - src/liblzma/api/Makefile.am | 3 - - src/liblzma/api/lzma.h | 13 ++- - src/liblzma/api/lzma/base.h | 3 - - src/liblzma/api/lzma/bcj.h | 3 - - src/liblzma/api/lzma/block.h | 3 - - src/liblzma/api/lzma/check.h | 3 - - src/liblzma/api/lzma/container.h | 3 - - src/liblzma/api/lzma/delta.h | 3 - - src/liblzma/api/lzma/filter.h | 3 - - src/liblzma/api/lzma/hardware.h | 3 - - src/liblzma/api/lzma/index.h | 3 - - src/liblzma/api/lzma/index_hash.h | 3 - - src/liblzma/api/lzma/lzma12.h | 3 - - src/liblzma/api/lzma/stream_flags.h | 3 - - src/liblzma/api/lzma/version.h | 3 - - src/liblzma/api/lzma/vli.h | 3 - - src/liblzma/check/Makefile.inc | 3 - - src/liblzma/check/check.c | 3 - - src/liblzma/check/check.h | 3 - - src/liblzma/check/crc32_arm64.h | 3 - - src/liblzma/check/crc32_fast.c | 3 - - src/liblzma/check/crc32_small.c | 3 - - src/liblzma/check/crc32_table.c | 3 - - src/liblzma/check/crc32_tablegen.c | 3 - - src/liblzma/check/crc32_x86.S | 3 - - src/liblzma/check/crc64_fast.c | 3 - - src/liblzma/check/crc64_small.c | 3 - - src/liblzma/check/crc64_table.c | 3 - - src/liblzma/check/crc64_tablegen.c | 3 - - src/liblzma/check/crc64_x86.S | 3 - - src/liblzma/check/crc_common.h | 3 - - src/liblzma/check/crc_x86_clmul.h | 3 - - src/liblzma/check/sha256.c | 3 - - src/liblzma/common/Makefile.inc | 3 - - src/liblzma/common/alone_decoder.c | 3 - - src/liblzma/common/alone_decoder.h | 3 - - src/liblzma/common/alone_encoder.c | 3 - - src/liblzma/common/auto_decoder.c | 3 - - src/liblzma/common/block_buffer_decoder.c | 3 - - src/liblzma/common/block_buffer_encoder.c | 3 - - src/liblzma/common/block_buffer_encoder.h | 3 - - src/liblzma/common/block_decoder.c | 3 - - src/liblzma/common/block_decoder.h | 3 - - src/liblzma/common/block_encoder.c | 3 - - src/liblzma/common/block_encoder.h | 3 - - src/liblzma/common/block_header_decoder.c | 3 - - src/liblzma/common/block_header_encoder.c | 3 - - src/liblzma/common/block_util.c | 3 - - src/liblzma/common/common.c | 3 - - src/liblzma/common/common.h | 3 - - src/liblzma/common/easy_buffer_encoder.c | 3 - - src/liblzma/common/easy_decoder_memusage.c | 3 - - src/liblzma/common/easy_encoder.c | 3 - - src/liblzma/common/easy_encoder_memusage.c | 3 - - src/liblzma/common/easy_preset.c | 3 - - src/liblzma/common/easy_preset.h | 3 - - src/liblzma/common/file_info.c | 3 - - src/liblzma/common/filter_buffer_decoder.c | 3 - - src/liblzma/common/filter_buffer_encoder.c | 3 - - src/liblzma/common/filter_common.c | 3 - - src/liblzma/common/filter_common.h | 3 - - src/liblzma/common/filter_decoder.c | 3 - - src/liblzma/common/filter_decoder.h | 3 - - src/liblzma/common/filter_encoder.c | 3 - - src/liblzma/common/filter_encoder.h | 3 - - src/liblzma/common/filter_flags_decoder.c | 3 - - src/liblzma/common/filter_flags_encoder.c | 3 - - src/liblzma/common/hardware_cputhreads.c | 3 - - src/liblzma/common/hardware_physmem.c | 3 - - src/liblzma/common/index.c | 3 - - src/liblzma/common/index.h | 3 - - src/liblzma/common/index_decoder.c | 3 - - src/liblzma/common/index_decoder.h | 3 - - src/liblzma/common/index_encoder.c | 3 - - src/liblzma/common/index_encoder.h | 3 - - src/liblzma/common/index_hash.c | 3 - - src/liblzma/common/lzip_decoder.c | 3 - - src/liblzma/common/lzip_decoder.h | 3 - - src/liblzma/common/memcmplen.h | 3 - - src/liblzma/common/microlzma_decoder.c | 3 - - src/liblzma/common/microlzma_encoder.c | 3 - - src/liblzma/common/outqueue.c | 3 - - src/liblzma/common/outqueue.h | 3 - - src/liblzma/common/stream_buffer_decoder.c | 3 - - src/liblzma/common/stream_buffer_encoder.c | 3 - - src/liblzma/common/stream_decoder.c | 3 - - src/liblzma/common/stream_decoder.h | 3 - - src/liblzma/common/stream_decoder_mt.c | 3 - - src/liblzma/common/stream_encoder.c | 3 - - src/liblzma/common/stream_encoder_mt.c | 3 - - src/liblzma/common/stream_flags_common.c | 3 - - src/liblzma/common/stream_flags_common.h | 3 - - src/liblzma/common/stream_flags_decoder.c | 3 - - src/liblzma/common/stream_flags_encoder.c | 3 - - src/liblzma/common/string_conversion.c | 3 - - src/liblzma/common/vli_decoder.c | 3 - - src/liblzma/common/vli_encoder.c | 3 - - src/liblzma/common/vli_size.c | 3 - - src/liblzma/delta/Makefile.inc | 3 - - src/liblzma/delta/delta_common.c | 3 - - src/liblzma/delta/delta_common.h | 3 - - src/liblzma/delta/delta_decoder.c | 3 - - src/liblzma/delta/delta_decoder.h | 3 - - src/liblzma/delta/delta_encoder.c | 3 - - src/liblzma/delta/delta_encoder.h | 3 - - src/liblzma/delta/delta_private.h | 3 - - src/liblzma/liblzma.pc.in | 3 - - src/liblzma/liblzma_w32res.rc | 3 - - src/liblzma/lz/Makefile.inc | 3 - - src/liblzma/lz/lz_decoder.c | 3 - - src/liblzma/lz/lz_decoder.h | 3 - - src/liblzma/lz/lz_encoder.c | 3 - - src/liblzma/lz/lz_encoder.h | 3 - - src/liblzma/lz/lz_encoder_hash.h | 3 - - src/liblzma/lz/lz_encoder_mf.c | 3 - - src/liblzma/lzma/Makefile.inc | 3 - - src/liblzma/lzma/fastpos.h | 3 - - src/liblzma/lzma/fastpos_tablegen.c | 3 - - src/liblzma/lzma/lzma2_decoder.c | 3 - - src/liblzma/lzma/lzma2_decoder.h | 3 - - src/liblzma/lzma/lzma2_encoder.c | 3 - - src/liblzma/lzma/lzma2_encoder.h | 3 - - src/liblzma/lzma/lzma_common.h | 3 - - src/liblzma/lzma/lzma_decoder.c | 3 - - src/liblzma/lzma/lzma_decoder.h | 3 - - src/liblzma/lzma/lzma_encoder.c | 3 - - src/liblzma/lzma/lzma_encoder.h | 3 - - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 3 - - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 3 - - src/liblzma/lzma/lzma_encoder_presets.c | 3 - - src/liblzma/lzma/lzma_encoder_private.h | 3 - - src/liblzma/rangecoder/Makefile.inc | 3 - - src/liblzma/rangecoder/price.h | 3 - - src/liblzma/rangecoder/price_tablegen.c | 3 - - src/liblzma/rangecoder/range_common.h | 3 - - src/liblzma/rangecoder/range_decoder.h | 3 - - src/liblzma/rangecoder/range_encoder.h | 3 - - src/liblzma/simple/Makefile.inc | 3 - - src/liblzma/simple/arm.c | 3 - - src/liblzma/simple/arm64.c | 3 - - src/liblzma/simple/armthumb.c | 3 - - src/liblzma/simple/ia64.c | 3 - - src/liblzma/simple/powerpc.c | 3 - - src/liblzma/simple/riscv.c | 3 - - src/liblzma/simple/simple_coder.c | 3 - - src/liblzma/simple/simple_coder.h | 3 - - src/liblzma/simple/simple_decoder.c | 3 - - src/liblzma/simple/simple_decoder.h | 3 - - src/liblzma/simple/simple_encoder.c | 3 - - src/liblzma/simple/simple_encoder.h | 3 - - src/liblzma/simple/simple_private.h | 3 - - src/liblzma/simple/sparc.c | 3 - - src/liblzma/simple/x86.c | 3 - - src/liblzma/validate_map.sh | 3 - - src/lzmainfo/Makefile.am | 3 - - src/lzmainfo/lzmainfo.1 | 4 +- - src/lzmainfo/lzmainfo.c | 3 - - src/lzmainfo/lzmainfo_w32res.rc | 3 - - src/scripts/Makefile.am | 3 - - src/scripts/xzless.1 | 4 +- - src/xz/Makefile.am | 3 - - src/xz/args.c | 3 - - src/xz/args.h | 3 - - src/xz/coder.c | 3 - - src/xz/coder.h | 3 - - src/xz/file_io.c | 3 - - src/xz/file_io.h | 3 - - src/xz/hardware.c | 3 - - src/xz/hardware.h | 3 - - src/xz/list.c | 3 - - src/xz/list.h | 3 - - src/xz/main.c | 3 - - src/xz/main.h | 3 - - src/xz/message.c | 3 - - src/xz/message.h | 3 - - src/xz/mytime.c | 3 - - src/xz/mytime.h | 3 - - src/xz/options.c | 3 - - src/xz/options.h | 3 - - src/xz/private.h | 3 - - src/xz/signals.c | 3 - - src/xz/signals.h | 3 - - src/xz/suffix.c | 3 - - src/xz/suffix.h | 3 - - src/xz/util.c | 3 - - src/xz/util.h | 3 - - src/xz/xz.1 | 4 +- - src/xz/xz_w32res.rc | 3 - - src/xzdec/Makefile.am | 3 - - src/xzdec/lzmadec_w32res.rc | 3 - - src/xzdec/xzdec.1 | 4 +- - src/xzdec/xzdec.c | 3 - - src/xzdec/xzdec_w32res.rc | 3 - - tests/Makefile.am | 3 - - tests/bcj_test.c | 3 - - tests/code_coverage.sh | 3 - - tests/create_compress_files.c | 3 - - tests/files/README | 3 +- - tests/ossfuzz/fuzz_common.h | 3 - - tests/ossfuzz/fuzz_decode_alone.c | 3 - - tests/ossfuzz/fuzz_decode_stream.c | 3 - - tests/ossfuzz/fuzz_encode_stream.c | 3 - - tests/test_bcj_exact_size.c | 3 - - tests/test_block_header.c | 3 - - tests/test_check.c | 3 - - tests/test_compress.sh | 3 - - tests/test_files.sh | 3 - - tests/test_filter_flags.c | 3 - - tests/test_filter_str.c | 3 - - tests/test_hardware.c | 3 - - tests/test_index.c | 3 - - tests/test_index_hash.c | 3 - - tests/test_lzip_decoder.c | 3 - - tests/test_memlimit.c | 3 - - tests/test_scripts.sh | 3 - - tests/test_stream_flags.c | 3 - - tests/test_suffix.sh | 3 - - tests/test_vli.c | 3 - - tests/tests.h | 3 - - tests/tuktest.h | 3 - - windows/README-Windows.txt | 11 +-- - windows/build.bash | 3 - - 288 files changed, 100 insertions(+), 911 deletions(-) - -commit 76946dc4336c831fe2cc26696a035d807dd3cf13 -Author: Lasse Collin -Date: 2024-02-09 17:20:31 +0200 - - Fix SHA-256 authors. - - The initial commit 5d018dc03549c1ee4958364712fb0c94e1bf2741 - in 2007 had a comment in sha256.c that the code is based on - Crypto++ Library 5.5.1. In 2009 the Authors list in sha256.c - and the AUTHORS file was updated with information that the - code had come from Crypto++ but via 7-Zip. I know I had viewed - 7-Zip's SHA-256 code but back then the C code has been identical - enough with Crypto++, so I don't why I thought the author info - would need that extra step via 7-Zip for this single file. - - Another error is that I had mixed sha.* and shacal2.* files - when checking for author info in Crypto++. The shacal2.* files - aren't related to liblzma's sha256.c and thus Kevin Springle's - code in Crypto++ isn't either. - - AUTHORS | 6 ++---- - src/liblzma/check/sha256.c | 14 ++++---------- - 2 files changed, 6 insertions(+), 14 deletions(-) - -commit 21d9cbae9eecca28ce373d3d9464defd2cf5d851 -Author: Lasse Collin -Date: 2024-02-09 17:20:31 +0200 - - Remove macosx/build.sh. - - It was last updated in 2013. - - Makefile.am | 1 - - macosx/build.sh | 113 -------------------------------------------------------- - 2 files changed, 114 deletions(-) - -commit eac2c3c67f9113a225fb6667df862edd30366931 -Author: Lasse Collin -Date: 2024-02-09 17:20:31 +0200 - - Doc: Remove doc/examples_old. - - It was good to keep these around in parallel with the newer examples - but I think it's OK to remove the old ones at this point. - - Makefile.am | 5 -- - doc/examples_old/xz_pipe_comp.c | 127 -------------------------------------- - doc/examples_old/xz_pipe_decomp.c | 123 ------------------------------------ - 3 files changed, 255 deletions(-) - -commit 89ea1a22f4ed3685b053b7260bc5acf6c75d1664 -Author: Jia Tan -Date: 2024-02-13 22:38:58 +0800 - - Tests: Add RISC-V filter support in a few places. - - tests/test_filter_flags.c | 6 ++++++ - tests/test_filter_str.c | 6 ++++++ - 2 files changed, 12 insertions(+) - -commit 45663443eb2b377e6171529380fee312f1adcdf4 -Author: Jia Tan -Date: 2024-02-13 22:37:07 +0800 - - liblzma: Fix build error if only RISC-V BCJ filter is enabled. - - If any other BCJ filter was enabled for encoding or decoding, then this - was not a problem. - - src/liblzma/common/string_conversion.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 2f15597d677bc35743c777d4cf3bfa698b478681 -Author: Jia Tan -Date: 2024-02-13 22:56:24 +0800 - - Translations: Update the Korean translation. - - po/ko.po | 526 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 284 insertions(+), 242 deletions(-) - -commit df873143ad1615c6d6aaa1bf8808b1676091dfe3 -Author: Jia Tan -Date: 2024-02-13 01:55:53 +0800 - - Translations: Update the Korean man page translations. - - po4a/ko.po | 1375 ++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 770 insertions(+), 605 deletions(-) - -commit b3f415eddb150341865a1af47959c3baba076b33 -Author: Jia Tan -Date: 2024-02-13 01:53:33 +0800 - - Translations: Update the Chinese (simplified) translation. - - po/zh_CN.po | 424 ++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 268 insertions(+), 156 deletions(-) - -commit 9860d418d296eb3c721e5384fb367c0499b579c8 -Author: Lasse Collin -Date: 2024-02-09 23:21:01 +0200 - - xzless: Use ||- in LESSOPEN with with "less" 451 and newer. - - src/scripts/xzless.in | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -commit fd0692b0525e6c26b496492be9e2c865cab734f8 -Author: Lasse Collin -Date: 2024-02-09 23:00:05 +0200 - - xzless: Use --show-preproc-errors with "less" 632 and newer. - - This makes "less" show a warning if a decompression error occurred. - - src/scripts/xzless.in | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -commit adb073da76a920b5a81e6b32254f4ddb054dc57a -Author: Jia Tan -Date: 2024-02-09 23:59:54 +0800 - - liblzma: Fix typo discovered by codespell. - - src/liblzma/check/crc32_arm64.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 55d9fc883d221cbace951a370f1fb144698f8c2e -Author: Jia Tan -Date: 2024-02-09 20:01:06 +0800 - - Translations: Update the Swedish translation. - - po/sv.po | 420 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 254 insertions(+), 166 deletions(-) - -commit 55ba4a1ea321499c805eedfa811ffde690bae311 -Author: Jia Tan -Date: 2024-02-08 20:09:04 +0800 - - Translations: Update the Spanish translation. - - po/es.po | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -commit 7f2293cd804a89d3c3b2d3ed573560ca9e1520ae -Author: Jia Tan -Date: 2024-02-07 21:34:35 +0800 - - Translations: Update the Spanish translation. - - po/es.po | 419 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 253 insertions(+), 166 deletions(-) - -commit f4af2036bc625739d6d33d9e1fede583a25c3828 -Author: Jia Tan -Date: 2024-02-07 21:28:32 +0800 - - Translations: Update the Polish translation. - - po/pl.po | 411 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 249 insertions(+), 162 deletions(-) - -commit e5e93bb816043c559cddf03a3b7ba13bec353ee4 -Author: Jia Tan -Date: 2024-02-07 19:40:12 +0800 - - Translations: Update the German translation. - - po/de.po | 396 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 242 insertions(+), 154 deletions(-) - -commit 28f18ff8e26902762fb007c13be235b4ac1ac071 -Author: Jia Tan -Date: 2024-02-07 19:27:25 +0800 - - Translations: Update the German man page translations. - - po4a/de.po | 1353 +++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 752 insertions(+), 601 deletions(-) - -commit cabfbc7947da05aa5dfe39bec9759e076f940e3c -Author: Jia Tan -Date: 2024-02-06 23:44:06 +0800 - - Translations: Update the Romanian translation. - - po/ro.po | 416 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 252 insertions(+), 164 deletions(-) - -commit bf20c94f5d748cea2147779f4fa7e2fd2eb8555e -Author: Jia Tan -Date: 2024-02-06 23:45:02 +0800 - - Translations: Update the Romanian man page translations. - - po4a/ro.po | 1759 +++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 966 insertions(+), 793 deletions(-) - -commit 7c25ec9feb0241e4affb7432681cc4f5696f3a96 -Author: Jia Tan -Date: 2024-02-07 20:56:57 +0800 - - Translations: Update the Ukrainian translation. - - po/uk.po | 397 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 242 insertions(+), 155 deletions(-) - -commit b3523250e9eef10b017473754c1e1c9e31f10374 -Author: Jia Tan -Date: 2024-02-06 23:30:03 +0800 - - Translations: Update the Ukrainian man page translations. - - po4a/uk.po | 1363 ++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 764 insertions(+), 599 deletions(-) - -commit a5c177f514f4c90e0d2f6045636fca6c2e80a20d -Author: Jia Tan -Date: 2024-02-02 01:39:28 +0800 - - Update AUTHORS. - - AUTHORS | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 7f68a68c19d0ae57bd0e802be0ea8f974e41299f -Author: Jia Tan -Date: 2024-02-02 01:38:51 +0800 - - liblzma: Update Authors list in crc32_arm64.h. - - src/liblzma/check/crc32_arm64.h | 1 + - 1 file changed, 1 insertion(+) - -commit 97f9ba50b84e67b3dcb5b17dd5d3e1d14f9ad1d0 -Author: Jia Tan -Date: 2024-02-01 16:07:03 +0800 - - liblzma: Check HAVE_USABLE_CLMUL before omitting CRC32 table. - - This was split from the prior commit so it could be easily applied to - the 5.4 branch. - - Closes: https://github.com/tukaani-project/xz/pull/77 - - src/liblzma/check/crc32_table.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit ca9015f4dead2c97b48f5a6933631b0a448b65b9 -Author: Jia Tan -Date: 2024-02-01 16:06:29 +0800 - - liblzma: Check HAVE_USABLE_CLMUL before omitting CRC64 table. - - If liblzma is configured with --disable-clmul-crc - CFLAGS="-msse4.1 -mpclmul", then it will fail to compile because the - generic version must be used but the CRC tables were not included. - - src/liblzma/check/crc64_table.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 2f1552a91c825e87013925e1a67a0930e7aef592 -Author: Jia Tan -Date: 2024-01-23 18:02:13 +0800 - - liblzma: Only use ifunc in crcXX_fast.c if its needed. - - The code was using HAVE_FUNC_ATTRIBUTE_IFUNC instead of CRC_USE_IFUNC. - With ARM64, ifunc is incompatible because it requires non-inline - function calls for runtime detection. - - src/liblzma/check/crc32_fast.c | 6 +++--- - src/liblzma/check/crc64_fast.c | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 30a25f3742287697bc57a1bef86c19ecf5129322 -Author: Jia Tan -Date: 2024-01-22 22:08:45 +0800 - - Docs: Add --disable-arm64-crc32 description to INSTALL. - - INSTALL | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -commit 1940f0ec28f08c0ac72c1413d9706fb82eabe6ad -Author: Jia Tan -Date: 2024-01-22 21:36:09 +0800 - - liblzma: Omit CRC tables when not needed with ARM64 optimizations. - - This is similar to the existing x86-64 CLMUL conditions to omit the - tables. They were slightly refactored to improve readability. - - src/liblzma/check/crc32_table.c | 18 +++++++++++++++--- - src/liblzma/check/crc64_table.c | 7 ++++++- - src/liblzma/check/crc_common.h | 5 ++++- - 3 files changed, 25 insertions(+), 5 deletions(-) - -commit 761f5b69a4c778c8bcb09279b845b07c28790575 -Author: Jia Tan -Date: 2024-01-22 20:54:56 +0800 - - liblzma: Rename crc32_aarch64.h to crc32_arm64.h. - - Even though the proper name for the architecture is aarch64, this - project uses ARM64 throughout. So the rename is for consistency. - - Additionally, crc32_arm64.h was slightly refactored for the following - changes: - - * Added MSVC, FreeBSD, and macOS support in - is_arch_extension_supported(). - - * crc32_arch_optimized() now checks the size when aligning the - buffer. - - * crc32_arch_optimized() loop conditions were slightly modified to - avoid both decrementing the size and incrementing the buffer - pointer. - - * Use the intrinsic wrappers defined in because GCC and - Clang name them differently. - - * Minor spacing and comment changes. - - CMakeLists.txt | 2 +- - src/liblzma/check/Makefile.inc | 2 +- - src/liblzma/check/crc32_aarch64.h | 109 ---------------------------------- - src/liblzma/check/crc32_arm64.h | 119 ++++++++++++++++++++++++++++++++++++++ - src/liblzma/check/crc32_fast.c | 3 +- - src/liblzma/check/crc64_fast.c | 3 - - 6 files changed, 122 insertions(+), 116 deletions(-) - -commit 455a08609caa3223066a717fb01bfa42c5dba47d -Author: Jia Tan -Date: 2024-01-22 20:49:30 +0800 - - liblzma: Refactor crc_common.h. - - The CRC_GENERIC is now split into CRC32_GENERIC and CRC64_GENERIC, since - the ARM64 optimizations will be different between CRC32 and CRC64. - - For the same reason, CRC_ARCH_OPTIMIZED is split into - CRC32_ARCH_OPTIMIZED and CRC64_ARCH_OPTIMIZED. - - ifunc will only be used with x86-64 CLMUL because the runtime detection - methods needed with ARM64 are not compatible with ifunc. - - src/liblzma/check/crc32_fast.c | 8 +-- - src/liblzma/check/crc64_fast.c | 8 +-- - src/liblzma/check/crc_common.h | 108 ++++++++++++++++++++++++++++------------- - 3 files changed, 82 insertions(+), 42 deletions(-) - -commit 61908e816049af7a9f43ea804a57ee8570e2e644 -Author: Jia Tan -Date: 2024-01-22 00:42:28 +0800 - - CMake: Add support for ARM64 CRC32 instruction detection. - - CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 50 insertions(+) - -commit c5f6d79cc9515a7f22d7ea4860c6cc394b295732 -Author: Jia Tan -Date: 2024-01-22 00:36:47 +0800 - - Build: Add support for ARM64 CRC32 instruction detection. - - This adds --enable-arm64-crc32/--disable-arm64-crc32 (enabled by - default) for using the ARM64 CRC32 instruction. This can be disabled if - one knows the binary will never need to run on an ARM64 machine - with this instruction extension. - - configure.ac | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 52 insertions(+) - -commit 849d0f282a6a890c5cf5a0e0f02980b12d9ebb0f -Author: Chenxi Mao -Date: 2024-01-09 17:23:11 +0800 - - Speed up CRC32 calculation on ARM64 - - The CRC32 instructions in ARM64 can calculate the CRC32 result - for 8 bytes in a single operation, making the use of ARM64 - instructions much faster compared to the general CRC32 algorithm. - - Optimized CRC32 will be enabled if ARM64 has CRC extension - running on Linux. - - Signed-off-by: Chenxi Mao - - CMakeLists.txt | 1 + - src/liblzma/check/Makefile.inc | 3 +- - src/liblzma/check/crc32_aarch64.h | 109 ++++++++++++++++++++++++++++++++++++++ - src/liblzma/check/crc32_fast.c | 5 +- - src/liblzma/check/crc64_fast.c | 5 +- - src/liblzma/check/crc_common.h | 16 +++--- - 6 files changed, 130 insertions(+), 9 deletions(-) - -commit b43c3e48bf6097095eef36d44cdbec811074940a -Author: Jia Tan -Date: 2024-01-26 19:05:51 +0800 - - Bump version number for 5.5.1alpha. - - src/liblzma/api/lzma/version.h | 2 +- - src/liblzma/liblzma_generic.map | 2 +- - src/liblzma/liblzma_linux.map | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit c7a7ae1500ea90bd3c2d54533e4f433933eb598f -Author: Jia Tan -Date: 2024-01-26 19:00:52 +0800 - - Add NEWS for 5.5.1alpha - - NEWS | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 80 insertions(+) - -commit 0ef8192e8d5af4e6200d5d4aee22d1f177f7a2df -Author: Jia Tan -Date: 2024-01-26 18:54:24 +0800 - - Add NEWS for 5.4.6. - - NEWS | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -commit 93de7e751d17731315a899264f2a7239d7d2d316 -Author: Lasse Collin -Date: 2024-01-24 20:00:57 +0200 - - Move doc/logo/xz-logo.png to "doc" and Doxygen footer to "doxygen". - - The footer isn't a complete HTML file so having it in the doxygen - directory is a tiny bit clearer. - - Makefile.am | 2 +- - doc/{logo => }/xz-logo.png | Bin - doxygen/Doxyfile | 4 ++-- - doc/logo/copyright.html => doxygen/footer.html | 0 - 4 files changed, 3 insertions(+), 3 deletions(-) - -commit 00fa01698df51c58ae2acf8c7fa4e1fb159f75a9 -Author: Jia Tan -Date: 2024-01-09 17:05:01 +0800 - - README: Add COPYING.CC-BY-SA-4.0 entry to section 1.1. - - The Overall documentation section (1.1) table spacing had to be adjusted - since the filename was very long. - - README | 38 ++++++++++++++++++++------------------ - 1 file changed, 20 insertions(+), 18 deletions(-) - -commit e280470040b27c5e58d78b25b9e2bb71fc6c3882 -Author: Jia Tan -Date: 2024-01-09 16:56:16 +0800 - - Build: Add the logo and license to the release. - - Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -commit b1ee6cf259bb49ce91abe9f622294524e37edf4c -Author: Jia Tan -Date: 2024-01-09 16:44:42 +0800 - - COPYING: Add the license for the XZ logo. - - COPYING | 5 + - COPYING.CC-BY-SA-4.0 | 427 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 432 insertions(+) - -commit 31293ae7074802cc7286089a89c7b552d930c97f -Author: Jia Tan -Date: 2024-01-09 16:40:56 +0800 - - Doxygen: Added the XZ logo and copyright information. - - The PROJECT_LOGO field is now used to include the XZ logo. The footer - of each page now lists the copyright information instead of the default - footer. The license is also copied to statisfy the copyright and so the - link in the documentation can be local. - - doc/logo/copyright.html | 11 +++++++++++ - doc/logo/xz-logo.png | Bin 0 -> 6771 bytes - doxygen/Doxyfile | 6 +++--- - 3 files changed, 14 insertions(+), 3 deletions(-) - -commit 6daa4d0ea46a8441f21f609149f3633158bf4704 -Author: Lasse Collin -Date: 2024-01-23 18:29:28 +0200 - - xz: Use threaded mode by defaut (as if --threads=0 was used). - - This hopefully does more good than bad: - - + It's faster by default. - - + Only the threaded compressor creates files that - can be decompressed in threaded mode. - - - Compression ratio is worse, usually not too much though. - When it matters, -T1 must be used. - - - Memory usage increases. - - - Scripts that assume single-threaded mode but don't use -T1 will - possibly use too much resources, for example, if they run - multiple xz processes in parallel to compress multiple files. - - - Output from single-threaded and multi-threaded compressors - differ but such changes could happen for other reasons too - (they just haven't happened since 5.0.0). - - src/xz/hardware.c | 6 +++++- - src/xz/message.c | 4 ++-- - src/xz/xz.1 | 9 +++++++++ - 3 files changed, 16 insertions(+), 3 deletions(-) - -commit a2dd2dc8e5307a7280bb99868bc478560facba2c -Author: Jia Tan -Date: 2024-01-23 23:52:49 +0800 - - CI: Use RISC-V filter when building with BCJ support. - - build-aux/ci_build.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 3060e1070b2421b26c0e17794c1307ec5622f11d -Author: Jia Tan -Date: 2024-01-23 23:52:14 +0800 - - Tests: Use smaller dictionary size in RISC-V test files. - - tests/files/good-1-riscv-lzma2-1.xz | Bin 7512 -> 7512 bytes - tests/files/good-1-riscv-lzma2-2.xz | Bin 7516 -> 7512 bytes - 2 files changed, 0 insertions(+), 0 deletions(-) - -commit 44ff2fa5c94dc345c4dd69195a19fc5238df60b3 -Author: Jia Tan -Date: 2024-01-23 23:50:57 +0800 - - Tests: Skip RISC-V test files if decoder was not built. - - tests/test_files.sh | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 6133a3f30049d3beaf7d22535b1e5d38e109be4e -Author: Lasse Collin -Date: 2024-01-23 16:11:54 +0200 - - xz: Man page: Add more examples of LZMA2 options with BCJ filters. - - src/xz/xz.1 | 38 +++++++++++++++++++++++++++++++------- - 1 file changed, 31 insertions(+), 7 deletions(-) - -commit 50255feeaabcc7e7db22b858a6bd64a9b5b4f16d -Author: Lasse Collin -Date: 2024-01-23 00:09:48 +0200 - - liblzma: RISC-V filter: Use byte-by-byte access. - - Not all RISC-V processors support fast unaligned access so - it's better to read only one byte in the main loop. This can - be faster even on x86-64 when compared to reading 32 bits at - a time as half the time the address is only 16-bit aligned. - - The downside is larger code size on archs that do support - fast unaligned access. - - src/liblzma/simple/riscv.c | 114 +++++++++++++++++++++++++++++++++------------ - 1 file changed, 84 insertions(+), 30 deletions(-) - -commit db5eb5f563e8baa8d912ecf576f53391ff861596 -Author: Jia Tan -Date: 2024-01-22 23:33:39 +0800 - - xz: Update xz -lvv for RISC-V filter. - - Version 5.6.0 will be shown, even though upcoming alphas and betas - will be able to support this filter. 5.6.0 looks nicer in the output and - people shouldn't be encouraged to use an unstable version in production - in any way. - - src/xz/list.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit e2870db5be1503e6a489fc3d47daf950d6f62723 -Author: Jia Tan -Date: 2024-01-22 23:33:39 +0800 - - Tests: Add two RISC-V Filter test files. - - These test files achieve 100% code coverage in - src/liblzma/simple/riscv.c. They contain all of the instructions that - should be filtered and a few cases that should not. - - tests/files/README | 8 ++++++++ - tests/files/good-1-riscv-lzma2-1.xz | Bin 0 -> 7512 bytes - tests/files/good-1-riscv-lzma2-2.xz | Bin 0 -> 7516 bytes - 3 files changed, 8 insertions(+) - -commit b26a89869315ece2f6d9d10d32d45f672550f245 -Author: Jia Tan -Date: 2024-01-22 23:33:39 +0800 - - xz: Update message in --long-help for RISC-V Filter. - - src/xz/message.c | 1 + - 1 file changed, 1 insertion(+) - -commit 283f778908873eca61388029fc418fa800c9d7d7 -Author: Jia Tan -Date: 2024-01-22 23:33:39 +0800 - - xz: Update the man page for the RISC-V Filter. - - A special note was added to suggest using four-byte alignment when the - compressed instruction extension is not present in a RISC-V binary. - - src/xz/xz.1 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit ac3691ccca051d67f60b4a3b05b88e511d0b1b28 -Author: Jia Tan -Date: 2024-01-22 23:33:39 +0800 - - Tests: Add RISC-V Filter test in test_compress.sh. - - tests/test_compress.sh | 1 + - 1 file changed, 1 insertion(+) - -commit 2959dbc7358efcf421ce51bc9cd7eae8fdd8fec4 -Author: Jia Tan -Date: 2024-01-22 23:33:39 +0800 - - liblzma: Update string_conversion.c to support RISC-V Filter. - - src/liblzma/common/string_conversion.c | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 34372a5adbe5a7f6bf29498410ba3a463a720966 -Author: Jia Tan -Date: 2024-01-22 23:33:39 +0800 - - CMake: Support RISC-V BCJ Filter for encoding and decoding. - - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -commit 440a2eccb082dc13400c09e22308a58fef85146c -Author: Jia Tan -Date: 2024-01-22 23:33:39 +0800 - - liblzma: Add RISC-V BCJ filter. - - The new Filter ID is 0x0B. - - Thanks to Chien Wong for the initial version of the Filter, - the xz CLI updates, and the Autotools build system modifications. - - Thanks to Igor Pavlov for his many contributions to the design of - the filter. - - configure.ac | 4 +- - src/liblzma/api/lzma/bcj.h | 5 + - src/liblzma/common/filter_common.c | 9 + - src/liblzma/common/filter_decoder.c | 8 + - src/liblzma/common/filter_encoder.c | 10 + - src/liblzma/simple/Makefile.inc | 4 + - src/liblzma/simple/riscv.c | 688 ++++++++++++++++++++++++++++++++++++ - src/liblzma/simple/simple_coder.h | 9 + - src/xz/args.c | 7 + - 9 files changed, 742 insertions(+), 2 deletions(-) - -commit 5540f4329bbdb4deb4850d4af48b18ad074bba19 -Author: Jia Tan -Date: 2024-01-19 23:08:14 +0800 - - Docs: Update .xz file format specification to 1.2.0. - - The new RISC-V filter was added to the specification, in addition to - updating the specification URL. - - doc/xz-file-format.txt | 29 +++++++++++++++++------------ - 1 file changed, 17 insertions(+), 12 deletions(-) - -commit 22d86192f8cf00902a1f90ee2a83ca600794459b -Author: Jia Tan -Date: 2024-01-19 23:08:14 +0800 - - xz: Update website URLs in the man pages. - - src/xz/xz.1 | 6 +++--- - src/xzdec/xzdec.1 | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 6b63c4c6139fa1bb21b570521d3d2b4a608bc34d -Author: Jia Tan -Date: 2024-01-19 23:08:14 +0800 - - liblzma: Update website URL. - - dos/config.h | 2 +- - src/liblzma/api/lzma.h | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit fce4758018f3a3589236f3fe7999fd9dd08c77e9 -Author: Jia Tan -Date: 2024-01-19 23:08:14 +0800 - - Docs: Update website URLs. - - .github/SECURITY.md | 2 +- - COPYING | 3 ++- - README | 4 ++-- - doc/faq.txt | 2 +- - doc/lzma-file-format.txt | 18 +++++++++--------- - windows/README-Windows.txt | 3 ++- - 6 files changed, 17 insertions(+), 15 deletions(-) - -commit c26812c5b2c8a2a47f43214afe6b0b840c73e4f5 -Author: Jia Tan -Date: 2024-01-19 23:08:14 +0800 - - Build: Update website URL. - - CMakeLists.txt | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit fbb3ce541ef79cad1710e88a27a5babb5f6f8e5b -Author: Lasse Collin -Date: 2024-01-11 15:01:50 +0200 - - liblzma: CRC: Add a comment to crc_x86_clmul.h about BUILDING_ macros. - - src/liblzma/check/crc_x86_clmul.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit 4f518c1b6b7b7ce5dcefea81acd44d7a086a8882 -Author: Lasse Collin -Date: 2024-01-11 15:22:36 +0200 - - liblzma: CRC: Remove crc_always_inline, use lzma_always_inline instead. - - Now crc_simd_body() in crc_x86_clmul.h is only called once - in a translation unit, we no longer need to be so cautious - about ensuring the always-inline behavior. - - src/liblzma/check/crc_common.h | 20 -------------------- - src/liblzma/check/crc_x86_clmul.h | 2 +- - 2 files changed, 1 insertion(+), 21 deletions(-) - -commit 35c03ec6bf66f1b159964c9721a2dce0e2859b20 -Author: Lasse Collin -Date: 2024-01-11 14:39:46 +0200 - - liblzma: CRC: Update CLMUL comments to more generic wording. - - src/liblzma/check/crc32_fast.c | 16 ++++++++-------- - src/liblzma/check/crc64_fast.c | 10 +++++----- - 2 files changed, 13 insertions(+), 13 deletions(-) - -commit 66f080e8016129576536482ac377e2ecac7a2b90 -Author: Lasse Collin -Date: 2024-01-10 18:23:31 +0200 - - liblzma: Rename arch-specific CRC functions and macros. - - CRC_CLMUL was split to CRC_ARCH_OPTIMIZED and CRC_X86_CLMUL. - CRC_ARCH_OPTIMIZED is defined when an arch-optimized version is used. - Currently the x86 CLMUL implementations are the only arch-optimized - versions, and these also use the CRC_x86_CLMUL macro to tell when - crc_x86_clmul.h needs to be included. - - is_clmul_supported() was renamed to is_arch_extension_supported(). - crc32_clmul() and crc64_clmul() were renamed to - crc32_arch_optimized() and crc64_arch_optimized(). - This way the names make sense with arch-specific non-CLMUL - implementations as well. - - src/liblzma/check/crc32_fast.c | 13 +++++++------ - src/liblzma/check/crc64_fast.c | 13 +++++++------ - src/liblzma/check/crc_common.h | 9 ++++++--- - src/liblzma/check/crc_x86_clmul.h | 21 +++++++++++---------- - 4 files changed, 31 insertions(+), 25 deletions(-) - -commit 3dbed75b0b9c7087c76fe687acb5cf582cd57b99 -Author: Lasse Collin -Date: 2024-01-10 18:19:21 +0200 - - liblzma: Fix a comment in crc_common.h. - - src/liblzma/check/crc_common.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 419f55f9dfc2df8792902b8953d50690121afeea -Author: Lasse Collin -Date: 2023-10-20 23:35:10 +0300 - - liblzma: Avoid extern lzma_crc32_clmul() and lzma_crc64_clmul(). - - A CLMUL-only build will have the crcxx_clmul() inlined into - lzma_crcxx(). Previously a jump to the extern lzma_crcxx_clmul() - was needed. Notes about shared liblzma on ELF platforms: - - - On platforms that support ifunc and -fvisibility=hidden, this - was silly because CLMUL-only build would have that single extra - jump instruction of extra overhead. - - - On platforms that support neither -fvisibility=hidden nor linker - version script (liblzma*.map), jumping to lzma_crcxx_clmul() - would go via PLT so a few more instructions of overhead (still - not a big issue but silly nevertheless). - - There was a downside with static liblzma too: if an application only - needs lzma_crc64(), static linking would make the linker include the - CLMUL code for both CRC32 and CRC64 from crc_x86_clmul.o even though - the CRC32 code wouldn't be needed, thus increasing code size of the - executable (assuming that -ffunction-sections isn't used). - - Also, now compilers are likely to inline crc_simd_body() - even if they don't support the always_inline attribute - (or MSVC's __forceinline). Quite possibly all compilers - that build the code do support such an attribute. But now - it likely isn't a problem even if the attribute wasn't supported. - - Now all x86-specific stuff is in crc_x86_clmul.h. If other archs - The other archs can then have their own headers with their own - is_clmul_supported() and crcxx_clmul(). - - Another bonus is that the build system doesn't need to care if - crc_clmul.c is needed. - - is_clmul_supported() stays as inline function as it's not needed - when doing a CLMUL-only build (avoids a warning about unused function). - - CMakeLists.txt | 7 +- - configure.ac | 1 - - src/liblzma/check/Makefile.inc | 6 +- - src/liblzma/check/crc32_fast.c | 9 ++- - src/liblzma/check/crc64_fast.c | 9 ++- - src/liblzma/check/crc_common.h | 64 ---------------- - src/liblzma/check/{crc_clmul.c => crc_x86_clmul.h} | 86 ++++++++++++++++++---- - 7 files changed, 91 insertions(+), 91 deletions(-) - -commit e3833e297dfb5021a197bda34ba2a795e30aaf8a -Author: Lasse Collin -Date: 2023-10-21 00:06:52 +0300 - - liblzma: crc_clmul.c: Add crc_attr_target macro. - - This reduces the number of the complex #if directives. - - src/liblzma/check/crc_clmul.c | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -commit d164ac0e62904126f7920c25f9a2875c8cd28b97 -Author: Lasse Collin -Date: 2023-10-20 22:49:48 +0300 - - liblzma: Simplify existing cases with lzma_attr_no_sanitize_address. - - src/liblzma/check/crc_clmul.c | 12 +++--------- - 1 file changed, 3 insertions(+), 9 deletions(-) - -commit 9523c1300d22fa715765c181cf991d14d6112fb1 -Author: Lasse Collin -Date: 2023-10-20 21:53:35 +0300 - - liblzma: #define crc_attr_no_sanitize_address in crc_common.h. - - src/liblzma/check/crc_common.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit 93d144f0930821590524247bd174afd38003d7f0 -Author: Lasse Collin -Date: 2023-10-20 23:25:14 +0300 - - liblzma: CRC: Add empty lines. - - And remove one too. - - src/liblzma/check/crc32_fast.c | 2 ++ - src/liblzma/check/crc64_fast.c | 3 +++ - src/liblzma/check/crc_clmul.c | 1 - - 3 files changed, 5 insertions(+), 1 deletion(-) - -commit 0c7e854ffd27f1cec2e9b0e61601d6f90bfa10ae -Author: Lasse Collin -Date: 2023-10-20 23:19:33 +0300 - - liblzma: crc_clmul.c: Tidy up the location of MSVC pragma. - - It makes no difference in practice. - - src/liblzma/check/crc_clmul.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 15cf3f04f270d707a5c91cc0208b23b6db42b774 -Author: Lasse Collin -Date: 2023-12-20 21:16:24 +0200 - - Update THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit cd64dd70d5665b6048829c45772d08606f44672e -Author: Lasse Collin -Date: 2023-12-20 21:15:16 +0200 - - liblzma: Use 8-byte method in memcmplen.h on ARM64. - - It requires fast unaligned access to 64-bit integers - and a fast instruction to count leading zeros in - a 64-bit integer (__builtin_ctzll()). This perhaps - should be enabled on some other archs too. - - Thanks to Chenxi Mao for the original patch: - https://github.com/tukaani-project/xz/pull/75 (the first commit) - According to the numbers there, this may improve encoding - speed by about 3-5 %. - - This enables the 8-byte method on MSVC ARM64 too which - should work but wasn't tested. - - src/liblzma/common/memcmplen.h | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -commit 12c90c00f05e19da3c0c91d8cd8e0d0d45965606 -Author: Lasse Collin -Date: 2023-12-20 21:01:06 +0200 - - liblzma: Check also for __clang__ in memcmplen.h. - - This change hopefully makes no practical difference as Clang - likely was detected via __GNUC__ or _MSC_VER already. - - src/liblzma/common/memcmplen.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 133c5851eb917c6d99d0b623c1689c8518e65f38 -Author: Jia Tan -Date: 2023-12-21 21:39:08 +0800 - - Translations: Update the French translation. - - po/fr.po | 632 +++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 370 insertions(+), 262 deletions(-) - -commit 710cbc186cad0ac601c38bd6bf31167648a5581e -Author: Jia Tan -Date: 2023-12-21 16:39:53 +0800 - - xz: Add a comment to Capsicum sandbox setup. - - This comment is repeated in xzdec.c to help remind us why all the - capabilities are removed from stdin in certain situations. - - src/xz/file_io.c | 1 + - 1 file changed, 1 insertion(+) - -commit 4e1c695676bafbaecc9fb307f6ee94138ae72c12 -Author: Jia Tan -Date: 2023-12-20 22:19:19 +0800 - - Docs: Update --enable-sandbox option in INSTALL. - - xzdec now also uses the sandbox when its configured. - - INSTALL | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -commit ebddf20214143a8e002ab897e95e880bb4c5ac44 -Author: Jia Tan -Date: 2023-12-20 22:39:13 +0800 - - CMake: Move sandbox detection outside of xz section. - - The sandbox is now enabled for xzdec as well, so it no longer belongs - in just the xz section. xz and xzdec are always built, except for older - MSVC versions, so there isn't a need to conditionally show the sandbox - configuration. CMake will do a little unecessary work on older MSVC - versions that can't build xz or xzdec, but this is a very small - downside. - - CMakeLists.txt | 178 +++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 98 insertions(+), 80 deletions(-) - -commit 5feb09266fd2928ec0a4dcb98c1dc7f053111316 -Author: Jia Tan -Date: 2023-12-20 22:43:44 +0800 - - Build: Allow sandbox to be configured for just xzdec. - - If xz is disabled, then xzdec can still use the sandbox. - - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -commit d74fb5f060b76db709b50f5fd37490394e52f975 -Author: Jia Tan -Date: 2023-12-19 21:18:28 +0800 - - xzdec: Add sandbox support for Pledge, Capsicum, and Landlock. - - A very strict sandbox is used when the last file is decompressed. The - likely most common use case of xzdec is to decompress a single file. - The Pledge sandbox is applied to the entire process with slightly more - relaxed promises, until the last file is processed. - - Thanks to Christian Weisgerber for the initial patch adding Pledge - sandboxing. - - src/xzdec/xzdec.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 139 insertions(+), 7 deletions(-) - -commit b34b6a9912d6165e34ba0db151b7f9941d2e06d5 -Author: Jia Tan -Date: 2023-12-20 21:31:34 +0800 - - liblzma: Initialize lzma_lz_encoder pointers with NULL. - - This fixes the recent change to lzma_lz_encoder that used memzero - instead of the NULL constant. On some compilers the NULL constant - (always 0) may not equal the NULL pointer (this only needs to guarentee - to not point to valid memory address). - - Later code compares the pointers to the NULL pointer so we must - initialize them with the NULL pointer instead of 0 to guarentee - code correctness. - - src/liblzma/lz/lz_encoder.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit 183a62f0b540ff4d23cc19b2b6bc2525f0bd64df -Author: Jia Tan -Date: 2023-12-16 20:51:38 +0800 - - liblzma: Set all values in lzma_lz_encoder to NULL after allocation. - - The first member of lzma_lz_encoder doesn't necessarily need to be set - to NULL since it will always be set before anything tries to use it. - However the function pointer members must be set to NULL since other - functions rely on this NULL value to determine if this behavior is - supported or not. - - This fixes a somewhat serious bug, where the options_update() and - set_out_limit() function pointers are not set to NULL. This seems to - have been forgotten since these function pointers were added many years - after the original two (code() and end()). - - The problem is that by not setting this to NULL we are relying on the - memory allocation to zero things out if lzma_filters_update() is called - on a LZMA1 encoder. The function pointer for set_out_limit() is less - serious because there is not an API function that could call this in an - incorrect way. set_out_limit() is only called by the MicroLZMA encoder, - which must use LZMA1 where set_out_limit() is always set. Its currently - not possible to call set_out_limit() on an LZMA2 encoder at this time. - - So calling lzma_filters_update() on an LZMA1 encoder had undefined - behavior since its possible that memory could be manipulated so the - options_update member pointed to a different instruction sequence. - - This is unlikely to be a bug in an existing application since it relies - on calling lzma_filters_update() on an LZMA1 encoder in the first place. - For instance, it does not affect xz because lzma_filters_update() can - only be used when encoding to the .xz format. - - This is fixed by using memzero() to set all members of lzma_lz_encoder - to NULL after it is allocated. This ensures this mistake will not occur - here in the future if any additional function pointers are added. - - src/liblzma/lz/lz_encoder.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -commit 1a1bb381db7a20cf86cb45a350e5cca35224d017 -Author: Jia Tan -Date: 2023-12-16 20:30:55 +0800 - - liblzma: Tweak a comment. - - src/liblzma/lz/lz_encoder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 55810780e04f759747b02683fb8020b8cd022a85 -Author: Jia Tan -Date: 2023-12-16 20:28:21 +0800 - - liblzma: Make parameter names in function definition match declaration. - - lzma_raw_encoder() and lzma_raw_encoder_init() used "options" as the - parameter name instead of "filters" (used by the declaration). "filters" - is more clear since the parameter represents the list of filters passed - to the raw encoder, each of which contains filter options. - - src/liblzma/common/filter_encoder.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 5dad6f628af742bab826819760deb677597445f7 -Author: Jia Tan -Date: 2023-12-16 20:18:47 +0800 - - liblzma: Improve lzma encoder init function consistency. - - lzma_encoder_init() did not check for NULL options, but - lzma2_encoder_init() did. This is more of a code style improvement than - anything else to help make lzma_encoder_init() and lzma2_encoder_init() - more similar. - - src/liblzma/lzma/lzma_encoder.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit e1b1a9d6370b788bd6078952c6c201e12bc27cbf -Author: Jia Tan -Date: 2023-12-16 11:20:20 +0800 - - Docs: Update repository URL in Changelog. - - ChangeLog | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f9b82bc64a9405e486575c65c1729229eb0a8198 -Author: Jia Tan -Date: 2023-12-15 16:56:31 +0800 - - CI: Update Upload Artifact Action. - - .github/workflows/ci.yml | 2 +- - .github/workflows/windows-ci.yml | 2 +- + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -commit d0b24efe6cdc47db5b0fdf6306f70a2e0e63e49e -Author: Jia Tan -Date: 2023-12-07 21:48:07 +0800 - - Tests: Silence -Wsign-conversion warning on GCC version < 10. - - Since GCC version 10, GCC no longer complains about simple implicit - integer conversions with Arithmetic operators. - - For instance: - - uint8_t a = 5; - uint32_t b = a + 5; - - Give a warning on GCC 9 and earlier but this: - - uint8_t a = 5; - uint32_t b = (a + 5) * 2; - - Gives a warning with GCC 10+. - - tests/test_block_header.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 4a972a8ee3ed88ac14067c1d2f15b78988e5dae8 -Author: Jia Tan -Date: 2023-12-06 18:39:03 +0800 - - Update THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit ee2f48350099201694a7586e41d7aa2f09fc74da -Author: Jia Tan -Date: 2023-12-06 18:30:25 +0800 - - Tests: Minor cleanups to OSS-Fuzz files. - - Most of these fixes are small typos and tweaks. A few were caused by bad - advice from me. Here is the summary of what is changed: - - - Author line edits - - - Small comment changes/additions - - - Using the return value in the error messages in the fuzz targets' - coder initialization code - - - Removed fuzz_encode_stream.options. This set a max length, which may - prevent some worthwhile code paths from being properly exercised. - - - Removed the max_len option from fuzz_decode_stream.options for the - same reason as fuzz_encode_stream. The alone decoder fuzz target still - has this restriction. - - - Altered the dictionary contents for fuzz_lzma.dict. Instead of keeping - the properties static and varying the dictionary size, the properties - are varied and the dictionary size is kept small. The dictionary size - doesn't have much impact on the code paths but the properties do. - - Closes: https://github.com/tukaani-project/xz/pull/73 - - tests/ossfuzz/Makefile | 3 ++ - tests/ossfuzz/config/fuzz_decode_stream.options | 1 - - tests/ossfuzz/config/fuzz_lzma.dict | 34 +++++++++++----------- - tests/ossfuzz/fuzz_common.h | 16 +++++------ - tests/ossfuzz/fuzz_decode_alone.c | 15 +++++----- - tests/ossfuzz/fuzz_decode_stream.c | 15 +++++----- - tests/ossfuzz/fuzz_encode_stream.c | 38 +++++++++++++++---------- - 7 files changed, 66 insertions(+), 56 deletions(-) - -commit 483bb90eec7c83e1c2bcd06287714afd62d8c17d -Author: Maksym Vatsyk -Date: 2023-12-05 16:31:09 +0100 - - Tests: Add fuzz_encode_stream ossfuzz target. - - This fuzz target handles .xz stream encoding. The first byte of input - is used to dynamically set the preset level in order to increase the - fuzz coverage of complex critical code paths. - - tests/ossfuzz/config/fuzz_encode_stream.options | 2 + - tests/ossfuzz/fuzz_encode_stream.c | 79 +++++++++++++++++++++++++ - 2 files changed, 81 insertions(+) - -commit 7ca8c9869df82756c3128c4fcf1058da4d18aa48 -Author: Maksym Vatsyk -Date: 2023-12-04 17:23:24 +0100 - - Tests: Add fuzz_decode_alone OSS-Fuzz target - - This fuzz target that handles LZMA alone decoding. A new fuzz - dictionary .dict was also created with common LZMA header values to - help speed up the discovery of valid headers. - - tests/ossfuzz/config/fuzz_decode_alone.options | 3 ++ - tests/ossfuzz/config/fuzz_lzma.dict | 22 ++++++++++++++ - tests/ossfuzz/fuzz_decode_alone.c | 41 ++++++++++++++++++++++++++ - 3 files changed, 66 insertions(+) - -commit 37581a77ad5a49615325b1d1925fdc402b1e1d5a -Author: Maksym Vatsyk -Date: 2023-12-04 17:21:29 +0100 - - Tests: Update OSS-Fuzz Makefile. - - All .c files can be built as separate fuzz targets. This simplifies - the Makefile by allowing us to use wildcards instead of having a - Makefile target for each fuzz target. - - tests/ossfuzz/Makefile | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -commit 28ce6a1c2a74866c51f7996a6869679c236d3c94 -Author: Maksym Vatsyk -Date: 2023-12-04 17:20:08 +0100 - - Tests: Move common OSS-Fuzz target code to .h file. - - tests/ossfuzz/fuzz_common.h | 56 ++++++++++++++++++++++++++++++++++++ - tests/ossfuzz/fuzz_decode_stream.c | 59 ++++++++++---------------------------- - 2 files changed, 71 insertions(+), 44 deletions(-) - -commit bf0521ea1591c25b9d510c1b8be86073e9d847c6 -Author: Maksym Vatsyk -Date: 2023-12-04 17:18:20 +0100 - - Tests: Rename OSS-Fuzz files. - - tests/ossfuzz/config/fuzz.options | 2 -- - tests/ossfuzz/config/fuzz_decode_stream.options | 3 +++ - tests/ossfuzz/config/{fuzz.dict => fuzz_xz.dict} | 0 - tests/ossfuzz/{fuzz.c => fuzz_decode_stream.c} | 0 - 4 files changed, 3 insertions(+), 2 deletions(-) - -commit 685094b8e1c1aa1bf934de0366ca42ef599d25f7 -Author: Jia Tan -Date: 2023-11-30 23:10:43 +0800 - - Update THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 3b3023e00b0071e10f589bbc3674e0ec432b8add -Author: Kian-Meng Ang -Date: 2023-11-30 23:01:19 +0800 - - Tests: Fix typos - - tests/test_index.c | 2 +- - tests/test_lzip_decoder.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 424d46ead8cbc0da57f406b76926ec4ed47437f5 -Author: Kian-Meng Ang -Date: 2023-11-30 22:59:47 +0800 - - xz: Fix typo - - src/xz/file_io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 35558adf9c45e5597f2c8dbd969885dd484038d2 -Author: Jia Tan -Date: 2023-11-30 20:41:00 +0800 - - Update THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit fd170e8557727bed6bec0518c16415064d972e4e -Author: Jia Tan -Date: 2023-11-22 21:20:12 +0800 - - CI: Test musl libc builds on Ubuntu runner. - - .github/workflows/ci.yml | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -commit db2b4aa068a492c0013279a4ed43803e8ff9bb3e -Author: Jia Tan -Date: 2023-11-22 21:12:15 +0800 - - CI: Allow ci_build.sh to set a different C compiler. - - build-aux/ci_build.sh | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -commit ff7badef53c2cd698d4b72b945f34dfd0835e13c -Author: Jia Tan -Date: 2023-11-24 21:19:12 +0800 - - CMake: Use consistent indentation with check_c_source_compiles(). - - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit d4af167570f2c14b002ee18a39d5b1e7e5a892b1 -Author: Jia Tan -Date: 2023-11-22 20:33:36 +0800 - - CMake: Change __attribute__((__ifunc__())) detection. - - This renames ALLOW_ATTR_IFUNC to USE_ATTR_IFUNC and applies the ifunc - detection changes that were made to the Autotools build. - - Fixes: https://github.com/tukaani-project/xz/issues/70 - - CMakeLists.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 45 insertions(+), 8 deletions(-) - -commit 20ecee40a0053fd16371ef0628046bf45e548d72 -Author: Jia Tan -Date: 2023-11-24 20:19:11 +0800 - - Docs: Update INSTALL for --enable_ifunc change. - - INSTALL | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -commit ffb456593d695d70052a2f71c7a2e6269217d194 -Author: Jia Tan -Date: 2023-11-21 20:56:55 +0800 - - Build: Change --enable-ifunc handling. - - Some compilers support __attribute__((__ifunc__())) even though the - dynamic linker does not. The compiler is able to create the binary - but it will fail on startup. So it is not enough to just test if - the attribute is supported. - - The default value for enable_ifunc is now auto, which will attempt - to compile a program using __attribute__((__ifunc__())). There are - additional checks in this program if glibc is being used or if it - is running on FreeBSD. - - Setting --enable-ifunc will skip this test and always enable - __attribute__((__ifunc__())), even if is not supported. - - configure.ac | 61 +++++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 44 insertions(+), 17 deletions(-) - -commit 12b89bcc9915090eb42ae638e565af44b6832a23 -Author: Lasse Collin -Date: 2023-11-23 17:39:10 +0200 - - xz: Tweak a comment. - - src/xz/util.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 2ab2e4b5a542eab93902985ce4e642719a8b7a4e -Author: Jia Tan -Date: 2023-11-23 22:13:39 +0800 - - xz: Use is_tty() in message.c. - - src/xz/message.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -commit 584e3a258f32d579b1d07f99b4dc6e856c10ac7e -Author: Jia Tan -Date: 2023-11-23 22:04:35 +0800 - - xz: Create separate is_tty() function. - - The new is_tty() will report if a file descriptor is a terminal or not. - On POSIX systems, it is a wrapper around isatty(). However, the native - Windows implementation of isatty() will return true for all character - devices, not just terminals. So is_tty() has a special case for Windows - so it can use alternative Windows API functions to determine if a file - descriptor is a terminal. - - This fixes a bug with MSVC and MinGW-w64 builds that refused to read from - or write to non-terminal character devices because xz thought it was a - terminal. For instance: - - xz foo -c > /dev/null - - would fail because /dev/null was assumed to be a terminal. - - src/xz/util.c | 30 +++++++++++++++++++++++------- - src/xz/util.h | 14 ++++++++++++++ - 2 files changed, 37 insertions(+), 7 deletions(-) - -commit 6b05f827f50e686537e9a23c49c5aa4c0aa6b23d -Author: Jia Tan -Date: 2023-11-22 20:39:41 +0800 - - tuklib_integer: Fix typo discovered by codespell. - - Based on internet dictionary searches, 'choise' is an outdated spelling - of 'choice'. - - src/common/tuklib_integer.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 659aca0d695807c0762d4101765189e4e33d1e2c -Author: Lasse Collin -Date: 2023-11-17 19:35:19 +0200 - - xz: Move the check for --suffix with --format=raw a few lines earlier. - - Now it reads from argv[] instead of args->arg_names. - - src/xz/args.c | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -commit ca278eb2b7f5a4940f5ab18955297b398d423824 -Author: Jia Tan -Date: 2023-11-17 20:35:11 +0800 - - Tests: Create test_suffix.sh. - - This tests some complicated interactions with the --suffix= option. - The suffix option must be used with --format=raw, but can optionally - be used to override the default .xz suffix. - - This test also verifies some recent bugs have been correctly solved - and to hopefully avoid further regressions in the future. - - tests/Makefile.am | 2 + - tests/test_suffix.sh | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 191 insertions(+) - -commit 2a732aba22da1b0d4a1241cb32280ed010ba03ce -Author: Jia Tan -Date: 2023-11-17 20:19:26 +0800 - - xz: Fix a bug with --files and --files0 in raw mode without a suffix. - - The following command caused a segmentation fault: - - xz -Fraw --lzma1 --files=foo - - when foo was a valid file. The usage of --files or --files0 was not - being checked when compressing or decompressing in raw mode without a - suffix. The suffix checking code was meant to validate that all files - to be processed are "-" (if not writing to standard out), meaning the - data is only coming from standard in. In this case, there were no file - names to check since --files and --files0 store their file name in a - different place. - - Later code assumed the suffix was set and caused a segmentation fault. - Now, the above command results in an error. - - src/xz/args.c | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 299920bab9ae258a247366339264e8aefca9e3ce -Author: Jia Tan -Date: 2023-11-17 20:04:58 +0800 - - Tests: Fix typo in a comment. - - tests/test_files.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f481523baac946fa3bc13d79186ffaf0c0b818a7 -Author: Jia Tan -Date: 2023-11-15 23:40:13 +0800 - - xz: Refactor suffix test with raw format. - - The previous version set opt_stdout, but this caused an issue with - copying an input file to standard out when decompressing an unknown file - type. The following needs to result in an error: - - echo foo | xz -df - - since -c, --stdout is not used. This fixes the previous error by not - setting opt_stdout. - - src/xz/args.c | 38 +++++++++++++------------------------- - 1 file changed, 13 insertions(+), 25 deletions(-) - -commit 837ea40b1c9d4998cac4500b55171bf33e0c31a6 -Author: Jia Tan -Date: 2023-11-14 20:27:46 +0800 - - xz: Move suffix check after stdout mode is detected. - - This fixes a bug introduced in cc5aa9ab138beeecaee5a1e81197591893ee9ca0 - when the suffix check was initially moved. This caused a situation that - previously worked: - - echo foo | xz -Fraw --lzma1 | wc -c - - to fail because the old code knew that this would write to standard out - so a suffix was not needed. - - src/xz/args.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -commit d4f4a4d040ef47a5e82dffd0f067e92716606ddf -Author: Jia Tan -Date: 2023-11-14 20:27:04 +0800 - - xz: Detect when all data will be written to standard out earlier. - - If the -c, --stdout argument is not used, then we can still detect when - the data will be written to standard out if all of the provided - filenames are "-" (denoting standard in) or if no filenames are - provided. - - src/xz/args.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -commit 2ade7246e7ba729a91460d2fab0f4c7b89d3998b -Author: Jia Tan -Date: 2023-11-09 01:21:53 +0800 - - liblzma: Add missing comments to lz_encoder.h. - - src/liblzma/lz/lz_encoder.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit 5fe1450603dc625340b8b7866fb4a83ff748ad06 +commit 84c0cfc556287628df871703672879e530d0391f Author: Jia Tan Date: 2023-11-01 20:18:30 +0800 @@ -3585,7 +17,7 @@ NEWS | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) -commit 46007049cd42e606543dbe650feb17bdf4469c29 +commit d90ed84db9770712e2421e170076b43bda9b64a7 Author: Lasse Collin Date: 2023-10-31 21:41:09 +0200 @@ -3605,7 +37,7 @@ src/liblzma/lzma/fastpos_tablegen.c | 2 ++ 1 file changed, 2 insertions(+) -commit 148e20607e95781558bdfc823ecba07b7af4b590 +commit 9b1268538b0b2c6c0a121f95165de65fc71ad23c Author: Jia Tan Date: 2023-10-31 21:51:40 +0800 @@ -3614,20 +46,7 @@ configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -commit 8c36ab79cbf23104ce7a3d533d5ac98cd492e57c -Author: Lasse Collin -Date: 2023-10-30 18:09:53 +0200 - - liblzma: Add a note why crc_always_inline exists for now. - - Solaris Studio is a possible example (not tested) which - supports the always_inline attribute but might not get - detected by the common.h #ifdefs. - - src/liblzma/check/crc_common.h | 5 +++++ - 1 file changed, 5 insertions(+) - -commit e7a86b94cd247435ac96bc79ba528b690b9ca388 +commit 068ee436f4a8a706125ef43e8228b30001b1554e Author: Lasse Collin Date: 2023-10-22 17:59:11 +0300 @@ -3636,7 +55,7 @@ src/liblzma/common/memcmplen.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -commit dcfe5632992fb7f06f921da13fcdd84f83d0d285 +commit 6cdf0a7b7974baf58c1fd20ec3278f3b84ae56e5 Author: Lasse Collin Date: 2023-10-30 17:43:03 +0200 @@ -3645,7 +64,7 @@ src/liblzma/common/common.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -commit 41113fe30a47f6fd3e30cb4494dd538e86212edf +commit 33daad3961a4f07f3902b40f13e823e6e43e85da Author: Lasse Collin Date: 2023-10-22 17:15:32 +0300 @@ -3660,7 +79,7 @@ src/liblzma/rangecoder/price.h | 1 + 5 files changed, 13 insertions(+) -commit a2f5ca706acc6f7715b8d260a8c6ed50d7717478 +commit 6961a5ac7df178bfc2b7a181c40575847bc3035f Author: Lasse Collin Date: 2023-10-22 17:08:39 +0300 @@ -3700,7 +119,7 @@ src/liblzma/common/common.h | 11 +++++++++++ 1 file changed, 11 insertions(+) -commit 2c7ee92e44e1e66f0a427555233eb22c78f6c4f8 +commit 5b9e16764905d06fa8e8339ba185ddfee304e5fb Author: Lasse Collin Date: 2023-09-30 22:54:28 +0300 @@ -3718,7 +137,7 @@ src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -commit 597f49b61475438a43a417236989b2acc968a686 +commit 36fabdbe67c8a8fbdc3ac695a91fc443a1328cc4 Author: Lasse Collin Date: 2023-09-27 00:58:17 +0300 @@ -3734,7 +153,7 @@ cmake/tuklib_large_file_support.cmake | 52 +++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) -commit 1bc548b8210366e44ba35b0b11577a8e328c1228 +commit 989c8c354cbd2d20fbae4a432a3e31f5bc1cb9bf Author: Lasse Collin Date: 2023-09-30 02:14:25 +0300 @@ -3747,7 +166,7 @@ CMakeLists.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -commit 2add71966f891d315105d6245f724ed4f43a4eff +commit 983f3b458dc79c5976a4237fdfe4f8079f8d8830 Author: Lasse Collin Date: 2023-09-30 01:13:13 +0300 @@ -3761,7 +180,7 @@ CMakeLists.txt | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) -commit a7d1b2825c49dc83f1910eeb8ba0f1dfbd886d91 +commit 4083c8e9501a48934a5fb563d2c3ce2ae143cd27 Author: Lasse Collin Date: 2023-09-29 20:46:11 +0300 @@ -3776,7 +195,7 @@ src/liblzma/liblzma.pc.in | 1 + 1 file changed, 1 insertion(+) -commit 80e0750e3996c1c659e972ce9cf789ca2e99f702 +commit 661549ecb7a9b136d72a01c137d9776c75d52d51 Author: Lasse Collin Date: 2023-09-27 22:46:20 +0300 @@ -3786,7 +205,7 @@ cmake/remove-ordinals.cmake | 26 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) -commit 08d12595f486890cf601b87f36ee0ddbce57728e +commit 0e546eb4da05c52b7d257e5bd85e15c51c4d86a3 Author: Lasse Collin Date: 2023-10-26 21:44:42 +0300 @@ -3797,7 +216,7 @@ CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit e67aaf698de75c73443a5ec786781cbf2034461d +commit da4d04e4d6e199d28b58bd2e0df4e120c52dd5d7 Author: Lasse Collin Date: 2023-10-01 19:10:57 +0300 @@ -3809,53 +228,7 @@ CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) -commit 88588b1246d8c26ffbc138b3e5c413c5f14c3179 -Author: Lasse Collin -Date: 2023-10-25 19:13:25 +0300 - - Build: Detect -fsanitize= in CFLAGS and incompatible build options. - - Now configure will fail if -fsanitize= is found in CFLAGS - and sanitizer-incompatible ifunc or Landlock sandboxing - would be used. These are incompatible with one or more sanitizers. - It's simpler to reject all -fsanitize= uses instead of trying to - pass those that might not cause problems. - - CMake-based build was updated similarly. It lets the configuration - finish (SEND_ERROR instead of FATAL_ERROR) so that both error - messages can be seen at once. - - CMakeLists.txt | 29 +++++++++++++++++++++++++++++ - configure.ac | 37 +++++++++++++++++++++++++++++++++---- - 2 files changed, 62 insertions(+), 4 deletions(-) - -commit 5e3d890f8862a7d4fbef5e38e11b6c9fbd98f468 -Author: Jia Tan -Date: 2023-10-24 00:50:08 +0800 - - CI: Disable sandboxing in fsanitize=address,undefined job. - - The sandboxing on Linux now supports Landlock, which restricts all - supported filesystem actions after xz opens the files it needs. The - sandbox is only enabled when one file is input and we are writing to - standard out. With fsanitize=address,undefined, the instrumentation - needs to read additional files after the sandbox is in place. This - forces all xz based test to fail, so the sandbox must instead be - disabled. - - .github/workflows/ci.yml | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -commit b1408987ea832e2760e478ae960a636df17a1363 -Author: Jia Tan -Date: 2023-10-24 00:15:39 +0800 - - CI: Allow disabling the sandbox in ci_build.sh. - - build-aux/ci_build.sh | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit 91c435cf1c7a1e893706d4d716dfd361621ed824 +commit 007558a358c48a0175cc8d47d11798d7967282ab Author: Lasse Collin Date: 2023-10-11 19:47:44 +0300 @@ -3869,34 +242,7 @@ CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -commit fa1609eb9393ecd30decfed4891c907829f06710 -Author: Lasse Collin -Date: 2023-10-09 22:28:49 +0300 - - Docs: Update INSTALL about sandboxing support. - - INSTALL | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit 8276c7f41c671eee4aa3239490658b23dcfd3021 -Author: Lasse Collin -Date: 2023-10-09 22:07:52 +0300 - - xz: Support basic sandboxing with Linux Landlock (ABI versions 1-3). - - It is enabled only when decompressing one file to stdout, - similar to how Capsicum is used. - - Landlock was added in Linux 5.13. - - CMakeLists.txt | 12 +++++++++++- - configure.ac | 11 ++++++++--- - src/xz/file_io.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/xz/main.c | 19 +++++++++++++++++++ - src/xz/private.h | 3 ++- - 5 files changed, 98 insertions(+), 5 deletions(-) - -commit 3a1e9fd031b9320d769d63b503ef4e82e1b6ea8c +commit 7d01de67ee3dd76cfc12c23220e2e4cdc59708f1 Author: Lasse Collin Date: 2023-10-09 21:12:31 +0300 @@ -3907,7 +253,7 @@ CMakeLists.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) -commit bf011352528ae3539ea7b780b45b96736ee57a99 +commit f8edcf3da689aad4b21e139197725450f2c456a0 Author: Lasse Collin Date: 2023-10-09 20:59:24 +0300 @@ -3924,167 +270,7 @@ CMakeLists.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) -commit 3f53870c249945d657ca3d75e0993e6267d71f75 -Author: Lasse Collin -Date: 2023-10-09 18:37:32 +0300 - - CMake: Add sandboxing support. - - CMakeLists.txt | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 49 insertions(+), 1 deletion(-) - -commit 2e2cd11535ad77364cf021297e0b3f162fa3a3d0 -Author: Lasse Collin -Date: 2023-10-09 18:13:08 +0300 - - Simplify detection of Capsicum support. - - This removes support for FreeBSD 10.0 and 10.1 which used - instead of . Support for - FreeBSD 10.1 ended on 2016-12-31. So now FreeBSD >= 10.2 is - required to enable Capsicum support. - - This also removes support for Capsicum on Linux (libcaprights) - which seems to have been unmaintained since 2017 and Linux 4.11: - https://github.com/google/capsicum-linux - - configure.ac | 4 +-- - m4/ax_check_capsicum.m4 | 85 ------------------------------------------------- - src/xz/Makefile.am | 2 +- - src/xz/file_io.c | 14 +++----- - src/xz/private.h | 2 +- - 5 files changed, 9 insertions(+), 98 deletions(-) - -commit c57858b60e186d020b2dbaf7aabd9b32c71da824 -Author: Lasse Collin -Date: 2023-09-25 01:46:36 +0300 - - xz/Windows: Allow clock_gettime with POSIX threads. - - If winpthreads are used for threading, it's OK to use clock_gettime() - from winpthreads too. - - src/xz/mytime.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -commit dd32f628bb5541ef4e8ce66966ef456a1934084c -Author: Lasse Collin -Date: 2023-09-25 01:39:26 +0300 - - mythread.h: Make MYTHREAD_POSIX compatible with MinGW-w64's winpthreads. - - This might be almost useless but it doesn't need much extra code either. - - src/common/mythread.h | 23 ++++++++++++++++++++++- - 1 file changed, 22 insertions(+), 1 deletion(-) - -commit 680e52cdd086e92691d8a0bca2c98815565f60ca -Author: Lasse Collin -Date: 2023-09-23 03:06:36 +0300 - - CMake: Check for clock_gettime() even on Windows. - - This mirrors configure.ac although currently MinGW-w64 builds - don't use clock_gettime() even if it is found. - - CMakeLists.txt | 44 +++++++++++++++++++++----------------------- - 1 file changed, 21 insertions(+), 23 deletions(-) - -commit 1c1a8c3ee4dad0064dbe63b8dbc4ac4bc679f419 -Author: Lasse Collin -Date: 2023-09-23 03:23:32 +0300 - - Build: Check for clock_gettime() even if not using POSIX threads. - - See the new comment in the code. - - This also makes the check for clock_gettime() run with MinGW-w64 - with which we don't want to use clock_gettime(). The previous - commit already took care of this situation. - - configure.ac | 31 ++++++++++++++++++------------- - 1 file changed, 18 insertions(+), 13 deletions(-) - -commit 46fd991cd2808ef62554853864c946232e7547f0 -Author: Lasse Collin -Date: 2023-09-24 22:58:53 +0300 - - xz/Windows: Ensure that clock_gettime() isn't used with MinGW-w64. - - This commit alone doesn't change anything in the real-world: - - - configure.ac currently checks for clock_gettime() only - when using pthreads. - - - CMakeLists.txt doesn't check for clock_gettime() on Windows. - - So clock_gettime() wasn't used with MinGW-w64 before either. - - clock_gettime() provides monotonic time and it's better than - gettimeofday() in this sense. But clock_gettime() is defined - in winpthreads, and liblzma or xz needs nothing else from - winpthreads. By avoiding clock_gettime(), we avoid the dependency on - libwinpthread-1.dll or the need to link against the static version. - - As a bonus, GetTickCount64() and MinGW-w64's gettimeofday() can be - faster than clock_gettime(CLOCK_MONOTONIC, &tv). The resolution - is more than good enough for the progress indicator in xz. - - src/xz/mytime.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -commit cdb4d91f2464b50c985ef7b9517314ea237ddda7 -Author: Lasse Collin -Date: 2023-09-24 00:21:22 +0300 - - xz/Windows: Use GetTickCount64() with MinGW-w64 if using Vista threads. - - src/xz/mytime.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -commit 988e09f27b9b04a43d45d10f92782e0092ee27a9 -Author: Jia Tan -Date: 2023-10-20 19:17:46 +0800 - - liblzma: Move is_clmul_supported() back to crc_common.h. - - This partially reverts creating crc_clmul.c - (8c0f9376f58c0696d5d6719705164d35542dd891) where is_clmul_supported() - was moved, extern'ed, and renamed to lzma_is_clmul_supported(). This - caused a problem when the function call to lzma_is_clmul_supported() - results in a call through the PLT. ifunc resolvers run very early in - the dynamic loading sequence, so the PLT may not be setup properly at - this point. Whether the PLT is used or not for - lzma_is_clmul_supported() depened upon the compiler-toolchain used and - flags. - - In liblzma compiled with GCC, for instance, GCC will go through the PLT - for function calls internal to liblzma if the version scripts and - symbol visibility hiding are not used. If lazy-binding is disabled, - then it would have made any program linked with liblzma fail during - dynamic loading in the ifunc resolver. - - src/liblzma/check/crc32_fast.c | 2 +- - src/liblzma/check/crc64_fast.c | 2 +- - src/liblzma/check/crc_clmul.c | 45 ------------------------------------ - src/liblzma/check/crc_common.h | 52 +++++++++++++++++++++++++++++++++++++++--- - 4 files changed, 51 insertions(+), 50 deletions(-) - -commit 105c7ca90d4152942e0798580a37f736d02faa22 -Author: Jia Tan -Date: 2023-10-19 16:23:32 +0800 - - Build: Remove check for COND_CHECK_CRC32 in check/Makefile.inc. - - Currently crc32 is always enabled, so COND_CHECK_CRC32 must always be - set. Because of this, it makes the recent change to conditionally - compile check/crc_clmul.c appear wrong since that file has CLMUL - implementations for both CRC32 and CRC64. - - src/liblzma/check/Makefile.inc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 139757170468f0f1fafdf0a8ffa74363d1ea1d0c +commit 1695021e4a233a9388ddd428654c1447f0ea3bfb Author: Jia Tan Date: 2023-10-19 16:09:01 +0800 @@ -4096,67 +282,10 @@ This mirrors our Autotools build --disable-clmul-crc functionality. - CMakeLists.txt | 44 +++++++++++++++++++++++++------------------- - 1 file changed, 25 insertions(+), 19 deletions(-) - -commit c60b25569d414bb73b705977a4dd342f8f9f1965 -Author: Jia Tan -Date: 2023-10-19 00:22:50 +0800 - - liblzma: Fix -fsanitize=address failure with crc_clmul functions. - - After forcing crc_simd_body() to always be inlined it caused - -fsanitize=address to fail for lzma_crc32_clmul() and - lzma_crc64_clmul(). The __no_sanitize_address__ attribute was added - to lzma_crc32_clmul() and lzma_crc64_clmul(), but not removed from - crc_simd_body(). ASAN and inline functions behavior has changed over - the years for GCC specifically, so while strictly required we will - keep __attribute__((__no_sanitize_address__)) on crc_simd_body() in - case this becomes a requirement in the future. - - Older GCC versions refuse to inline a function with ASAN if the - caller and callee do not agree on sanitization flags - (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89124#c3). If the - function was forced to be inlined, it will not compile if the callee - function has __no_sanitize_address__ but the caller doesn't. - - src/liblzma/check/crc_clmul.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit 9a78971261bc67622cbd7dae02f6966968ac1393 -Author: Lasse Collin -Date: 2023-10-14 20:16:13 +0300 - - tuklib_integer: Update the CMake test for fast unaligned access. - - cmake/tuklib_integer.cmake | 69 ++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 54 insertions(+), 15 deletions(-) - -commit 2f81ac852bc5aafc91c8e2adc66b5114761703c4 -Author: Lasse Collin -Date: 2023-09-23 23:28:48 +0300 - - Build: Enabled unaligned access by default on PowerPC64LE and some RISC-V. - - PowerPC64LE wasn't tested but it seems like a safe change. - POWER8 supports unaligned access in little endian mode. Testing - on godbolt.org shows that GCC uses unaligned access by default. - - The RISC-V macro __riscv_misaligned_fast is very new and not - in any stable compiler release yet. - - Documentation in INSTALL was updated to match. - - Documentation about an autodetection bug when using ARM64 GCC - with -mstrict-align was added to INSTALL. - - CMake files weren't updated yet. - - INSTALL | 39 +++++++++++++++++++++++++++++++++++++-- - m4/tuklib_integer.m4 | 34 +++++++++++++++++++++++++++------- - 2 files changed, 64 insertions(+), 9 deletions(-) + CMakeLists.txt | 40 +++++++++++++++++++++++----------------- + 1 file changed, 23 insertions(+), 17 deletions(-) -commit c8f715f1bca4c30db814fcf1fd2fe88b8992ede2 +commit 5056bc51071d1a07097c5667a0d5bd85242e31b9 Author: Lasse Collin Date: 2023-10-14 17:56:59 +0300 @@ -4169,7 +298,7 @@ src/common/tuklib_integer.h | 256 ++++++++++++++++++++++++++++++++------------ 1 file changed, 189 insertions(+), 67 deletions(-) -commit 6828242735cbf61b93d140383336e1e51a006f2d +commit 9e14743ee5ba79181076bc33952245d5b18fbc58 Author: Lasse Collin Date: 2023-09-23 02:21:49 +0300 @@ -4178,233 +307,7 @@ src/common/tuklib_integer.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) -commit 1c8884f0af28b3a4690bb573cdf3240a8ec73416 -Author: Jia Tan -Date: 2023-10-18 19:57:10 +0800 - - liblzma: Set the MSVC optimization fix to only cover lzma_crc64_clmul(). - - After testing a 32-bit Release build on MSVC, only lzma_crc64_clmul() - has the bug. crc_simd_body() and lzma_crc32_clmul() do not need the - optimizations disabled. - - src/liblzma/check/crc_clmul.c | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -commit 5ce0f7a48bdf5c3b45430850a4487307afac6143 -Author: Lasse Collin -Date: 2023-10-18 14:30:00 +0300 - - liblzma: CRC_USE_GENERIC_FOR_SMALL_INPUTS cannot be used with ifunc. - - src/liblzma/check/crc_common.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 27735380491bb5ce0d0f41d5244d89c1d0825f6b -Author: Lasse Collin -Date: 2023-10-17 21:53:11 +0300 - - liblzma: Include common.h in crc_common.h. - - crc_common.h depends on common.h. The headers include common.h except - when there is a reason to not do so. - - src/liblzma/check/crc_clmul.c | 1 - - src/liblzma/check/crc_common.h | 3 +++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -commit e13b7947b92355c334edd594295d3a2c99c4bca1 -Author: Jia Tan -Date: 2023-10-18 01:23:26 +0800 - - liblzma: Add include guards to crc_common.h. - - src/liblzma/check/crc_common.h | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 40abd88afcc61a8157fcd12d78d491caeb8e12be -Author: Jia Tan -Date: 2023-10-18 22:50:25 +0800 - - liblzma: Add the crc_always_inline macro to crc_simd_body(). - - Forcing this to be inline has a significant speed improvement at the - cost of a few repeated instructions. The compilers tested on did not - inline this function since it is large and is used twice in the same - translation unit. - - src/liblzma/check/crc_clmul.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit a5966c276bd6fa975f0389f8a8dc61393de750b0 -Author: Jia Tan -Date: 2023-10-18 22:48:19 +0800 - - liblzma: Create crc_always_inline macro. - - This macro must be used instead of the inline keyword. On MSVC, it is - a replacement for __forceinline which is an MSVC specific keyword that - should not be used with inline (it will issue a warning if it is). - - It does not use a build system check to determine if - __attribute__((__always_inline__)) since all compilers that can use - CLMUL extensions (except the special case for MSVC) should support this - attribute. If this assumption is incorrect then it will result in a bug - report instead of silently producing slow code. - - src/liblzma/check/crc_common.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -commit 96b663f67c0e738a99ba8f35d9f4ced9add74544 -Author: Jia Tan -Date: 2023-10-14 13:23:23 +0800 - - liblzma: Refactor CRC comments. - - A detailed description of the three dispatch methods was added. Also, - duplicated comments now only appear in crc32_fast.c or were removed from - both crc32_fast.c and crc64_fast.c if they appeared in crc_clmul.c. - - src/liblzma/check/crc32_fast.c | 64 +++++++++++++++++++++++++++++------------- - src/liblzma/check/crc64_fast.c | 61 ++++++---------------------------------- - 2 files changed, 53 insertions(+), 72 deletions(-) - -commit 8c0f9376f58c0696d5d6719705164d35542dd891 -Author: Jia Tan -Date: 2023-10-14 12:17:57 +0800 - - liblzma: Create crc_clmul.c. - - Both crc32_clmul() and crc64_clmul() are now exported from - crc32_clmul.c as lzma_crc32_clmul() and lzma_crc64_clmul(). This - ensures that is_clmul_supported() (now lzma_is_clmul_supported()) is - not duplicated between crc32_fast.c and crc64_fast.c. - - Also, it encapsulates the complexity of the CLMUL implementations into a - single file and reduces the complexity of crc32_fast.c and crc64_fast.c. - Before, CLMUL code was present in crc32_fast.c, crc64_fast.c, and - crc_common.h. - - During the conversion, various cleanups were applied to code (thanks to - Lasse Collin) including: - - - Require using semicolons with MASK_/L/H/LH macros. - - Variable typing and const handling improvements. - - Improvements to comments. - - Fixes to the pragmas used. - - Removed unneeded variables. - - Whitespace improvements. - - Fixed CRC_USE_GENERIC_FOR_SMALL_INPUTS handling. - - Silenced warnings and removed the need for some #pragmas - - CMakeLists.txt | 6 +- - configure.ac | 6 +- - src/liblzma/check/Makefile.inc | 3 + - src/liblzma/check/crc32_fast.c | 120 +----------- - src/liblzma/check/crc64_fast.c | 128 +------------ - src/liblzma/check/crc_clmul.c | 414 +++++++++++++++++++++++++++++++++++++++++ - src/liblzma/check/crc_common.h | 190 +------------------ - 7 files changed, 444 insertions(+), 423 deletions(-) - -commit a3ebc2c516b09616638060806c841bd4bcf7bce3 -Author: Jia Tan -Date: 2023-10-14 10:23:03 +0800 - - liblzma: Define CRC_USE_IFUNC in crc_common.h. - - When ifunc is supported, we can define a simpler macro instead of - repeating the more complex check in both crc32_fast.c and crc64_fast.c. - - src/liblzma/check/crc32_fast.c | 3 +-- - src/liblzma/check/crc64_fast.c | 3 +-- - src/liblzma/check/crc_common.h | 5 +++++ - 3 files changed, 7 insertions(+), 4 deletions(-) - -commit f1cd9d7194f005cd66ec03c6635ceae75f90ef17 -Author: Hans Jansen -Date: 2023-10-12 19:37:01 +0200 - - liblzma: Added crc32_clmul to crc32_fast.c. - - src/liblzma/check/crc32_fast.c | 247 ++++++++++++++++++++++++++++++++++++++-- - src/liblzma/check/crc32_table.c | 19 +++- - 2 files changed, 255 insertions(+), 11 deletions(-) - -commit 93e6fb08b22c7c13be2dd1e7274fe78413436254 -Author: Hans Jansen -Date: 2023-10-12 19:23:40 +0200 - - liblzma: Moved CLMUL CRC logic to crc_common.h. - - crc64_fast.c was updated to use the code from crc_common.h instead. - - src/liblzma/check/crc64_fast.c | 257 ++--------------------------------------- - src/liblzma/check/crc_common.h | 230 +++++++++++++++++++++++++++++++++++- - 2 files changed, 240 insertions(+), 247 deletions(-) - -commit 233885a437f8b55a5c8442984ebc0aaa579e92de -Author: Hans Jansen -Date: 2023-10-12 19:07:50 +0200 - - liblzma: Rename crc_macros.h to crc_common.h. - - CMakeLists.txt | 2 +- - src/liblzma/check/Makefile.inc | 2 +- - src/liblzma/check/crc32_fast.c | 2 +- - src/liblzma/check/crc64_fast.c | 2 +- - src/liblzma/check/{crc_macros.h => crc_common.h} | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -commit 37947d4a7565b87e4cec8b89229d35b0a3f8d2cd -Author: Gabriela Gutierrez -Date: 2023-09-26 15:55:13 +0000 - - CI: Bump and ref actions by commit SHA in windows-ci.yml - - Referencing actions by commit SHA in GitHub workflows guarantees you are using an immutable version. Actions referenced by tags and branches are more vulnerable to attacks, such as the tag being moved to a malicious commit or a malicious commit being pushed to the branch. - - It's important to make sure the SHA's are from the original repositories and not forks. - - For reference: - - https://github.com/msys2/setup-msys2/releases/tag/v2.20.1 - https://github.com/msys2/setup-msys2/commit/27b3aa77f672cb6b3054121cfd80c3d22ceebb1d - - https://github.com/actions/checkout/releases/tag/v4.1.0 - https://github.com/actions/checkout/commit/8ade135a41bc03ea155e62e844d188df1ea18608 - - https://github.com/actions/upload-artifact/releases/tag/v3.1.3 - https://github.com/actions/upload-artifact/commit/a8a3f3ad30e3422c9c7b888a15615d19a852ae32 - - Signed-off-by: Gabriela Gutierrez - - .github/workflows/windows-ci.yml | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit f28cc9bd481ce493da11f98c18526d324211599a -Author: Gabriela Gutierrez -Date: 2023-09-26 14:35:08 +0000 - - CI: Bump and ref actions by commit SHA in ci.yml - - Referencing actions by commit SHA in GitHub workflows guarantees you are using an immutable version. Actions referenced by tags and branches are more vulnerable to attacks, such as the tag being moved to a malicious commit or a malicious commit being pushed to the branch. - - It's important to make sure the SHA's are from the original repositories and not forks. - - For reference: - - https://github.com/actions/checkout/releases/tag/v4.1.0 - https://github.com/actions/checkout/commit/8ade135a41bc03ea155e62e844d188df1ea18608 - - https://github.com/actions/upload-artifact/releases/tag/v3.1.3 - https://github.com/actions/upload-artifact/commit/a8a3f3ad30e3422c9c7b888a15615d19a852ae32 - - Signed-off-by: Gabriela Gutierrez - - .github/workflows/ci.yml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit f74f1740067b75042497edbfa6ea457ff75484b9 +commit 4cc91ceb3992ef4f51302b56178c3b2c2aeaaaad Author: Jia Tan Date: 2023-10-12 20:12:18 +0800 @@ -4417,7 +320,7 @@ m4/visibility.m4 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -commit 5c4bca521e6fb435898a0012b3276eee70a6dadf +commit 1824a6007cb1c8d5d7abcc7bf649148bc06fa72c Author: Lasse Collin Date: 2023-10-06 19:36:35 +0300 @@ -4426,49 +329,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit d91cb6e884c73d0b05d7e7d68ad4e6eb29f4b44b -Author: Lasse Collin -Date: 2023-10-06 18:55:57 +0300 - - CMake/Windows: Fix when the windres workaround is applied. - - CMake doesn't set WIN32 on CYGWIN but the workaround is - probably needed on Cygwin too. Same for MSYS and MSYS2. - - The workaround must not be used with Clang that is acting in - MSVC mode. This fixes it by checking for the known environments - that need the workaround instead of using "NOT MSVC". - - Thanks to Martin Storsjö. - https://github.com/tukaani-project/xz/commit/0570308ddd9c0e39e85597ebc0e31d4fc81d436f#commitcomment-129098431 - - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 01e34aa1171b04f8b28960b1cc6135a903e0c13d -Author: Jia Tan -Date: 2023-09-29 22:11:54 +0800 - - CI: Disable CLANG64 MSYS2 environment until bug is resolved. - - lld 17.0.1 searches for libraries to link first in the toolchain - directories before the local directory when building. The is a problem - for us because liblzma.a is installed in MSYS2 CLANG64 by default and - xz.exe will thus use the installed library instead of the one being - built. - - This causes tests to fail when they are expecting features to be - disabled. More importantly, it will compile xz.exe with an incorrect - liblzma and could cause unexpected behavior by being unable to update - liblzma code in static builds. The CLANG64 environment can be tested - again once this is fixed. - - Link to bug: https://github.com/llvm/llvm-project/issues/67779. - - .github/workflows/windows-ci.yml | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -commit 30d0c35327f3639cb11224872aa58fdbf0b1526e +commit 8fdc71a27d07b10a3da52432432e080b6d577642 Author: Jia Tan Date: 2023-09-29 20:14:39 +0800 @@ -4482,19 +343,7 @@ CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -commit 506d03127a8565442b028ec991e1578124fd3025 -Author: Jia Tan -Date: 2023-09-29 19:58:44 +0800 - - CMake: Specify LINKER_LANGUAGE for libgnu target to fix Ninja Generator. - - CMake is unable to guess the linker language for just a header file so - it must be explicitly set. - - CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit 0570308ddd9c0e39e85597ebc0e31d4fc81d436f +commit 38171492ded6426ddf53d0c200fa8c93fcd02a60 Author: Lasse Collin Date: 2023-09-27 19:54:35 +0300 @@ -4506,46 +355,32 @@ LLVM 16.0.6 has the old behavior and there likely won't be more 16.x releases. So we can simply check for >= 17.0.0. + The workaround must not be used with Clang that is acting in + MSVC mode. This checks for the known environments that need + the workaround instead of using "NOT MSVC". + See also: https://github.com/llvm/llvm-project/commit/2bcc0fdc58a220cb9921b47ec8a32c85f2511a47 CMakeLists.txt | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) -commit 5a9af95f85a7e5d4f9c10cb8cf737651a921f1d1 -Author: Lasse Collin -Date: 2023-09-26 21:47:13 +0300 - - liblzma: Update a comment. - - The C standards don't allow an empty translation unit which can be - avoided by declaring something, without exporting any symbols. - - When I committed f644473a211394447824ea00518d0a214ff3f7f2 I had - a feeling that some specific toolchain somewhere didn't like - empty object files (assembler or maybe "ar" complained) but - I cannot find anything to confirm this now. Quite likely I - remembered nonsense. I leave this here as a note to my future self. :-) - - src/liblzma/check/crc64_table.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit 8ebaf3f665ddc7e4f19c613005050dde5ccbe499 +commit 1bce6fe48334b5df33d0487a9cbe41950122230e Author: Jia Tan Date: 2023-09-27 00:02:11 +0800 liblzma: Avoid compiler warning without creating extra symbol. When the generic fast crc64 method is used, then we omit - lzma_crc64_table[][]. Similar to - d9166b52cf3458a4da3eb92224837ca8fc208d79, we can avoid compiler warnings - with -Wempty-translation-unit (Clang) or -pedantic (GCC) by creating a - never used typedef instead of an extra symbol. + lzma_crc64_table[][]. + + The C standards don't allow an empty translation unit which can be + avoided by declaring something, without exporting any symbols. - src/liblzma/check/crc64_table.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + src/liblzma/check/crc64_table.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) -commit 092d21db2e5eea19fe079264ce48c178989c7606 +commit dce95a593e6cd9779110aa1e314abd8b35c75f6b Author: Lasse Collin Date: 2023-09-26 17:24:15 +0300 @@ -4554,29 +389,7 @@ configure.ac | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -commit a37a2763383e6c204fe878e1416dd35e7711d3a9 -Author: Lasse Collin -Date: 2023-09-26 15:00:43 +0300 - - Build: Fix __attribute__((ifunc(...))) detection with clang -Wall. - - Now if user-supplied CFLAGS contains -Wall -Wextra -Wpedantic - the two checks that need -Werror will still work. - - At CMake side there is add_compile_options(-Wall -Wextra) - but it didn't affect the -Werror tests. So with both Autotools - and CMake only user-supplied CFLAGS could make the checks fail - when they shouldn't. - - This is not a full fix as things like -Wunused-macros in - user-supplied CFLAGS will still cause problems with both - GCC and Clang. - - CMakeLists.txt | 8 ++++++++ - configure.ac | 8 ++++++++ - 2 files changed, 16 insertions(+) - -commit 9c42f936939b813f25d0ff4e99c3eb9c2d17a0d2 +commit f3c32762ae309afa2fe330e7fb397acfdedc4d37 Author: Lasse Collin Date: 2023-09-26 13:51:31 +0300 @@ -4587,14 +400,14 @@ configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 9f1444a8a5c0e724b2c7ef83424f642f07a95982 +commit 7dd57f2f2c8fde93fa42b4dbf6d9860717723b41 Author: Lasse Collin Date: 2023-09-26 13:14:37 +0300 - Build: Silence two Autoconf warnings. + Build: Silence Autoconf warning. - There were two uses of AC_COMPILE_IFELSE that didn't use - AC_LANG_SOURCE and Autoconf warned about these. The omission + There was a use of AC_COMPILE_IFELSE that didn't use + AC_LANG_SOURCE and Autoconf warned about this. The omission had been intentional but it turned out that this didn't do what I thought it would. @@ -4618,26 +431,16 @@ these two tests because these tests must use -Werror. CC=clang CFLAGS=-Weverything is the most extreme example. It enables -Wreserved-macro-identifier which warns about - #define __EXTENSIONS__ 1 because it begins with two underscores. It's possible to write a test file that passes -Weverything but it becomes impossible when Autoconf inserts confdefs.h. So this commit adds AC_LANG_SOURCE to silence Autoconf warnings. A different solution is needed for -Werror tests. - configure.ac | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -commit 519e47c2818acde571fadc79551294527fe6cc22 -Author: Jia Tan -Date: 2023-09-26 01:17:11 +0800 - - CMake: Remove accidental extra newline. - - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) + configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) -commit bbb42412da6a02705ba3e668e90840c2683e4e67 +commit edec253e418562f3164a01ecc8805295fa022efa Author: Jia Tan Date: 2023-09-26 00:47:26 +0800 @@ -4649,7 +452,7 @@ tests/Makefile.am | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -commit d265f6b75691c6c8fa876eb5320c3ff5aed17dfa +commit 46cb133ce7360496eecca1255b364c05f0205855 Author: Jia Tan Date: 2023-09-26 00:43:43 +0800 @@ -4660,233 +463,7 @@ CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) -commit 9fb5de41f2fb654ca952d4bda15cf3777c2b720f -Author: Jia Tan -Date: 2023-09-24 22:10:41 +0800 - - Scripts: Change quoting style from `...' to '...'. - - src/scripts/xzdiff.in | 2 +- - src/scripts/xzgrep.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit eaebdef4d4de3c088b0905f42626b74e0d23abf3 -Author: Jia Tan -Date: 2023-09-24 22:10:18 +0800 - - xz: Change quoting style from `...' to '...'. - - src/xz/args.c | 6 +++--- - src/xz/file_io.c | 2 +- - src/xz/main.c | 4 ++-- - src/xz/message.c | 14 +++++++------- - src/xz/options.c | 2 +- - src/xz/suffix.c | 2 +- - src/xz/util.c | 6 +++--- - 7 files changed, 18 insertions(+), 18 deletions(-) - -commit f6667702bf075a05fbe336dbf3576ad1a82ec645 -Author: Jia Tan -Date: 2023-09-24 22:09:47 +0800 - - liblzma: Change quoting style from `...' to '...'. - - This was done for both internal and API headers. - - src/liblzma/api/lzma/base.h | 18 +++++++++--------- - src/liblzma/api/lzma/container.h | 10 +++++----- - src/liblzma/api/lzma/filter.h | 6 +++--- - src/liblzma/api/lzma/index.h | 8 ++++---- - src/liblzma/api/lzma/lzma12.h | 2 +- - src/liblzma/lz/lz_encoder.h | 2 +- - src/liblzma/rangecoder/range_decoder.h | 2 +- - 7 files changed, 24 insertions(+), 24 deletions(-) - -commit be012b8097a4eaee335b51357d6befa745f753ce -Author: Jia Tan -Date: 2023-09-24 22:09:16 +0800 - - Build: Change quoting style from `...' to '...'. - - configure.ac | 18 +++++++++--------- - dos/config.h | 6 +++--- - m4/getopt.m4 | 2 +- - m4/tuklib_progname.m4 | 2 +- - windows/build.bash | 2 +- - 5 files changed, 15 insertions(+), 15 deletions(-) - -commit ce162db07f03495bd333696e66883c8f36abdc1e -Author: Jia Tan -Date: 2023-09-24 22:05:02 +0800 - - Docs: Change quoting style from `...' to '...'. - - These days the ` and ' do not look symmetric. This quoting style has - been changed in various apps over the years including the GNU tools. - - INSTALL | 6 +++--- - doc/examples/01_compress_easy.c | 2 +- - doc/examples/11_file_info.c | 16 ++++++++-------- - 3 files changed, 12 insertions(+), 12 deletions(-) - -commit db17656721e43939bfa4ec13506e7c76f4b86da6 -Author: Jia Tan -Date: 2023-09-24 21:25:01 +0800 - - lib: Silence -Wsign-conversion in getopt.c. - - lib/getopt.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit a6234f677d66888f435010bc0b67de6a32fefcf6 -Author: Jia Tan -Date: 2023-09-24 20:48:52 +0800 - - Build: Update getopt.m4 from Gnulib. - - This file was modified from upstream since we do not need to replace - getopt() and can avoid complexity and feature tests. - - m4/getopt.m4 | 79 ++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 39 insertions(+), 40 deletions(-) - -commit 84808b68f1075e8603a8ef95d361a61fdc6a5b10 -Author: Jia Tan -Date: 2023-09-26 00:09:53 +0800 - - CMake: Add /lib to include path. - - CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 01804a0b4b64e0f33568e947e0579263808c59d3 -Author: Jia Tan -Date: 2023-09-24 20:36:34 +0800 - - CMake: Update libgnu target with new header files. - - CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -commit d34558388fe1d8929f6478d61dc322eb4f2900af -Author: Jia Tan -Date: 2023-09-23 00:47:52 +0800 - - lib: Update Makefile.am for new header files. - - lib/Makefile.am | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -commit 52bf644bdf536e20fcc743b712cede135e05eec5 -Author: Jia Tan -Date: 2023-09-24 20:34:03 +0800 - - lib: Update getopt1.c from Gnulib. - - The only difference was maintaining the conditional inclusion for - config.h. - - lib/getopt1.c | 56 ++++++++++++++++++++++---------------------------------- - 1 file changed, 22 insertions(+), 34 deletions(-) - -commit 7e884c00d0093c38339f17fb1d280eec493f42ca -Author: Jia Tan -Date: 2023-09-23 03:27:00 +0800 - - lib: Update getopt.in.h from Gnulib with modifications. - - We can still avoid modifying the contents of this file during - configuration to simplify the build systems. Gnulib added replacements - for inclusions guards for Cygwin. Cygwin should not need getopt_long - replacement so this feature can be omitted. - - is conditionally included to avoid MSVC since it is not - available. - - The definition for _GL_ARG_NONNULL was also copied into this file from - Gnulib since this stage is usually done during gnulib-tool. - - lib/getopt.in.h | 228 +++++++------------------------------------------------- - 1 file changed, 29 insertions(+), 199 deletions(-) - -commit cff05f82066ca3ce9425dafdb086325a8eef8de3 -Author: Jia Tan -Date: 2023-09-23 00:31:55 +0800 - - lib: Update getopt_int.h from Gnulib. - - lib/getopt_int.h | 109 ++++++++++++++++++++++++------------------------------- - 1 file changed, 48 insertions(+), 61 deletions(-) - -commit 04bd86a4b010d43c6a016a3857ecb38dc1d5b024 -Author: Jia Tan -Date: 2023-09-23 00:27:23 +0800 - - lib: Update getopt.c from Gnulib with modifications. - - The code maintains the prior modifications of conditionally including - config.h and disabling NLS support. - - _GL_UNUSED is repalced with the simple cast to void trick. _GL_UNUSED - is only used for these two parameters so its simpler than having to - define it. - - lib/getopt.c | 1134 +++++++++++++++++++--------------------------------------- - 1 file changed, 377 insertions(+), 757 deletions(-) - -commit 56b42be7287844db20b3a3bc1372c6ae8c040d63 -Author: Jia Tan -Date: 2023-09-23 00:18:56 +0800 - - lib: Add getopt-cdefs.h for getopt_long update. - - This was modified slightly from Gnulib. In Gnulib, it expects the - @HAVE_SYS_CDEFS_H@ to be replaced. Instead, we can set HAVE_SYS_CDEFS_H - on systems that have it and avoid copying another file into the build - directory. Since we are not using gnulib-tool, copying extra files - requires extra build system updates (and special handling with CMake) so - we should avoid when possible. - - lib/getopt-cdefs.h | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 70 insertions(+) - -commit 9834e591a4cf9dc2f49e42e26bf28d1d247bc196 -Author: Jia Tan -Date: 2023-09-23 00:15:25 +0800 - - lib: Copy new header files from Gnulib without modification. - - The getopt related files have changed from Gnulib by splitting up - getopt.in.h into more modular header files. We could have kept - everything in just getopt.in.h, but this will help us continue to update - in the future. - - lib/getopt-core.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ - lib/getopt-ext.h | 77 +++++++++++++++++++++++++++++++++++++++++ - lib/getopt-pfx-core.h | 66 +++++++++++++++++++++++++++++++++++ - lib/getopt-pfx-ext.h | 70 +++++++++++++++++++++++++++++++++++++ - 4 files changed, 309 insertions(+) - -commit 5b7a6f06e93d99d6635a740fd2e12fab66096c93 -Author: Lasse Collin -Date: 2023-09-22 21:16:52 +0300 - - Windows: Update the version requirement comments from Win95 to W2k. - - windows/README-Windows.txt | 10 ++++------ - windows/build.bash | 6 +++--- - 2 files changed, 7 insertions(+), 9 deletions(-) - -commit e582f8e0fee46e7cd967f42f465d6bb608b73bc1 -Author: Lasse Collin -Date: 2023-09-22 21:12:54 +0300 - - tuklib_physmem: Comment out support for Windows versions older than 2000. - - src/common/tuklib_physmem.c | 20 +++++++++----------- - 1 file changed, 9 insertions(+), 11 deletions(-) - -commit 7d73d1f0e08f96c4ab7aac91b958e37a3dadf07a +commit 4ae13cfe0dedb8ddc3cf9ded8cd1ac09361b3bd1 Author: Lasse Collin Date: 2023-09-24 16:32:32 +0300 @@ -4895,7 +472,7 @@ src/common/sysdefs.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -commit 2a9929af0ab7e6c0ab725565034afe3293e51d71 +commit 660c8c29e57d30dbd5009ef1f0ec1bbe195ccef6 Author: Lasse Collin Date: 2023-09-22 02:33:29 +0300 @@ -4925,7 +502,7 @@ src/xz/file_io.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) -commit 01311b81f03cce1c0ce847a3d556f84dbd439343 +commit b7ce6e80786fc0c08ed129e8ee262ea96a5473a1 Author: Lasse Collin Date: 2023-09-21 20:42:52 +0300 @@ -4934,7 +511,7 @@ CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -commit 152d0771ddd0cffcac9042ad1a66f110d228eee2 +commit 1595f454d5c8257c668cccd6a86dd68175d5c430 Author: Lasse Collin Date: 2023-09-21 20:36:31 +0300 @@ -4943,86 +520,7 @@ CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) -commit 6df988cceffaa3100b428ed816fad334935b27bf -Author: Lasse Collin -Date: 2023-09-12 23:53:25 +0300 - - MSVC: Remove Visual Studio project files and update INSTALL-MSVC.txt. - - CMake is now the preferred build file generator when building - with MSVC. - - windows/INSTALL-MSVC.txt | 37 ++-- - windows/vs2013/config.h | 157 --------------- - windows/vs2013/liblzma.vcxproj | 363 --------------------------------- - windows/vs2013/liblzma_dll.vcxproj | 398 ------------------------------------ - windows/vs2013/xz_win.sln | 48 ----- - windows/vs2017/config.h | 157 --------------- - windows/vs2017/liblzma.vcxproj | 363 --------------------------------- - windows/vs2017/liblzma_dll.vcxproj | 398 ------------------------------------ - windows/vs2017/xz_win.sln | 48 ----- - windows/vs2019/config.h | 157 --------------- - windows/vs2019/liblzma.vcxproj | 364 --------------------------------- - windows/vs2019/liblzma_dll.vcxproj | 399 ------------------------------------- - windows/vs2019/xz_win.sln | 51 ----- - 13 files changed, 12 insertions(+), 2928 deletions(-) - -commit edd563daf0da1d00018684614803c77ab62efcd6 -Author: Lasse Collin -Date: 2023-09-21 19:17:40 +0300 - - CMake: Require VS2015 or later for building xzdec. - - xzdec might build with VS2013 but it hasn't been tested. - It was never supported before and VS2013 is old anyway - so for simplicity only liblzma is supported with VS2013. - - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit daea64d158a7151ca6c255a0e4554c6d521cd589 -Author: Lasse Collin -Date: 2023-09-12 23:43:49 +0300 - - CMake: Allow building xz with Visual Studio 2015 and later. - - Building the command line tools xz and xzdec with the combination - of CMake + Visual Studio 2015/2017/2019/2022 works now. - - VS2013 update 2 should still be able to build liblzma. - VS2013 cannot build the xz command line tool because xz - needs snprintf() that roughly conforms to C99. - VS2013 is old and no extra code will be added to support it. - - Thanks to Kelvin Lee and Jia Tan for testing. - - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 8c2d197c940d246849b2ec48109bb22e54036927 -Author: Lasse Collin -Date: 2023-09-12 23:34:31 +0300 - - MSVC: #define inline and restrict only when needed. - - This also drops the check for _WIN32 as that shouldn't be needed. - - src/common/sysdefs.h | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -commit af66cd585902045e5689a0418103ec81f19f1d0a -Author: Lasse Collin -Date: 2023-09-12 22:16:56 +0300 - - CMake: Add support for replacement getopt_long (lib/getopt*). - - Thanks to Jia Tan for the initial work. I added the libgnu target - and made a few related minor edits. - - CMakeLists.txt | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 47 insertions(+), 7 deletions(-) - -commit e3288fdb45c580cb849f6799cf419c4922004ae5 +commit 5be6275f19784cdd5a954f0188045c8ff4934d54 Author: Lasse Collin Date: 2023-09-12 21:12:34 +0300 @@ -5037,23 +535,7 @@ CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit aff1b479c7b168652bd20305ceed4317d5db6661 -Author: Lasse Collin -Date: 2023-09-12 20:55:10 +0300 - - lib/getopt*.c: Include only HAVE_CONFIG_H is defined. - - The CMake-based build doesn't use config.h. - - Up-to-date getopt_long in Gnulib is LGPLv2 so at some - point it could be included in XZ Utils too but for now - this commit is enough to make CMake-based build possible. - - lib/getopt.c | 4 +++- - lib/getopt1.c | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -commit aa0cd585d2ed1455d35732798e0d90e3520e8ba5 +commit e515643d7524851d1eb7dab73453e26d8521324c Author: Lasse Collin Date: 2023-09-08 19:08:57 +0300 @@ -5062,7 +544,7 @@ doxygen/Doxyfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -commit ee7709bae53637e1765ce142ef102914f1423cb5 +commit e3478ae4f36cd06522a2fef023860893f068434d Author: Lasse Collin Date: 2023-09-11 18:47:26 +0300 @@ -5076,7 +558,7 @@ src/liblzma/common/memcmplen.h | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) -commit 217958d88713b5dc73d366d24dd64b2b311b86fe +commit b71b8922ef3971e5ccffd1e213888d44abe21d11 Author: Lasse Collin Date: 2023-09-11 19:03:35 +0300 @@ -5100,7 +582,7 @@ src/xzdec/xzdec.c | 9 ++++++--- 7 files changed, 37 insertions(+), 25 deletions(-) -commit 18a66fbac031c98f9c2077fc88846e4d07849197 +commit 359e5c6cb128dab64ea6070d21d1c240f96cea6b Author: Lasse Collin Date: 2023-09-11 18:53:31 +0300 @@ -5125,121 +607,7 @@ src/xz/util.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -commit 74b0e900c92d5b222b36f474f1efa431f8e262f7 -Author: Lasse Collin -Date: 2023-09-08 18:41:25 +0300 - - Build: Omit -Wc99-c11-compat since it warns about _Noreturn. - - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -commit 90c94dddfd57b7d744bfad64c54e10d15778144b -Author: Lasse Collin -Date: 2023-09-08 18:19:26 +0300 - - tuklib: Update tuklib_attr_noreturn for C11/C17 and C23. - - This makes no difference for GCC or Clang as they support - GNU C's __attribute__((__noreturn__)) but this helps with MSVC: - - - VS 2019 version 16.7 and later support _Noreturn if the - options /std:c11 or /std:c17 are used. This gets handled - with the check for __STDC_VERSION__ >= 201112. - - - When MSVC isn't in C11/C17 mode, __declspec(noreturn) is used. - - C23 will deprecate _Noreturn (and ) - for [[noreturn]]. This commit anticipates that but - the final __STDC_VERSION__ value isn't known yet. - - src/common/tuklib_common.h | 22 +++++++++++++++++++++- - src/common/tuklib_exit.h | 4 ++-- - 2 files changed, 23 insertions(+), 3 deletions(-) - -commit 189f72581329ab281ad6af37f60135910cb1b146 -Author: Lasse Collin -Date: 2023-09-11 17:22:44 +0300 - - Update THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 79334e7f20f2bf9e0de095835b48868f1238f584 -Author: Lasse Collin -Date: 2023-09-05 22:42:10 +0300 - - MSVC: xz: Make file_io.c and file_io.h compatible with MSVC. - - Thanks to Kelvin Lee for the original patches - and testing the modifications I made. - - src/xz/file_io.c | 26 ++++++++++++++++++++++++++ - src/xz/file_io.h | 10 ++++++++++ - 2 files changed, 36 insertions(+) - -commit c660b8d78b7bda43b12b285550d8c70e8ccec698 -Author: Lasse Collin -Date: 2023-09-05 21:33:35 +0300 - - MSVC: xz: Use GetTickCount64() to implement mytime_now(). - - It's available since Windows Vista. - - src/xz/mytime.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -commit 5c6f892d411670e3060f4bc309402617a209e57c -Author: Kelvin Lee -Date: 2023-09-05 15:05:09 +0300 - - MSVC: xz: Use _stricmp() instead of strcasecmp() in suffix.c. - - src/xz/suffix.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -commit e241051f50044259d174e8b4633dd9a1c4478408 -Author: Kelvin Lee -Date: 2023-09-05 15:01:10 +0300 - - MSVC: xz: Use _isatty() from to implement isatty(). - - src/xz/message.c | 5 +++++ - src/xz/util.c | 5 +++++ - 2 files changed, 10 insertions(+) - -commit d14bba8fc2be02a9fed8c9bcaaf61103451755f8 -Author: Kelvin Lee -Date: 2023-09-05 15:10:31 +0300 - - MSVC: xz: Use _fileno() instead of fileno(). - - src/xz/private.h | 4 ++++ - 1 file changed, 4 insertions(+) - -commit c4edd367678e6a38c42b149856159bf417da7fe1 -Author: Kelvin Lee -Date: 2023-09-05 15:00:07 +0300 - - MSVC: xzdec: Use _fileno and _setmode. - - src/xzdec/xzdec.c | 4 ++++ - 1 file changed, 4 insertions(+) - -commit cfd1054b9b539ee92524901e95d7bb5a1fe670a0 -Author: Kelvin Lee -Date: 2023-09-05 14:37:50 +0300 - - MSVC: Don't #include . - - lib/getopt.c | 4 +++- - lib/getopt.in.h | 4 +++- - src/xz/private.h | 5 ++++- - src/xzdec/xzdec.c | 5 ++++- - 4 files changed, 14 insertions(+), 4 deletions(-) - -commit adef92f23563a2cc088b31ddee9040ecc96bc996 +commit 589b4cba22fccb1dbc919df5d134aefb2b5a6b01 Author: Lasse Collin Date: 2023-09-19 14:03:45 +0300 @@ -5248,19 +616,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 953e775941a25bfcfa353f802b13e66acb1edf2c -Author: Jia Tan -Date: 2023-09-14 21:13:23 +0800 - - CI: Enable CLMUL in address sanitization test. - - The crc64_clmul() function should be ignored by the address sanitizer - now so these builds should still pass. - - .github/workflows/ci.yml | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -commit f167e79bc98f3f56af2e767b83aa81c2d2b9ed77 +commit 43728ed2267e921fbdfa699ee1e91b105ab0e98b Author: Lasse Collin Date: 2023-09-14 16:35:46 +0300 @@ -5269,7 +625,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 4f44ef86758a41a8ec814096f4cb6ee6de04c82e +commit caf00e0988ba47842cfd93dfbb17f7d30120d6e7 Author: Lasse Collin Date: 2023-09-14 16:34:07 +0300 @@ -5281,7 +637,7 @@ src/liblzma/check/crc64_fast.c | 8 ++++++++ 1 file changed, 8 insertions(+) -commit 7379bb3eed428c0ae734d0cc4a1fd04359d53f08 +commit a70e96d2da761b8b3a77bf14e08002d871e5950b Author: Jia Tan Date: 2023-09-12 22:36:12 +0800 @@ -5295,7 +651,7 @@ CMakeLists.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) -commit 5d691fe58286b92d704c0dc5cd0c4df22881c6c6 +commit d5275d83bd2a9701c5feb8666785007c074b1359 Author: Jia Tan Date: 2023-09-12 22:34:06 +0800 @@ -5307,7 +663,7 @@ CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -commit eccf12866527b8d24c7d7f92f755142be8ef9b11 +commit 1f6e7c68fbdeeaa9482fc77de090be63d90912fd Author: Lasse Collin Date: 2023-08-31 19:50:05 +0300 @@ -5322,7 +678,7 @@ src/xz/util.c | 89 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 44 deletions(-) -commit f7093cd9d130477c234b40aeda613964171f8f21 +commit ef71f83973a20cc28a3221f85681922026ea33f5 Author: Lasse Collin Date: 2023-08-31 18:14:43 +0300 @@ -5335,19 +691,19 @@ src/xz/file_io.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) -commit 74c3449d8b816a724b12ebce7417e00fb597309a +commit cf8ba7c3a89e37736b926dfbe85dffeff725db47 Author: Jia Tan Date: 2023-08-28 23:14:45 +0800 Tests: Improve invalid unpadded size check in test_lzma_index_append(). This check was extended to test the code added to fix a failing assert - in ae5c07b22a6b3766b84f409f1b6b5c100469068a. + in 68bda971bb8b666a009331455fcedb4e18d837a4. tests/test_index.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) -commit 2544274a8b8a27f4ea6c457d2c4c32eb1e4cd336 +commit 4a4180ce74788e97e90b9aab579bfd7c6dce3f59 Author: Jia Tan Date: 2023-08-28 21:54:41 +0800 @@ -5356,7 +712,7 @@ tests/test_index.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -commit 49be29d6380b94e6fb26e511dd2cdbd9afce0f8b +commit 4b23b84b89e39a5117e16f66c3b01db4f08ed3e7 Author: Jia Tan Date: 2023-08-28 21:52:54 +0800 @@ -5365,7 +721,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 721e3d9f7a82f59f32795d5fb97e0210d1aa839a +commit 773f1e8622cb1465df528cb16a749517650acd93 Author: Jia Tan Date: 2023-08-28 21:50:16 +0800 @@ -5379,7 +735,7 @@ src/liblzma/common/index.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit ae5c07b22a6b3766b84f409f1b6b5c100469068a +commit 68bda971bb8b666a009331455fcedb4e18d837a4 Author: Jia Tan Date: 2023-08-28 21:31:25 +0800 @@ -5419,25 +775,16 @@ src/liblzma/common/index.c | 6 ++++++ 1 file changed, 6 insertions(+) -commit 1057765aaabfe0f1397b8094531846655376ae38 +commit b41bb79c602481d7ea93d65f5b3e3f08dc54233b Author: Jia Tan Date: 2023-08-28 22:18:29 +0800 Translations: Update the Esperanto translation. - po/eo.po | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit f2e94d064f305bb8ad77ca70f91d93e55f5cf856 -Author: Jia Tan -Date: 2023-08-26 20:10:23 +0800 - - Translations: Update the Esperanto translation. - po/eo.po | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) -commit 2b871f4dbffe3801d0da3f89806b5935f758d5f3 +commit 6614e6d4bf8e2b5af6eb73930148e0ffc8d2265a Author: Jia Tan Date: 2023-08-09 20:55:36 +0800 @@ -5449,16 +796,16 @@ INSTALL | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -commit 356ad5b26b4196f085ce3afa1869154ca81faad8 +commit bfb623ad96fa6f1dbc0c560403c4296e3c8e26c9 Author: Jia Tan Date: 2023-08-09 20:54:15 +0800 CMake: Conditionally allow win95 threads and --enable-small. - CMakeLists.txt | 28 ++++++++++++++++++++-------- - 1 file changed, 20 insertions(+), 8 deletions(-) + CMakeLists.txt | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) -commit de574404c4c2f87aca049f232c38526e3ce092aa +commit e919ebb29ac9f5270cd7176a39d0d3b4cea875a9 Author: Jia Tan Date: 2023-08-09 20:35:16 +0800 @@ -5477,7 +824,7 @@ configure.ac | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) -commit 6bf33b704cd31dccf25e68480464aa22d3fcad5a +commit c0c0cd4a483a672b66a13761583bc4f84d86d501 Author: Jamaika1 Date: 2023-08-08 14:07:59 +0200 @@ -5490,22 +837,7 @@ src/common/mythread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 80cb961e5380a3878246d41341ff91378ca59e05 -Author: Jia Tan -Date: 2023-08-04 22:17:11 +0800 - - codespell: Add .codespellrc to set default options. - - The .codespellrc allows setting default options to avoid false positive - matches, set additional dictionaries, etc. For now, codespell can be - used locally before committing doc and comment changes. - - It should help prevent silly errors and fix up commits in the future. - - .codespellrc | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -commit cd678a6077358935249b64a4a16fe8d17434f9c9 +commit d93fbefcc48a8737fdf5678ce66d1c1d605752a0 Author: Jia Tan Date: 2023-08-03 20:10:21 +0800 @@ -5514,7 +846,7 @@ tests/test_lzip_decoder.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) -commit 1cac5ed4fa45c9861d745b02d80575cb2ff01d81 +commit 65981d8e45741fd1502e007609469e1d60312e69 Author: Jia Tan Date: 2023-08-03 15:56:20 +0800 @@ -5523,7 +855,7 @@ po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 16068f6c30b888cdb873f6285af941d00f95741d +commit a108ed589171d683c34238a87e358b87f69e39a0 Author: Lasse Collin Date: 2023-08-02 17:15:12 +0300 @@ -5532,7 +864,17 @@ src/xz/xz.1 | 1 - 1 file changed, 1 deletion(-) -commit 9ae4371b5106189486e850ce777e40f7b6021c0b +commit 03c51c5c08fe3579d8bbc8eea8251a1128001330 +Author: Jia Tan +Date: 2023-08-02 20:32:20 +0800 + + Bump version and soname for 5.4.4. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d7fa3f1b58a77f79b1a4e12452418b5555632e18 Author: Jia Tan Date: 2023-08-02 20:30:07 +0800 @@ -5541,7 +883,7 @@ NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) -commit e8c2203b2c76466d8d3387c5212b46151de8e605 +commit 6a1093c0004c42eeaef312456c295671496dd67a Author: Lasse Collin Date: 2023-08-02 15:19:43 +0300 @@ -5554,7 +896,7 @@ build-aux/manconv.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 9a706167b0d903d92fd134895acb4bc6a5e3e688 +commit f6f9f5651a7e2d89f588981533155ab850e063f7 Author: Lasse Collin Date: 2023-08-01 19:10:43 +0300 @@ -5563,7 +905,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 33e25a0f5650754c38bed640deedefe3b4fec5ef +commit 0dd83ba8767dad722e0f0f94e0e4146e290a28cb Author: Lasse Collin Date: 2023-08-01 18:22:24 +0300 @@ -5572,7 +914,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 81db3b889830132334d1f2129bdc93177ac2ca7d +commit 4170a80785cc69edfc5fdfe498bed5f40db6a7ef Author: ChanTsune <41658782+ChanTsune@users.noreply.github.com> Date: 2023-08-01 18:17:17 +0300 @@ -5592,19 +934,7 @@ src/common/mythread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 71c638c611324e606d324c8189fef8fe79db6991 -Author: Jia Tan -Date: 2023-08-01 21:58:51 +0800 - - Add newline to end of .gitignore. - - Newline was accidentally removed in commit - 01cbb7f023ee7fda8ddde04bd17cf7d3c2418706. - - .gitignore | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 42df7c7aa1cca385e509eb33c65136e61890f0bf +commit 0db6fbe0be1545a4f25fcd6993371155b37bbb26 Author: Dimitri Papadopoulos Orfanos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: 2023-07-31 14:02:21 +0200 @@ -5630,7 +960,7 @@ tests/test_vli.c | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) -commit 01cbb7f023ee7fda8ddde04bd17cf7d3c2418706 +commit 84a3a1f4e4f146b3b5fa73fe708cacb0d9f829f3 Author: Jia Tan Date: 2023-07-26 20:26:23 +0800 @@ -5639,7 +969,7 @@ .gitignore | 4 ++++ 1 file changed, 4 insertions(+) -commit f97a1afd564c48ad9cb94682e10972a72e11fa08 +commit 962b3d41e0c27355ba3052ef7b7d9a887de807e5 Author: Jia Tan Date: 2023-07-28 22:03:08 +0800 @@ -5657,66 +987,7 @@ CMakeLists.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 75 insertions(+), 7 deletions(-) -commit 7190f4cc7c9ade5b9b3675d0cbfa3b6d6ec9cb4f -Author: Jia Tan -Date: 2023-07-28 21:56:48 +0800 - - CI: Fix windows-ci dependency installation. - - All of the MSYS2 environments need make, and it does not come with the - toolchain package. The toolchain package will install the needed - compiler toolchains since without this package CMake cannot properly - generate the Makefiles. - - .github/workflows/windows-ci.yml | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit a048f472cd9a2245265cb292853cbbcdd4f02001 -Author: Jia Tan -Date: 2023-07-28 21:54:22 +0800 - - CI: Update ci_build.sh CMake to always make Unix Makefiles. - - The default for many of the MSYS2 environments is for CMake to create - Ninja build files. This would complicate the build script since we would - need a different command to run the tests. Its simpler to always use - Unix Makefiles so that "make test" is always a usable target for - testing. - - build-aux/ci_build.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 7870396a0ca945473aa0d1d790f4cbef456610bd -Author: Jia Tan -Date: 2023-07-25 20:17:23 +0800 - - CI: Test CMake builds and test framework with MSYS2. - - .github/workflows/windows-ci.yml | 32 ++++++++++++++++++++------------ - 1 file changed, 20 insertions(+), 12 deletions(-) - -commit 6497d1f8875cb7e3007f714336cc09c06fed235b -Author: Jia Tan -Date: 2023-07-25 20:14:53 +0800 - - CI: Windows CI rename system matrix variable -> msys2_env. - - Calling the MSYS2 environment "system" was a bit vague and should be - more specific. - - .github/workflows/windows-ci.yml | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) - -commit 785e4121d9b2921ad36bd3af1cf61fa20a9265bd -Author: Jia Tan -Date: 2023-07-24 23:11:45 +0800 - - CI: Add Clang64 MSYS2 environment to Windows CI. - - .github/workflows/windows-ci.yml | 1 + - 1 file changed, 1 insertion(+) - -commit d9166b52cf3458a4da3eb92224837ca8fc208d79 +commit 19899340cf74d98304f9f5b726c72e85c7017d72 Author: Jia Tan Date: 2023-07-24 21:43:44 +0800 @@ -5731,53 +1002,7 @@ src/liblzma/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -commit db5019d691f980d622fb56fdcf383af2c3519c98 -Author: Jia Tan -Date: 2023-07-22 18:37:56 +0800 - - Translations: Update the Vietnamese translation. - - po/vi.po | 45 ++++++++++++++++++++++++++++----------------- - 1 file changed, 28 insertions(+), 17 deletions(-) - -commit f3a055f762ba5b71b746fc2d44a6ababde2c61b5 -Author: Jia Tan -Date: 2023-07-22 14:55:42 +0800 - - CI: Add Windows runner for Autotools builds with MSYS2. - - Only a subset of the tests run by the Linux and MacOS Autotools builds - are run. The most interesting tests are the ones that disable threads, - encoders, and decoders. - - The Windows runner will only be run manually since these tests will - likely take much longer than the Linux and MacOS runners. This runner - should be used before merging any large features and before releases. - - Currently the clang64 environment fails to due to a warning and - -Werror is enabled for the CI tests. This is still an early version - since the CMake build can be done for MSVC and optionally each of the - MSYS2 environments. GitHub does not allow manually running the CI tests - unless the workflow is checked on the default branch so checking in a - minimum version is a good idea. - - Thanks to Arthur S for the original proposing the original patch. - - Closes: https://github.com/tukaani-project/xz/pull/34 - - .github/workflows/windows-ci.yml | 119 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 119 insertions(+) - -commit 556536a3525df9e5ed78b8c7057991cfa9edfac8 -Author: Jia Tan -Date: 2023-07-21 22:11:01 +0800 - - CI: Add argument to ci_build.sh to pass flags to autogen.sh. - - build-aux/ci_build.sh | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -commit 39a32d36fc465c4e70f13192eea380e518ba6e8a +commit ef7fbe83937abd7f55f1637c1d08b559f1d3d6cc Author: Jia Tan Date: 2023-07-21 18:05:44 +0800 @@ -5789,7 +1014,7 @@ tests/test_files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 194d12724b30fe42789d12a0184f9d412c449347 +commit e49815ba7aa610b72e8724025eceee23c27e7b23 Author: Jia Tan Date: 2023-07-20 22:11:13 +0800 @@ -5798,7 +1023,16 @@ tests/test_compress.sh | 1 + 1 file changed, 1 insertion(+) -commit d850365c444368102c69beaddf849ed463c33467 +commit db5b57b827c2b084586c51da1b8a3ab0984bdb40 +Author: Jia Tan +Date: 2023-07-22 18:37:56 +0800 + + Translations: Update the Vietnamese translation. + + po/vi.po | 45 ++++++++++++++++++++++++++++----------------- + 1 file changed, 28 insertions(+), 17 deletions(-) + +commit e6ba5014081c98cb068253b3e5f9e372dd157f3c Author: Jia Tan Date: 2023-07-20 20:30:05 +0800 @@ -5807,7 +1041,7 @@ po/hr.po | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) -commit 24049eb7acf6d42a60f00efe4e7289fe8e1797fe +commit 82657a1f10a25050a3e9c246c41deb785cccba3a Author: Jia Tan Date: 2023-07-20 20:28:32 +0800 @@ -5816,7 +1050,7 @@ po4a/ko.po | 1255 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 629 insertions(+), 626 deletions(-) -commit 4d4a4fa07de6cb9d913fb2f97712fddda2527b49 +commit fab35907d13efbe7c457e00a310123335d7bae3e Author: Jia Tan Date: 2023-07-20 20:25:24 +0800 @@ -5825,7 +1059,7 @@ po/ko.po | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) -commit 237f06d9c55cf438a7538a598354bcf103f23711 +commit f530fe1964c34797fa3b775ec5804d68007c1579 Author: Jia Tan Date: 2023-07-20 20:24:05 +0800 @@ -5834,7 +1068,7 @@ po/pl.po | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) -commit 80c2c832136656d5ac7a1bca8bc42d95e13d281a +commit 10b3500cc2617aabdbc802a63164ce0a3683ad2b Author: Jia Tan Date: 2023-07-20 20:22:23 +0800 @@ -5843,7 +1077,7 @@ po4a/de.po | 1255 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 629 insertions(+), 626 deletions(-) -commit fdbde14503ca03069d3649aa51926f5f796b89d8 +commit 3d14e8a34dba176f975326924ae28a3ab5fee165 Author: Jia Tan Date: 2023-07-20 20:18:44 +0800 @@ -5852,7 +1086,7 @@ po/de.po | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) -commit 9f3bf5ff5b2b5cf0b252a2bf381238ca49dc4101 +commit bdcc180a2da15039c47455c1cafd1ce9aff442e4 Author: Jia Tan Date: 2023-07-20 20:17:10 +0800 @@ -5861,7 +1095,7 @@ po/zh_CN.po | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) -commit 376938c588011567c74f1d5a160c0ccce6336d46 +commit 844240350d33cb46ba8827b74dc8758e2abed9e5 Author: Jia Tan Date: 2023-07-20 20:15:47 +0800 @@ -5870,7 +1104,7 @@ po/sv.po | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) -commit 26b0bc6eb82c84559936a7c7080de5c71c8276f8 +commit bdc7952bcfbc20c134f723ff5cbf84ab690fb4fc Author: Jia Tan Date: 2023-07-20 20:14:00 +0800 @@ -5879,7 +1113,7 @@ po4a/uk.po | 1253 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 628 insertions(+), 625 deletions(-) -commit 2d02c8b7640b54f3c5aa1c8b5990ba56f322393b +commit 143396e070c8d8afb56e3a5f688b214222cf71e0 Author: Jia Tan Date: 2023-07-20 20:09:15 +0800 @@ -5888,7 +1122,7 @@ po/uk.po | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) -commit f881018b503fd334331c24a09075429558abbce1 +commit 1b8146d64eaac51b40079f5788b85c1eb79e35de Author: Jia Tan Date: 2023-07-20 20:06:57 +0800 @@ -5897,7 +1131,7 @@ po/es.po | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) -commit 791fe6d3ffd6877fa5f852be69d9251397dfaa31 +commit f947ce09d79ef8fa6549d350c4d72e4a8a9fa697 Author: Jia Tan Date: 2023-07-20 20:05:19 +0800 @@ -5906,7 +1140,7 @@ po/ro.po | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) -commit 8827e90704f699fe08bb5bed56b1717a2bc0eb77 +commit f681301a368def3f597a7c7bea7cb3f7a2f933e7 Author: Jia Tan Date: 2023-07-20 20:02:56 +0800 @@ -5915,40 +1149,28 @@ po4a/ro.po | 1254 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 629 insertions(+), 625 deletions(-) -commit 0184d344fa4f215cd345bb131db9068e077c69b8 +commit 8bc3146c6be920b56283f4ee846456cb34ae4b6f Author: Jia Tan -Date: 2023-07-19 23:36:00 +0800 +Date: 2023-07-13 21:26:47 +0800 - liblzma: Suppress -Wunused-function warning. - - Clang 16.0.0 and earlier have a bug that the ifunc resolver function - triggers the -Wunused-function warning. The resolver function is static - and only "used" by the __attribute__((__ifunc()__)). - - At this time, the bug is still unresolved, but has been reported: - https://github.com/llvm/llvm-project/issues/63957 - - This is not a problem in GCC. + xz: Update man page Authors and date. - src/liblzma/check/crc64_fast.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) + src/xz/xz.1 | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) -commit 43845fa70fc751736c44c18f4cee42d49bfd1392 +commit c2905540ef905412b54c76488758712d3e2a0f9d Author: Jia Tan -Date: 2023-07-18 22:52:25 +0800 +Date: 2023-07-18 23:19:09 +0800 - liblzma: Reword lzma_str_list_filters() documentation. + xz: Slight reword in xz man page for consistency. - This further improves the documentation from commit - f36ca7982f6bd5e9827219ed4f3c5a1fbf5d7bdf. The previous wording of - "supported options" was slightly misleading since the options that are - printed are the ones that are relevant for encoding/decoding. It is not - about which options can or must be specified. + Changed will print => prints in xz --robot --version description to + match --robot --info-memory description. - src/liblzma/api/lzma/filter.h | 2 +- + src/xz/xz.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 818701ba1c9dff780b7fbf28f9ab8eb11a25dd67 +commit 2600d3352449faf57d9cb3fa00cbe40548a1310f Author: Jia Tan Date: 2023-07-18 22:49:57 +0800 @@ -5960,7 +1182,22 @@ src/liblzma/common/string_conversion.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit b6b7d065853cd4c3f5b8d9be8aea0b6dcb0fe090 +commit 98fc14541eec3e1dcf694075c8533f19a3cee552 +Author: Jia Tan +Date: 2023-05-13 21:21:54 +0800 + + liblzma: Reword lzma_str_list_filters() documentation. + + Reword "options required" to "options read". The previous wording + may have suggested that the options listed were all required when + the filters are used for encoding or decoding. Now it should be + more clear that the options listed are the ones relevant for + encoding or decoding. + + src/liblzma/api/lzma/filter.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1ac79b4cbaecf3f4930a5d8ce6f7e1f2b63c2a01 Author: Lasse Collin Date: 2023-07-18 17:37:33 +0300 @@ -5972,7 +1209,7 @@ src/xz/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit be644042c3066d8e7a2834f989671ba74d27f749 +commit 97851be2c6c64494f23c3a735601c13d4387820b Author: Lasse Collin Date: 2023-07-18 14:35:33 +0300 @@ -5984,7 +1221,7 @@ src/xz/list.c | 11 ++++++----- 4 files changed, 18 insertions(+), 14 deletions(-) -commit 97fd5cb669ee0afc48d2087675ab166aff89eaa2 +commit b406828a6dfd3caa4f77efe3ff3e3eea263eee62 Author: Lasse Collin Date: 2023-07-18 13:57:54 +0300 @@ -5996,7 +1233,7 @@ src/liblzma/common/memcmplen.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 40392c19f71985852d75997f109dea97177d6f3f +commit ef4a07ad9434f81417395f6fe0bb331e027a703b Author: Lasse Collin Date: 2023-07-18 13:49:43 +0300 @@ -6005,20 +1242,25 @@ src/liblzma/common/memcmplen.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit abc1d5601b7e419ebc28a1ab4b268613b52e6f98 +commit 64ee0caaea06654b28afaee850fb187a11bf9cb2 Author: Jia Tan -Date: 2023-07-18 00:51:48 +0800 +Date: 2023-06-28 20:22:38 +0800 - xz: Update Authors list in a few files. + liblzma: Prevent warning for MSYS2 Windows build. + + In lzma_memcmplen(), the header file is only included if + _MSC_VER and _M_X64 are both defined but _BitScanForward64() was + previously used if _M_X64 was defined. GCC for MSYS2 defines _M_X64 but + not _MSC_VER so _BitScanForward64() was used without including + . + + Now, lzma_memcmplen() will use __builtin_ctzll() for MSYS2 GCC builds as + expected. - src/xz/args.c | 3 ++- - src/xz/args.h | 3 ++- - src/xz/coder.c | 3 ++- - src/xz/coder.h | 3 ++- - src/xz/message.c | 3 ++- - 5 files changed, 10 insertions(+), 5 deletions(-) + src/liblzma/common/memcmplen.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) -commit 289034a168878baa9df6ff6e159110aade69cba5 +commit ba177057643dae6e9c167ee26471181c199c8a00 Author: Jia Tan Date: 2023-07-14 23:20:33 +0800 @@ -6035,7 +1277,7 @@ INSTALL | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 17 deletions(-) -commit 1119e5f5a519b0ab71c81fc4dc84c0cc72abe513 +commit 0745b900fafa5ac2c31e8ec3cfba3053457c8b1f Author: Jia Tan Date: 2023-07-14 21:10:27 +0800 @@ -6047,9 +1289,9 @@ README | 4 ++++ 1 file changed, 4 insertions(+) -commit f99e2e4e53b7ea89e4eef32ddd4882e0416357c9 +commit c972d44103c4edf88e73917ef08bde69db9d06cb Author: Jia Tan -Date: 2023-07-13 23:32:10 +0800 +Date: 2023-07-18 13:27:46 +0300 xz: Fix typo in man page. @@ -6060,307 +1302,7 @@ src/xz/xz.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit f907705eb1f6c5edaafc9668a34c51a989932f1d -Author: Jia Tan -Date: 2023-07-13 21:46:12 +0800 - - xz: Minor clean up for coder.c - - * Moved max_block_list_size from a global to local variable. - * Reworded error message in validate_block_list_filter(). - * Removed helper function filter_chain_error(). - * Changed 1 << X to 1U << X in many places - - src/xz/coder.c | 53 +++++++++++++++++++++-------------------------------- - 1 file changed, 21 insertions(+), 32 deletions(-) - -commit 9adc9e56157ecbf2948e5036df8567809b9ae177 -Author: Jia Tan -Date: 2023-07-13 21:26:47 +0800 - - xz: Update man page Authors and date. - - src/xz/xz.1 | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -commit c12e429f2635da8d8f5749e5f733f451baca6945 -Author: Jia Tan -Date: 2023-06-20 20:32:59 +0800 - - xz: Add a section to man page for robot mode --filters-help. - - src/xz/xz.1 | 32 ++++++++++++++++++++++++++++++-- - 1 file changed, 30 insertions(+), 2 deletions(-) - -commit e10f2db5d10300c16fa482a136ed31c1aa6e8e8d -Author: Jia Tan -Date: 2023-06-19 23:11:41 +0800 - - xz: Slight reword in xz man page for consistency. - - Changed will print => prints in xz --robot --version description to - match --robot --info-memory description. - - src/xz/xz.1 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f5dc172a402fa946f3c45a16929d7fe14c9f5e81 -Author: Jia Tan -Date: 2023-06-19 23:07:10 +0800 - - xz: Reorder robot mode subsections in the man page. - - The order is now consistent with the order the command line arguments - are documented earlier in the man page. The new order is: - 1. --list - 2. --info-memory - 3. --version - - Instead of the previous order: - 1. --version - 2. --info-memory - 3. --list - - src/xz/xz.1 | 192 ++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 96 insertions(+), 96 deletions(-) - -commit 9628be23aef2784249fd9f3199799d785d2ec5cc -Author: Jia Tan -Date: 2023-05-13 00:46:50 +0800 - - xz: Update man page for new --filters-help option. - - src/xz/xz.1 | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit a165d7df1964121eb9df715e6f836a31c865beef -Author: Jia Tan -Date: 2023-05-13 00:44:41 +0800 - - xz: Add a new --filters-help option. - - The --filters-help can be used to help create filter chains with the - --filters and --filtersX options. The message in --long-help is too - short to fully explain the syntax to construct complex filter chains. - - In --robot mode, xz will only print the output from liblzma function - lzma_str_list_filters. - - src/xz/args.c | 8 ++++++++ - src/xz/message.c | 30 ++++++++++++++++++++++++++++++ - src/xz/message.h | 5 +++++ - 3 files changed, 43 insertions(+) - -commit 95f1a414b156ee35d3e71862a14915fdd138f913 -Author: Jia Tan -Date: 2023-04-21 20:28:11 +0800 - - xz: Update the man page for --block-list and --filtersX - - The --block-list option description needed updating since the new - --filtersX option changes how it can be used. The new entry for - --filters1=FILTERS ... --filter9=FILTERS was created right after - the --filters option. - - src/xz/xz.1 | 106 +++++++++++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 80 insertions(+), 26 deletions(-) - -commit 47a63cad2aa778280e0c1926b7159427ea028cb1 -Author: Jia Tan -Date: 2023-04-21 19:50:14 +0800 - - xz: Update --long-help for the new --filtersX option. - - src/xz/message.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -commit 8b9913a13daca2550d02dfdcdc9be15f55ca4d13 -Author: Jia Tan -Date: 2023-06-17 20:46:21 +0800 - - xz: Ignore filter chains that are set but never used in --block-list. - - If a filter chain is set but not used in --block-list, it introduced - unexpected behavior such as requiring an unneeded amount of memory to - compress, reducing the number of threads in multi-threaded encoding, and - printing an incorrect amount of memory needed to decompress. - - This also renames filters_init_mask => filters_used_mask. A filter is - assumed to be used if it is specified in --filtersX until - coder_set_compression_settings() determines which filters are referenced - in --block-list. - - src/xz/coder.c | 66 ++++++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 48 insertions(+), 18 deletions(-) - -commit 183819bfd9efac8c184d9bf123325719b7eee30f -Author: Jia Tan -Date: 2023-05-13 20:11:13 +0800 - - xz: Set the Block size for mt encoding correctly. - - When opt_block_size is not used, the Block size for mt encoder is - derived from the minimum of the largest Block specified by - --block-list and the recommended Block size on all filter chains - calculated by lzma_mt_block_size(). This avoids using unnecessary - memory and ensures that all Blocks are large enough for the most memory - needy filter chain. - - src/xz/coder.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 67 insertions(+), 1 deletion(-) - -commit afb2dbec3d857b026486b75e42a4728e12d234cb -Author: Jia Tan -Date: 2023-05-11 00:09:41 +0800 - - xz: Validate --flush-timeout for all specified filter chains. - - src/xz/coder.c | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -commit 5f0c5a04388f8334962c70bc37a8c2ff8f605e0a -Author: Jia Tan -Date: 2023-05-13 19:54:33 +0800 - - xz: Allows --block-list filters to scale down memory usage. - - Previously, only the default filter chain could have its memory usage - adjusted. The filter chains specified with --filtersX were not checked - for memory usage. Now, all used filter chains will be adjusted if - necessary. - - src/xz/coder.c | 269 +++++++++++++++++++++++++++++++++++++++++++++------------ - 1 file changed, 214 insertions(+), 55 deletions(-) - -commit 479fd58d60622331fcbe48fddf756927b9f80d9a -Author: Jia Tan -Date: 2023-05-10 21:50:33 +0800 - - xz: Do not include block splitting if encoders are disabled. - - The block splitting logic and split_block() function are not needed if - encoders are disabled. This will help slightly reduce the binary size - when built without encoders and allow split_block() to use functions - that require encoders being enabled. - - src/xz/coder.c | 29 ++++++++++++++++++++--------- - 1 file changed, 20 insertions(+), 9 deletions(-) - -commit f86ede22500f7ae024ec3ec3f3489ab5a857a3b3 -Author: Jia Tan -Date: 2023-05-10 22:38:59 +0800 - - xz: Free filters[] in debug mode. - - This will only free filter chains created with --filters1-9 since the - default filter chain may be set from a static function variable. The - complexity to free the default filter chain is not worth the burden on - code maintenance. - - src/xz/coder.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit f281cd0d692ac0c70fc7669b80dddb863ea947e1 -Author: Jia Tan -Date: 2023-05-13 19:28:23 +0800 - - xz: Add a message if --block-list is used outside of xz compresssion. - - --block-list is only supported with compression in xz format. This avoids - silently ignoring when --block-list is unused. - - src/xz/args.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -commit d6af7f347077b22403133239592e478931307759 -Author: Jia Tan -Date: 2023-04-18 20:29:09 +0800 - - xz: Create command line options for filters[1-9]. - - The new command line options are meant to be combined with --block-list. - They work as an optional extension to --block-list to specify a custom - filter chain for each block listed. The new options allow the creation - of up to 9 reusable filter chains. For instance: - - xz --block-list=1:10MiB,3:5MiB,,2:5MiB,1:0 --filters1=delta--lzma2 \ - --filters2=x86--lzma2 --filters3=arm64--lzma2 - - Will create the following blocks: - 1. A block of size 10 MiB with filter chain delta, lzma2. - 2. A block of size 5 MiB with filter chain arm64, lzma2. - 3. A block of size 5 MiB with filter chain arm64, lzma2. - 4. A block of size 5 MiB with filter chain x86, lzma2. - 5. A block containing the rest of the file contents with filter chain - delta, lzma2. - - src/xz/args.c | 82 ++++++++++++++++++++++--- - src/xz/coder.c | 188 ++++++++++++++++++++++++++++++++++++++++++--------------- - src/xz/coder.h | 20 +++++- - 3 files changed, 230 insertions(+), 60 deletions(-) - -commit 072d29250113268536719ad0e040ab8a66fb6435 -Author: Jia Tan -Date: 2023-05-13 19:36:09 +0800 - - xz: Use lzma_filters_free() in forget_filter_chain(). - - This is a little cleaner than the previous implementation of - forget_filter_chain(). It is also more consistent since - lzma_str_to_filters() will always terminate the filter chain so there - is no need to terminate it later in coder_set_compression_settings(). - - src/xz/coder.c | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -commit 3d21da5cff4b511633cb6e0d8a1090485c0c1059 -Author: Jia Tan -Date: 2023-04-17 22:22:45 +0800 - - xz: Separate string to filter conversion into a helper function. - - Converting from string to filter will also need to be done for block - specific filter chains. - - src/xz/coder.c | 33 ++++++++++++++++++++------------- - 1 file changed, 20 insertions(+), 13 deletions(-) - -commit a6583726e5f950278f96abcf79c04f1056810be6 -Author: Jia Tan -Date: 2023-01-06 00:03:35 +0800 - - Tests: Use new --filters option in test_compress.sh - - tests/test_compress.sh | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -commit 5f3b898d07cc9b7160c7c88b3120b7edabb8a5b0 -Author: Jia Tan -Date: 2023-01-06 00:03:06 +0800 - - xz: Update --long-help and man page for new --filters option. - - src/xz/message.c | 6 ++++++ - src/xz/xz.1 | 41 ++++++++++++++++++++++++++++++++++++----- - 2 files changed, 42 insertions(+), 5 deletions(-) - -commit 9ded880a0221f4d1256845fc4ab957ffd377c760 -Author: Jia Tan -Date: 2023-01-06 00:02:29 +0800 - - xz: Add --filters option to CLI. - - The --filters option uses the new lzma_str_to_filters() function - to convert a string into a full filter chain. Using this option - will reset all previous filters set by --preset, --[filter], or - --filters. - - src/xz/args.c | 9 +++++++-- - src/xz/coder.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- - src/xz/coder.h | 3 +++ - 3 files changed, 58 insertions(+), 4 deletions(-) - -commit 2c189bb00af73dc7ba1a67a9d274d5be03ee3a88 +commit 6e21f1b4e2c580b64d258e3b81ac9e44d53b9283 Author: Jia Tan Date: 2023-07-14 21:30:25 +0800 @@ -6380,7 +1322,7 @@ tests/test_files.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -commit 80a6b9bcad016c99c9ba3f3eeb4a619fcadfd357 +commit 26c37d290c0884a4518a26b949575420a77fb938 Author: Jia Tan Date: 2023-07-10 20:56:28 +0800 @@ -6389,21 +1331,7 @@ po/zh_TW.po | 659 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 377 insertions(+), 282 deletions(-) -commit 17f8844e6fc355abf997d77637a7447c4f7bbcbd -Author: Jia Tan -Date: 2023-07-08 21:24:19 +0800 - - liblzma: Remove non-portable empty initializer. - - Commit 78704f36e74205857c898a351c757719a6c8b666 added an empty - initializer {} to prevent a warning. The empty initializer is a GNU - extension and results in a build failure on MSVC. The -wpedantic flag - warns about empty initializers. - - src/liblzma/common/stream_encoder_mt.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 3aca4f629cd577f0c54f594d5d88722edf0b0413 +commit 2ec65181e28335692a3a4fac4fefc4303111d355 Author: Jia Tan Date: 2023-07-08 20:03:59 +0800 @@ -6412,7 +1340,7 @@ po/vi.po | 620 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 349 insertions(+), 271 deletions(-) -commit 66bdcfa85fef2911cc80f5f30fed3f9610faccb4 +commit c44c7e7590db1b89c97e106f5c516bf69189e233 Author: Jia Tan Date: 2023-06-28 20:46:31 +0800 @@ -6425,7 +1353,7 @@ tests/test_index.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -commit fe3bd438fb119f9bad3f08dc29d331e4956196e1 +commit b9499c94fccc03eba5311b5305f04149a7c5af65 Author: Jia Tan Date: 2023-06-28 20:43:29 +0800 @@ -6438,7 +1366,7 @@ tests/test_block_header.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) -commit 78704f36e74205857c898a351c757719a6c8b666 +commit 1155471651ad456c5f90aee6435931fae65682bf Author: Jia Tan Date: 2023-06-28 20:31:11 +0800 @@ -6458,150 +1386,7 @@ src/liblzma/common/stream_encoder_mt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit e3356a204c5ae02db3ec4552b6c1be354e9b6142 -Author: Jia Tan -Date: 2023-06-28 20:22:38 +0800 - - liblzma: Prevent warning for MSYS2 Windows build. - - In lzma_memcmplen(), the header file is only included if - _MSC_VER and _M_X64 are both defined but _BitScanForward64() was - previously used if _M_X64 was defined. GCC for MSYS2 defines _M_X64 but - not _MSC_VER so _BitScanForward64() was used without including - . - - Now, lzma_memcmplen() will use __builtin_ctzll() for MSYS2 GCC builds as - expected. - - src/liblzma/common/memcmplen.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit 45e250a9e9f3c3e8e8af2983366b170bf54f890e -Author: Jia Tan -Date: 2023-06-28 21:01:22 +0800 - - CI: Add test with -fsanitize=address,undefined. - - ci_build.sh was updated to accept disabling of __attribute__ ifunc - and CLMUL. This will allow -fsanitize=address to pass because ifunc - is incompatible with -fsanitize=address. The CLMUL implementation has - optimizations that potentially read past the buffer and mask out the - unwanted bytes. - - This test will only run on Autotools Linux. - - .github/workflows/ci.yml | 23 +++++++++++++++++++---- - build-aux/ci_build.sh | 8 +++++++- - 2 files changed, 26 insertions(+), 5 deletions(-) - -commit 596ee722cd7ddf0afae584fc06365adc0e735977 -Author: Jia Tan -Date: 2023-06-28 20:16:04 +0800 - - CI: Upgrade checkout action from v2 to v3. - - .github/workflows/ci.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 86118ea320f867e09e98a8682cc08cbbdfd640e2 -Author: Jia Tan -Date: 2023-06-27 23:38:32 +0800 - - Update THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 3d1fdddf92321b516d55651888b9c669e254634e -Author: Jia Tan -Date: 2023-06-27 17:27:09 +0300 - - Docs: Document the configure option --disable-ifunc in INSTALL. - - INSTALL | 8 ++++++++ - 1 file changed, 8 insertions(+) - -commit b4cf7a2822e8d30eb2b12a1a07fd04383b10ade3 -Author: Lasse Collin -Date: 2023-06-27 17:24:49 +0300 - - Minor tweaks to style and comments. - - CMakeLists.txt | 8 ++++---- - configure.ac | 9 +++++---- - 2 files changed, 9 insertions(+), 8 deletions(-) - -commit 23fb9e3a329117c2968c1e7388b6ef07c782dba1 -Author: Lasse Collin -Date: 2023-06-27 17:19:49 +0300 - - CMake: Rename CHECK_ATTR_IFUNC to ALLOW_ATTR_IFUNC. - - It's so that there's a clear difference in wording compared - to liblzma's integrity check types. - - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit ee44863ae88e377a5df10db007ba9bfadde3d314 -Author: Lasse Collin -Date: 2023-06-27 17:05:23 +0300 - - liblzma: Add ifunc implementation to crc64_fast.c. - - The ifunc method avoids indirection via the function pointer - crc64_func. This works on GNU/Linux and probably on FreeBSD too. - The previous __attribute((__constructor__)) method is kept for - compatibility with ELF platforms which do support ifunc. - - The ifunc method has some limitations, for example, building - liblzma with -fsanitize=address will result in segfaults. - The configure option --disable-ifunc must be used for such builds. - - Thanks to Hans Jansen for the original patch. - Closes: https://github.com/tukaani-project/xz/pull/53 - - src/liblzma/check/crc64_fast.c | 35 ++++++++++++++++++++++++++--------- - 1 file changed, 26 insertions(+), 9 deletions(-) - -commit b72d21202402a603db6d512fb9271cfa83249639 -Author: Hans Jansen -Date: 2023-06-22 19:49:30 +0200 - - Add ifunc check to CMakeLists.txt - - CMake build system will now verify if __attribute__((__ifunc__())) can be - used in the build system. If so, HAVE_FUNC_ATTRIBUTE_IFUNC will be - defined to 1. - - CMakeLists.txt | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -commit 23b5c36fb71904bfbe16bb20f976da38dadf6c3b -Author: Hans Jansen -Date: 2023-06-22 19:46:55 +0200 - - Add ifunc check to configure.ac - - configure.ac will now verify if __attribute__((__ifunc__())) can be used in - the build system. If so, HAVE_FUNC_ATTRIBUTE_IFUNC will be defined to 1. - - configure.ac | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -commit dbb3a536ed9873ffa0870321f6873e564c6a9da8 -Author: Jia Tan -Date: 2023-06-07 00:18:30 +0800 - - CI: Add apt update command before installing dependencies. - - Without the extra command, all of the CI tests were automatically - failing because the Ubuntu servers could not be reached properly. - - .github/workflows/ci.yml | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -commit 6bcd516812331de42b347922913230895bebad34 +commit 62dd1c9bf0c66679ceeebc8b99bca136ca43bcb9 Author: Jia Tan Date: 2023-06-07 00:10:38 +0800 @@ -6610,7 +1395,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 0d94ba69220d894d2a86081821d2d7a89df5a10b +commit d04eb78ab3892d3678c180437dd66379efa051fd Author: Benjamin Buch Date: 2023-06-06 15:32:45 +0200 @@ -6618,8 +1403,8 @@ Boost iostream uses `find_package` in quiet mode and then again uses `find_package` with required. This second call triggers a - `add_library cannot create imported target "ZLIB::ZLIB" because another - target with the same name already exists.` + `add_library cannot create imported target "LibLZMA::LibLZMA" + because another target with the same name already exists.` This can simply be fixed by skipping the alias part on secondary `find_package` runs. @@ -6627,7 +1412,7 @@ CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) -commit 045d7aae286ecd2ce163be9e0d9041343a03f89a +commit 12ea1fb29763dd72376aca73d69621aff01eaa7f Author: Jia Tan Date: 2023-05-31 20:26:42 +0800 @@ -6636,7 +1421,7 @@ po/eo.po | 185 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 92 insertions(+), 93 deletions(-) -commit b0cc7c2dcefe4cbc4e1e697598c14fb687ed0b78 +commit a4d45c07c1e4aa0ea9410b4eed7301c97e960319 Author: Jia Tan Date: 2023-05-31 20:25:00 +0800 @@ -6645,7 +1430,7 @@ po/hr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit af045ef6f848f02cd14c9ad195a5f87bb0c02dce +commit f51b7bcea6f948db9529b3e6d850e76a30cc0e96 Author: Jia Tan Date: 2023-05-31 20:15:53 +0800 @@ -6654,7 +1439,7 @@ po/zh_CN.po | 317 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 157 insertions(+), 160 deletions(-) -commit e6b92d5817fe91ad27a0f7f57bd0f2144311e383 +commit d5b81c19a7594fbb913bb3450360bc2145f29568 Author: Jia Tan Date: 2023-05-17 23:12:13 +0800 @@ -6663,7 +1448,7 @@ po4a/de.po | 52 ++++++++++++---------------------------------------- 1 file changed, 12 insertions(+), 40 deletions(-) -commit 592961ccdbba39c7d60fe37e36764232feb57c60 +commit 36860a3e30d5675b4dba3a343159458d8864bceb Author: Jia Tan Date: 2023-05-17 23:09:18 +0800 @@ -6672,7 +1457,7 @@ po/de.po | 189 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 94 insertions(+), 95 deletions(-) -commit 13572cb2c391f5b7503e333c6e05b20bd5bbb524 +commit f05641ef0d4990c4c58f459039d412475b94b37d Author: Jia Tan Date: 2023-05-17 20:30:01 +0800 @@ -6681,7 +1466,7 @@ po/hr.po | 187 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 93 insertions(+), 94 deletions(-) -commit 4e6e425ea8f097c6fb43e69cc9540294dca3680d +commit b852f6f11d43cafce871cd158c80488f86619a63 Author: Jia Tan Date: 2023-05-17 20:26:54 +0800 @@ -6690,7 +1475,7 @@ po4a/ko.po | 3015 ++++++++++++------------------------------------------------ 1 file changed, 568 insertions(+), 2447 deletions(-) -commit d5ef1f6faf7c270f60093629257150085ecf19ca +commit fdcb78fb6f5313eda363869690685471d7ab9731 Author: Jia Tan Date: 2023-05-17 20:13:01 +0800 @@ -6699,7 +1484,7 @@ po/ko.po | 319 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 158 insertions(+), 161 deletions(-) -commit e22d0b0f2e301e7906d0106689d967ed84362028 +commit 9e39cebe3ccdd4bc320ce6e7eea989bdd167c8b2 Author: Jia Tan Date: 2023-05-16 23:49:09 +0800 @@ -6708,7 +1493,7 @@ po/es.po | 319 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 158 insertions(+), 161 deletions(-) -commit f50da74d52d01f6cfd826a921249e289cf671678 +commit 7a578d1d8293fc1cf7c6f9df76bc6a0e55c51a14 Author: Jia Tan Date: 2023-05-16 23:47:23 +0800 @@ -6717,7 +1502,7 @@ po/ro.po | 195 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 98 insertions(+), 97 deletions(-) -commit 4b9ad60a7305e9841b7cb4ea611bdf5fa7271696 +commit 362320fea5383bae179763763625532bad6d10e8 Author: Jia Tan Date: 2023-05-16 23:45:43 +0800 @@ -6726,7 +1511,7 @@ po4a/ro.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) -commit cb6fd57f889c5d9fab36ae8c9e10083a5fe32dea +commit 29c5a870be23d0a565b959404b34a8b1babef7df Author: Jia Tan Date: 2023-05-16 23:43:51 +0800 @@ -6735,7 +1520,7 @@ po4a/uk.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -commit c3e8fcbc2db4861f92ad15606c995bd255803c52 +commit 5ee57572773207371712b1bbcd9b5b8c1baad2cc Author: Jia Tan Date: 2023-05-16 23:37:54 +0800 @@ -6744,7 +1529,7 @@ po/uk.po | 321 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 159 insertions(+), 162 deletions(-) -commit 27b81b84fcedbc55aa6e6b21004c44070b15b038 +commit dfc257bdb224780d3c8cdeca5a8e52848b9adc0a Author: Jia Tan Date: 2023-05-16 23:07:35 +0800 @@ -6753,7 +1538,7 @@ po/pl.po | 316 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 155 insertions(+), 161 deletions(-) -commit 8024ad636a65ed6ea95c94d57255be4c6724d6ed +commit f6df4c4ab7378d2971ae1606f4eecc011ea5fc6d Author: Jia Tan Date: 2023-05-16 22:52:14 +0800 @@ -6762,7 +1547,7 @@ po/sv.po | 319 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 158 insertions(+), 161 deletions(-) -commit 6699a29673f227c4664826db485ed9f7596320d2 +commit 25da22e0521ec698dae4eb5e994b4cd3f4708b60 Author: Jia Tan Date: 2023-05-16 21:21:38 +0800 @@ -6771,21 +1556,7 @@ po/eo.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) -commit f36ca7982f6bd5e9827219ed4f3c5a1fbf5d7bdf -Author: Jia Tan -Date: 2023-05-13 21:21:54 +0800 - - liblzma: Slightly rewords lzma_str_list_filters() documentation. - - Reword "options required" to "supported options". The previous may have - suggested that the options listed were all required anytime a filter is - used for encoding or decoding. The reword makes this more clear that - adjusting the options is optional. - - src/liblzma/api/lzma/filter.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 3374a5359e52f1671d8f831d65827d5020fe2595 +commit 4f57a9c9915b7b9267885cf9fca58e5c8208458d Author: Jia Tan Date: 2023-05-11 23:49:23 +0800 @@ -6797,65 +1568,7 @@ src/liblzma/api/lzma/container.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -commit 8f236574986e7c414c0ea059f441982d1387e6a4 -Author: Jia Tan -Date: 2023-05-09 20:20:06 +0800 - - liblzma: Exports lzma_mt_block_size() as an API function. - - The lzma_mt_block_size() was previously just an internal function for - the multithreaded .xz encoder. It is used to provide a recommended Block - size for a given filter chain. - - This function is helpful to determine the maximum Block size for the - multithreaded .xz encoder when one wants to change the filters between - blocks. Then, this determined Block size can be provided to - lzma_stream_encoder_mt() in the lzma_mt options parameter when - intializing the coder. This requires one to know all the filter chains - they are using before starting to encode (or at least the filter chain - that will need the largest Block size), but that isn't a bad limitation. - - src/liblzma/api/lzma/container.h | 28 ++++++++++++++++++++++++++++ - src/liblzma/common/filter_encoder.c | 16 ++++++++++------ - src/liblzma/common/filter_encoder.h | 6 +----- - src/liblzma/common/stream_encoder_mt.c | 20 +++++++++----------- - src/liblzma/liblzma_generic.map | 5 +++++ - src/liblzma/liblzma_linux.map | 5 +++++ - src/liblzma/lzma/lzma2_encoder.c | 3 +++ - 7 files changed, 61 insertions(+), 22 deletions(-) - -commit d0f33d672a4da7985ebb5ba8d829f885de49c171 -Author: Jia Tan -Date: 2023-05-08 22:58:09 +0800 - - liblzma: Creates IS_ENC_DICT_SIZE_VALID() macro. - - This creates an internal liblzma macro to test if the dictionary size - is valid for encoding. - - src/liblzma/lz/lz_encoder.c | 4 +--- - src/liblzma/lz/lz_encoder.h | 8 ++++++++ - 2 files changed, 9 insertions(+), 3 deletions(-) - -commit c247d06e1f6cada9a76f4f6225cbd97ea760f52f -Author: Jia Tan -Date: 2023-05-02 20:39:56 +0800 - - Add NEWS for 5.4.3. - - NEWS | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit 77050b78364ffb6b0f129e742b7c31602d725c08 -Author: Jia Tan -Date: 2023-05-02 20:39:37 +0800 - - Add NEWS for 5.2.12. - - NEWS | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -commit 713e15e43eb6279a7ab4bbad3d1325ebfdcf09a0 +commit 238b4e5458b4bd2cadefb768b8ea7c6b70a191ac Author: Jia Tan Date: 2023-05-04 20:38:52 +0800 @@ -6864,28 +1577,26 @@ po/hr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -commit 9ad64bdf309844b6ca6c3e8a4dfb6dbaedda0ca9 +commit 0cee63c3c6c4f9084a5e7fa7c15a1863ac8e5ffc Author: Jia Tan -Date: 2023-05-04 20:30:25 +0800 +Date: 2023-05-04 19:50:42 +0800 - tuklib_integer.h: Reverts previous commit. - - Previous commit 6be460dde07113fe3f08f814b61ddc3264125a96 would cause an - error if the integer size was 32 bit. + Bump version and soname for 5.4.3. - src/common/tuklib_integer.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -commit 6be460dde07113fe3f08f814b61ddc3264125a96 +commit 01f937ea9a49005c5091c0165fa0c1e572dd1749 Author: Jia Tan -Date: 2023-05-04 19:25:20 +0800 +Date: 2023-05-02 20:39:56 +0800 - tuklib_integer.h: Changes two other UINT_MAX == UINT32_MAX to >=. + Add NEWS for 5.4.3. - src/common/tuklib_integer.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + NEWS | 10 ++++++++++ + 1 file changed, 10 insertions(+) -commit 44c0c5eae990a22ef04e9b88c1a15838a0d00878 +commit e9b9ea953179502d5245b4e6ca4f5ffe9d5797b1 Author: Lasse Collin Date: 2023-05-03 22:46:42 +0300 @@ -6898,25 +1609,7 @@ src/common/tuklib_integer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 2cf5ae5b5b279b0b2e69ca4724e7bd705865fe68 -Author: Jia Tan -Date: 2023-04-25 20:06:15 +0800 - - CI: Adds a build and test for small configuration. - - .github/workflows/ci.yml | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 16b81a057a87c2f18e6ed6447f003af0cbdcfe43 -Author: Jia Tan -Date: 2023-04-25 20:05:26 +0800 - - CI: ci_build.sh allows configuring small build. - - build-aux/ci_build.sh | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit 78ccd93951f9e988d447bcdd70b24f6df5448d1d +commit be6e39a8622f0d905072874ec25b1ffd155b12e1 Author: Jia Tan Date: 2023-04-20 20:15:00 +0800 @@ -6925,7 +1618,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit f41df2ac2fed347d3f107f3533e76e000d29c6cb +commit 9e343a46cf87a345799222c0b0b3a6f3358dde0c Author: Jia Tan Date: 2023-04-19 22:22:16 +0800 @@ -6943,7 +1636,7 @@ src/liblzma/common/memcmplen.h | 10 ++++++++++ 2 files changed, 16 insertions(+) -commit 7062348bf35c1e4cbfee00ad9fffb4a21aa6eff7 +commit 12321a9390acc076b414035a46df9d7545ac379f Author: Jia Tan Date: 2023-04-19 21:59:03 +0800 @@ -6959,7 +1652,7 @@ src/common/tuklib_integer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -commit 3938718ce3773c90755785c0df8777f133b7ae29 +commit d1f0e01c395960efd6c29ff144eda4f4c8c1c6d3 Author: Lasse Collin Date: 2023-04-14 18:42:33 +0300 @@ -6970,7 +1663,7 @@ src/liblzma/api/lzma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 2a89670ab295e377f8b44f5bda6d198deb8ea285 +commit 8204c5d1304e1e3b7487801b4acaf8e3179a6c52 Author: Jia Tan Date: 2023-04-13 20:45:19 +0800 @@ -6979,69 +1672,7 @@ src/liblzma/common/alone_encoder.c | 11 ----------- 1 file changed, 11 deletions(-) -commit 0fbb2b87a7b5a1dd9d0f4a5e84ac7919557dbe81 -Author: Jia Tan -Date: 2023-04-07 20:46:41 +0800 - - Docs: Add missing word to SECURITY.md. - - .github/SECURITY.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit fb9c50f38a17bf37581de4034b36c8df8ec90a87 -Author: Jia Tan -Date: 2023-04-07 20:43:22 +0800 - - Update THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 537c6cd8a9db0dd6b13683e64ddac2943190d715 -Author: Jia Tan -Date: 2023-04-07 20:42:12 +0800 - - Docs: Minor edits to SECURITY.md. - - .github/SECURITY.md | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -commit 6549df8dd53f358345957e232648fdb699930074 -Author: Gabriela Gutierrez -Date: 2023-04-07 12:08:30 +0000 - - Docs: Create SECURITY.md - - Signed-off-by: Gabriela Gutierrez - - .github/SECURITY.md | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -commit d0faa85df5a5d253a4625d45313cf5e9277e6cd2 -Author: Jia Tan -Date: 2023-03-28 22:48:24 +0800 - - CI: Tests for disabling threading on CMake builds. - - .github/workflows/ci.yml | 3 --- - build-aux/ci_build.sh | 4 ++-- - 2 files changed, 2 insertions(+), 5 deletions(-) - -commit 8be5cc3b1359d88b4b30a39067466c0ae0bfbc4d -Author: Jia Tan -Date: 2023-03-28 22:45:42 +0800 - - CI: Removes CMakeCache.txt between builds. - - If the cache file is not removed, CMake will not reset configurations - back to their default values. In order to make the tests independent, it - is simplest to purge the cache. Unfortunatly, this will slow down the - tests a little and repeat some checks. - - build-aux/ci_build.sh | 2 ++ - 1 file changed, 2 insertions(+) - -commit 2cb6028fc31de082b7f927632363bb1426b61aaa +commit 32980d1562bc031013306be1c787761fa63da87d Author: Jia Tan Date: 2023-03-28 22:32:40 +0800 @@ -7053,7 +1684,7 @@ CMakeLists.txt | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) -commit 4d7fac0b07cc722825ba8d7838c558827e635611 +commit 023907faa965476fb921a6344253c50e0ba795f9 Author: Jia Tan Date: 2023-03-28 22:25:33 +0800 @@ -7073,48 +1704,7 @@ CMakeLists.txt | 144 +++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 104 insertions(+), 40 deletions(-) -commit 20cd905d898c1494dee42b78530769bb9c9f8076 -Author: Jia Tan -Date: 2023-03-24 23:05:48 +0800 - - CI: Runs CMake feature tests. - - Now, CMake will run similar feature disable tests that the Autotools - version did before. In order to do this without repeating lines in - ci.yml, it now makes sense to use the GitHub Workflow matrix to create - a loop. - - .github/workflows/ci.yml | 169 +++++++++++++++-------------------------------- - 1 file changed, 55 insertions(+), 114 deletions(-) - -commit 4fabdb269f1fc5624b3b94a170c4efb329d1d229 -Author: Jia Tan -Date: 2023-03-24 20:35:11 +0800 - - CI: ci_build.sh allows CMake features to be configured. - - Also included various clean ups for style and helper functions for - repeated work. - - build-aux/ci_build.sh | 233 +++++++++++++++++++++++++++++++------------------- - 1 file changed, 143 insertions(+), 90 deletions(-) - -commit cf3d1f130e50cf63da4bb1031771605f6f443b6a -Author: Jia Tan -Date: 2023-03-24 20:06:33 +0800 - - CI: Change ci_build.sh to use bash instead of sh. - - This script is only meant to be run as part of the CI build/test process - on machines that are known to have bash (Ubuntu and MacOS). If this - assumption changes in the future, then the bash specific commands will - need to be replaced with a more portable option. For now, it is - convenient to use bash commands. - - build-aux/ci_build.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ddfe164368e779c40d061aa4ccc376129e92f8e1 +commit ba176d77cbb164b13006516660fc1ff6c59dedb5 Author: Jia Tan Date: 2023-03-24 20:05:59 +0800 @@ -7123,7 +1713,7 @@ CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 116e81f002c503d3c3cd12726db8f9116e58ef25 +commit c99d697df800e9bc47e09facf88bcfdb9e0264a5 Author: Jia Tan Date: 2023-03-22 15:42:04 +0800 @@ -7132,7 +1722,7 @@ src/liblzma/lzma/Makefile.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -commit 0ba234f692772595329d225462d391fe2c199d0a +commit 54a2fd8c850e626343b79c4cc8fcac2f638ec890 Author: Lasse Collin Date: 2023-03-23 15:14:29 +0200 @@ -7145,7 +1735,7 @@ CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit b0891684b4436aed31510fddcbb218d513bd5489 +commit 622d0fdc02d5f565c2872d79bc70c669c95c8284 Author: Jia Tan Date: 2023-03-21 23:36:00 +0800 @@ -7154,7 +1744,7 @@ CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -commit 2c1a830efb61d9d65906a09c9ee3ce27c2c49227 +commit 3e2dc523c596cd770a6a7c58cacc0d0d8761e853 Author: Jia Tan Date: 2023-02-25 11:46:50 +0800 @@ -7168,7 +1758,7 @@ CMakeLists.txt | 528 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 391 insertions(+), 137 deletions(-) -commit 8be136f667aaeb8f9e16fbd57a83cb282f0c27ff +commit 0c053f97337fa4ead77acefb577e8e86f8ef388d Author: Lasse Collin Date: 2023-03-21 14:07:51 +0200 @@ -7180,7 +1770,7 @@ configure.ac | 3 +++ 1 file changed, 3 insertions(+) -commit 53cc475f2652d9e390ca002018dfd0af0626ef80 +commit 915d4f6058d52f84d2b58b0a5f3c8272eaa6c1bd Author: Lasse Collin Date: 2023-03-21 14:04:37 +0200 @@ -7194,7 +1784,7 @@ configure.ac | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) -commit 3b8890a40233b6c783bb101ec14405e786871775 +commit b848c039586ed2cddb6fb033680dac107cc5143f Author: Lasse Collin Date: 2023-03-21 13:12:03 +0200 @@ -7203,7 +1793,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 5a5bd7f871818029d5ccbe189f087f591258c294 +commit c775ba1602a74f29dbc2088bbe4d02c23fc32ba1 Author: Lasse Collin Date: 2023-03-21 13:11:49 +0200 @@ -7233,7 +1823,7 @@ configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -commit dfe1710784c0a3c3a90c17b80c9e1fe19b5fce06 +commit 0673c9ec98b6bae12b33dc295564514aaa26e2fc Author: Lasse Collin Date: 2023-03-19 22:45:59 +0200 @@ -7245,25 +1835,26 @@ src/liblzma/common/memcmplen.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit f0c580c5fc38bf49a184b48d76c1d8c057d499ce +commit 6ca8046ecbc7a1c81ee08f544bfd1414819fb2e8 Author: Jia Tan -Date: 2023-03-18 22:10:57 +0800 +Date: 2023-03-18 23:22:06 +0800 - Add NEWS for 5.4.2. + Bump version and soname for 5.4.2. - NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 48 insertions(+) + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -commit af4925e6043113ec9b5f9c0cf13abf2a18ccb1f6 +commit ce4f246600db10e77fc93d492ea045b4c9830bc6 Author: Jia Tan -Date: 2023-03-18 22:10:12 +0800 +Date: 2023-03-18 22:10:57 +0800 - Add NEWS for 5.2.11. + Add NEWS for 5.4.2. - NEWS | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) + NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) -commit 5a7b930efa7f9849d8da8397e8e5d8638f92be40 +commit 3634fe330788fc0df217acdb6581031a851600a3 Author: Lasse Collin Date: 2023-03-18 16:00:54 +0200 @@ -7272,7 +1863,7 @@ COPYING.GPLv3 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -commit b473a92891f7e991398a3b5eff305f6f2b6d7293 +commit 97679d25ce7cb014328f1455bb338903c003d54f Author: Lasse Collin Date: 2023-03-18 15:51:57 +0200 @@ -7290,7 +1881,7 @@ windows/INSTALL-MinGW.txt | 10 +++++----- 8 files changed, 19 insertions(+), 19 deletions(-) -commit 8b2f6001b4f412c259a7883427f2f2c8cea98ea8 +commit 01a67e89a56c3ebf5f6681bd06f0edc22a1ae594 Author: Jia Tan Date: 2023-03-18 00:40:28 +0800 @@ -7299,7 +1890,7 @@ CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 76e2315e14c399c15cc90e7930fd4d3d086b0227 +commit 5dca3f5cbab31105196c89cd6df0a9bbc3307c05 Author: Lasse Collin Date: 2023-03-17 18:36:22 +0200 @@ -7308,7 +1899,7 @@ windows/build.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit 133cf55edc5ce92952d2709abd992e48ef1f45ee +commit ae252862b30b509ab88b2bbcaa08e8d51b57e928 Author: Lasse Collin Date: 2023-03-17 08:53:38 +0200 @@ -7324,7 +1915,7 @@ windows/vs2019/liblzma_dll.vcxproj | 2 ++ 6 files changed, 12 insertions(+) -commit 75c9ca450fab6982fda9286b168081c9d54126cd +commit 147d282cc3733e2723df82622b6540ddfb52635e Author: Lasse Collin Date: 2023-03-17 08:43:51 +0200 @@ -7335,7 +1926,7 @@ CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) -commit 0cc3313bd4e569c51e686e5aab8c40c35241d34b +commit 4523a5ee29f45c0256af67a15771bc8bbd25ba53 Author: Lasse Collin Date: 2023-03-17 08:41:36 +0200 @@ -7345,7 +1936,7 @@ m4/tuklib_integer.m4 | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) -commit 5e57e3301319f20c35f8111dea73fa58403b96b1 +commit 82aacb40367dc580b09c5a7b270f6c98b63e49b9 Author: Lasse Collin Date: 2023-03-17 00:02:30 +0200 @@ -7354,7 +1945,7 @@ .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit 0007394d54e21bf30abb9a5e09cbc1e8d44a73ac +commit 5d022c24921eec938604a8cb10d70aa08dbd8575 Author: Lasse Collin Date: 2023-03-14 20:04:03 +0200 @@ -7363,7 +1954,7 @@ po4a/update-po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 509157c80c500426ec853bd992d684ebafc8500c +commit 896295117324f323c0b8db6a31ad6ebfaa88793d Author: Jia Tan Date: 2023-03-17 01:30:36 +0800 @@ -7381,7 +1972,7 @@ doxygen/update-doxygen | 18 +++++++++--------- 5 files changed, 22 insertions(+), 22 deletions(-) -commit fd90e2f4c29180b44e33c7ef726f94e4eae54ed3 +commit 94097157fae308b2c1a5edb4e8597c68b45eeaea Author: Jia Tan Date: 2023-03-16 22:07:15 +0800 @@ -7393,19 +1984,7 @@ src/liblzma/api/lzma/bcj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 4f50763b981f9056c5f1763dfb26cfa4a26a181d -Author: Jia Tan -Date: 2023-03-16 21:44:02 +0800 - - CI: Add doxygen as a dependency. - - Autogen now requires --no-doxygen or having doxygen installed to run - without errors. - - .github/workflows/ci.yml | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -commit f68f4b27f62f53fdac570885a1f4f23367ce6599 +commit da16d0b73b79d7785ece6f78a577fadd1fb59d0e Author: Lasse Collin Date: 2023-03-15 19:19:13 +0200 @@ -7414,7 +1993,7 @@ COPYING | 11 +++++++++++ 1 file changed, 11 insertions(+) -commit 8979308528c1f45cb9ee52d511f05232b4ad90a1 +commit e57c74f9ef19201f72c106f2c347596f40229936 Author: Jia Tan Date: 2023-03-16 21:41:09 +0800 @@ -7423,7 +2002,7 @@ PACKAGERS | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) -commit 55ba6e93004842ae0a0792214a23504267ad8f43 +commit 7e2fa48bb73edb25457232e2e62a4f81c6b95281 Author: Jia Tan Date: 2023-03-16 21:38:32 +0800 @@ -7462,7 +2041,7 @@ src/liblzma/api/lzma/vli.h | 2 -- 15 files changed, 2 insertions(+), 29 deletions(-) -commit 16f21255597f6a57e5692780f962cdc090f62b8c +commit d42977c7acfdf7fd9acc8803cf411eca7dc10478 Author: Jia Tan Date: 2023-03-16 21:37:32 +0800 @@ -7475,7 +2054,7 @@ autogen.sh | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) -commit 1321852a3be7196bd7fcfd146221a5669e46407c +commit 8fc712fcf41d821069c670f22b8bf628e7a4a877 Author: Jia Tan Date: 2023-03-16 21:35:55 +0800 @@ -7499,7 +2078,7 @@ doxygen/update-doxygen | 111 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) -commit b1216a7772952d2fe7fe9c6acfcbd98d30abbc7b +commit 77d2c025d19fbac7277c63239cfb1338f02c66c0 Author: Jia Tan Date: 2023-03-16 21:34:36 +0800 @@ -7515,9 +2094,9 @@ Makefile.am | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -commit c97d12f300b2a94c9f54a44c8931c8bc08cf0a73 -Author: Lasse Collin -Date: 2023-03-16 21:23:48 +0800 +commit 9af8f6f947a43974a4ff025f4c896f2fb4c91b4f +Author: Jia Tan +Date: 2023-01-03 20:37:30 +0800 Doxygen: Refactor Doxyfile.in to doxygen/Doxyfile. @@ -7534,13 +2113,14 @@ internal is for people who want to understand how xz and liblzma work. It might be useful for people who want to contribute to the project. - .gitignore | 3 +- - Makefile.am | 1 - - configure.ac | 40 --- - Doxyfile.in => doxygen/Doxyfile | 721 +++++++++++++++++++++++++--------------- - 4 files changed, 456 insertions(+), 309 deletions(-) + .gitignore | 3 +- + Doxyfile.in | 1234 ------------------------- + Makefile.am | 1 - + configure.ac | 1 - + doxygen/Doxyfile | 2684 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 2686 insertions(+), 1237 deletions(-) -commit 1b7661faa4bbf4a54c6b75900b5059835c382a0f +commit 1c558a26928b753fcf1c0d4bce9c0643285edd86 Author: Jia Tan Date: 2023-02-28 23:22:36 +0800 @@ -7549,17 +2129,7 @@ tests/tests.h | 75 ----------------------------------------------------------- 1 file changed, 75 deletions(-) -commit af55191102f01e76de658c881299f0909ca0feda -Author: Jia Tan -Date: 2022-12-29 21:52:15 +0800 - - liblzma: Defines masks for return values from lzma_index_checks(). - - src/liblzma/api/lzma/index.h | 23 +++++++++++++++++++++++ - tests/test_index.c | 22 +++++++++++----------- - 2 files changed, 34 insertions(+), 11 deletions(-) - -commit 8f38cdd9ab71e2a9d5a9787550222b7578243b73 +commit 7479a69a45a1b8fdb9a209e11f247dce11ac1ba0 Author: Jia Tan Date: 2023-01-12 22:29:07 +0800 @@ -7572,20 +2142,7 @@ tests/test_index.c | 2036 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 1492 insertions(+), 544 deletions(-) -commit 717aa3651ce582807f379d8654c2516e1594df77 -Author: Lasse Collin -Date: 2023-03-11 18:42:08 +0200 - - xz: Simplify the error-label in Capsicum sandbox code. - - Also remove unneeded "sandbox_allowed = false;" as this code - will never be run more than once (making it work with multiple - input files isn't trivial). - - src/xz/file_io.c | 27 ++++++++++++--------------- - 1 file changed, 12 insertions(+), 15 deletions(-) - -commit a0eecc235d3ba8ad3453da98b46c7bc3e644de75 +commit fd56d5353360279c10e8e5e05f5bc6ea03f64584 Author: Lasse Collin Date: 2023-03-07 19:59:23 +0200 @@ -7594,69 +2151,63 @@ src/xz/file_io.c | 8 ++++++++ 1 file changed, 8 insertions(+) -commit 916448d624aaf55cef0fc3e53754affb8c4f309d -Author: Jia Tan -Date: 2023-03-08 23:08:46 +0800 +commit d1bdaaebc68cae7f0ba457fa990b520df2186fd1 +Author: Lasse Collin +Date: 2023-03-11 19:31:40 +0200 - Revert: "Add warning if Capsicum sandbox system calls are unsupported." + xz: Don't fail if Capsicum is enabled but kernel doesn't support it. - The warning causes the exit status to be 2, so this will cause problems - for many scripted use cases for xz. The sandbox usage is already very - limited already, so silently disabling this allows it to be more usable. - - src/xz/file_io.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -commit 01587dda2a8f13fef7e12fd624e6d05da5f9624f -Author: Jia Tan -Date: 2023-03-07 20:02:22 +0800 - - xz: Fix -Wunused-label in io_sandbox_enter(). + (This commit combines related commits from the master branch.) - Thanks to Xin Li for recommending the fix. - - src/xz/file_io.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 5fb936786601a1cd013a5d436adde65982b1e13c -Author: Jia Tan -Date: 2023-03-06 21:37:45 +0800 - - xz: Add warning if Capsicum sandbox system calls are unsupported. + If Capsicum support is missing from the kernel or xz is being run + in an emulator that lacks Capsicum suport, the syscalls will fail + and set errno to ENOSYS. Previously xz would display and error and + exit, making xz unusable. Now it will check for ENOSYS and run + without sandbox support. Other tools like ssh behave similarly. + + Displaying a warning for missing Capsicum support was considered + but such extra output would quickly become annoying. It would also + break test_scripts.sh in "make check". - The warning is only used when errno == ENOSYS. Otherwise, xz still - issues a fatal error. + Also move cap_enter() to be the first step instead of the last one. + This matches the example in the cap_rights_limit(2) man page. With + the current code it shouldn't make any practical difference though. + + Thanks to Xin Li for the bug report, suggesting a fix, and testing: + https://github.com/tukaani-project/xz/pull/43 + + Thanks to Jia Tan for most of the original commits. - src/xz/file_io.c | 2 ++ - 1 file changed, 2 insertions(+) + src/xz/file_io.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) -commit 61ee82cb1232a402c82282bbae42821f2b952b0d +commit 5d351c69c19d212ddd2cf1f3bdb24900820c6776 Author: Jia Tan -Date: 2023-03-06 21:27:53 +0800 +Date: 2023-02-04 21:06:35 +0800 - xz: Skip Capsicum sandbox system calls when they are unsupported. + Build: Adjust CMake version search regex. - If a system has the Capsicum header files but does not actually - implement the system calls, then this would render xz unusable. Instead, - we can check if errno == ENOSYS and not issue a fatal error. + Now, the LZMA_VERSION_MAJOR, LZMA_VERSION_MINOR, and LZMA_VERSION_PATCH + macros do not need to be on consecutive lines in version.h. They can be + separated by more whitespace, comments, or even other content, as long + as they appear in the proper order (major, minor, patch). - src/xz/file_io.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) -commit f070722b57ba975a0dff36492d766f03026b1d21 +commit b82d4831e3f2339c4cdbc47776c99462088c11b7 Author: Jia Tan -Date: 2023-03-06 21:08:26 +0800 +Date: 2023-01-26 09:50:21 +0800 - xz: Reorder cap_enter() to beginning of capsicum sandbox code. + liblzma: Improve documentation for version.h. - cap_enter() puts the process into the sandbox. If later calls to - cap_rights_limit() fail, then the process can still have some extra - protections. + Specified parameter and return values for API functions and documented + a few more of the macros. - src/xz/file_io.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + src/liblzma/api/lzma/version.h | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) -commit f1ab1f6b339d16a53ac53efeb97779ecd2bae70f +commit 2caba3efe3e0c2d7c6dca00e22c56812326a34e6 Author: Jia Tan Date: 2023-02-24 23:46:23 +0800 @@ -7674,7 +2225,7 @@ src/liblzma/api/lzma/lzma12.h | 5 +++++ 1 file changed, 5 insertions(+) -commit 4b7fb3bf41a0ca4c97fad3799949a2aa61b13b99 +commit 594f904673ba55a833adfa60bbab6b60d4902d08 Author: Lasse Collin Date: 2023-02-27 18:38:35 +0200 @@ -7687,7 +2238,7 @@ CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) -commit 9aa7fdeb04c486d2700967090956af88fdccab7e +commit 88101143cb774bca6b7006c8335b09dc3f334140 Author: Jia Tan Date: 2023-02-24 18:10:37 +0800 @@ -7700,7 +2251,7 @@ tests/test_vli.c | 2 ++ 1 file changed, 2 insertions(+) -commit 3cf72c4bcba5370f07477c9b9b62ae33069ef9a9 +commit 4042dbf03a06e019ccdd1e9d1b94cf613d62d5a9 Author: Jia Tan Date: 2023-02-06 21:46:43 +0800 @@ -7712,7 +2263,7 @@ src/liblzma/api/lzma/filter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 002006be62d77c706565fa6ec828bea64be302da +commit 3971f5c5024750ce8286891c6f79ae1661047483 Author: Jia Tan Date: 2023-02-06 21:45:37 +0800 @@ -7724,7 +2275,7 @@ src/liblzma/api/lzma/filter.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -commit 463d9359b8595f01d44ada1739d75aeb87f36524 +commit 5e61b39432752b6cd1a7b518f0f9e4f0c3f0f242 Author: Jia Tan Date: 2023-02-06 21:44:45 +0800 @@ -7733,7 +2284,7 @@ src/liblzma/api/lzma/filter.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -commit 01441df92c0fd6a6c02fe5ac27982a54ce887cc0 +commit 8a53533869defa1191b41f176a0312cb53a139e2 Author: Jia Tan Date: 2023-02-06 21:35:06 +0800 @@ -7750,7 +2301,7 @@ src/liblzma/api/lzma/filter.h | 226 ++++++++++++++++++++++++++---------------- 1 file changed, 143 insertions(+), 83 deletions(-) -commit 805b45cd60bfd5da3d3d89077de3789df179b324 +commit 6d05b08b17ac8cb93165ee8f310fdd925b0b258f Author: Lasse Collin Date: 2023-02-23 20:46:16 +0200 @@ -7759,7 +2310,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 30e95bb44c36ae26b2ab12a94343b215fec285e7 +commit dfc9a54082e0fc7b3b796ea15336b5075acc79d5 Author: Lasse Collin Date: 2023-02-21 22:57:10 +0200 @@ -7843,7 +2394,7 @@ src/liblzma/simple/simple_coder.c | 6 ++++-- 10 files changed, 77 insertions(+), 23 deletions(-) -commit fa9065fac54194fe0407fc7f0cc9633fdce13c21 +commit f6dce49cb656b358e2fb2a3032e35e20af34dc84 Author: Jia Tan Date: 2023-02-07 00:00:44 +0800 @@ -7852,7 +2403,7 @@ src/liblzma/api/lzma/container.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) -commit 00a721b63d82dfb658dca8d8cb599d8a245c663f +commit 173d240bb4763aedc8c01df4d9c83e311d954c33 Author: Jia Tan Date: 2023-02-07 00:00:09 +0800 @@ -7861,7 +2412,7 @@ src/liblzma/api/lzma/container.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -commit 5b1c171d4ffe89ef18fa31509bb0185d6fd11d39 +commit 17797bacde3f7264048ef0976c137a600148d6cf Author: Jia Tan Date: 2023-02-06 23:42:08 +0800 @@ -7870,7 +2421,7 @@ src/liblzma/api/lzma/container.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -commit dbd47622eb99fefb3538a22baec3def002aa56f5 +commit 37da0e727161b401b8bfd8dccf163a4b2fc0460b Author: Jia Tan Date: 2023-01-26 23:17:41 +0800 @@ -7881,7 +2432,7 @@ src/liblzma/api/lzma/container.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 14cd30806d69e55906073745bcce3ee50e0ec942 +commit b8331077c626e6bf14f4671d09b561146eaf816a Author: Jia Tan Date: 2023-01-26 23:16:34 +0800 @@ -7894,7 +2445,7 @@ src/liblzma/api/lzma/container.h | 146 +++++++++++++++++++++++++-------------- 1 file changed, 93 insertions(+), 53 deletions(-) -commit c9c8bfae3502842dcead85eeb2b951b437c2cd88 +commit b9a3511bb61d3b6ce49abd33dce6155a573f5272 Author: Jia Tan Date: 2023-02-22 20:59:41 +0800 @@ -7903,7 +2454,7 @@ CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) -commit b9f171dd00a3cc32b6d41ea8e082cf545640ec2a +commit cd82ef2fb48b174c57cd03b84a9a0f978772cb89 Author: Lasse Collin Date: 2023-02-17 20:56:49 +0200 @@ -7912,7 +2463,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 2ee86d20e49985b903b78ebcfa3fa672e73e93aa +commit 076e911ba25cadf2cbdfbd0f65991a002e210c0b Author: Lasse Collin Date: 2023-02-17 20:48:28 +0200 @@ -7955,7 +2506,7 @@ configure.ac | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -commit d831072cceca458d94d2d5da201862f6d43a417b +commit bc34e5ac9996667d2c1ec9a7895ec5931ac4caea Author: Lasse Collin Date: 2023-02-16 21:09:00 +0200 @@ -7975,7 +2526,7 @@ src/liblzma/api/lzma/stream_flags.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) -commit f029daea39c215fd7d5cb6b6798818b055cf5b22 +commit d31fbd28be5b79eb682db50004b0fb7aad5299ec Author: Jia Tan Date: 2023-02-17 00:54:33 +0800 @@ -7984,7 +2535,7 @@ src/liblzma/api/lzma/bcj.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -commit a5de68bac2bb7e1b9119e6cea7d761a22ea73e9c +commit 701e9be6bede19771895f756082db0c017f86f07 Author: Jia Tan Date: 2023-02-17 00:44:44 +0800 @@ -7993,7 +2544,7 @@ src/liblzma/api/lzma/bcj.h | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) -commit efa498c13b883810497e0ea8a169efd6f48f5026 +commit 762c4d0b62d2694cf3a01e030fdfe68e09e7b503 Author: Jia Tan Date: 2023-02-17 00:36:05 +0800 @@ -8010,7 +2561,7 @@ src/liblzma/api/lzma/stream_flags.h | 32 +++++++++++++-------------- 7 files changed, 95 insertions(+), 95 deletions(-) -commit 718b22a6c5e3ee5de123323ea798872381f9320e +commit 0ce1db0223854d94b4a0d17737ac0486a75d9e6a Author: Lasse Collin Date: 2023-02-16 17:59:50 +0200 @@ -8025,11 +2576,11 @@ src/liblzma/check/crc64_fast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 87c53553fa7d50f777b4edfa99f2083628f590fe +commit d83da006b3e8dbad9112e6cde6b27049d193c9ec Author: Jia Tan Date: 2023-02-16 21:04:54 +0800 - liblzma: Improve documentation for stream_flags.h + liblzma: Improve documentation for stream_flags.h Standardizing each function to always specify parameters and return values. Also moved the parameters and return values to the end of each @@ -8040,7 +2591,7 @@ src/liblzma/api/lzma/stream_flags.h | 76 ++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 30 deletions(-) -commit 13d99e75a543e9e5f8633cc241eae55b91a3b242 +commit 2796bb4736f645d34939b5d62d5958f534e41e69 Author: Jia Tan Date: 2023-02-14 21:50:16 +0800 @@ -8051,7 +2602,7 @@ src/liblzma/api/lzma/lzma12.h | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) -commit 43ec344c868f930e96879eb9e49212cce92a9884 +commit ebebaa8d9381afea440eb1b01917117551adf68f Author: Jia Tan Date: 2023-01-27 22:44:06 +0800 @@ -8064,7 +2615,7 @@ src/liblzma/api/lzma/check.h | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) -commit 9c71db4e884fd49aea3d1e711036bff45ca66487 +commit 765fa2865aab97ea713c1715922e322b3cf599a7 Author: Jia Tan Date: 2023-02-08 21:33:52 +0800 @@ -8075,7 +2626,7 @@ src/liblzma/api/lzma/index.h | 177 ++++++++++++++++++++++++++++++------------- 1 file changed, 126 insertions(+), 51 deletions(-) -commit 421f2f2e160720f6009e3b6a125cafe2feaa9419 +commit 918e208af5960728b6def01e692b395f7d8e3701 Author: Jia Tan Date: 2023-02-08 20:35:32 +0800 @@ -8084,7 +2635,7 @@ src/liblzma/api/lzma/index.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit b67539484981351d501b68de5e925425e50c59b1 +commit 1f157d214bc09338876d2467b549935679abc0bf Author: Jia Tan Date: 2023-02-08 20:30:23 +0800 @@ -8096,7 +2647,7 @@ src/liblzma/api/lzma/index.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -commit 0c9e4fc2ad6d88d54f299240fcc5a2ce7d695d96 +commit 28757fa46d8e0f0a9c17628b2b6af9bcb3cd96fc Author: Jia Tan Date: 2023-01-21 21:32:03 +0800 @@ -8108,7 +2659,7 @@ src/liblzma/api/lzma/base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 816fec125aa74bcef46512c73acc6d9e5a700d15 +commit 135d5a1a65a9e199b9a5550c1f788cf43cd81018 Author: Jia Tan Date: 2023-01-21 00:29:38 +0800 @@ -8120,16 +2671,7 @@ src/liblzma/api/lzma/base.h | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) -commit 862dacef1a4e7e1b28d465956fa4244ed01df154 -Author: Jia Tan -Date: 2023-02-14 00:12:34 +0800 - - liblzma: Add one more missing [out] annotation in vli.h - - src/liblzma/api/lzma/vli.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 867b08ae4254bf55dd1f7fd502cc618231b92f75 +commit 2287d5668384e289d51e72724997dc920483768e Author: Jia Tan Date: 2023-02-14 00:08:33 +0800 @@ -8138,10 +2680,10 @@ Added [out] annotations to parameters that are pointers and can have their value changed. Also added a clarification to lzma_vli_is_valid. - src/liblzma/api/lzma/vli.h | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) + src/liblzma/api/lzma/vli.h | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) -commit 90d0e628ff11e5030bcc4fc000bca056adda6603 +commit 7124b8a16ae60cb2e93218ff531868eebd673bde Author: Jia Tan Date: 2023-02-10 21:38:02 +0800 @@ -8153,7 +2695,7 @@ src/liblzma/api/lzma/delta.h | 8 ++++++++ 1 file changed, 8 insertions(+) -commit 9255fffdb13e59874bf7f95c370c410ad3a7e114 +commit 59c7bb8931159fdb1a31bbbeaed0e6984e2d3c81 Author: Jia Tan Date: 2023-02-10 21:35:23 +0800 @@ -8165,64 +2707,7 @@ src/liblzma/api/lzma/index_hash.h | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) -commit 1dbe12b90cff79bb51923733ac0840747b4b4131 -Author: Lasse Collin -Date: 2023-02-07 19:07:45 +0200 - - xz: Improve the comment about start_time in mytime.c. - - start_time is relative to an arbitary point in time, it's not - time of day, so using it for anything else than time differences - wouldn't make sense. - - src/xz/mytime.c | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -commit 7673ef5aa80c1af7fb693360dd82f527b46c2c56 -Author: Jia Tan -Date: 2023-02-04 21:06:35 +0800 - - Build: Adjust CMake version search regex. - - Now, the LZMA_VERSION_MAJOR, LZMA_VERSION_MINOR, and LZMA_VERSION_PATCH - macros do not need to be on consecutive lines in version.h. They can be - separated by more whitespace, comments, or even other content, as long - as they appear in the proper order (major, minor, patch). - - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -commit b8bce89be7fb5bffe5fef4a2782ca9b2b107eaac -Author: Jia Tan -Date: 2023-02-04 12:01:23 +0800 - - xz: Add a comment clarifying the use of start_time in mytime.c. - - src/xz/mytime.c | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 912af91b10a18fb9bb3167247ecaaefca8248ee9 -Author: Jia Tan -Date: 2023-01-26 09:50:21 +0800 - - liblzma: Improve documentation for version.h. - - Specified parameter and return values for API functions and documented - a few more of the macros. - - src/liblzma/api/lzma/version.h | 29 ++++++++++++++++++++++------- - 1 file changed, 22 insertions(+), 7 deletions(-) - -commit 850adec171203cd22b57d016084d713f72ae5307 -Author: Jia Tan -Date: 2023-02-03 22:52:55 +0800 - - Docs: Omit SIGTSTP not handled from TODO. - - TODO | 4 ---- - 1 file changed, 4 deletions(-) - -commit 2c78a83c6faec70154d9eb78022a618ed62cdcb3 +commit e970c28ac3cb2e8051925f81db2fe953664c2645 Author: Jia Tan Date: 2023-02-03 00:33:32 +0800 @@ -8235,7 +2720,7 @@ src/liblzma/common/string_conversion.c | 7 +++++++ 1 file changed, 7 insertions(+) -commit e01f01b9af1c074463b92694a16ecc16a31907c0 +commit 85e01266a96689448abb249da6c6abc3afcd4a4e Author: Jia Tan Date: 2023-02-03 00:32:47 +0800 @@ -8249,7 +2734,7 @@ tests/test_filter_str.c | 593 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 596 insertions(+) -commit 8dfc029e7a4ce45809c30313dc0e502f0d22be26 +commit 3fa0f3ba12dd3383f62dbfa18a864f9b4217fa0a Author: Jia Tan Date: 2023-01-22 08:49:00 +0800 @@ -8258,7 +2743,7 @@ src/liblzma/common/string_conversion.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 54ad83c1ae2180dcc0cb2445b181dc1e9732a5d6 +commit 32dbe045d74e94f75c53236fa2a6c0454d7b6d9e Author: Jia Tan Date: 2023-02-03 00:20:20 +0800 @@ -8271,7 +2756,7 @@ src/liblzma/api/lzma/block.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) -commit f680e771b3eb2a46310fe85b3e000ac3a1a0640f +commit ccf12acbfa7331b1bbb99ec55879186eb35f879f Author: Jia Tan Date: 2023-02-03 00:12:24 +0800 @@ -8280,7 +2765,7 @@ src/liblzma/api/lzma/block.h | 3 +++ 1 file changed, 3 insertions(+) -commit 504cf4af895fd45aad0c56eb3b49d90acd54465b +commit 6a0b168dd9dc1ef437255c4bfdc6eff8b96fdb24 Author: Jia Tan Date: 2023-02-03 00:11:37 +0800 @@ -8289,7 +2774,7 @@ src/liblzma/api/lzma/block.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit 115b720fb521f99aa832d06b2c12b7f8c6c50680 +commit 84ce36f90e68471fec1f0e61cd93ac7ed9ab4883 Author: Jia Tan Date: 2023-02-03 00:11:07 +0800 @@ -8298,7 +2783,7 @@ src/liblzma/api/lzma/block.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) -commit 85ea0979adcf808a3830aefbe7a4ec884e542ea1 +commit d6620774682830d606f57109861b6763805b3492 Author: Jia Tan Date: 2023-02-03 00:10:34 +0800 @@ -8307,7 +2792,7 @@ src/liblzma/api/lzma/block.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit 1f7ab90d9ce224230a04de6b921ad6e2029023a8 +commit 880adb5aa25f66a53d81c2f3acc716f7a4d373d1 Author: Jia Tan Date: 2023-02-03 00:07:23 +0800 @@ -8321,7 +2806,7 @@ src/liblzma/api/lzma/block.h | 96 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 75 insertions(+), 21 deletions(-) -commit c563a4bc554a96bd0b6aab3c139715b7ec8f6ca3 +commit b5b1b1f061c342271e4977ce5cba604a19c0ca52 Author: Jia Tan Date: 2023-02-01 23:38:30 +0800 @@ -8335,84 +2820,7 @@ src/liblzma/api/lzma/filter.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -commit 315c64c7e18acc59a745b68148188a73e998252b -Author: Jia Tan -Date: 2023-02-01 21:43:33 +0800 - - CI: Update .gitignore for artifacts directory in build-aux. - - The workflow action for our CI pipeline can only reference artifacts in - the source directory, so we should ignore these files if the ci_build.sh - is run locally. - - .gitignore | 1 + - 1 file changed, 1 insertion(+) - -commit 2c1341f4fa06e7f487d61142aa354c433e17ec7f -Author: Jia Tan -Date: 2023-02-01 21:36:46 +0800 - - CI: Add quotes around variables in a few places. - - build-aux/ci_build.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 3a401b0e0c7a2658af7801dd0690256ef24149e0 -Author: Jia Tan -Date: 2023-02-01 21:36:22 +0800 - - CI: Upload test logs as artifacts if a test fails. - - .github/workflows/ci.yml | 60 ++++++++++++++++++++++++++++++++++-------------- - build-aux/ci_build.sh | 31 ++++++++++++++++++++----- - 2 files changed, 68 insertions(+), 23 deletions(-) - -commit 610dde15a88f12cc540424eb3eb3ed61f3876f74 -Author: Lasse Collin -Date: 2023-01-27 20:02:49 +0200 - - xz: Use clock_gettime() even if CLOCK_MONOTONIC isn't available. - - mythread.h and thus liblzma already does it. - - src/xz/mytime.c | 11 ++++++++--- - src/xz/private.h | 3 +-- - 2 files changed, 9 insertions(+), 5 deletions(-) - -commit 2e02877288f6576cd4595e9ac7684f867cd47d68 -Author: Lasse Collin -Date: 2023-01-27 19:41:19 +0200 - - po4a/po4a.conf: Sort the language identifiers in alphabetical order. - - po4a/po4a.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ff592c616eda274215b485cf1b8d34f060c9f3be -Author: Lasse Collin -Date: 2023-01-26 18:29:17 +0200 - - xz: Add SIGTSTP handler for progress indicator time keeping. - - This way, if xz is stopped the elapsed time and estimated time - remaining won't get confused by the amount of time spent in - the stopped state. - - This raises SIGSTOP. It's not clear to me if this is the correct way. - POSIX and glibc docs say that SIGTSTP shouldn't stop the process if - it is orphaned but this commit doesn't attempt to handle that. - - Search for SIGTSTP in section 2.4.3: - - https://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html - - src/xz/mytime.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/xz/mytime.h | 6 ++++++ - src/xz/private.h | 12 ++++++++++++ - src/xz/signals.c | 17 ++++++++++++++++- - 4 files changed, 89 insertions(+), 2 deletions(-) - -commit 3b1c8ac8d1d553cbb1fb22b545d2b1424c752b76 +commit e904e778b82b14f2779aab80d6c8f3c01a3fc54b Author: Jia Tan Date: 2023-01-27 20:14:51 +0800 @@ -8424,28 +2832,7 @@ po4a/pt_BR.po | 3677 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3678 insertions(+), 1 deletion(-) -commit a15a7552f9f67c4e402f5d2967324e0ccfd6fccc -Author: Lasse Collin -Date: 2023-01-26 17:51:06 +0200 - - Build: Avoid different quoting style in --enable-doxygen doc. - - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -commit af5a4bd5afc089d9697756dded38feafaa987ae4 -Author: Lasse Collin -Date: 2023-01-26 17:39:46 +0200 - - tuklib_physmem: Check for __has_warning before GCC version. - - Clang can be configured to fake a too high GCC version so - this way it's more robust. - - src/common/tuklib_physmem.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit f35d98e20609e0be6a04ae2604bfb7cb9d5bd5e4 +commit e9c47e79c9584ba1126f5fa0dbe6c96e67411aa6 Author: Jia Tan Date: 2023-01-24 20:48:50 +0800 @@ -8460,53 +2847,7 @@ src/liblzma/api/lzma/filter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 2f78ecc5939b3d97ddfc2a6bd31b50108a28d0a2 -Author: Lasse Collin -Date: 2023-01-23 23:44:58 +0200 - - Revert "tuklib_common: Define __has_warning if it is not defined." - - This reverts commit 82e3c968bfa10e3ff13333bd9cbbadb5988d6766. - - Macros in the reserved namespace (_foo or __foo) shouldn't be #defined - without a very good reason. Here the alternative would have been - to #define tuklib_has_warning(str) to an approriate value. - - Also the tuklib_* files should stay namespace clean if possible. - - src/common/tuklib_common.h | 7 ------- - 1 file changed, 7 deletions(-) - -commit 8366cf8738e8b7bb74c967d07bf0fd2a1878e575 -Author: Lasse Collin -Date: 2023-01-23 23:38:34 +0200 - - tuklib_physmem: Clean up the way -Wcast-function-type is silenced on Windows. - - __has_warning and other __has_foo macros are meant to become - compiler-agnostic so it's not good to check for __clang__ with it. - - This also relied on tuklib_common.h for #defining __has_warning - which was confusing as #defining reserved macros is generally - not a good idea. - - src/common/tuklib_physmem.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -commit 683a3c7e2fcd922200c31078e5c9dd1348e90941 -Author: Lasse Collin -Date: 2023-01-24 00:05:38 +0200 - - xz: Flip the return value of suffix_is_set to match the documentation. - - Also edit style to match the existing coding style in the project. - - src/xz/args.c | 6 +++--- - src/xz/suffix.c | 2 +- - src/xz/suffix.h | 1 + - 3 files changed, 5 insertions(+), 4 deletions(-) - -commit cc5aa9ab138beeecaee5a1e81197591893ee9ca0 +commit 99575947a58a60416c570eb78038d18a1ea4cef4 Author: Jia Tan Date: 2023-01-07 21:55:06 +0800 @@ -8514,10 +2855,10 @@ src/xz/args.c | 8 ++++++++ src/xz/suffix.c | 26 ++++++++------------------ - src/xz/suffix.h | 7 +++++++ - 3 files changed, 23 insertions(+), 18 deletions(-) + src/xz/suffix.h | 8 ++++++++ + 3 files changed, 24 insertions(+), 18 deletions(-) -commit 9663141274e01592a281a7f2df5d7a31a1dac8bf +commit 76dec92fcca4a9ccd2063ed6d5d9e3474665baad Author: Jia Tan Date: 2023-01-20 21:53:14 +0800 @@ -8535,37 +2876,7 @@ src/liblzma/api/lzma/stream_flags.h | 28 ++++++++++++++++++++++++ 7 files changed, 173 insertions(+) -commit 6327a045f34d48fc5afc58ba0d32a82c94403049 -Author: Jia Tan -Date: 2022-12-20 21:39:59 +0800 - - Doxygen: Update Doxyfile.in from 1.4.7 to 1.8.17. - - A few Doxygen tags were obsolete from 1.4.7. Version 1.8.17 released - in 2019, so this should be compatible with resonable modern distros. - The purpose of Doxygen these days is for docs on the website, so it - doesn't necessarily have to work for everyone. Just when the maintainers - want to update the docs. - - Doxyfile.in | 2523 ++++++++++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 1893 insertions(+), 630 deletions(-) - -commit bbf71b69ebf9d0d62a0af150a5c37d193b8159ad -Author: Jia Tan -Date: 2023-01-03 20:37:30 +0800 - - Doxygen: Make Doxygen only produce liblzma API documentation by default. - - Doxygen is now configurable in autotools only with - --enable-doxygen=[api|all]. The default is "api", which will only - generate HTML output for liblzma API functions. The LaTex documentation - output was also disabled. - - Doxyfile.in | 18 +++++++++--------- - configure.ac | 39 +++++++++++++++++++++++++++++++++++++++ - 2 files changed, 48 insertions(+), 9 deletions(-) - -commit 6fcf4671b6047113c583a0919fc850987a4ec5f4 +commit bd213d06ebf92cf42eeb97e7c578bddc857f8ea8 Author: Jia Tan Date: 2022-12-21 23:59:43 +0800 @@ -8590,7 +2901,7 @@ src/liblzma/api/lzma/vli.h | 5 +++-- 14 files changed, 42 insertions(+), 28 deletions(-) -commit b43ff180fb2e372adce876bfa155fc9bcf0c3db4 +commit 257dbff0ba1a7bc45a74d203ece015c9f70c88cd Author: Jia Tan Date: 2023-01-19 20:35:09 +0800 @@ -8602,48 +2913,10 @@ this causes a cast-function-type warning, so the best solution is to simply ignore the warning. - src/common/tuklib_physmem.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -commit 82e3c968bfa10e3ff13333bd9cbbadb5988d6766 -Author: Jia Tan -Date: 2023-01-19 20:32:40 +0800 - - tuklib_common: Define __has_warning if it is not defined. - - clang supports the __has_warning macro to determine if the version of - clang compiling the code supports a given warning. If we do not define - it for other compilers, it may cause a preprocessor error. - - src/common/tuklib_common.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit b2ba1a489df451cdcd93b2334e319dd06778de19 -Author: Jia Tan -Date: 2023-01-18 22:11:05 +0800 - - CI: Reorder 32-bit build first for Linux autotool builds. - - The 32-bit build needs to be first so the configure cache only needs to - be reset one time. The 32-bit build sets the CFLAGS env variable, so any - build using that flag after will fail unless the cache is reset. - - .github/workflows/ci.yml | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -commit dd1c1135741057c91e8d018be9ec4d43968b0e64 -Author: Jia Tan -Date: 2023-01-18 21:51:43 +0800 - - CI: Enable --config-cache in autotool builds. - - If CFLAGS are set in a build, the cache must be cleared with - "make distclean", or by deleting the cache file. - - build-aux/ci_build.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/common/tuklib_physmem.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) -commit d3e11477053764c003eec2daa5198c747d70ff69 +commit 720ad4a44282a7ee59aa9920eaf495d85d245d97 Author: Jia Tan Date: 2023-01-16 21:35:45 +0800 @@ -8652,7 +2925,7 @@ src/xz/coder.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit 123255b6ed15f4428b2aa92e4962015a5362f6bf +commit 88dc19163421282369c0989e997c05f9a447edc6 Author: Jia Tan Date: 2023-01-16 20:55:10 +0800 @@ -8666,7 +2939,7 @@ src/xz/args.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit 571919c47b9ff5171ede84378620ed0a9aeb98c0 +commit 039e0ab13efb144642f9d99eeeb9c668e76bb430 Author: Jia Tan Date: 2023-01-13 20:37:06 +0800 @@ -8675,70 +2948,7 @@ po/pt_BR.po | 603 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 344 insertions(+), 259 deletions(-) -commit 81cb02e2c22bbc036cdfaa2d2c4176f6bd60d3cf -Author: Jia Tan -Date: 2023-01-12 23:43:06 +0800 - - CI: Disable shared and nls from various jobs in autotool runners. - - Disabling shared library generation and linking should help speed up the - runners. The shared library is still being tested in the 32 bit build - and the full feature. - - Disabling nls is to check for any unexpected warnings or errors. - - .github/workflows/ci.yml | 56 ++++++++++++++++++++++++------------------------ - 1 file changed, 28 insertions(+), 28 deletions(-) - -commit 58a052198a7bcaf6e958f87fad72e69e19a2579b -Author: Jia Tan -Date: 2023-01-12 23:39:19 +0800 - - CI: Reorder the 32-bit job in the Ubuntu runner. - - Run the 32 bit job sooner since this is a more interesting test than - some of the later jobs. - - .github/workflows/ci.yml | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -commit 4110a998b83459fe2bc9bc1bec30ad68afa8f797 -Author: Jia Tan -Date: 2023-01-12 23:09:03 +0800 - - CI: Allow disabling Native Language Support. - - build-aux/ci_build.sh | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -commit 0dec634e705b5bf89a37c5d62d71e8511d480058 -Author: Jia Tan -Date: 2023-01-12 23:02:20 +0800 - - CI: Only run autogen.sh if it has not already run. - - build-aux/ci_build.sh | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -commit 32287dc8def94df4546e903495d14c132bd54cc4 -Author: Jia Tan -Date: 2023-01-12 22:58:36 +0800 - - CI: Allow disabling shared library in autotools builds. - - build-aux/ci_build.sh | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -commit 77d1ebcc99ddd82a300d1838f608150221931dcd -Author: Jia Tan -Date: 2023-01-12 22:44:18 +0800 - - CI: Improve Usage readability and add -h option. - - build-aux/ci_build.sh | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -commit a8bb8358d10b059274f3cf993d9b8f490bafb268 +commit 718f7a60e740b26b8353965edaaddc7d4deb4d85 Author: Lasse Collin Date: 2023-01-12 13:04:05 +0200 @@ -8751,7 +2961,7 @@ configure.ac | 1 - 1 file changed, 1 deletion(-) -commit 52dc033d0bde0d19e3912303c6c74bae559d6498 +commit 3ccedb09724c998c39d708c945f6da5852c39e13 Author: Lasse Collin Date: 2023-01-12 06:05:58 +0200 @@ -8763,7 +2973,7 @@ src/xz/file_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit b1a6d180a363d57b2b1c89526ff3f0782bf863d3 +commit 09fbd2f0527def89e839c8907de4fe7ef6bc5019 Author: Lasse Collin Date: 2023-01-12 06:01:12 +0200 @@ -8773,7 +2983,7 @@ src/xz/list.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -commit 31c21c734b7c7d7428a3da7402a2cb7bc2587339 +commit 683d3f178ef1487b5418be49f331b0131a101b40 Author: Lasse Collin Date: 2023-01-12 05:38:48 +0200 @@ -8786,7 +2996,7 @@ src/liblzma/lz/lz_encoder_mf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -commit 37fbdfb7263522c11c7ad2685413d6295532581d +commit 2b8062ef94a38d0f9ad0d1b309e8748db52f5c15 Author: Lasse Collin Date: 2023-01-12 04:46:45 +0200 @@ -8795,7 +3005,7 @@ src/common/mythread.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 5ce6ddc221d0bfb57d810d845bb65fb0aac0b008 +commit b16b9c0d22227012518595c2222facc73bd833a8 Author: Lasse Collin Date: 2023-01-12 04:17:24 +0200 @@ -8810,7 +3020,7 @@ configure.ac | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) -commit bfc3a0a8ac16de90049c1b1ba1445a7626d0230c +commit c47ecd6d3909d0d3ff48dfd6e2ee41e7c7130b94 Author: Lasse Collin Date: 2023-01-12 04:14:18 +0200 @@ -8831,7 +3041,7 @@ tests/tests.h | 9 +++++++++ 4 files changed, 17 insertions(+), 8 deletions(-) -commit 49245bb31e215ad455a1ab85e4ed6783152dc522 +commit 34e13ce015232968731de2a9ec3440a08b0084b1 Author: Lasse Collin Date: 2023-01-12 03:51:07 +0200 @@ -8846,7 +3056,7 @@ tests/test_stream_flags.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) -commit 3f13bf6b9e8624cbe6d6e3e82d6c98a3ed1ad571 +commit 6671d0fe46b77f0fafce860836b7a12dc3cda14a Author: Lasse Collin Date: 2023-01-12 03:19:59 +0200 @@ -8861,7 +3071,7 @@ src/liblzma/common/stream_encoder_mt.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) -commit 6c886cc5b3c90c6a75e6be8b1278ec2261e452a6 +commit d3e833ca1d2abda54648494c33aca73a40a47efe Author: Lasse Collin Date: 2023-01-12 03:11:40 +0200 @@ -8872,7 +3082,7 @@ src/xz/options.c | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) -commit a0e7fb1c1ea658b67f30517f5d1975efd0226dba +commit 977dd2e26bc50efec8d30fb90380394042d24558 Author: Lasse Collin Date: 2023-01-12 03:04:28 +0200 @@ -8881,7 +3091,7 @@ tests/test_lzip_decoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit c0f8d6782f29e219fd496dd23f6a033270509d5c +commit c55157ed7437ab14f2afb7fecf331e321f2edf9a Author: Lasse Collin Date: 2023-01-12 03:03:55 +0200 @@ -8890,7 +3100,17 @@ tests/test_lzip_decoder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -commit 62efd48a825e8f439e84c85e165d8774ddc68fd2 +commit 18b845e69752c975dfeda418ec00eda22605c2ee +Author: Lasse Collin +Date: 2023-01-11 18:52:54 +0200 + + Bump version and soname for 5.4.1. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 4080bbb844fb36701ffb978f0c41ea2c2c9f8960 Author: Jia Tan Date: 2023-01-11 23:58:16 +0800 @@ -8899,7 +3119,44 @@ NEWS | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) -commit d1561c47ec8cd3844a785d3741dc932f9b9c5790 +commit 674c89fdb8c457ebc3a0652e235d8b6cd7b7dee2 +Author: Lasse Collin +Date: 2023-01-10 11:56:11 +0200 + + sysdefs.h: Don't include strings.h anymore. + + On some platforms src/xz/suffix.c may need for + strcasecmp() but suffix.c includes the header when it needs it. + + Unless there is an old system that otherwise supports enough C99 + to build XZ Utils but doesn't have C89/C90-compatible , + there should be no need to include in sysdefs.h. + + src/common/sysdefs.h | 6 ------ + 1 file changed, 6 deletions(-) + +commit 2a6b938084fac9ddb39cd69c9beeed15c3b6f6f6 +Author: Lasse Collin +Date: 2023-01-10 11:23:41 +0200 + + xz: Include in suffix.c if needed for strcasecmp(). + + SUSv2 and POSIX.1‐2017 declare only a few functions in . + Of these, strcasecmp() is used on some platforms in suffix.c. + Nothing else in the project needs (at least if + building on a modern system). + + sysdefs.h currently includes if HAVE_STRINGS_H is + defined and suffix.c relied on this. + + Note that dos/config.h doesn't #define HAVE_STRINGS_H even though + DJGPP does have strings.h. It isn't needed with DJGPP as strcasecmp() + is also in in DJGPP. + + src/xz/suffix.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit aea639e81beb548e3114c74b6d9a894d6e036189 Author: Jia Tan Date: 2023-01-11 22:46:48 +0800 @@ -8912,7 +3169,7 @@ src/xz/message.c | 9 +++++++++ 1 file changed, 9 insertions(+) -commit 8c0f115cc489331c48df77beca92fe378039d919 +commit e3b42bfcb0f67988beee7c7022fed0361282be45 Author: Jia Tan Date: 2023-01-11 20:58:31 +0800 @@ -8921,7 +3178,7 @@ tests/test_filter_flags.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 25035813d1d596fde692addc33e7f715f1fe55eb +commit 21625b7e11d004788e40eb5eb88d9d89f65fe347 Author: Jia Tan Date: 2023-01-11 20:42:29 +0800 @@ -8935,7 +3192,7 @@ tests/test_filter_flags.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -commit 0b8fa310cf56fec55663f62340e49e8e1441594f +commit c337983e928682d56ce3470b286a8d5b8646e0ad Author: Lasse Collin Date: 2023-01-10 22:14:03 +0200 @@ -8956,7 +3213,7 @@ src/liblzma/check/crc64_fast.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -commit 765354b50c2886fc0d294d6be3b207f7ae2ada70 +commit b7fb438ea0e3ee02e3a164f3b72fae456cbe34d7 Author: Jia Tan Date: 2023-01-11 01:18:50 +0800 @@ -8968,7 +3225,7 @@ tests/test_block_header.c | 4 ++++ 1 file changed, 4 insertions(+) -commit 7c23c05befdcc73231c0d6632a7d943dbeaea1aa +commit 68e9ef036d18d7c3952bff0b391d5989b86934da Author: Jia Tan Date: 2023-01-11 01:08:03 +0800 @@ -8980,43 +3237,16 @@ tests/test_index_hash.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -commit 57464bb4ebd6c00dc8b19803f05ea55ddd0826f6 -Author: Jia Tan -Date: 2023-01-11 00:54:45 +0800 - - CI/CD: Add 32-bit build and test steps to Ubuntu autotools runner. - - If all goes well, Mac autotools and Linux and Mac CMake will be added - later for 32-bit builds. - - .github/workflows/ci.yml | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit 923eb689a4b863b6cca8df6360d4962aae994edf -Author: Jia Tan -Date: 2023-01-11 00:51:01 +0800 - - CI/CD: Enables warnings as errors in autotool build. - - This will help us catch warnings and potential bugs in builds that are - not often tested by us. - - build-aux/ci_build.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit feae5528a30c006b6e2f96a95116e20b983703fc -Author: Jia Tan -Date: 2023-01-11 00:48:35 +0800 +commit a387707cd8cdefbffb5b7429bda4b7fcc192954a +Author: Lasse Collin +Date: 2023-01-10 00:33:14 +0200 - CI/CD: Add -f argument to set CFLAGS in ci_build.sh. - - For now, the suggested option is for -m32 only, but this can be updated - later if other flags are deemed useful. + Windows: Update INSTALL-MSVC.txt to recommend CMake over project files. - build-aux/ci_build.sh | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + windows/INSTALL-MSVC.txt | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) -commit cfabb62a4874c146e7d6f30445637602545bc054 +commit 52902ad69518255a14b0144f0a2379e06fde5b6e Author: Lasse Collin Date: 2023-01-10 12:47:16 +0200 @@ -9033,44 +3263,7 @@ src/liblzma/check/crc64_fast.c | 6 ------ 1 file changed, 6 deletions(-) -commit 0b64215170dd3562f207ef26f794755bcd600526 -Author: Lasse Collin -Date: 2023-01-10 11:56:11 +0200 - - sysdefs.h: Don't include strings.h anymore. - - On some platforms src/xz/suffix.c may need for - strcasecmp() but suffix.c includes the header when it needs it. - - Unless there is an old system that otherwise supports enough C99 - to build XZ Utils but doesn't have C89/C90-compatible , - there should be no need to include in sysdefs.h. - - src/common/sysdefs.h | 6 ------ - 1 file changed, 6 deletions(-) - -commit ec2fc39fe4f4e6e242b3a669585049763968cdeb -Author: Lasse Collin -Date: 2023-01-10 11:23:41 +0200 - - xz: Include in suffix.c if needed for strcasecmp(). - - SUSv2 and POSIX.1‐2017 declare only a few functions in . - Of these, strcasecmp() is used on some platforms in suffix.c. - Nothing else in the project needs (at least if - building on a modern system). - - sysdefs.h currently includes if HAVE_STRINGS_H is - defined and suffix.c relied on this. - - Note that dos/config.h doesn't #define HAVE_STRINGS_H even though - DJGPP does have strings.h. It isn't needed with DJGPP as strcasecmp() - is also in in DJGPP. - - src/xz/suffix.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit 7049c4a76c805ad27d6cf4ee119a2ef2a7add59f +commit e81b9fc48ca70f9228308d3f1871cd81f9a5a496 Author: Lasse Collin Date: 2023-01-10 10:05:13 +0200 @@ -9079,7 +3272,7 @@ src/common/sysdefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 194a5fab69277d9e804a6113b5f676b8666b3a61 +commit 6e89ab58b031aa046308a0b3504ff0a5be042571 Author: Lasse Collin Date: 2023-01-10 10:04:06 +0200 @@ -9095,45 +3288,24 @@ src/common/sysdefs.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -commit 5e34774c31d1b7509b5cb77a3be9973adec59ea0 +commit 65c59ad429aa59f9df0326d9fc82931ba4a9d123 Author: Lasse Collin -Date: 2023-01-10 08:29:32 +0200 +Date: 2023-01-10 08:50:26 +0200 - CMake: Fix appending to CMAKE_RC_FLAGS. + CMake/Windows: Add a workaround for windres from GNU binutils. - It's a string, not a list. It only worked when the variable was empty. + This is combined from the following commits in the master branch: + 443dfebced041adc88f10d824188eeef5b5821a9 + 6b117d3b1fe91eb26d533ab16a2e552f84148d47 + 5e34774c31d1b7509b5cb77a3be9973adec59ea0 - Thanks to Iouri Kharon. + Thanks to Iouri Kharon for the bug report, the original patch, + and testing. - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 6e652ceb18c615c578c869db300fa0756788b4e0 -Author: Lasse Collin -Date: 2023-01-10 00:33:14 +0200 - - Windows: Update INSTALL-MSVC.txt to recommend CMake over project files. - - windows/INSTALL-MSVC.txt | 19 ++++++++++++------- - 1 file changed, 12 insertions(+), 7 deletions(-) + CMakeLists.txt | 32 +++++++++++++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) -commit 6b117d3b1fe91eb26d533ab16a2e552f84148d47 -Author: Lasse Collin -Date: 2023-01-09 23:41:25 +0200 - - CMake: Fix windres issues again. - - At least on some systems, GNU windres needs --use-temp-file - in addition to the \x20 hack to avoid spaces in the command line - argument. Hovever, that \x20 syntax is broken with llvm-windres - version 15.0.0 (results in "XZx20Utils") but luckily it works - with a regular space. Thus it is best to limit the workarounds - to GNU toolchain on Windows. - - CMakeLists.txt | 35 +++++++++++++++++++++++------------ - 1 file changed, 23 insertions(+), 12 deletions(-) - -commit 0c210ca7f489e971e94e1ddc72b0b0806e3c7935 +commit 43521e77acc907863fa4f94aae276366172cb9ee Author: Lasse Collin Date: 2023-01-06 22:53:38 +0200 @@ -9160,7 +3332,7 @@ tests/test_filter_flags.c | 153 +++++++++++++++++++++++----------------------- 1 file changed, 78 insertions(+), 75 deletions(-) -commit 5c9fdd3bf53a9655f5eb2807d662b3af0d5e1865 +commit 6b44cead95d767414272dc3a67898a36bfdf95b3 Author: Jia Tan Date: 2022-12-29 23:33:33 +0800 @@ -9171,32 +3343,7 @@ tests/test_filter_flags.c | 655 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 457 insertions(+), 198 deletions(-) -commit 36edc65ab4cf10a131f239acbd423b4510ba52d5 -Author: Lasse Collin -Date: 2023-01-09 12:22:05 +0200 - - liblzma: CLMUL CRC64: Workaround a bug in MSVC (VS2015-2022). - - I haven't tested with MSVC myself and there doesn't seem to be - information about the problem online, so I'm relying on the bug report. - - Thanks to Iouri Kharon for the bug report and the patch. - - src/liblzma/check/crc64_fast.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit 790a12a95a78ff82d8c6d4efe3b789851ca9470d -Author: Lasse Collin -Date: 2023-01-09 11:27:24 +0200 - - CMake: Fix a copypaste error in xzdec Windows resource file handling. - - It was my mistake. Thanks to Iouri Kharon for the bug report. - - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 0e1545fea39c0514c7b7032a0a3592a9a33d2848 +commit 1bbefa9659b202ba31bd244a9d0e4f0d37ff3ed7 Author: Lasse Collin Date: 2023-01-08 00:32:29 +0200 @@ -9209,16 +3356,7 @@ tests/tuktest.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 69d5d78c6904668eb09a131da86276beec3281f8 -Author: Lasse Collin -Date: 2023-01-08 00:24:23 +0200 - - Update THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit dd38655f80c113c9db73b9ed370dc900e1c4dc41 +commit ce3a3fbc7c2c399aeed644d54f3bd56ac914dfee Author: Lasse Collin Date: 2023-01-07 21:57:11 +0200 @@ -9230,7 +3368,16 @@ CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit a890a637bee9193d5b690aefa9a59eba5b8532ae +commit 99fcd57f2ea35eaa94e09f674d5364329c880fa2 +Author: Lasse Collin +Date: 2023-01-08 00:24:23 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit c0c13d9d82eb8a4302c8bbb8b4c5178d285fe9ab Author: Lasse Collin Date: 2023-01-07 19:50:35 +0200 @@ -9239,7 +3386,18 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit 6e38e595dd56ac1800478cef1f6f754d0eba0d2e +commit 3d45987451b1c3bb42697b29341824c0e5484cba +Author: Lasse Collin +Date: 2023-01-09 11:27:24 +0200 + + CMake: Fix a copypaste error in xzdec Windows resource file handling. + + It was my mistake. Thanks to Iouri Kharon for the bug report. + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 706bce5018d7cf83094e13454a0731169ec119b5 Author: Lasse Collin Date: 2023-01-07 19:50:03 +0200 @@ -9253,18 +3411,21 @@ CMakeLists.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -commit 443dfebced041adc88f10d824188eeef5b5821a9 +commit e96dee55df04113c33b387ccdb6cb70935422d91 Author: Lasse Collin -Date: 2023-01-07 19:48:52 +0200 +Date: 2023-01-09 12:22:05 +0200 - CMake/Windows: Add a workaround for windres from GNU binutils. + liblzma: CLMUL CRC64: Workaround a bug in MSVC (VS2015-2022). - Thanks to Iouri Kharon for the bug report and the original patch. + I haven't tested with MSVC myself and there doesn't seem to be + information about the problem online, so I'm relying on the bug report. + + Thanks to Iouri Kharon for the bug report and the patch. - CMakeLists.txt | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) + src/liblzma/check/crc64_fast.c | 6 ++++++ + 1 file changed, 6 insertions(+) -commit ceb805011747d04a915f3f39e4bed9eed151c634 +commit 52bc1ee34dda9bb6fb40175e5952863066681b77 Author: Lasse Collin Date: 2023-01-07 19:31:15 +0200 @@ -9279,132 +3440,69 @@ configure.ac | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) -commit 8d372bd94066b1a5b0570b2550f83c2868486adf +commit bad44cfe19e8be8ae76755369be2a34abcd2b4fa Author: Jia Tan -Date: 2023-01-07 21:05:15 +0800 +Date: 2022-12-29 00:25:18 +0800 - CI/CD: Split CMake Linux and MacOS build phase to build and test. + Tests: Creates test_index_hash.c - The phase split was only done for Autotools before, so should also - apply to CMake. - - .github/workflows/ci.yml | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -commit 747c7f2b34bd498f6702c6875500a26b06201772 -Author: Jia Tan -Date: 2023-01-07 11:16:55 +0800 - - CI/CD: Reduce job runners to 4 instead of using matrix strategy. + Tests all API functions exported from index_hash.h. Does not have a + dedicated test for lzma_index_hash_end. - The old version used too many runners that resulted in unnecessary - dependency downloads. Now, the runners are reused for the different - configurations for each OS and build system. + [Minor edits were made by Lasse Collin.] - .github/workflows/ci.yml | 95 ++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 83 insertions(+), 12 deletions(-) + .gitignore | 1 + + CMakeLists.txt | 2 + + tests/Makefile.am | 3 + + tests/test_index_hash.c | 388 ++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 394 insertions(+) -commit 4de35fd6b58d46fc887c78faf163f6a37b790c45 +commit 692ccdf5516dfe55fb6e9c5cdfb31f4c02c1ecd1 Author: Jia Tan -Date: 2023-01-07 10:07:20 +0800 +Date: 2023-01-05 20:57:25 +0800 - CI/CD: Add new -p (PHASE) argument to ci_build.sh + liblzma: Remove common.h include from common/index.h. - The new PHASE argument can be build, test, or all. all is the default. - This way, the CI/CD script can differentiate between the build and test - phases to make it easier to track down errors when they happen. + common/index.h is needed by liblzma internally and tests. common.h will + include and define many things that are not needed by the tests. + + Also, this prevents include order problems because both common.h and + lzma.h define LZMA_API. On most platforms it results only in a warning + but on Windows it would break the build as the definition in common.h + must be used only for building liblzma itself. - build-aux/ci_build.sh | 140 +++++++++++++++++++++++++++----------------------- - 1 file changed, 76 insertions(+), 64 deletions(-) + src/liblzma/common/index.c | 1 + + src/liblzma/common/index.h | 9 +++++++-- + src/liblzma/common/index_decoder.h | 1 + + src/liblzma/common/stream_buffer_encoder.c | 1 + + 4 files changed, 10 insertions(+), 2 deletions(-) -commit 6fd39664de47801e670a16617863196bfbde4755 -Merge: 78e0561d fc0c7884 +commit 2ac7bafc8f07c1edefe96a4a7a040ddfff0eb5bb Author: Jia Tan -Date: 2023-01-07 00:10:50 +0800 +Date: 2022-08-17 20:20:16 +0800 - Merge pull request #7 from tukaani-project/tuktest_index_hash + liblzma: Add NULL check to lzma_index_hash_append. - Tuktest index hash - -commit fc0c788469159f634f09ff23c8cef6925c91da57 -Author: Lasse Collin -Date: 2023-01-06 17:58:48 +0200 - - Tests: test_index_hash: Add an assert_uint_eq(). - - tests/test_index_hash.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit d550304f5343b3a082da265107cd820e0d81dc71 -Author: Lasse Collin -Date: 2023-01-06 17:55:06 +0200 - - Tests: test_index_hash: Fix a memory leak. - - tests/test_index_hash.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit 02608f74ea1f2d2d56585711ff241c34b4ad0937 -Author: Lasse Collin -Date: 2023-01-06 17:53:03 +0200 - - Tests: test_index_hash: Don't treat pointers as booleans. - - tests/test_index_hash.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 056766c8601a3808bea1761f6cc833197a35a3e0 -Author: Lasse Collin -Date: 2023-01-06 17:51:41 +0200 - - Tests: test_index_hash: Fix a typo in a comment. + This is for consistency with lzma_index_append. - tests/test_index_hash.c | 2 +- + src/liblzma/common/index_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 873e684028ba9738f071c5236db7d452ed797b4c -Author: Lasse Collin -Date: 2023-01-06 17:44:29 +0200 - - Tests: test_index_hash: Avoid the variable name "index". - - It can trigger warnings from -Wshadow on some systems. - - tests/test_index_hash.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -commit d1f24c35874eeba8432d75aa77b06c50375ed937 -Author: Lasse Collin -Date: 2023-01-06 17:35:50 +0200 - - Tests: test_index_hash: Use the word "Record" instead of "entry". - - tests/test_index_hash.c | 102 ++++++++++++++++++++++++------------------------ - 1 file changed, 51 insertions(+), 51 deletions(-) - -commit b93f7c5cbb02b42024ac866fc0af541de3d816e2 -Author: Lasse Collin -Date: 2023-01-06 17:35:05 +0200 - - Tests: test_index_hash: Tweak comments and style. - - The words defined in the .xz file format specification - begin with capital letter to emphasize that they have - a specific meaning. - - tests/test_index_hash.c | 62 ++++++++++++++++++++++++++----------------------- - 1 file changed, 33 insertions(+), 29 deletions(-) - -commit c48b24fc06d98569adb72f13c2e8e5ff30bb8036 -Author: Lasse Collin -Date: 2023-01-06 17:17:37 +0200 +commit db714d30e0c74d1dd4af1a23ed62b44e0e8e4efc +Author: Jia Tan +Date: 2022-08-17 17:59:51 +0800 - Tests: test_index_hash: Use INDEX_INDICATOR constant instead of 0. + liblzma: Replaced hardcoded 0x0 index indicator byte with macro - tests/test_index_hash.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/liblzma/common/index.h | 3 +++ + src/liblzma/common/index_decoder.c | 2 +- + src/liblzma/common/index_encoder.c | 2 +- + src/liblzma/common/index_hash.c | 2 +- + src/liblzma/common/stream_decoder.c | 3 ++- + src/liblzma/common/stream_decoder_mt.c | 2 +- + 6 files changed, 9 insertions(+), 5 deletions(-) -commit 78e0561dfebaa9d5e34558de537efcda890e0629 +commit 39d2585dcd3e827cfc3c46025ab6708c4aeb36c6 Author: Jia Tan Date: 2023-01-06 20:43:31 +0800 @@ -9413,7 +3511,7 @@ src/common/mythread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit e834e1e934ed0af673598d8c0c34afb2af56bee0 +commit 3f0130aa288e4ed57ace609517db9700a41223af Author: Jia Tan Date: 2023-01-06 20:35:55 +0800 @@ -9430,24 +3528,7 @@ windows/vs2019/liblzma_dll.vcxproj | 1 + 6 files changed, 6 insertions(+) -commit 84f9687cbae972c2c342e10bf69f8ec8f70ae111 -Author: Jia Tan -Date: 2023-01-05 20:57:25 +0800 - - liblzma: Remove common.h include from common/index.h. - - common/index.h is needed by liblzma internally and tests. common.h will - include and define many things that are not needed by the tests. Also, - this prevents include order problems because common.h will redefine - LZMA_API resulting in a warning. - - src/liblzma/common/index.c | 1 + - src/liblzma/common/index.h | 9 +++++++-- - src/liblzma/common/index_decoder.h | 1 + - src/liblzma/common/stream_buffer_encoder.c | 1 + - 4 files changed, 10 insertions(+), 2 deletions(-) - -commit 7657ce1c3c4abff7560336a7b687d98e0e2bd14f +commit f204d1050a515d17851eed9049862ce5a9c729c1 Author: Lasse Collin Date: 2023-01-04 22:40:54 +0200 @@ -9456,7 +3537,7 @@ THANKS | 1 + 1 file changed, 1 insertion(+) -commit aafd67fba045ab99683971263a5a26fb2a6e8ce2 +commit 34a9c2d650d6c30bd88e1b21910dd863209aa884 Author: Lasse Collin Date: 2023-01-04 18:40:28 +0200 @@ -9465,7 +3546,7 @@ tests/test_compress.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -commit 52380678f42364daa4510f92f6d3b18ec98c3638 +commit 761c208d58e0c3daa0f46e68b406adfc318d2a46 Author: Jia Tan Date: 2023-01-04 23:58:58 +0800 @@ -9481,7 +3562,7 @@ tests/test_compress_prepared_bcj_x86 | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) -commit d0eb345bb7d148a62883ee299adec2b74a0f6f3b +commit 8a7cbc074547e55e57f4f3696f69bedeb05e14c4 Author: Jia Tan Date: 2023-01-03 21:02:38 +0800 @@ -9493,7 +3574,7 @@ po4a/po4a.conf | 2 +- 2 files changed, 5553 insertions(+), 1 deletion(-) -commit c4145978d95ebf1690c778d354e15f7c2823d7a8 +commit ca2af49bb8be5995eb0e6a3abf457622626d49a7 Author: Jia Tan Date: 2023-01-03 20:47:27 +0800 @@ -9502,24 +3583,7 @@ po/eo.po | 620 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 332 insertions(+), 288 deletions(-) -commit 4103a2e78ac60b00c888485cd967a5fe5d1b917c -Author: Lasse Collin -Date: 2023-01-02 17:20:47 +0200 - - Bump version and soname for 5.5.0alpha. - - 5.5.0alpha won't be released, it's just to mark that - the branch is not for stable 5.4.x. - - Once again there is no API/ABI stability for new features - in devel versions. The major soname won't be bumped even - if API/ABI of new features breaks between devel releases. - - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/version.h | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 73c9e6d6b970ccc3d5ad61dcaa21cba050e5df0a +commit bfba3394aed03311fe9a746d3141b2e16d8b9325 Author: Lasse Collin Date: 2023-01-02 17:05:07 +0200 @@ -9529,7 +3593,7 @@ m4/tuklib_progname.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -commit bb740e3b117f1a3c65152d01e5755523a908ecb1 +commit 507648ad114c2ae0cd6d181063e1ac07e8106718 Author: Jia Tan Date: 2023-01-02 22:33:48 +0800 @@ -9548,55 +3612,7 @@ src/common/tuklib_progname.h | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) -commit 064cd385a716abc78d93a3612411a82d69ceb221 -Author: Jia Tan -Date: 2022-12-29 00:30:52 +0800 - - Adds test_index_hash to .gitignore. - - .gitignore | 1 + - 1 file changed, 1 insertion(+) - -commit 3959162baec074511d83ba0fec1284c3ed724799 -Author: Jia Tan -Date: 2022-12-29 00:25:18 +0800 - - Tests: Creates test_index_hash.c - - Tests all API functions exported from index_hash.h. Does not have a - dedicated test for lzma_index_hash_end. - - CMakeLists.txt | 2 + - tests/Makefile.am | 3 + - tests/test_index_hash.c | 379 ++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 384 insertions(+) - -commit f16e12d5e755d371247202fcccbcccd1ec16b2cf -Author: Jia Tan -Date: 2022-08-17 20:20:16 +0800 - - liblzma: Add NULL check to lzma_index_hash_append. - - This is for consistency with lzma_index_append. - - src/liblzma/common/index_hash.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 203b008eb220208981902e0db541c02d1c1c9f5e -Author: Jia Tan -Date: 2022-08-17 17:59:51 +0800 - - liblzma: Replaced hardcoded 0x0 index indicator byte with macro - - src/liblzma/common/index.h | 3 +++ - src/liblzma/common/index_decoder.c | 2 +- - src/liblzma/common/index_encoder.c | 2 +- - src/liblzma/common/index_hash.c | 2 +- - src/liblzma/common/stream_decoder.c | 3 ++- - src/liblzma/common/stream_decoder_mt.c | 2 +- - 6 files changed, 9 insertions(+), 5 deletions(-) - -commit dfecda875211f737d0db92dc1d3c58a3a2afb0c0 +commit ab5229d32adfec1f3fbc95228d9dd6f560732ab5 Author: Lasse Collin Date: 2022-12-30 20:10:08 +0200 @@ -9605,7 +3621,7 @@ tests/test_check.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -commit ce96bb20435212fe797d6d84738fb9fd4ea13cc7 +commit 8791826f31733fda0a13b411c2ed930faaeb25aa Author: Lasse Collin Date: 2022-12-30 19:36:49 +0200 @@ -9614,7 +3630,7 @@ tests/test_lzip_decoder.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -commit 2fcba17fc4d7eda8fc60567169cf2a0e6fcfb2f8 +commit c410d812ea12bfc74f6b727c1a799478c79f19ca Author: Jia Tan Date: 2022-12-29 01:55:19 +0800 @@ -9625,7 +3641,7 @@ src/xz/mytime.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -commit f82294c8318a7a0990583d51ac5c7de682ad36ef +commit 501c6013d4a59fae5d4368e9657c4885493db809 Author: Jia Tan Date: 2022-12-29 01:15:27 +0800 @@ -9638,7 +3654,7 @@ src/common/mythread.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -commit 74dae7d30091e906d6a92a57952dea4354473f9b +commit 9e3cb514b5b95bd235dcdff3db4436f57444ee4f Author: Jia Tan Date: 2022-12-29 01:10:53 +0800 @@ -9657,7 +3673,7 @@ src/xz/mytime.c | 5 ++--- 4 files changed, 11 insertions(+), 11 deletions(-) -commit 7339e39dc060df6eda74a2c5b69961befc3d5d24 +commit 6fc3e5467911572fa9af4021ea46396261aae796 Author: Jia Tan Date: 2022-12-28 01:14:07 +0800 @@ -9669,22 +3685,7 @@ po4a/uk.po | 3676 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3677 insertions(+), 1 deletion(-) -commit 9f05c27a58ce8cd7803079aa295e41c24665ce6e -Author: Jia Tan -Date: 2022-12-23 00:34:48 +0800 - - CI/CD: Create initial version of CI/CD workflow. - - The CI/CD workflow will only execute on Ubuntu and MacOS latest version. - The workflow will attempt to build with autotools and CMake and execute - the tests. The workflow will run for all pull requests and pushes done - to the master branch. - - .github/workflows/ci.yml | 72 ++++++++++++++++++++++++ - build-aux/ci_build.sh | 141 +++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 213 insertions(+) - -commit 1275ebfba74230dbd028049141423c79c8b83b8f +commit e84f2ab7f8bc38cd8f8befa0bb398656c3c11f8e Author: Jia Tan Date: 2022-12-22 23:14:53 +0800 @@ -9693,7 +3694,7 @@ src/liblzma/common/filter_encoder.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -commit 7c9ff5f1667a16733163b75dfd4b509662c387f4 +commit b14b8dbba9a3b232787ae218b46430b9246383dd Author: Jia Tan Date: 2022-12-21 21:12:03 +0800 @@ -9704,7 +3705,7 @@ tests/test_lzip_decoder.c | 471 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 474 insertions(+) -commit 799ead162de63b8400733603d3abcd2e1977bdca +commit 09a114805e1d4f9a02a06cee7dbf2f5014d1f710 Author: Jia Cheong Tan Date: 2022-12-20 22:05:21 +0800 @@ -9716,7 +3717,7 @@ .gitignore | 2 ++ 1 file changed, 2 insertions(+) -commit 5f7ce42a16b1e86ca8408b5c670c25e2a12acc4e +commit d3e6fe44196bf9478ad193522e2b48febf2eca6b Author: Jia Tan Date: 2022-12-20 20:46:44 +0800 @@ -9730,7 +3731,16 @@ src/liblzma/common/microlzma_encoder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit 8ace358d65059152d9a1f43f4770170d29d35754 +commit b55a27b46f52524a4a8d9cdef03e6689cefc1375 +Author: Lasse Collin +Date: 2022-12-16 18:30:02 +0200 + + liblzma: Update authors list in arm64.c. + + src/liblzma/simple/arm64.c | 1 + + 1 file changed, 1 insertion(+) + +commit 2fd28d2b7cec3468324a6f15eff7e73c285b1d7d Author: Jia Tan Date: 2022-12-16 20:58:55 +0800 @@ -9742,15 +3752,6 @@ .gitignore | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -commit 8fd225a2c149f30aeac377e68eb5abf6b28300ad -Author: Lasse Collin -Date: 2022-12-16 18:30:02 +0200 - - liblzma: Update authors list in arm64.c. - - src/liblzma/simple/arm64.c | 1 + - 1 file changed, 1 insertion(+) - commit b69da6d4bb6bb11fc0cf066920791990d2b22a06 Author: Lasse Collin Date: 2022-12-13 20:37:17 +0200 @@ -9762,3 +3763,7994 @@ src/liblzma/liblzma_generic.map | 2 +- src/liblzma/liblzma_linux.map | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) + +commit 20869eb3fb280ff4f271ef527b12b6bf68b05e19 +Author: Lasse Collin +Date: 2022-12-13 20:29:39 +0200 + + Update INSTALL: CMake on Windows isn't experimental anymore. + + Using CMake to build liblzma should work on a few other OSes + but building the command line tools is still subtly broken. + + It is known that shared library versioning may differ between + CMake and Libtool builds on some OSes, most notably Darwin. + + INSTALL | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit cbbd84451944e3e8c63acfaa3c923f6d8aff7852 +Author: Lasse Collin +Date: 2022-12-13 19:47:53 +0200 + + Add NEWS for 5.4.0. + + NEWS | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 202 insertions(+) + +commit c3e94d37e8d10a3e96019864b6f5d7b578db2c14 +Author: Lasse Collin +Date: 2022-12-13 17:41:20 +0200 + + Fix a typo in NEWS. + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0d2a2e0a545c3da2b3e9500f1e531eb903087245 +Author: Lasse Collin +Date: 2022-12-13 17:41:03 +0200 + + Add NEWS for 5.2.10. + + NEWS | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 177ece1c8eb007188fb1b04eff09ca2193fbdea6 +Author: Lasse Collin +Date: 2022-12-13 12:30:45 +0200 + + Tests: Fix a typo in tests/files/README. + + tests/files/README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 60f45bdbaa6b07558b3f4baac285739b0c6342f5 +Author: Lasse Collin +Date: 2022-12-13 12:30:09 +0200 + + Tests: Add two ARM64 test files. + + tests/files/README | 7 +++++++ + tests/files/good-1-arm64-lzma2-1.xz | Bin 0 -> 512 bytes + tests/files/good-1-arm64-lzma2-2.xz | Bin 0 -> 488 bytes + tests/test_files.sh | 5 +++++ + 4 files changed, 12 insertions(+) + +commit f5e419550619c548c7c35d7e367cf00580a56521 +Author: Lasse Collin +Date: 2022-12-12 22:44:21 +0200 + + Translations: Update the Catalan translation. + + po/ca.po | 657 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 306 insertions(+), 351 deletions(-) + +commit 0fb9d355da3789b1757040af475b4e6bbc8b8af8 +Author: Lasse Collin +Date: 2022-12-12 19:18:12 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit e5b6c161c61a37c54dcb76a99bbb83ac4abe02dc +Author: Lasse Collin +Date: 2022-12-12 19:07:58 +0200 + + Update AUTHORS. + + AUTHORS | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit f2d98e691099d82054d5f3071ef6f5e809932e44 +Author: Lasse Collin +Date: 2022-12-12 15:31:14 +0200 + + Docs: Omit multi-threaded decompress from TODO. + + The TODO file outdated still. + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit b42908c42a4cc091db45a7e5ba0e0ecceaa3f6da +Author: Lasse Collin +Date: 2022-12-11 21:16:09 +0200 + + Docs: Update xz-file-format.txt to 1.1.0 for ARM64 filter. + + doc/xz-file-format.txt | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) + +commit 854f2f5946b353cb0963fd6dfd54d363adc89b9f +Author: Lasse Collin +Date: 2022-12-11 21:13:57 +0200 + + xz: Rename --experimental-arm64 to --arm64. + + src/xz/args.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 31dbd1e5fb65831915a7bbb531c3f19aea8d57a5 +Author: Lasse Collin +Date: 2022-12-11 21:13:06 +0200 + + liblzma: Change LZMA_FILTER_ARM64 to the official Filter ID 0x0A. + + src/liblzma/api/lzma/bcj.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 01b3549e523edac899ec4925b282ceddd20da116 +Author: Lasse Collin +Date: 2022-12-08 19:24:22 +0200 + + xz: Make args_info.files_name a const pointer. + + src/xz/args.c | 2 +- + src/xz/args.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bc665b84ea6bf7946394a08122177efe41b26a5f +Author: Lasse Collin +Date: 2022-12-08 19:18:16 +0200 + + xz: Don't modify argv[]. + + The code that parses --memlimit options and --block-list modified + the argv[] when parsing the option string from optarg. This was + visible in "ps auxf" and such and could be confusing. I didn't + understand it back in the day when I wrote that code. Now a copy + is allocated when modifiable strings are needed. + + src/xz/args.c | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +commit a13064e1c290de7933db72b6dffbd65cfce59c9f +Author: Lasse Collin +Date: 2022-12-08 18:18:57 +0200 + + Translations: Update the German man page translations. + + po4a/de.po | 4570 ++++++++++++++++++------------------------------------------ + 1 file changed, 1374 insertions(+), 3196 deletions(-) + +commit 8bdbe42a8d0d75dff70206b923fc4bce5c69a40a +Author: Jia Tan +Date: 2022-12-06 23:05:56 +0800 + + Translations: Update the German translation. + + po/de.po | 586 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 315 insertions(+), 271 deletions(-) + +commit 5c304b57c24ef40ff57f864301065f0244c05bde +Author: Jia Tan +Date: 2022-12-06 23:04:25 +0800 + + Translations: Update the Turkish translation. + + po/tr.po | 221 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 108 insertions(+), 113 deletions(-) + +commit 6d86781fdb937970486500447ebb49b98244235b +Author: Jia Tan +Date: 2022-12-06 23:02:11 +0800 + + Translations: Update the Croatian translation. + + po/hr.po | 228 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 113 insertions(+), 115 deletions(-) + +commit 7a5b4b8075eb36026b1796f04ffed5830c42396a +Author: Jia Tan +Date: 2022-12-06 22:56:30 +0800 + + Translations: Add Romanian translation of man pages. + + Thanks to Remus-Gabriel Chelu. + + po4a/po4a.conf | 2 +- + po4a/ro.po | 3692 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 3693 insertions(+), 1 deletion(-) + +commit c6977e7400088177556e8771bcb839eb7d90caa3 +Author: Jia Tan +Date: 2022-12-06 22:52:13 +0800 + + Translations: Update the Romanian translation. + + po/ro.po | 294 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 147 insertions(+), 147 deletions(-) + +commit ac2a747e939c2cbccff7a49c399769af5e02d2ab +Author: Lasse Collin +Date: 2022-12-08 17:30:09 +0200 + + liblzma: Check for unexpected NULL pointers in block_header_decode(). + + The API docs gave an impression that such checks are done + but they actually weren't done. In practice it made little + difference since the calling code has a bug if these are NULL. + + Thanks to Jia Tan for the original patch that checked for + block->filters == NULL. + + src/liblzma/common/block_header_decoder.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 24790f49ae66938c1c7574315e1c0aba1ed5ed25 +Author: Lasse Collin +Date: 2022-12-01 20:59:32 +0200 + + Bump version number for 5.3.5beta. + + This also sorts the symbol names alphabetically in liblzma_*.map. + + src/liblzma/api/lzma/version.h | 4 ++-- + src/liblzma/liblzma_generic.map | 10 +++++----- + src/liblzma/liblzma_linux.map | 10 +++++----- + 3 files changed, 12 insertions(+), 12 deletions(-) + +commit 7e53c5bcb3c2c17f47c096c06ff6b1481e6ecafa +Author: Lasse Collin +Date: 2022-12-01 20:57:26 +0200 + + Add NEWS for 5.3.5beta. + + NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) + +commit 5865f2aaac326fcbd9f8a7d62defa230e4cb644e +Author: Lasse Collin +Date: 2022-12-01 20:57:09 +0200 + + Update THANKS. + + THANKS | 3 +++ + 1 file changed, 3 insertions(+) + +commit 62b270988ec67314d69976df484d2974c6eacfda +Author: Lasse Collin +Date: 2022-12-01 20:04:17 +0200 + + liblzma: Use __has_attribute(__symver__) to fix Clang detection. + + If someone sets up Clang to define __GNUC__ to 10 or greater + then symvers broke. __has_attribute is supported by such GCC + and Clang versions that don't support __symver__ so this should + be much better and simpler way to detect if __symver__ is + actually supported. + + Thanks to Tomasz Gajc for the bug report. + + src/liblzma/common/common.h | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit f9ca7d45162664ddd9fb70e19335c2426e5d75bb +Author: Lasse Collin +Date: 2022-12-01 18:51:52 +0200 + + liblzma: Omit zero-skipping from ARM64 filter. + + It has some complicated downsides and its usefulness is more limited + than I originally thought. So this change is bad for certain very + specific situations but a generic solution that works for other + filters (and is otherwise better too) is planned anyway. And this + way 7-Zip can use the same compatible filter for the .7z format. + + This is still marked as experimental with a new temporary Filter ID. + + src/liblzma/api/lzma/bcj.h | 2 +- + src/liblzma/simple/arm64.c | 81 +++++++++++++--------------------------------- + 2 files changed, 24 insertions(+), 59 deletions(-) + +commit 5baec3f0a9c85e6abf45c0f652f699b074129a8b +Author: Lasse Collin +Date: 2022-12-01 18:13:27 +0200 + + xz: Omit the special notes about ARM64 filter on the man page. + + src/xz/xz.1 | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 0c3627b51862eb0dcdd4fc283d046250571991c6 +Author: Lasse Collin +Date: 2022-12-01 18:12:03 +0200 + + liblzma: Don't be over-specific in lzma_str_to_filters API doc. + + src/liblzma/api/lzma/filter.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 94adf057f27b1970f493dc99cd166407d7255639 +Author: Lasse Collin +Date: 2022-12-01 17:54:23 +0200 + + liblzma: Silence unused variable warning when BCJ filters are disabled. + + Thanks to Jia Tan for the original patch. + + src/liblzma/common/string_conversion.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit c68af4441744e5ffc41a472e1be9c9d53a1d9780 +Author: Lasse Collin +Date: 2022-12-01 17:38:03 +0200 + + Translations: Update the Chinese (simplified) translation. + + po/zh_CN.po | 608 ++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 348 insertions(+), 260 deletions(-) + +commit 3be6942e5c27d29995d41da52fbe274e4ce4a537 +Author: Lasse Collin +Date: 2022-11-30 18:55:03 +0200 + + Add NEWS for 5.2.9. + + NEWS | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 7c16e312cb2f40b81154c0e5be13a3c6b8da485d +Author: Jia Tan +Date: 2022-11-30 23:33:08 +0800 + + xz: Remove message_filters_to_str function prototype from message.h. + + This was forgotten from 7484744af6cbabe81e92af7d9e061dfd597fff7b. + + src/xz/message.h | 16 ---------------- + 1 file changed, 16 deletions(-) + +commit 764955e2d4f2a5e8d6d6fec63af694f799e050e7 +Author: Lasse Collin +Date: 2022-11-30 18:08:34 +0200 + + Change the bug report address. + + It forwards to me and Jia Tan. + + Also update the IRC reference in README as #tukaani was moved + to Libera Chat long ago. + + CMakeLists.txt | 2 +- + README | 11 +++++------ + configure.ac | 2 +- + dos/config.h | 2 +- + windows/README-Windows.txt | 2 +- + 5 files changed, 9 insertions(+), 10 deletions(-) + +commit c21983c76031e01da01ad3c6cc716fe4b8a75070 +Author: Lasse Collin +Date: 2022-11-30 17:50:17 +0200 + + Build: Add string_conversion.c to CMake, DOS, and VS files. + + CMakeLists.txt | 1 + + dos/Makefile | 1 + + windows/vs2013/liblzma.vcxproj | 1 + + windows/vs2013/liblzma_dll.vcxproj | 1 + + windows/vs2017/liblzma.vcxproj | 1 + + windows/vs2017/liblzma_dll.vcxproj | 1 + + windows/vs2019/liblzma.vcxproj | 1 + + windows/vs2019/liblzma_dll.vcxproj | 1 + + 8 files changed, 8 insertions(+) + +commit 30be0c35d24eb5175459d69dbf7d92e2b087ef82 +Author: Lasse Collin +Date: 2022-11-30 17:38:32 +0200 + + Update to HTTPS URLs in AUTHORS. + + AUTHORS | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0a72b9ca2fe20082da9b7128fe0d908af947a851 +Author: Jia Tan +Date: 2022-11-30 00:52:06 +0800 + + liblzma: Improve documentation for string to filter functions. + + src/liblzma/api/lzma/filter.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit a6e21fcede3b196160a52dd294d965c508a4bb33 +Author: Lasse Collin +Date: 2022-11-29 22:27:42 +0200 + + liblzma: Two fixes to lzma_str_list_filters() API docs. + + Thanks to Jia Tan. + + src/liblzma/api/lzma/filter.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 7484744af6cbabe81e92af7d9e061dfd597fff7b +Author: Lasse Collin +Date: 2022-11-28 21:57:47 +0200 + + xz: Use lzma_str_from_filters(). + + Two uses: Displaying encoder filter chain when compressing with -vv, + and displaying the decoder filter chain in --list -vv. + + src/xz/list.c | 28 ++++++--- + src/xz/message.c | 175 +++---------------------------------------------------- + 2 files changed, 28 insertions(+), 175 deletions(-) + +commit cedeeca2ea6ada5b0411b2ae10d7a859e837f203 +Author: Lasse Collin +Date: 2022-11-28 21:37:48 +0200 + + liblzma: Add lzma_str_to_filters, _from_filters, and _list_filters. + + lzma_str_to_filters() uses static error messages which makes + them not very precise. It tells the position in the string + where an error occurred though which helps quite a bit if + applications take advantage of it. Dynamic error messages can + be added later with a new flag if it seems important enough. + + src/liblzma/api/lzma/filter.h | 258 +++++++ + src/liblzma/common/Makefile.inc | 1 + + src/liblzma/common/string_conversion.c | 1302 ++++++++++++++++++++++++++++++++ + src/liblzma/liblzma_generic.map | 3 + + src/liblzma/liblzma_linux.map | 3 + + 5 files changed, 1567 insertions(+) + +commit 072ebf7b1335421193ffa9d4a70d5533786b8995 +Author: Lasse Collin +Date: 2022-11-28 21:02:19 +0200 + + liblzma: Make lzma_validate_chain() available outside filter_common.c. + + src/liblzma/common/filter_common.c | 8 ++++---- + src/liblzma/common/filter_common.h | 3 +++ + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit 5f22bd2d37e3bd01a5d701b51750eb51f09c11bf +Author: Lasse Collin +Date: 2022-11-28 10:51:03 +0200 + + liblzma: Remove lzma_lz_decoder_uncompressed() as it's now unused. + + src/liblzma/lz/lz_decoder.c | 14 -------------- + src/liblzma/lz/lz_decoder.h | 3 --- + 2 files changed, 17 deletions(-) + +commit cee83206465b95729ab649aa2f57fdbde8dcaf89 +Author: Lasse Collin +Date: 2022-11-28 10:48:53 +0200 + + liblzma: Use LZMA1EXT feature in lzma_microlzma_decoder(). + + Here too this avoids the slightly ugly method to set + the uncompressed size. + + Also moved the setting of dict_size to the struct initializer. + + src/liblzma/common/microlzma_decoder.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit e310e8b6a490dfb468f4ed68feff246d776b323c +Author: Lasse Collin +Date: 2022-11-28 10:28:20 +0200 + + liblzma: Use LZMA1EXT feature in lzma_alone_decoder(). + + This avoids the need to use the slightly ugly method to + set the uncompressed size. + + src/liblzma/common/alone_decoder.c | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit 33b8a24b6646a9dbfd8358405aec466b13078559 +Author: Lasse Collin +Date: 2022-11-27 23:16:21 +0200 + + liblzma: Add LZMA_FILTER_LZMA1EXT to support LZMA1 without end marker. + + Some file formats need support for LZMA1 streams that don't use + the end of payload marker (EOPM) alias end of stream (EOS) marker. + So far liblzma API has supported decompressing such streams via + lzma_alone_decoder() when .lzma header specifies a known + uncompressed size. Encoding support hasn't been available in the API. + + Instead of adding a new LZMA1-only API for this purpose, this commit + adds a new filter ID for use with raw encoder and decoder. The main + benefit of this approach is that then also filter chains are possible, + for example, if someone wants to implement support for .7z files that + use the x86 BCJ filter with LZMA1 (not BCJ2 as that isn't supported + in liblzma). + + src/liblzma/api/lzma/lzma12.h | 123 ++++++++++++++++++++++++++++++-- + src/liblzma/common/filter_common.c | 7 ++ + src/liblzma/common/filter_decoder.c | 6 ++ + src/liblzma/common/filter_encoder.c | 9 +++ + src/liblzma/lzma/lzma2_encoder.c | 2 +- + src/liblzma/lzma/lzma_decoder.c | 26 ++++++- + src/liblzma/lzma/lzma_encoder.c | 40 +++++++++-- + src/liblzma/lzma/lzma_encoder.h | 3 +- + src/liblzma/lzma/lzma_encoder_private.h | 3 + + 9 files changed, 204 insertions(+), 15 deletions(-) + +commit 9a304bf1e45b3ddf61aaeaa7c764915b34618ede +Author: Lasse Collin +Date: 2022-11-27 18:43:07 +0200 + + liblzma: Avoid unneeded use of void pointer in LZMA decoder. + + src/liblzma/lzma/lzma_decoder.c | 3 +-- + src/liblzma/lzma/lzma_decoder.h | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 218394958c7683f892275bb40eae880620feebcc +Author: Lasse Collin +Date: 2022-11-27 18:20:33 +0200 + + liblzma: Pass the Filter ID to LZ encoder and decoder. + + This allows using two Filter IDs with the same + initialization function and data structures. + + src/liblzma/common/alone_decoder.c | 1 + + src/liblzma/common/alone_encoder.c | 1 + + src/liblzma/common/common.h | 7 +++++-- + src/liblzma/common/lzip_decoder.c | 1 + + src/liblzma/common/microlzma_decoder.c | 1 + + src/liblzma/common/microlzma_encoder.c | 1 + + src/liblzma/lz/lz_decoder.c | 5 +++-- + src/liblzma/lz/lz_decoder.h | 3 ++- + src/liblzma/lz/lz_encoder.c | 5 +++-- + src/liblzma/lz/lz_encoder.h | 3 ++- + src/liblzma/lzma/lzma2_decoder.c | 3 ++- + src/liblzma/lzma/lzma2_encoder.c | 3 ++- + src/liblzma/lzma/lzma_decoder.c | 2 +- + src/liblzma/lzma/lzma_encoder.c | 2 +- + 14 files changed, 26 insertions(+), 12 deletions(-) + +commit 1663c7676b76f4c514031797f3db1896e8100f7f +Author: Lasse Collin +Date: 2022-11-27 01:03:16 +0200 + + liblzma: Remove two FIXME comments. + + src/liblzma/common/filter_encoder.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 11fe708db783ac36ebeeb85da164e29e8c300910 +Author: Lasse Collin +Date: 2022-11-26 22:25:30 +0200 + + xz: Use lzma_filters_free(). + + src/xz/list.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit e782af9110d8499c7ac2929bc871540eefea5ea1 +Author: Lasse Collin +Date: 2022-11-26 22:21:13 +0200 + + liblzma: Use lzma_filters_free() in more places. + + src/liblzma/common/block_header_decoder.c | 20 ++------------------ + src/liblzma/common/stream_decoder.c | 4 +--- + src/liblzma/common/stream_decoder_mt.c | 22 +++++----------------- + 3 files changed, 8 insertions(+), 38 deletions(-) + +commit 90caaded2dc6db1d6a55b01160d7e87f4a423628 +Author: Lasse Collin +Date: 2022-11-25 18:04:37 +0200 + + liblzma: Omit simple coder init functions if they are disabled. + + src/liblzma/simple/arm.c | 4 ++++ + src/liblzma/simple/armthumb.c | 4 ++++ + src/liblzma/simple/ia64.c | 4 ++++ + src/liblzma/simple/powerpc.c | 4 ++++ + src/liblzma/simple/sparc.c | 4 ++++ + src/liblzma/simple/x86.c | 4 ++++ + 6 files changed, 24 insertions(+) + +commit 5cd9f0df78cc4f8a7807bf6104adea13034fbb45 +Author: Lasse Collin +Date: 2022-11-24 23:24:59 +0200 + + xz: Allow nice_len 2 and 3 even if match finder requires 3 or 4. + + Now that liblzma accepts these, we avoid the extra check and + there's one message less for translators too. + + src/xz/options.c | 5 ----- + 1 file changed, 5 deletions(-) + +commit 3be88ae071371caa279b44e13f4836fb178fe4ae +Author: Lasse Collin +Date: 2022-11-24 23:23:55 +0200 + + liblzma: Allow nice_len 2 and 3 even if match finder requires 3 or 4. + + That is, if the specified nice_len is smaller than the minimum + of the match finder, silently use the match finder's minimum value + instead of reporting an error. The old behavior is annoying to users + and it complicates xz options handling too. + + src/liblzma/lz/lz_encoder.c | 14 +++++++++----- + src/liblzma/lz/lz_encoder.h | 9 +++++++++ + src/liblzma/lzma/lzma_encoder.c | 11 ++++++++--- + 3 files changed, 26 insertions(+), 8 deletions(-) + +commit 93439cfafe1768b3b18d67d2356ef7e7559bba59 +Author: Lasse Collin +Date: 2022-11-24 16:25:10 +0200 + + liblzma: Add lzma_filters_update() support to the multi-threaded encoder. + + A tiny downside of this is that now a 1-4 tiny allocations are made + for every Block because each worker thread needs its own copy of + the filter chain. + + src/liblzma/api/lzma/filter.h | 36 +++++++------ + src/liblzma/common/stream_encoder_mt.c | 96 +++++++++++++++++++++++++++++++--- + 2 files changed, 109 insertions(+), 23 deletions(-) + +commit 17ac51e689794eb41cab3e80946fec689caea2d2 +Author: Lasse Collin +Date: 2022-11-24 14:53:22 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 06824396b2b6c84f3a235cb7c19c2a9701167797 +Author: Lasse Collin +Date: 2022-11-24 14:52:44 +0200 + + Build: Don't put GNU/Linux-specific symbol versions into static liblzma. + + It not only makes no sense to put symbol versions into a static library + but it can also cause breakage. + + By default Libtool #defines PIC if building a shared library and + doesn't define it for static libraries. This is documented in the + Libtool manual. It can be overriden using --with-pic or --without-pic. + configure.ac detects if --with-pic or --without-pic is used and then + gives an error if neither --disable-shared nor --disable-static was + used at the same time. Thus, in normal situations it works to build + both shared and static library at the same time on GNU/Linux, + only --with-pic or --without-pic requires that only one type of + library is built. + + Thanks to John Paul Adrian Glaubitz from Debian for reporting + the problem that occurred on ia64: + https://www.mail-archive.com/xz-devel@tukaani.org/msg00610.html + + CMakeLists.txt | 5 +- + configure.ac | 143 +++++++++++++++++++++++++++++--------------- + src/liblzma/common/common.h | 12 ++++ + 3 files changed, 111 insertions(+), 49 deletions(-) + +commit e1acf7107291f8b3d6d609a7133331ff36d35d14 +Author: Lasse Collin +Date: 2022-11-24 01:32:16 +0200 + + liblzma: Refactor to use lzma_filters_free(). + + lzma_filters_free() sets the options to NULL and ids to + LZMA_VLI_UNKNOWN so there is no need to do it by caller; + the filter arrays will always be left in a safe state. + + Also use memcpy() instead of a loop to copy a filter chain + when it is known to be safe to copy LZMA_FILTERS_MAX + 1 + (even if the elements past the terminator might be uninitialized). + + src/liblzma/common/stream_encoder.c | 16 ++++------------ + src/liblzma/common/stream_encoder_mt.c | 11 ++--------- + 2 files changed, 6 insertions(+), 21 deletions(-) + +commit cb05dbcf8b868441ec805016222f3fd77f1c5caa +Author: Lasse Collin +Date: 2022-11-24 01:26:37 +0200 + + liblzma: Fix another invalid free() after memory allocation failure. + + This time it can happen when lzma_stream_encoder_mt() is used + to reinitialize an existing multi-threaded Stream encoder + and one of 1-4 tiny allocations in lzma_filters_copy() fail. + + It's very similar to the previous bug + 10430fbf3820dafd4eafd38ec8be161a6978ed2b, happening with + an array of lzma_filter structures whose old options are freed + but the replacement never arrives due to a memory allocation + failure in lzma_filters_copy(). + + src/liblzma/common/stream_encoder_mt.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 75f1a6c26df4ce329da0882786403e3ccf5cd898 +Author: Jia Tan +Date: 2022-05-05 20:53:42 +0800 + + liblzma: Add support for LZMA_SYNC_FLUSH in the Block encoder. + + The documentation mentions that lzma_block_encoder() supports + LZMA_SYNC_FLUSH but it was never added to supported_actions[] + in the internal structure. Because of this, LZMA_SYNC_FLUSH could + not be used with the Block encoder unless it was the next coder + after something like stream_encoder() or stream_encoder_mt(). + + src/liblzma/common/block_encoder.c | 1 + + 1 file changed, 1 insertion(+) + +commit d0901645170b638c517f5c50866b6ef48f491c65 +Author: Lasse Collin +Date: 2022-11-24 01:02:50 +0200 + + liblzma: Add new API function lzma_filters_free(). + + This is small but convenient and should have been added + a long time ago. + + src/liblzma/api/lzma/filter.h | 21 +++++++++++++++++++++ + src/liblzma/common/filter_common.c | 26 ++++++++++++++++++++++++++ + src/liblzma/liblzma_generic.map | 1 + + src/liblzma/liblzma_linux.map | 1 + + 4 files changed, 49 insertions(+) + +commit ae1f8a723dcde2f2c5cf444bcbb5fc5026b3c3c5 +Author: Lasse Collin +Date: 2022-11-24 00:02:31 +0200 + + CMake: Don't use symbol versioning with static library. + + CMakeLists.txt | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 48c1b99dc537a27e1ca929d8837e778e5ba32191 +Author: Lasse Collin +Date: 2022-11-23 21:55:22 +0200 + + liblzma: Add lzma_attr_warn_unused_result to lzma_filters_copy(). + + src/liblzma/api/lzma/filter.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 10430fbf3820dafd4eafd38ec8be161a6978ed2b +Author: Lasse Collin +Date: 2022-11-23 21:26:21 +0200 + + liblzma: Fix invalid free() after memory allocation failure. + + The bug was in the single-threaded .xz Stream encoder + in the code that is used for both re-initialization and for + lzma_filters_update(). To trigger it, an application had + to either re-initialize an existing encoder instance with + lzma_stream_encoder() or use lzma_filters_update(), and + then one of the 1-4 tiny allocations in lzma_filters_copy() + (called from stream_encoder_update()) must fail. An error + was correctly reported but the encoder state was corrupted. + + This is related to the recent fix in + f8ee61e74eb40600445fdb601c374d582e1e9c8a which is good but + it wasn't enough to fix the main problem in stream_encoder.c. + + src/liblzma/common/stream_encoder.c | 39 +++++++++++++++++++++++++++++-------- + 1 file changed, 31 insertions(+), 8 deletions(-) + +commit cafd6dc397ca8b5b5f7775e8d6876b8fe70f8e70 +Author: Lasse Collin +Date: 2022-11-22 16:37:15 +0200 + + liblzma: Fix language in a comment. + + src/liblzma/common/stream_encoder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c392bf8ccba857baaf50399c4b460119befacd54 +Author: Lasse Collin +Date: 2022-11-22 11:20:17 +0200 + + liblzma: Fix infinite loop in LZMA encoder init with dict_size >= 2 GiB. + + The encoder doesn't support dictionary sizes larger than 1536 MiB. + This is validated, for example, when calculating the memory usage + via lzma_raw_encoder_memusage(). It is also enforced by the LZ + part of the encoder initialization. However, LZMA encoder with + LZMA_MODE_NORMAL did an unsafe calculation with dict_size before + such validation and that results in an infinite loop if dict_size + was 2 << 30 or greater. + + src/liblzma/lzma/lzma_encoder.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit f50534c973a591ccf65485adfc827a8a7126ca6c +Author: Lasse Collin +Date: 2022-11-21 13:02:33 +0200 + + liblzma: Fix two Doxygen commands in the API headers. + + These were caught by clang -Wdocumentation. + + src/liblzma/api/lzma/hardware.h | 2 +- + src/liblzma/api/lzma/index_hash.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 649d4872ed2f55196114a061d45b416fc4353569 +Author: Lasse Collin +Date: 2022-11-19 19:09:55 +0200 + + xz: Refactor duplicate code from hardware_memlimit_mtenc_get(). + + src/xz/hardware.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d327743bb547a53364e5951a16e5f1663fe4b9ff +Author: Lasse Collin +Date: 2022-11-19 19:06:13 +0200 + + xz: Add support --threads=+N so that -T+1 gives threaded mode. + + src/xz/args.c | 18 +++++++++++++++--- + src/xz/hardware.c | 17 +++++++++++++++-- + src/xz/hardware.h | 1 + + src/xz/xz.1 | 21 ++++++++++++++++++++- + 4 files changed, 51 insertions(+), 6 deletions(-) + +commit a11a2b8b5e830ba682c1d81aaa7078842b296995 +Author: Jia Tan +Date: 2022-11-19 23:18:04 +0800 + + CMake: Adds test_memlimit to CMake tests + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 2af8d9e9b3f44f62d19e7c39297ec63af2e8c64f +Author: Lasse Collin +Date: 2022-11-15 19:10:21 +0200 + + Translations: Update the Korean translation. + + po/ko.po | 652 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 371 insertions(+), 281 deletions(-) + +commit 16ac05677292f7e21a4feaddcfb2ab062ea5f385 +Author: Lasse Collin +Date: 2022-11-15 19:09:28 +0200 + + Translations: Update the Turkish translation. + + po/tr.po | 568 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 310 insertions(+), 258 deletions(-) + +commit b9a67d9a5fa207062d4aa8a01639234609315d31 +Author: Lasse Collin +Date: 2022-11-15 10:58:39 +0200 + + Bump version number for 5.3.4alpha. + + src/liblzma/api/lzma/version.h | 2 +- + src/liblzma/liblzma_generic.map | 2 +- + src/liblzma/liblzma_linux.map | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 5b999ba289b3280457b7386b9ac65dbbdf1575a5 +Author: Lasse Collin +Date: 2022-11-15 10:54:40 +0200 + + Add NEWS for 5.3.4alpha. + + NEWS | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 96 insertions(+) + +commit ce8db9e37da4f6c87691c5066f51f91f2411c44a +Author: Lasse Collin +Date: 2022-11-15 10:54:08 +0200 + + Add NEWS for 5.2.8. + + NEWS | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 79 insertions(+) + +commit b56bc8251d2736224af6bdaaae734ceb8926a879 +Author: Lasse Collin +Date: 2022-11-14 23:19:57 +0200 + + Revert "liblzma: Simple/BCJ filters: Allow disabling generic BCJ options." + + This reverts commit 177bdc922cb17bd0fd831ab8139dfae912a5c2b8 + and also does equivalent change to arm64.c. + + Now that ARM64 filter will use lzma_options_bcj, this change + is not needed anymore. + + src/liblzma/simple/arm.c | 2 +- + src/liblzma/simple/arm64.c | 2 +- + src/liblzma/simple/armthumb.c | 2 +- + src/liblzma/simple/ia64.c | 2 +- + src/liblzma/simple/powerpc.c | 2 +- + src/liblzma/simple/simple_coder.c | 4 ++-- + src/liblzma/simple/simple_private.h | 2 +- + src/liblzma/simple/sparc.c | 2 +- + src/liblzma/simple/x86.c | 3 +-- + 9 files changed, 10 insertions(+), 11 deletions(-) + +commit 8370ec8edf9ddf8d1d9fef03d8d1027503ec4c35 +Author: Lasse Collin +Date: 2022-11-14 23:14:41 +0200 + + Replace the experimental ARM64 filter with a new experimental version. + + This is incompatible with the previous version. + + This has space/tab fixes in filter_*.c and bcj.h too. + + src/liblzma/api/lzma/bcj.h | 41 +----- + src/liblzma/common/filter_common.c | 14 +- + src/liblzma/common/filter_decoder.c | 12 +- + src/liblzma/common/filter_encoder.c | 17 +-- + src/liblzma/simple/arm64.c | 283 ++++++++++++++---------------------- + src/liblzma/simple/simple_decoder.h | 4 - + src/liblzma/simple/simple_encoder.h | 2 - + src/xz/args.c | 2 +- + src/xz/message.c | 13 +- + src/xz/options.c | 39 ----- + src/xz/options.h | 7 - + 11 files changed, 147 insertions(+), 287 deletions(-) + +commit f644473a211394447824ea00518d0a214ff3f7f2 +Author: Lasse Collin +Date: 2022-11-14 21:34:57 +0200 + + liblzma: Add fast CRC64 for 32/64-bit x86 using SSSE3 + SSE4.1 + CLMUL. + + It also works on E2K as it supports these intrinsics. + + On x86-64 runtime detection is used so the code keeps working on + older processors too. A CLMUL-only build can be done by using + -msse4.1 -mpclmul in CFLAGS and this will reduce the library + size since the generic implementation and its 8 KiB lookup table + will be omitted. + + On 32-bit x86 this isn't used by default for now because by default + on 32-bit x86 the separate assembly file crc64_x86.S is used. + If --disable-assembler is used then this new CLMUL code is used + the same way as on 64-bit x86. However, a CLMUL-only build + (-msse4.1 -mpclmul) won't omit the 8 KiB lookup table on + 32-bit x86 due to a currently-missing check for disabled + assembler usage. + + The configure.ac check should be such that the code won't be + built if something in the toolchain doesn't support it but + --disable-clmul-crc option can be used to unconditionally + disable this feature. + + CLMUL speeds up decompression of files that have compressed very + well (assuming CRC64 is used as a check type). It is know that + the CLMUL code is significantly slower than the generic code for + tiny inputs (especially 1-8 bytes but up to 16 bytes). If that + is a real-world problem then there is already a commented-out + variant that uses the generic version for small inputs. + + Thanks to Ilya Kurdyukov for the original patch which was + derived from a white paper from Intel [1] (published in 2009) + and public domain code from [2] (released in 2016). + + [1] https://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf + [2] https://github.com/rawrunprotected/crc + + CMakeLists.txt | 26 ++- + INSTALL | 12 ++ + configure.ac | 59 +++++- + src/liblzma/check/crc64_fast.c | 449 +++++++++++++++++++++++++++++++++++++++- + src/liblzma/check/crc64_table.c | 21 +- + 5 files changed, 554 insertions(+), 13 deletions(-) + +commit 3b466bc79672bb2b06d1245a500588e6026e0ba0 +Author: Lasse Collin +Date: 2022-11-14 20:14:34 +0200 + + Translations: Update the Swedish translation one more time. + + po/sv.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e963379a8622ebdff6ce78e76b803bcd1e1d16d6 +Author: Lasse Collin +Date: 2022-11-14 19:34:15 +0200 + + Translations: Update the Swedish translation again. + + po/sv.po | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit a4bc689a823a2254f29ac9d233170add5121b307 +Author: Lasse Collin +Date: 2022-11-14 19:07:45 +0200 + + Translations: Update the Swedish translation. + + po/sv.po | 671 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 382 insertions(+), 289 deletions(-) + +commit bbf2073d824ab4ba33bed4b77f467435abd333a5 +Author: Lasse Collin +Date: 2022-11-14 18:58:09 +0200 + + Translations: Update the Ukrainian translation. + + po/uk.po | 618 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 354 insertions(+), 264 deletions(-) + +commit ac10b1b3622e70881595586edfb8a3ebdcd76bb6 +Author: Lasse Collin +Date: 2022-11-14 17:58:07 +0200 + + Build: Omit x86_64 from --enable-assembler. + + It didn't do anything. There are only 32-bit x86 assembly files + and it feels likely that new files won't be added as intrinsics + in C are more portable across toolchains and OSes. + + configure.ac | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit eb0f1450ad9f23dac03050d9c8375980240aee21 +Author: Lasse Collin +Date: 2022-11-14 16:00:52 +0200 + + liblzma: Use __attribute__((__constructor__)) if available. + + This uses it for CRC table initializations when using --disable-small. + It avoids mythread_once() overhead. It also means that then + --disable-small --disable-threads is thread-safe if this attribute + is supported. + + CMakeLists.txt | 15 +++++++++++++++ + INSTALL | 4 +++- + configure.ac | 31 ++++++++++++++++++++++++++++--- + src/liblzma/check/crc32_small.c | 7 +++++++ + src/liblzma/check/crc64_small.c | 5 +++++ + src/liblzma/lz/lz_encoder.c | 2 +- + 6 files changed, 59 insertions(+), 5 deletions(-) + +commit 6553f49b11dafad35c73b05f12e14865ea1fd8a1 +Author: Lasse Collin +Date: 2022-11-12 21:19:52 +0200 + + Translations: Update the Romanian translation. + + po/ro.po | 651 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 380 insertions(+), 271 deletions(-) + +commit db97e69e12393becc29f8febd53133d0d36989bd +Author: Lasse Collin +Date: 2022-11-12 21:17:45 +0200 + + Translations: Update the Hungarian translation. + + po/hu.po | 625 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 357 insertions(+), 268 deletions(-) + +commit 2bbb9c0f3829a8b121b36998d273a6c6f92000f4 +Author: Lasse Collin +Date: 2022-11-11 17:58:57 +0200 + + Translations: Update the Finnish translation. + + po/fi.po | 610 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 348 insertions(+), 262 deletions(-) + +commit 3c8cbb8137b6f8ed9416c1209d73cdbcb015251f +Author: Lasse Collin +Date: 2022-11-11 17:58:18 +0200 + + Translations: Update the Croatian translation. + + po/hr.po | 680 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 381 insertions(+), 299 deletions(-) + +commit 26c3359eac0988d6f3986735cd1363bec1678e8e +Author: Lasse Collin +Date: 2022-11-11 17:57:18 +0200 + + Translations: Update the Polish translation. + + po/pl.po | 569 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 309 insertions(+), 260 deletions(-) + +commit 577e467b137c735afb8de6ae71ac7a73c2960cc4 +Author: Lasse Collin +Date: 2022-11-11 17:56:44 +0200 + + Translations: Update the Spanish translation. + + po/es.po | 598 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 344 insertions(+), 254 deletions(-) + +commit f9b4ff6e9a0f1678650775582d3e4fe782abce97 +Author: Lasse Collin +Date: 2022-11-11 17:16:03 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit a39961ef211e1bf030b17edeea3cff29fe263b67 +Author: Lasse Collin +Date: 2022-11-11 17:15:25 +0200 + + liblzma: Fix building with Intel ICC (the classic compiler). + + It claims __GNUC__ >= 10 but doesn't support __symver__ attribute. + + Thanks to Stephen Sachs. + + src/liblzma/common/common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c715f683dcb1a817d565da292cddfbceda643e12 +Author: Lasse Collin +Date: 2022-11-11 14:35:58 +0200 + + liblzma: Fix incorrect #ifdef for x86 SSE2 support. + + __SSE2__ is the correct macro for SSE2 support with GCC, Clang, + and ICC. __SSE2_MATH__ means doing floating point math with SSE2 + instead of 387. Often the latter macro is defined if the first + one is but it was still a bug. + + src/liblzma/common/memcmplen.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit bd334ae56afe7f642ad4d0f1ac19e74e82daa1ce +Author: Lasse Collin +Date: 2022-11-11 13:27:06 +0200 + + Add NEWS for 5.2.7 (forgotten cherry-pick from v5.2). + + NEWS | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 74 insertions(+) + +commit 3c7860cf49de6f81046b3a4034a89f3a4803a576 +Author: Lasse Collin +Date: 2022-11-11 13:16:21 +0200 + + xzdiff: Add support for .lz files. + + The other scripts don't need changes for .lz support because + in those scripts it is enough that xz supports .lz. + + src/scripts/xzdiff.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit d76c752a6d77052e5ad57ade555082585f7ac5d8 +Author: Lasse Collin +Date: 2022-11-11 12:23:58 +0200 + + Scripts: Ignore warnings from xz. + + In practice this means making the scripts work when + the input files have an unsupported check type which + isn't a problem in practice unless support for + some check types has been disabled at build time. + + src/scripts/xzdiff.in | 5 +++-- + src/scripts/xzgrep.in | 2 +- + src/scripts/xzless.in | 4 ++-- + src/scripts/xzmore.in | 4 ++-- + 4 files changed, 8 insertions(+), 7 deletions(-) + +commit 6552535afd1fe29d726ab6e68cf14ce3624fd48c +Author: Lasse Collin +Date: 2022-11-10 12:34:43 +0200 + + Translations: Rename poa4/fr_FR.po to po4a/fr.po. + + That's how it is preferred at the Translation Project. + On my system /usr/share/man/fr_FR doesn't contain any + other man pages than XZ Utils while /usr/share/man/fr + has quite a few, so this will fix that too. + + Thanks to Benno Schulenberg from the Translation Project. + + po4a/{fr_FR.po => fr.po} | 0 + po4a/po4a.conf | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 0918159ce4c75bfb60aff0193b559f8a9f41d25a +Author: Lasse Collin +Date: 2022-11-09 18:48:50 +0200 + + xz: Update the man page about BCJ filters, including upcoming --arm64. + + The --arm64 isn't actually implemented yet in the form + described in this commit. + + Thanks to Jia Tan. + + src/xz/xz.1 | 66 +++++++++++++++++++++++++++---------------------------------- + 1 file changed, 29 insertions(+), 37 deletions(-) + +commit ba2ae3596f6be1587495f33b367488f6e00e56f1 +Author: Lasse Collin +Date: 2022-11-09 18:14:14 +0200 + + xz: Add --arm64 to --long-help and omit endianness from ARM(-Thumb). + + Modern 32-bit ARM in big endian mode use little endian for + instruction encoding still, so the filters work on such + executables too. It's likely less confusing for users this way. + + The --arm64 option hasn't been implemented yet (there is + --experimental-arm64 but it's different). The --arm64 option + is added now anyway because this is the likely result and the + strings need to be ready for translators. + + Thanks to Jia Tan. + + src/xz/message.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 802d57d9215d9c81dbee86edb43c9e93a7f7ec55 +Author: Lasse Collin +Date: 2022-11-09 15:12:13 +0200 + + Windows: Update the VS project files for ARM64 and .lz support. + + windows/vs2013/config.h | 9 +++++++++ + windows/vs2013/liblzma.vcxproj | 5 ++++- + windows/vs2013/liblzma_dll.vcxproj | 5 ++++- + windows/vs2017/config.h | 9 +++++++++ + windows/vs2017/liblzma.vcxproj | 3 +++ + windows/vs2017/liblzma_dll.vcxproj | 3 +++ + windows/vs2019/config.h | 9 +++++++++ + windows/vs2019/liblzma.vcxproj | 5 ++++- + windows/vs2019/liblzma_dll.vcxproj | 5 ++++- + 9 files changed, 49 insertions(+), 4 deletions(-) + +commit 5846aeda05972bc803c6094821ae836229ebe691 +Author: Lasse Collin +Date: 2022-11-09 14:57:48 +0200 + + DOS: Update Makefile and config.h to include ARM64 and .lz support. + + dos/Makefile | 2 ++ + dos/config.h | 9 +++++++++ + 2 files changed, 11 insertions(+) + +commit 781da8d6c44de6aa278c916375250668a0b107f2 +Author: Lasse Collin +Date: 2022-11-09 14:45:05 +0200 + + CMake: Add lzip decoder files and #define to the build. + + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +commit df8ad4af65a9c4846b108550d0083770a69dee64 +Author: Lasse Collin +Date: 2022-11-09 14:41:56 +0200 + + Docs: Update INSTALL and also add new prohibited options to PACKAGERS. + + INSTALL | 49 +++++++++++++++++++++++++++++++++++++++++-------- + PACKAGERS | 2 ++ + 2 files changed, 43 insertions(+), 8 deletions(-) + +commit c8ef089c149afaab413c3a51be827dd1d11afe0e +Author: Lasse Collin +Date: 2022-10-20 17:39:06 +0300 + + Tests: Test the .lz files in test_files.sh. + + tests/test_files.sh | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit c8f70ebb4628ceb6cb29cc9195d9deadf69d2bd7 +Author: Lasse Collin +Date: 2022-10-20 15:35:59 +0300 + + Tests: Add .lz (lzip) test files. + + tests/files/README | 109 +++++++++++++++++++++++++++++---- + tests/files/bad-1-v0-uncomp-size.lz | Bin 0 -> 42 bytes + tests/files/bad-1-v1-crc32.lz | Bin 0 -> 50 bytes + tests/files/bad-1-v1-dict-1.lz | Bin 0 -> 50 bytes + tests/files/bad-1-v1-dict-2.lz | Bin 0 -> 50 bytes + tests/files/bad-1-v1-magic-1.lz | Bin 0 -> 50 bytes + tests/files/bad-1-v1-magic-2.lz | Bin 0 -> 50 bytes + tests/files/bad-1-v1-member-size.lz | Bin 0 -> 50 bytes + tests/files/bad-1-v1-trailing-magic.lz | Bin 0 -> 54 bytes + tests/files/bad-1-v1-uncomp-size.lz | Bin 0 -> 50 bytes + tests/files/good-1-v0-trailing-1.lz | Bin 0 -> 59 bytes + tests/files/good-1-v0.lz | Bin 0 -> 42 bytes + tests/files/good-1-v1-trailing-1.lz | Bin 0 -> 67 bytes + tests/files/good-1-v1-trailing-2.lz | Bin 0 -> 70 bytes + tests/files/good-1-v1.lz | Bin 0 -> 50 bytes + tests/files/good-2-v0-v1.lz | Bin 0 -> 78 bytes + tests/files/good-2-v1-v0.lz | Bin 0 -> 78 bytes + tests/files/good-2-v1-v1.lz | Bin 0 -> 86 bytes + tests/files/unsupported-1-v234.lz | Bin 0 -> 50 bytes + 19 files changed, 98 insertions(+), 11 deletions(-) + +commit 731db13e6fa3ad3e3fc786c0ccf6eac4cce6865f +Author: Lasse Collin +Date: 2022-10-19 22:32:51 +0300 + + xz: Remove the commented-out FORMAT_GZIP, gzip, .gz, and .tgz. + + src/xz/args.c | 2 -- + src/xz/coder.h | 1 - + src/xz/suffix.c | 9 --------- + 3 files changed, 12 deletions(-) + +commit 3176f992c55b8d788c4633809aaf9447376a5a12 +Author: Lasse Collin +Date: 2022-10-08 21:28:15 +0300 + + xz: Add .lz (lzip) decompression support. + + If configured with --disable-lzip-decoder then --long-help will + still list `lzip' in --format but I left it like that since + due to translations it would be messy to have two help strings. + Features are disabled only in special situations so wrong help + in such a situation shouldn't matter much. + + Thanks to Michał Górny for the original patch. + + src/xz/args.c | 9 ++++++++ + src/xz/coder.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + src/xz/coder.h | 3 +++ + src/xz/message.c | 2 +- + src/xz/suffix.c | 26 ++++++++++++++++++---- + src/xz/xz.1 | 46 +++++++++++++++++++++++++++++++++----- + 6 files changed, 141 insertions(+), 13 deletions(-) + +commit 034086e1ae1459210837a24e04878435c86dc41b +Author: Lasse Collin +Date: 2022-10-08 00:29:20 +0300 + + liblzma: Add .lz support to lzma_auto_decoder(). + + Thanks to Michał Górny for the original patch. + + src/liblzma/api/lzma/container.h | 10 ++++++---- + src/liblzma/common/Makefile.inc | 3 ++- + src/liblzma/common/auto_decoder.c | 23 +++++++++++++++++------ + src/liblzma/common/lzip_decoder.h | 22 ++++++++++++++++++++++ + 4 files changed, 47 insertions(+), 11 deletions(-) + +commit 0538db038f3cdc352007dacb42454aa1806b8e40 +Author: Lasse Collin +Date: 2022-10-06 15:50:20 +0300 + + liblzma: Add .lz (lzip) decompression support (format versions 0 and 1). + + Support for format version 0 was removed from lzip 1.18 for some + reason. .lz format version 0 files are rare (and old) but some + source packages were released in this format, and some people might + have personal files in this format too. It's very little extra code + to support it along side format version 1 so this commits adds + support for both. + + The Sync Flush marker extentension to the original .lz format + version 1 isn't supported. It would require changes to the + LZMA decoder itself. Such files are very rare anyway. + + See the API doc for lzma_lzip_decoder() for more details about + the .lz format support. + + Thanks to Michał Górny for the original patch. + + configure.ac | 21 ++ + src/liblzma/api/lzma/container.h | 62 +++++- + src/liblzma/common/Makefile.inc | 5 + + src/liblzma/common/lzip_decoder.c | 413 ++++++++++++++++++++++++++++++++++++++ + src/liblzma/liblzma_generic.map | 1 + + src/liblzma/liblzma_linux.map | 1 + + 6 files changed, 501 insertions(+), 2 deletions(-) + +commit 633d48a075b9ce4b9c08a7a56a7eb4cabc18100c +Author: Lasse Collin +Date: 2022-11-09 14:17:23 +0200 + + liblzma: Add the missing Makefile.inc change for --disable-microlzma. + + This was forgotten from commit 59c4d6e1390f6f4176f43ac1dad1f7ac03c449b8. + + src/liblzma/common/Makefile.inc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit 724285dadbdc88765c8fb83eab9816575a260966 +Author: Lasse Collin +Date: 2022-11-09 14:10:52 +0200 + + xz: Add comments about stdin and src_st.st_size. + + "xz -v < regular_file > out.xz" doesn't display the percentage + and estimated remaining time because it doesn't even try to + check the input file size when input is read from stdin. + This could be improved but for now there's just a comment + to remind about it. + + src/xz/coder.c | 9 +++++++++ + src/xz/file_io.c | 4 ++++ + 2 files changed, 13 insertions(+) + +commit f723eec68b0e44234910f669a29119de33018967 +Author: Lasse Collin +Date: 2022-11-09 12:48:22 +0200 + + xz: Fix displaying of file sizes in progress indicator in passthru mode. + + It worked for one input file since the counters are zero when + xz starts but they weren't reset when starting a new file in + passthru mode. For example, if files A, B, and C are one byte each, + then "xz -dcvf A B C" would show file sizes as 1, 2, and 3 bytes + instead of 1, 1, and 1 byte. + + src/xz/coder.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 69265d0f223ddf1d66f799b8b047df22923e376f +Author: Lasse Collin +Date: 2022-11-09 11:27:20 +0200 + + xz: Add a comment why --to-stdout is not in --help. + + It is on the man page still. + + src/xz/message.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit fe6b8852a3c6a0eb5a3c33512e0a69af257d3bc7 +Author: Lasse Collin +Date: 2022-11-08 23:05:37 +0200 + + xz: Make xz -lvv show that the upcoming --arm64 needs 5.4.0 to decompress. + + src/xz/list.c | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +commit fb3f05ac9f2b4b0e3643401960fbeab31997ac7a +Author: Lasse Collin +Date: 2022-11-08 22:26:54 +0200 + + Docs: Update faq.txt a little. + + doc/faq.txt | 66 ++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 43 insertions(+), 23 deletions(-) + +commit 05331f091ec3b68eccbfb2a9a7a576072768fb4b +Author: Lasse Collin +Date: 2022-11-08 16:57:17 +0200 + + Translations: Update Turkish translation. + + po/tr.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed3a4822963b4940d84e6f44d47277c394fc046d +Author: Lasse Collin +Date: 2022-11-08 14:55:32 +0200 + + Translations: Update Croatian translation. + + po/hr.po | 190 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 96 insertions(+), 94 deletions(-) + +commit 4746f5ec721316bc4c6fec9905b2902e0360e0af +Author: Lasse Collin +Date: 2022-11-08 14:13:03 +0200 + + liblzma: Update API docs about decoder flags. + + src/liblzma/api/lzma/container.h | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +commit 8779a9db5d0cec00c9dc9e9965dd2dda04f9d80d +Author: Lasse Collin +Date: 2022-11-08 14:01:50 +0200 + + liblzma: Use the return_if_error() macro in alone_decoder.c. + + src/liblzma/common/alone_decoder.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 3f4990b6822961e75cd9b4e2e82b1df63f6f8fcc +Author: Lasse Collin +Date: 2022-11-08 14:00:58 +0200 + + liblzma: Fix a comment in auto_decoder.c. + + src/liblzma/common/auto_decoder.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 026a5897c72a2041ae08ceec54ce8b1cdeb51334 +Author: Lasse Collin +Date: 2022-11-08 13:43:19 +0200 + + xz: Initialize the pledge(2) sandbox at the very beginning of main(). + + It feels better that the initializations are sandboxed too. + They don't do anything that the pledge() call wouldn't allow. + + src/xz/main.c | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +commit 49a59f6ca001c3ce9affa2c162b437aad021b4d5 +Author: Lasse Collin +Date: 2022-11-07 22:51:16 +0200 + + xz: Extend --robot --info-memory output. + + Now it includes everything that the human-readable --info-memory shows. + + src/xz/hardware.c | 24 +++++++++++++++--------- + src/xz/xz.1 | 47 +++++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 56 insertions(+), 15 deletions(-) + +commit 5e2450c75cbac966c62cf2231c824f2cc91ddba8 +Author: Lasse Collin +Date: 2022-11-07 17:22:04 +0200 + + liblzma: Include cached memory in reported memusage in threaded decoder. + + This affects lzma_memusage() and lzma_memlimit_set() when used + with the threaded decompressor. Now all allocations are reported + by lzma_memusage() (so it's not misleading) and lzma_memlimit_set() + cannot lower the limit below that value. + + The alternative would have been to allow lowering the limit if + doing so is possible by freeing the cached memory but since + the primary use case of lzma_memlimit_set() is to increase + memlimit after LZMA_MEMLIMIT_ERROR this simple approach + was selected. + + The cached memory was always included when enforcing + the memory usage limit while decoding. + + Thanks to Jia Tan. + + src/liblzma/common/stream_decoder_mt.c | 22 +++++++++++++++++++--- + 1 file changed, 19 insertions(+), 3 deletions(-) + +commit 1fc6e7dd1fabdb60124d449b99273330ccab3ff1 +Author: Jia Tan +Date: 2022-11-07 16:24:14 +0200 + + xz: Avoid a compiler warning in progress_speed() in message.c. + + This should be smaller too since it avoids the string constants. + + src/xz/message.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit cf118c014683069b5dbe91898acdc40f2f0a1f5d +Author: Lasse Collin +Date: 2022-10-31 16:26:05 +0200 + + Build: Clarify comment in configure.ac about SSE2. + + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit aad3c609ffb72f581a7a2b67be3ad70b2b327840 +Author: Lasse Collin +Date: 2022-10-31 16:16:37 +0200 + + Build: Remove obsolete commented-out lines from configure.ac. + + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +commit e53e0e2186c6b8ce866bd19aec52f1c318ed31ba +Author: Lasse Collin +Date: 2022-10-31 13:31:58 +0200 + + Windows: Fix mythread_once() macro with Vista threads. + + Don't call InitOnceComplete() if initialization was already done. + + So far mythread_once() has been needed only when building + with --enable-small. windows/build.bash does this together + with --disable-threads so the Vista-specific mythread_once() + is never needed by those builds. VS project files or + CMake-builds don't support HAVE_SMALL builds at all. + + src/common/mythread.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 48dde3bab9dc04081acb5aa7cf7c5044b8a49f58 +Author: Lasse Collin +Date: 2022-10-31 11:54:44 +0200 + + liblzma: Silence -Wconversion warning from crc64_fast.c. + + src/liblzma/check/crc64_fast.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit a243c617ff249d915ac123de4f536b80322c1fdb +Author: Lasse Collin +Date: 2022-10-31 11:49:47 +0200 + + CMake: Sync tuklib_cpucores.cmake with tuklib_cpucores.m4. + + This was forgotten from commit 2611c4d90535652d3eb7ef4a026a6691276fab43. + + cmake/tuklib_cpucores.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 05c72de06fcaaedc78f8abba7d5ec568ddcf1e75 +Author: Lasse Collin +Date: 2022-10-27 15:49:18 +0300 + + Tests: test_files.sh: Make it not fail if features were disabled at build. + + It now tries to test as many files as easily possible. + The exit status indicates skipping if any of the files were + skipped. This way it is easy to notice if something is being + skipped when it isn't expected. + + tests/test_files.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 46 insertions(+), 4 deletions(-) + +commit b3459327a51f4b8239d19e6c34b4e0c6bc2d81de +Author: Lasse Collin +Date: 2022-10-27 15:30:13 +0300 + + Tests: test_files.sh: Suppress an expected warning from the log. + + xz (but not xzdec) will normally warn about unsupported check + but since we are testing specifically such a file, it's better + to silence that warning so that it doesn't look suspicious in + test_files.sh.log. + + The use of -q and -Q in xzdec is just for consistency and + doesn't affect the result at least for now. + + tests/test_files.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 798c86e4231e0835ab76ccd0810c8ea30833b2ce +Author: Lasse Collin +Date: 2022-10-27 15:27:50 +0300 + + Tests: test_files.sh: Print the reason for skipping if xz & xzdec missing. + + tests/test_files.sh | 1 + + 1 file changed, 1 insertion(+) + +commit c1dd8524e1af07f16b790463899de06a6a5fcc08 +Author: Lasse Collin +Date: 2022-10-27 01:12:40 +0300 + + Tests: Keep test_compress_* working when some filters are unavailable. + + tests/test_compress.sh | 34 ++++++++++++++++++++-------------- + 1 file changed, 20 insertions(+), 14 deletions(-) + +commit ce30ada91951d0746879ae438da11f1ee8a90aa0 +Author: Jia Tan +Date: 2022-10-23 21:01:08 +0800 + + Tests: test_bcj_exact_size skips properly now if PowerPC filter disabled. + + tests/test_bcj_exact_size.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 89c5cfcacaca7130509fac836e2f30c46b824502 +Author: Lasse Collin +Date: 2022-10-26 00:05:57 +0300 + + Tests: Test also unsupported-*.xz. + + tests/test_files.sh | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +commit a4b214b93ac741edef9c41e55865b0b867ca2587 +Author: Lasse Collin +Date: 2022-10-25 23:45:03 +0300 + + Build: Use AC_CONFIG_HEADERS instead of the ancient AC_CONFIG_HEADER. + + We require Autoconf >= 2.69 and that has AC_CONFIG_HEADERS. + + There is a warning about AC_PROG_CC_C99 being obsolete but + it cannot be removed because it is needed with Autoconf 2.69. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 04f299b64e73f50afc188c2590ebebc6b73ed744 +Author: Lasse Collin +Date: 2022-10-25 23:31:44 +0300 + + Build: Update m4/ax_pthread.m4 from Autoconf Archive. + + m4/ax_pthread.m4 | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) + +commit 59c4d6e1390f6f4176f43ac1dad1f7ac03c449b8 +Author: Lasse Collin +Date: 2022-10-25 23:28:34 +0300 + + Build: Add configure option --disable-microlzma. + + MicroLZMA was made for EROFS and used by erofs-utils. + It might be used by something else in the future but + those wanting a smaller build for specific situations + can now disable this rarely-needed feature. + + configure.ac | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit 054ccd6d14b2cc6eddc56897af280d3221414150 +Author: Lasse Collin +Date: 2022-10-25 23:09:11 +0300 + + xz: Fix --single-stream with an empty .xz Stream. + + Example: + + $ xz -dc --single-stream good-0-empty.xz + xz: good-0-empty.xz: Internal error (bug) + + The code, that is tries to catch some input file issues early, + didn't anticipate LZMA_STREAM_END which is possible in that + code only when --single-stream is used. + + src/xz/coder.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 563288ea705e83ff5cb292adf794650c263bca1d +Author: Lasse Collin +Date: 2022-10-25 21:11:58 +0300 + + xz: Add support for OpenBSD's pledge() sandbox. + + configure.ac | 12 +++++++++--- + src/xz/file_io.c | 11 +++++++++++ + src/xz/main.c | 13 +++++++++++++ + src/xz/private.h | 2 +- + 4 files changed, 34 insertions(+), 4 deletions(-) + +commit f9913e8ee2ba0b1e4ff4d0aa4c001aae305ed944 +Author: Lasse Collin +Date: 2022-10-25 19:07:17 +0300 + + xz: Fix decompressor behavior if input uses an unsupported check type. + + Now files with unsupported check will make xz display + a warning, set the exit status to 2 (unless --no-warn is used), + and then decompress the file normally. This is how it was + supposed to work since the beginning but this was broken by + the commit 231c3c7098f1099a56abb8afece76fc9b8699f05, that is, + a little before 5.0.0 was released. The buggy behavior displayed + a message, set exit status 1 (error), and xz didn't attempt to + to decompress the file. + + This doesn't matter today except for special builds that disable + CRC64 or SHA-256 at build time (but such builds should be used + in special situations only). The bug matters if new check type + is added in the future and an old xz version is used to decompress + such a file; however, it's likely that such files would use a new + filter too and an old xz wouldn't be able to decompress the file + anyway. + + The first hunk in the commit is the actual fix. The second hunk + is a cleanup since LZMA_TELL_ANY_CHECK isn't used in xz. + + There is a test file for unsupported check type but it wasn't + used by test_files.sh, perhaps due to different behavior between + xz and the simpler xzdec. + + src/xz/coder.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit aa4fe145b9486adc454f44fd3e09be9add808a0f +Author: Lasse Collin +Date: 2022-10-25 18:36:19 +0300 + + xz: Clarify the man page: input file isn't removed if an error occurs. + + src/xz/xz.1 | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 8b46ae8cdeddfd7dc01fec92971b8696e9a96c5d +Author: Lasse Collin +Date: 2022-10-25 18:30:55 +0300 + + xz: Refactor to remove is_empty_filename(). + + Long ago it was used in list.c too but nowadays it's needed + only in io_open_src() so it's nicer to avoid a separate function. + + src/xz/file_io.c | 4 +++- + src/xz/util.c | 12 ------------ + src/xz/util.h | 4 ---- + 3 files changed, 3 insertions(+), 17 deletions(-) + +commit 85624015978b0de294cff3df79006df987c552b1 +Author: Lasse Collin +Date: 2022-10-25 18:23:54 +0300 + + xz: If input file cannot be removed, treat it as a warning, not error. + + Treating it as a warning (message + exit status 2) matches gzip + and it seems more logical as at that point the output file has + already been successfully closed. When it's a warning it is + possible to suppress it with --no-warn. + + src/xz/file_io.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit fda9f85f52c546f7ca0313cf89481da4707fecb3 +Author: Lasse Collin +Date: 2022-10-24 16:25:09 +0300 + + liblzma: Threaded decoder: Stop the worker threads on errors. + + It's waste of CPU time and electricity to leave the unfinished + worker threads running when it is known that their output will + get ignored. + + src/liblzma/common/stream_decoder_mt.c | 33 ++++++++++++++++++++++++++------- + 1 file changed, 26 insertions(+), 7 deletions(-) + +commit 2611c4d90535652d3eb7ef4a026a6691276fab43 +Author: Lasse Collin +Date: 2022-10-20 20:22:50 +0300 + + tuklib_cpucores: Use HW_NCPUONLINE on OpenBSD. + + On OpenBSD the number of cores online is often less + than what HW_NCPU would return because OpenBSD disables + simultaneous multi-threading (SMT) by default. + + Thanks to Christian Weisgerber. + + m4/tuklib_cpucores.m4 | 5 +++++ + src/common/tuklib_cpucores.c | 9 +++++++++ + 2 files changed, 14 insertions(+) + +commit 424ac91c7e0419393ff2bde4f62e21fa611c776d +Author: Lasse Collin +Date: 2022-10-19 19:39:35 +0300 + + Tests: Skip tests in test_*.sh if encoders and/or decoders are disabled. + + This isn't perfect as the scripts can still fail if only + certain filters are disabled. This is still an improvement + as now "make check" has better behavior when all encoders + or decoders are disabled. + + Grepping ../config.h is simple and fairly clean but it only + works if config.h was created. CMake builds don't create + config.h but they don't use these test scripts either. + + Thanks to Sebastian Andrzej Siewior for reporting the problem. + Thanks to Jia Tan for the original patch which grepped xz + error messages instead of config.h. + + tests/test_compress.sh | 12 ++++++++++++ + tests/test_files.sh | 11 +++++++++++ + tests/test_scripts.sh | 11 +++++++++++ + 3 files changed, 34 insertions(+) + +commit ca8bf9d7c5a30be8ba1eeb106fd892f19e83ed09 +Author: Lasse Collin +Date: 2022-10-19 18:54:34 +0300 + + Test: Remove the (exit 1) lines. + + I suspect that I used these in the original version because + Autoconf's manual describes that such a trick is needed in + some specific situations for portability reasons. None of those + situations listed on Autoconf 2.71 manual apply to these test + scripts though so this cleans them up. + + tests/test_compress.sh | 10 ---------- + tests/test_files.sh | 9 --------- + tests/test_scripts.sh | 6 ------ + 3 files changed, 25 deletions(-) + +commit 82fcb7cfc17ce62f79ebc7ca2374e1daca5e4d5e +Author: Lasse Collin +Date: 2022-10-19 17:14:57 +0300 + + Tests: Fix a warning in test_memlimit.c when decoders are disabled. + + tests/test_memlimit.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit b5f8271b45b9b0e59485ffba3640ca3418835ec4 +Author: Lasse Collin +Date: 2022-10-19 17:11:46 +0300 + + Tests: Add test_memlimit to .gitignore. + + Thanks to Jia Tan. + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 6a86e81cab202d0a812a7b2e9efacaf70c58ba38 +Author: Jia Tan +Date: 2022-10-06 21:53:09 +0300 + + Tests: Refactor test_stream_flags.c. + + Converts test_stream_flags to tuktest. Also the test will now + compile and skip properly if encoders or decoders are disabled. + + Thanks to Sebastian Andrzej Siewior. + + tests/test_stream_flags.c | 533 ++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 416 insertions(+), 117 deletions(-) + +commit 827ac5b4821491fd3afe0d0e1ddac326253aeb66 +Author: Jia Tan +Date: 2022-10-06 17:00:38 +0800 + + Tests: Refactor test_block_header.c. + + test_block_header now achieves higher test coverage. Also the + test will now compile and skip properly if encoders or decoders + are disabled. + + Thanks to Sebastian Andrzej Siewior. + + tests/test_block_header.c | 486 +++++++++++++++++++++++++++++++++++----------- + 1 file changed, 370 insertions(+), 116 deletions(-) + +commit 84963318952064a93bfc52edd6b0ef70593384ee +Author: Jia Tan +Date: 2022-10-05 23:54:12 +0800 + + Tests: Fix compilation issues. + + test_bcj_exact_size, test_check, test_hardware, and test_index will + all now compile and skip properly if encoders or decoders are disabled. + + Also fixed a small typo (disabed -> disabled). + + Thanks to Sebastian Andrzej Siewior. + + tests/test_bcj_exact_size.c | 20 ++++++++++++++------ + tests/test_check.c | 8 +++++++- + tests/test_hardware.c | 2 +- + tests/test_index.c | 6 ++++++ + tests/test_memlimit.c | 16 +++++++++++++++- + tests/test_vli.c | 13 +++++++++++++ + 6 files changed, 56 insertions(+), 9 deletions(-) + +commit 7dcabeec63d46b436fa5f043c3d1f09d0e15be16 +Author: Lasse Collin +Date: 2022-10-05 16:20:47 +0300 + + Tests: Include mythread.h in the tests that use MYTHREAD_ENABLED. + + tests/test_check.c | 1 + + tests/test_hardware.c | 1 + + tests/test_memlimit.c | 1 + + 3 files changed, 3 insertions(+) + +commit 14af758a770c7781af18fb66d6d21ee5b1c27f04 +Author: Jia Tan +Date: 2022-10-05 20:57:16 +0800 + + liblzma: Fix a compilation issue when encoders are disabled. + + When encoders were disabled and threading enabled, outqueue.c and + outqueue.h were not compiled. The multi threaded decoder required + these files, so compilation failed. + + src/liblzma/common/Makefile.inc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 6ca5c354bd4620aa7f81da68870eef1b1f26288f +Author: Jia Tan +Date: 2022-10-05 16:41:38 +0800 + + Tests: Fix compilation error when threading support has been disabled. + + Now tests that require threading are skipped when threading + support has been disabled. + + Thanks to Sebastian Andrzej Siewior. + + tests/test_check.c | 4 ++++ + tests/test_hardware.c | 4 ++++ + tests/test_memlimit.c | 4 ++++ + 3 files changed, 12 insertions(+) + +commit fae37ad2affd8fe8871f4ff93d5cab5ec14d5e58 +Author: Lasse Collin +Date: 2022-10-05 14:26:00 +0300 + + tuklib_integer: Add 64-bit endianness-converting reads and writes. + + Also update the comment in liblzma's memcmplen.h. + + Thanks to Michał Górny for the original patch for the reads. + + m4/tuklib_integer.m4 | 8 ++++---- + src/common/tuklib_integer.h | 46 ++++++++++++++++++++++++++++++++++++++++-- + src/liblzma/common/memcmplen.h | 9 +++------ + 3 files changed, 51 insertions(+), 12 deletions(-) + +commit 508a44372c5b0dede8863fd0d358d4a9d8645c95 +Author: Lasse Collin +Date: 2022-09-30 12:06:13 +0300 + + liblzma: Add API doc note about the .xz decoder LZMA_MEMLIMIT_ERROR bug. + + The bug was fixed in 660739f99ab211edec4071de98889fb32ed04e98. + + src/liblzma/api/lzma/base.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 8cc9874a7974cd575aee44f218836f7acdbeb0ed +Author: Jia Tan +Date: 2022-09-21 16:15:50 +0800 + + liblzma: Add dest and src NULL checks to lzma_index_cat. + + The documentation states LZMA_PROG_ERROR can be returned from + lzma_index_cat. Previously, lzma_index_cat could not return + LZMA_PROG_ERROR. Now, the validation is similar to + lzma_index_append, which does a NULL check on the index + parameter. + + src/liblzma/common/index.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit afd5a8bf5374eba82804a999e1ea7af680784086 +Author: Jia Tan +Date: 2022-09-21 20:29:28 +0800 + + Tests: Create a test for the lzma_index_cat bug. + + tests/test_index.c | 43 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 42 insertions(+), 1 deletion(-) + +commit 3d5a99ca373a4e86faf671226ca6487febb9eeac +Author: Jia Tan +Date: 2022-09-21 19:28:53 +0800 + + liblzma: Fix copying of check type statistics in lzma_index_cat(). + + The check type of the last Stream in dest was never copied to + dest->checks (the code tried to copy it but it was done too late). + This meant that the value returned by lzma_index_checks() would + only include the check type of the last Stream when multiple + lzma_indexes had been concatenated. + + In xz --list this meant that the summary would only list the + check type of the last Stream, so in this sense this was only + a visual bug. However, it's possible that some applications + use this information for purposes other than merely showing + it to the users in an informational message. I'm not aware of + such applications though and it's quite possible that such + applications don't exist. + + Regular streamed decompression in xz or any other application + doesn't use lzma_index_cat() and so this bug cannot affect them. + + src/liblzma/common/index.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit a61d32172789735350a941e23baf6b587c49e5d9 +Author: Lasse Collin +Date: 2022-09-28 12:20:41 +0300 + + tuklib_physmem: Fix Unicode builds on Windows. + + Thanks to ArSaCiA Game. + + src/common/tuklib_physmem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5a4d3548ab214fdca364d5c734baf1d1fab47308 +Author: Lasse Collin +Date: 2022-09-28 11:12:07 +0300 + + Tests: Add test_memlimit.c to test restarting after LZMA_MEMLIMIT_ERROR. + + tests/Makefile.am | 2 + + tests/test_memlimit.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 153 insertions(+) + +commit 660739f99ab211edec4071de98889fb32ed04e98 +Author: Lasse Collin +Date: 2022-09-28 11:05:15 +0300 + + liblzma: Stream decoder: Fix restarting after LZMA_MEMLIMIT_ERROR. + + If lzma_code() returns LZMA_MEMLIMIT_ERROR it is now possible + to use lzma_memlimit_set() to increase the limit and continue + decoding. This was supposed to work from the beginning but + there was a bug. With other decoders (.lzma or threaded .xz) + this already worked correctly. + + src/liblzma/common/stream_decoder.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 7e68fda58c74ad9e5b876cc22fcbe80fc0e4747b +Author: Lasse Collin +Date: 2022-09-28 11:00:23 +0300 + + liblzma: Stream decoder: Fix comments. + + src/liblzma/common/stream_decoder.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit f664cb25841fc1c478b819034a224a558e2ac6e7 +Author: Lasse Collin +Date: 2022-09-20 16:58:22 +0300 + + liblzma: ARM64: Add comments. + + src/liblzma/simple/arm64.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit b557b4a0eea05470fae8ba5ef4ad5a6dfb36ac41 +Author: Lasse Collin +Date: 2022-09-20 16:27:50 +0300 + + liblzma: ARM64: Fix wrong comment in API doc. + + Thanks to Jia Tan. + + src/liblzma/api/lzma/bcj.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d5b0906fa55157f48c200188a3951d80df9cb308 +Author: Lasse Collin +Date: 2022-09-19 20:24:26 +0300 + + xz: Add --experimental-arm64[=width=WIDTH]. + + It will be renamed to --arm64 once it is stable. + + Man page or --long-help weren't updated yet. + + src/xz/args.c | 7 +++++++ + src/xz/message.c | 7 +++++++ + src/xz/options.c | 39 +++++++++++++++++++++++++++++++++++++++ + src/xz/options.h | 7 +++++++ + 4 files changed, 60 insertions(+) + +commit ecb966de308c255bb4735a7307ef9901c643a9de +Author: Lasse Collin +Date: 2022-09-19 19:34:56 +0300 + + liblzma: Add experimental ARM64 BCJ filter with a temporary Filter ID. + + That is, the Filter ID will be changed once the design is final. + The current version will be removed. So files created with the + tempoary Filter ID won't be supported in the future. + + CMakeLists.txt | 3 + + configure.ac | 4 +- + src/liblzma/api/lzma/bcj.h | 35 +++++- + src/liblzma/common/filter_common.c | 9 ++ + src/liblzma/common/filter_decoder.c | 8 ++ + src/liblzma/common/filter_encoder.c | 11 ++ + src/liblzma/simple/Makefile.inc | 4 + + src/liblzma/simple/arm64.c | 227 ++++++++++++++++++++++++++++++++++++ + src/liblzma/simple/simple_coder.h | 9 ++ + src/liblzma/simple/simple_decoder.h | 4 + + src/liblzma/simple/simple_encoder.h | 2 + + 11 files changed, 313 insertions(+), 3 deletions(-) + +commit 177bdc922cb17bd0fd831ab8139dfae912a5c2b8 +Author: Lasse Collin +Date: 2022-09-17 22:42:18 +0300 + + liblzma: Simple/BCJ filters: Allow disabling generic BCJ options. + + This will be needed for the ARM64 BCJ filter as it will use + its own options struct. + + src/liblzma/simple/arm.c | 2 +- + src/liblzma/simple/armthumb.c | 2 +- + src/liblzma/simple/ia64.c | 2 +- + src/liblzma/simple/powerpc.c | 2 +- + src/liblzma/simple/simple_coder.c | 4 ++-- + src/liblzma/simple/simple_private.h | 2 +- + src/liblzma/simple/sparc.c | 2 +- + src/liblzma/simple/x86.c | 3 ++- + 8 files changed, 10 insertions(+), 9 deletions(-) + +commit c3592d0a55114144686ecf960cb516d6b31c98e9 +Author: Lasse Collin +Date: 2022-09-16 17:08:53 +0300 + + Tests: Add a test file for lzma_index_append() integer overflow bug. + + This test fails before commit 18d7facd3802b55c287581405c4d49c98708c136. + + test_files.sh now runs xz -l for bad-3-index-uncomp-overflow.xz + because only then the previously-buggy code path gets tested. + Normal decompression doesn't use lzma_index_append() at all. + Instead, lzma_index_hash functions are used and those already + did the overflow check. + + tests/files/README | 10 ++++++++++ + tests/files/bad-3-index-uncomp-overflow.xz | Bin 0 -> 132 bytes + tests/test_files.sh | 8 ++++++++ + 3 files changed, 18 insertions(+) + +commit 982b29f828079a2a26253a40e975127a40a7d2bd +Author: Lasse Collin +Date: 2022-09-16 15:10:07 +0300 + + Translations: Add Turkish translation. + + po/LINGUAS | 1 + + po/tr.po | 977 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 978 insertions(+) + +commit 1fc088d9f6d1697924aaeac8cd1fb9918d1532e2 +Author: Lasse Collin +Date: 2022-09-16 14:09:07 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 097c7b67ce86ff16a7cef7631b39e5ca4ee3d420 +Author: Lasse Collin +Date: 2022-09-16 14:07:03 +0300 + + xzgrep: Fix compatibility with old shells. + + Running the current xzgrep on Slackware 10.1 with GNU bash 3.00.15: + + xzgrep: line 231: syntax error near unexpected token `;;' + + On SCO OpenServer 5.0.7 with Korn Shell 93r: + + syntax error at line 231 : `;;' unexpected + + Turns out that some old shells don't like apostrophes (') inside + command substitutions. For example, the following fails: + + x=$(echo foo + # asdf'zxcv + echo bar) + printf '%s\n' "$x" + + The problem was introduced by commits + 69d1b3fc29677af8ade8dc15dba83f0589cb63d6 (2022-03-29), + bd7b290f3fe4faeceb7d3497ed9bf2e6ed5e7dc5 (2022-07-18), and + a648978b20495b7aa4a8b029c5a810b5ad9d08ff (2022-07-19). + 5.2.6 is the only stable release that included + this problem. + + Thanks to Kevin R. Bulgrien for reporting the problem + on SCO OpenServer 5.0.7 and for providing the fix. + + src/scripts/xzgrep.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f2d084fe3f0d6d71488bfc6987f26542f67bfd99 +Author: Lasse Collin +Date: 2022-09-09 14:12:30 +0300 + + Tests: Silence warnings about unused functions from tuktest.h. + + Warnings about unused tuktest_run_test conveniently tell which + test programs haven't been converted to tuktest.h yet but I + silenced that warning too for now anyway. + + It is fine to use __attribute__((__unused__)) even when the + function is actually used because the attribute only means + that the function might be unused. + + tests/tuktest.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit f8ee61e74eb40600445fdb601c374d582e1e9c8a +Author: Lasse Collin +Date: 2022-09-09 13:51:57 +0300 + + liblzma: lzma_filters_copy: Keep dest[] unmodified if an error occurs. + + lzma_stream_encoder() and lzma_stream_encoder_mt() always assumed + this. Before this patch, failing lzma_filters_copy() could result + in free(invalid_pointer) or invalid memory reads in stream_encoder.c + or stream_encoder_mt.c. + + To trigger this, allocating memory for a filter options structure + has to fail. These are tiny allocations so in practice they very + rarely fail. + + Certain badness in the filter chain array could also make + lzma_filters_copy() fail but both stream_encoder.c and + stream_encoder_mt.c validate the filter chain before + trying to copy it, so the crash cannot occur this way. + + src/liblzma/api/lzma/filter.h | 4 +++- + src/liblzma/common/filter_common.c | 18 ++++++++++++------ + 2 files changed, 15 insertions(+), 7 deletions(-) + +commit 18d7facd3802b55c287581405c4d49c98708c136 +Author: Jia Tan +Date: 2022-09-02 20:18:55 +0800 + + liblzma: lzma_index_append: Add missing integer overflow check. + + The documentation in src/liblzma/api/lzma/index.h suggests that + both the unpadded (compressed) size and the uncompressed size + are checked for overflow, but only the unpadded size was checked. + The uncompressed check is done first since that is more likely to + occur than the unpadded or index field size overflows. + + src/liblzma/common/index.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9ac06cb5b85274d18f9f70d82cf2d8c9c1151bd4 +Author: Lasse Collin +Date: 2022-09-08 15:11:08 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit ba3e4ba2de034ae93a513f9c3a0823b80cdb66dc +Author: Jia Tan +Date: 2022-09-08 15:07:00 +0300 + + CMake: Clarify a comment about Windows symlinks without file extension. + + CMakeLists.txt | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 17485e884ce5c74315f29a8a1507bc706cd5cd1d +Author: Lasse Collin +Date: 2022-09-08 15:02:41 +0300 + + CMake: Update for liblzma_*.map files and fix wrong common_w32res.rc dep. + + The previous commit split liblzma.map into liblzma_linux.map and + liblzma_generic.map. This commit updates the CMake build for those. + + common_w32res.rc dependency was listed under Linux/FreeBSD while + obviously it belongs to Windows when building a DLL. + + CMakeLists.txt | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +commit 913ddc5572b9455fa0cf299be2e35c708840e922 +Author: Lasse Collin +Date: 2022-09-04 23:23:00 +0300 + + liblzma: Vaccinate against an ill patch from RHEL/CentOS 7. + + RHEL/CentOS 7 shipped with 5.1.2alpha, including the threaded + encoder that is behind #ifdef LZMA_UNSTABLE in the API headers. + In 5.1.2alpha these symbols are under XZ_5.1.2alpha in liblzma.map. + API/ABI compatibility tracking isn't done between development + releases so newer releases didn't have XZ_5.1.2alpha anymore. + + Later RHEL/CentOS 7 updated xz to 5.2.2 but they wanted to keep + the exported symbols compatible with 5.1.2alpha. After checking + the ABI changes it turned out that >= 5.2.0 ABI is backward + compatible with the threaded encoder functions from 5.1.2alpha + (but not vice versa as fixes and extensions to these functions + were made between 5.1.2alpha and 5.2.0). + + In RHEL/CentOS 7, XZ Utils 5.2.2 was patched with + xz-5.2.2-compat-libs.patch to modify liblzma.map: + + - XZ_5.1.2alpha was added with lzma_stream_encoder_mt and + lzma_stream_encoder_mt_memusage. This matched XZ Utils 5.1.2alpha. + + - XZ_5.2 was replaced with XZ_5.2.2. It is clear that this was + an error; the intention was to keep using XZ_5.2 (XZ_5.2.2 + has never been used in XZ Utils). So XZ_5.2.2 lists all + symbols that were listed under XZ_5.2 before the patch. + lzma_stream_encoder_mt and _mt_memusage are included too so + they are listed both here and under XZ_5.1.2alpha. + + The patch didn't add any __asm__(".symver ...") lines to the .c + files. Thus the resulting liblzma.so exports the threaded encoder + functions under XZ_5.1.2alpha only. Listing the two functions + also under XZ_5.2.2 in liblzma.map has no effect without + matching .symver lines. + + The lack of XZ_5.2 in RHEL/CentOS 7 means that binaries linked + against unpatched XZ Utils 5.2.x won't run on RHEL/CentOS 7. + This is unfortunate but this alone isn't too bad as the problem + is contained within RHEL/CentOS 7 and doesn't affect users + of other distributions. It could also be fixed internally in + RHEL/CentOS 7. + + The second problem is more serious: In XZ Utils 5.2.2 the API + headers don't have #ifdef LZMA_UNSTABLE for obvious reasons. + This is true in RHEL/CentOS 7 version too. Thus now programs + using new APIs can be compiled without an extra #define. However, + the programs end up depending on symbol version XZ_5.1.2alpha + (and possibly also XZ_5.2.2) instead of XZ_5.2 as they would + with an unpatched XZ Utils 5.2.2. This means that such binaries + won't run on other distributions shipping XZ Utils >= 5.2.0 as + they don't provide XZ_5.1.2alpha or XZ_5.2.2; they only provide + XZ_5.2 (and XZ_5.0). (This includes RHEL/CentOS 8 as the patch + luckily isn't included there anymore with XZ Utils 5.2.4.) + + Binaries built by RHEL/CentOS 7 users get distributed and then + people wonder why they don't run on some other distribution. + Seems that people have found out about the patch and been copying + it to some build scripts, seemingly curing the symptoms but + actually spreading the illness further and outside RHEL/CentOS 7. + + The ill patch seems to be from late 2016 (RHEL 7.3) and in 2017 it + had spread at least to EasyBuild. I heard about the events only + recently. :-( + + This commit splits liblzma.map into two versions: one for + GNU/Linux and another for other OSes that can use symbol versioning + (FreeBSD, Solaris, maybe others). The Linux-specific file and the + matching additions to .c files add full compatibility with binaries + that have been built against a RHEL/CentOS-patched liblzma. Builds + for OSes other than GNU/Linux won't get the vaccine as they should + be immune to the problem (I really hope that no build script uses + the RHEL/CentOS 7 patch outside GNU/Linux). + + The RHEL/CentOS compatibility symbols XZ_5.1.2alpha and XZ_5.2.2 + are intentionally put *after* XZ_5.2 in liblzma_linux.map. This way + if one forgets to #define HAVE_SYMBOL_VERSIONS_LINUX when building, + the resulting liblzma.so.5 will have lzma_stream_encoder_mt@@XZ_5.2 + since XZ_5.2 {...} is the first one that lists that function. + Without HAVE_SYMBOL_VERSIONS_LINUX @XZ_5.1.2alpha and @XZ_5.2.2 + will be missing but that's still a minor problem compared to + only having lzma_stream_encoder_mt@@XZ_5.1.2alpha! + + The "local: *;" line was moved to XZ_5.0 so that it doesn't need + to be moved around. It doesn't matter where it is put. + + Having two similar liblzma_*.map files is a bit silly as it is, + at least for now, easily possible to generate the generic one + from the Linux-specific file. But that adds extra steps and + increases the risk of mistakes when supporting more than one + build system. So I rather maintain two files in parallel and let + validate_map.sh check that they are in sync when "make mydist" + is run. + + This adds .symver lines for lzma_stream_encoder_mt@XZ_5.2.2 and + lzma_stream_encoder_mt_memusage@XZ_5.2.2 even though these + weren't exported by RHEL/CentOS 7 (only @@XZ_5.1.2alpha was + for these two). I added these anyway because someone might + misunderstand the RHEL/CentOS 7 patch and think that @XZ_5.2.2 + (@@XZ_5.2.2) versions were exported too. + + At glance one could suggest using __typeof__ to copy the function + prototypes when making aliases. However, this doesn't work trivially + because __typeof__ won't copy attributes (lzma_nothrow, lzma_pure) + and it won't change symbol visibility from hidden to default (done + by LZMA_API()). Attributes could be copied with __copy__ attribute + but that needs GCC 9 and a fallback method would be needed anyway. + + This uses __symver__ attribute with GCC >= 10 and + __asm__(".symver ...") with everything else. The attribute method + is required for LTO (-flto) support with GCC. Using -flto with + GCC older than 10 is now broken on GNU/Linux and will not be fixed + (can silently result in a broken liblzma build that has dangerously + incorrect symbol versions). LTO builds with Clang seem to work + with the traditional __asm__(".symver ...") method. + + Thanks to Boud Roukema for reporting the problem and discussing + the details and testing the fix. + + configure.ac | 23 +++- + src/liblzma/Makefile.am | 10 +- + src/liblzma/common/block_buffer_encoder.c | 18 ++++ + src/liblzma/common/common.c | 14 +++ + src/liblzma/common/common.h | 28 +++++ + src/liblzma/common/hardware_cputhreads.c | 12 +++ + src/liblzma/common/stream_encoder_mt.c | 42 ++++++++ + src/liblzma/{liblzma.map => liblzma_generic.map} | 6 +- + src/liblzma/liblzma_linux.map | 131 +++++++++++++++++++++++ + src/liblzma/validate_map.sh | 113 +++++++++++++++++-- + 10 files changed, 382 insertions(+), 15 deletions(-) + +commit 80a1a8bb838842a2be343bd88ad1462c21c5e2c9 +Author: Lasse Collin +Date: 2022-08-31 16:42:04 +0300 + + CMake: Add xz symlinks. + + These are a minor thing especially since the xz build has + some real problems still like lack of large file support + on 32-bit systems but I'll commit this since the code exists. + + Thanks to Jia Tan. + + CMakeLists.txt | 38 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 37 insertions(+), 1 deletion(-) + +commit a4193bb6d85d7765b1b87faeab3e50106d3ab2e9 +Author: Lasse Collin +Date: 2022-08-31 16:29:38 +0300 + + CMake: Put xz man page install under if(UNIX) like is for xzdec. + + Thanks to Jia Tan. + + CMakeLists.txt | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit c1555b1a221a1427d4d650647531016d754bc4da +Author: Lasse Collin +Date: 2022-08-22 18:16:40 +0300 + + Bump version number for 5.3.3alpha. + + src/liblzma/api/lzma/version.h | 2 +- + src/liblzma/liblzma.map | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 44fedddc11c3f6ec2f7fe35a3e38f15ca93f90eb +Author: Lasse Collin +Date: 2022-08-22 18:13:56 +0300 + + Add NEWS for 5.3.3alpha. + + NEWS | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 119 insertions(+) + +commit a93e235d7ca764cc19f8f9f9063b40ff361c3cfa +Author: Lasse Collin +Date: 2022-07-12 17:59:41 +0300 + + Translations: Add Portuguese translation. + + Jia Tan made white-space changes and also changed "Language: pt_BR\n" + to pt. The translator wasn't reached so I'm hoping these changes + are OK and will commit it without translator's approval. + + Thanks to Pedro Albuquerque and Jia Tan. + + po/LINGUAS | 1 + + po/pt.po | 1001 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 1002 insertions(+) + +commit e7cf5a946f25e40d77f45e41f0dee7d42a04e9ae +Author: Lasse Collin +Date: 2022-07-10 21:16:40 +0300 + + Translations: Add Serbian translation. + + Quite a few white-space changes were made by Jia Tan to make + this look good. Contacting the translator didn't succeed so + I'm committing this without getting translator's approval. + + Thanks to Мирослав Николић (Miroslav Nikolic) and Jia Tan. + + po/LINGUAS | 1 + + po/sr.po | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 988 insertions(+) + +commit cc8617ab53b1f2a4da212fa76c92fe538269c5de +Author: Lasse Collin +Date: 2022-07-04 23:51:36 +0300 + + Translations: Add Swedish translation. + + Thanks to Sebastian Rasmussen and Jia Tan. + + po/LINGUAS | 1 + + po/sv.po | 983 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 984 insertions(+) + +commit c613598c358b640682d0ca2aed38fa7df763e8c7 +Author: Lasse Collin +Date: 2022-07-04 23:40:27 +0300 + + Translations: Add Esperanto translation. + + Thanks to Keith Bowes and Jia Tan. + + po/LINGUAS | 1 + + po/eo.po | 984 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 985 insertions(+) + +commit 659a587d678f21e98e91d2751c31d4ce050c081a +Author: Lasse Collin +Date: 2022-07-01 00:22:33 +0300 + + Translations: Add Catalan translation. + + Thanks to Jordi Mas and Jia Tan. + + po/LINGUAS | 1 + + po/ca.po | 1076 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 1077 insertions(+) + +commit 739fd8c9bdf1d85f57d56642aad87148d4779530 +Author: Lasse Collin +Date: 2022-06-30 17:47:08 +0300 + + Translations: Add Ukrainian translation. + + Thanks to Yuri Chornoivan and Jia Tan. + + po/LINGUAS | 1 + + po/uk.po | 996 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 997 insertions(+) + +commit 73280550b111930c62a667e56add8fd574f80bc8 +Author: Lasse Collin +Date: 2022-06-30 17:45:26 +0300 + + Translators: Add Romanian translation. + + Thanks to Remus-Gabriel Chelu and Jia Tan. + + po/LINGUAS | 1 + + po/ro.po | 1016 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 1017 insertions(+) + +commit 2465f5b825152714b2c357d96c2422c31109d320 +Author: Lasse Collin +Date: 2022-06-29 18:33:32 +0300 + + Translations: Update Brazilian Portuguese translation. + + One msgstr was changed. The diff is long due to changes + in the source code line numbers in the comments. + + Thanks to Rafael Fontenelle. + + po/pt_BR.po | 186 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 92 insertions(+), 94 deletions(-) + +commit 434e1ffd3e62719d509da10b646216f5ef53fe4d +Author: Lasse Collin +Date: 2022-06-29 18:04:44 +0300 + + Translations: Add Croatian translation. + + Thanks to Božidar Putanec and Jia Tan. + + po/LINGUAS | 1 + + po/hr.po | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 988 insertions(+) + +commit 0732d0f7065c9bd48bfe4f5983144ae970c4a499 +Author: Lasse Collin +Date: 2022-06-29 17:58:48 +0300 + + Translations: Add Spanish translation. + + Thanks to Cristian Othón Martínez Vera and Jia Tan. + + po/LINGUAS | 1 + + po/es.po | 984 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 985 insertions(+) + +commit 9899b0f82bc130998d1f1f618a6ab805b73f2696 +Author: Lasse Collin +Date: 2022-06-29 17:49:43 +0300 + + Translations: Add Korean translation. + + Thanks to Seong-ho Cho and Jia Tan. + + po/LINGUAS | 1 + + po/ko.po | 972 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 973 insertions(+) + +commit 65217eaf6bd195f3ef027d4ac55d57b7d133d69f +Author: Lasse Collin +Date: 2020-03-16 21:57:21 +0200 + + Translations: Rebuild cs.po to avoid incorrect fuzzy strings. + + "make dist" updates the .po files and the fuzzy strings would + result in multiple very wrong translations. + + po/cs.po | 592 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 322 insertions(+), 270 deletions(-) + +commit e56ff423ee7af9e648e16b132f0d835d2cb4db26 +Author: Lasse Collin +Date: 2020-03-16 17:30:39 +0200 + + Translations: Add partial Danish translation. + + I made a few minor white space changes without getting them + approved by the Danish translation team. + + po/LINGUAS | 1 + + po/da.po | 896 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 897 insertions(+) + +commit 43e09c62e77cb8807d932c81de4decbdb956e184 +Author: Lasse Collin +Date: 2020-03-11 22:37:54 +0200 + + Translations: Add hu, zh_CN, and zh_TW. + + I made a few white space changes to these without getting them + approved by the translation teams. (I tried to contact the hu and + zh_TW teams but didn't succeed. I didn't contact the zh_CN team.) + + po/LINGUAS | 3 + + po/hu.po | 985 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + po/zh_CN.po | 963 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + po/zh_TW.po | 956 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 2907 insertions(+) + +commit 982b6b198ae1ffe6093236dd8a3d03d1415b912b +Author: Lasse Collin +Date: 2020-03-11 14:33:30 +0200 + + Translations: Update vi.po to match the file from the TP. + + The translated strings haven't been updated but word wrapping + is different. + + po/vi.po | 407 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 179 insertions(+), 228 deletions(-) + +commit 801f39691fc4abc6dd33d7653d498781b593f3eb +Author: Lasse Collin +Date: 2020-03-11 14:18:03 +0200 + + Translations: Add fi and pt_BR, and update de, fr, it, and pl. + + The German translation isn't identical to the file in + the Translation Project but the changes (white space changes + only) were approved by the translator Mario Blättermann. + + po/LINGUAS | 2 + + po/de.po | 476 ++++++++++++++-------------- + po/fi.po | 974 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + po/fr.po | 272 ++++++++-------- + po/it.po | 479 ++++++++++++---------------- + po/pl.po | 239 +++++++------- + po/pt_BR.po | 1001 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 2697 insertions(+), 746 deletions(-) + +commit 311e4f85ede5d2f0bb71f3ad70b5b7db1b5adf33 +Author: Lasse Collin +Date: 2022-08-22 17:27:19 +0300 + + xz: Try to clarify --memlimit-mt-decompress vs. --memlimit-compress. + + src/xz/xz.1 | 31 +++++++++++++++++++------------ + 1 file changed, 19 insertions(+), 12 deletions(-) + +commit df23c31000283c00e5ef1ca32a0bc3bb757bd707 +Author: Lasse Collin +Date: 2022-08-22 16:46:18 +0300 + + CMake: Add liblzma tests. + + Thanks to Jia Tan for the patch. + + CMakeLists.txt | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 52 insertions(+), 1 deletion(-) + +commit 02a777f9c422d3b5ec895078530bb1a2b6f7bdf5 +Author: Lasse Collin +Date: 2022-08-19 23:32:22 +0300 + + xz: Revise --info-memory output. + + The strings could be more descriptive but it's good + to have some version of this committed now. + + --robot mode wasn't changed yet. + + src/xz/hardware.c | 32 ++++++++++++++++++++++++++------ + src/xz/xz.1 | 1 + + 2 files changed, 27 insertions(+), 6 deletions(-) + +commit f864f6d42eab57ea8ed82cc2dd19a03b51377442 +Author: Lasse Collin +Date: 2022-08-19 23:12:02 +0300 + + xz: Update the man page for threaded decompression and memlimits. + + This documents the changes made in commits + 6c6da57ae2aa962aabde6892442227063d87e88c, + cad299008cf73ec566f0662a9cf2b94f86a99659, and + 898faa97287a756231c663a3ed5165672b417207. + + The --info-memory bit hasn't been finished yet + even though it's already mentioned in this commit + under --memlimit-mt-decompress and --threads. + + src/xz/xz.1 | 148 +++++++++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 121 insertions(+), 27 deletions(-) + +commit d13bfcc0056617dd648f655a01653932fad7067f +Author: Lasse Collin +Date: 2022-08-18 17:49:16 +0300 + + Build: Include the CMake files in the distribution. + + This was supposed to be done in 2020 with 5.2.5 release + already but it was noticed only today. 5.2.5 and 5.2.6 + even mention experiemental CMake support in the NEWS entries. + + Thanks to Olivier B. for reporting the problem. + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit e66787bcfefdb93f19c974f895f65969a77937b0 +Author: Lasse Collin +Date: 2022-08-18 17:38:05 +0300 + + Windows: Fix broken liblzma.dll build with Visual Studio project files. + + The bug was introduced in 352ba2d69af2136bc814aa1df1a132559d445616 + "Windows: Fix building of resource files when config.h isn't used." + + That commit fixed liblzma.dll build with CMake while keeping it + working with Autotools on Windows but the VS project files were + forgotten. + + I haven't tested these changes. + + Thanks to Olivier B. for reporting the bug and for the initial patch. + + windows/vs2013/liblzma_dll.vcxproj | 6 ++++++ + windows/vs2017/liblzma_dll.vcxproj | 6 ++++++ + windows/vs2019/liblzma_dll.vcxproj | 6 ++++++ + 3 files changed, 18 insertions(+) + +commit c4e8e5fb311225b8b48d34157891a640b2535e0c +Author: Lasse Collin +Date: 2022-08-18 17:16:49 +0300 + + liblzma: Threaded decoder: Improve LZMA_FAIL_FAST when LZMA_FINISH is used. + + It will now return LZMA_DATA_ERROR (not LZMA_OK or LZMA_BUF_ERROR) + if LZMA_FINISH is used and there isn't enough input to finish + decoding the Block Header or the Block. The use of LZMA_DATA_ERROR + is simpler and the less risky than LZMA_BUF_ERROR but this might + be changed before 5.4.0. + + src/liblzma/api/lzma/container.h | 6 +++++ + src/liblzma/common/stream_decoder_mt.c | 42 ++++++++++++++++++++++++++++++++++ + 2 files changed, 48 insertions(+) + +commit 6dcf606e7efa2b259f0262f9e2f61e00116842d3 +Author: Lasse Collin +Date: 2022-08-12 18:31:47 +0300 + + Add NEWS for 5.2.6. + + NEWS | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 121 insertions(+) + +commit 413b86fcf8934fae5a004f378a9483d37d8fcaab +Author: Lasse Collin +Date: 2022-08-12 14:28:41 +0300 + + Add Jia Tan to AUTHORS. + + AUTHORS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 352672732c346c546ff3c26d0605bc0ed1c8b7c7 +Author: Lasse Collin +Date: 2022-07-25 19:28:26 +0300 + + Build: Start the generated ChangeLog from around 5.2.0 instead of 5.0.0. + + This makes ChangeLog smaller. + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f6d11225d6016be2bbb55d845b66f6b04d048df +Author: Lasse Collin +Date: 2022-07-25 19:11:05 +0300 + + Translations: Change the copyright comment string to use with po4a. + + This affects the second line in po4a/xz-man.pot. The man pages of + xzdiff, xzgrep, and xzmore are from GNU gzip and under GNU GPLv2+ + while the rest of the man pages are in the public domain. + + po4a/update-po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 61f8ec804abdb4c5dac01e8ae9b90c7be58a5c24 +Author: Jia Tan +Date: 2022-07-25 18:30:05 +0300 + + liblzma: Refactor lzma_mf_is_supported() to use a switch-statement. + + src/liblzma/lz/lz_encoder.c | 32 ++++++++++++++------------------ + 1 file changed, 14 insertions(+), 18 deletions(-) + +commit 4d80b463a1251aa22eabc87d2732fec13b1adda6 +Author: Jia Tan +Date: 2022-07-25 18:20:01 +0300 + + Build: Don't allow empty LIST in --enable-match-finders=LIST. + + It's enforced only when a match finder is needed, that is, + when LZMA1 or LZMA2 encoder is enabled. + + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9cc721af5436908f2d5a828aebbc4050a32a3487 +Author: Lasse Collin +Date: 2022-07-24 13:27:48 +0300 + + xz: Update the man page that change to --keep will be in 5.2.6. + + src/xz/xz.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b81bf0c7d1873e52a4086a9abb494471d652cb55 +Author: Lasse Collin +Date: 2022-07-19 23:23:54 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 340cf1ec3927767046b8293a49da3db4e393f426 +Author: Nicholas Jackson +Date: 2022-07-17 17:39:23 -0700 + + CMake: Add missing source file to liblzma build + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit d796b6d7fdb8b7238b277056cf9146cce25db604 +Author: Lasse Collin +Date: 2022-07-19 23:19:49 +0300 + + xzgrep man page: Document exit statuses. + + src/scripts/xzgrep.1 | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit 923bf96b55e5216a6c8df9d8331934f54784390e +Author: Lasse Collin +Date: 2022-07-19 23:13:24 +0300 + + xzgrep: Improve error handling, especially signals. + + xzgrep wouldn't exit on SIGPIPE or SIGQUIT when it clearly + should have. It's quite possible that it's not perfect still + but at least it's much better. + + If multiple exit statuses compete, now it tries to pick + the largest of value. + + Some comments were added. + + The exit status handling of signals is still broken if the shell + uses values larger than 255 in $? to indicate that a process + died due to a signal ***and*** their "exit" command doesn't take + this into account. This seems to work well with the ksh and yash + versions I tried. However, there is a report in gzip/zgrep that + OpenSolaris 5.11 (not 5.10) has a problem with "exit" truncating + the argument to 8 bits: + + https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22900#25 + + Such a bug would break xzgrep but I didn't add a workaround + at least for now. 5.11 is old and I don't know if the problem + exists in modern descendants, or if the problem exists in other + ksh implementations in use. + + src/scripts/xzgrep.in | 72 +++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 53 insertions(+), 19 deletions(-) + +commit a648978b20495b7aa4a8b029c5a810b5ad9d08ff +Author: Lasse Collin +Date: 2022-07-19 00:10:55 +0300 + + xzgrep: Make the fix for ZDI-CAN-16587 more robust. + + I don't know if this can make a difference in the real world + but it looked kind of suspicious (what happens with sed + implementations that cannot process very long lines?). + At least this commit shouldn't make it worse. + + src/scripts/xzgrep.in | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit bd7b290f3fe4faeceb7d3497ed9bf2e6ed5e7dc5 +Author: Lasse Collin +Date: 2022-07-18 21:52:31 +0300 + + xzgrep: Use grep -H --label when available (GNU, *BSDs). + + It avoids the use of sed for prefixing filenames to output lines. + Using sed for that is slower and prone to security bugs so now + the sed method is only used as a fallback. + + This also fixes an actual bug: When grepping a binary file, + GNU grep nowadays prints its diagnostics to stderr instead of + stdout and thus the sed-method for prefixing the filename doesn't + work. So with this commit grepping binary files gives reasonable + output with GNU grep now. + + This was inspired by zgrep but the implementation is different. + + src/scripts/xzgrep.in | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit b56729af9f1a596e57aeefd7570d8d7dce5c9f52 +Author: Lasse Collin +Date: 2022-07-18 21:10:25 +0300 + + xzgrep: Use -e to specify the pattern to grep. + + Now we don't need the separate test for adding the -q option + as it can be added directly in the two places where it's needed. + + src/scripts/xzgrep.in | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +commit bad61b5997e6647911974022bfb72f3d4818a594 +Author: Lasse Collin +Date: 2022-07-18 19:18:48 +0300 + + Scripts: Use printf instead of echo in a few places. + + It's a good habbit as echo has some portability corner cases + when the string contents can be anything. + + src/scripts/xzdiff.in | 6 +++--- + src/scripts/xzgrep.in | 4 ++-- + src/scripts/xzless.in | 4 ++-- + src/scripts/xzmore.in | 8 ++++---- + 4 files changed, 11 insertions(+), 11 deletions(-) + +commit 6a4a4a7d2667837dc824c26fcb19ed6ca5aff645 +Author: Lasse Collin +Date: 2022-07-17 21:36:25 +0300 + + xzgrep: Add more LC_ALL=C to avoid bugs with multibyte characters. + + Also replace one use of expr with printf. + + The rationale for LC_ALL=C was already mentioned in + 69d1b3fc29677af8ade8dc15dba83f0589cb63d6 that fixed a security + issue. However, unrelated uses weren't changed in that commit yet. + + POSIX says that with sed and such tools one should use LC_ALL=C + to ensure predictable behavior when strings contain byte sequences + that aren't valid multibyte characters in the current locale. See + under "Application usage" in here: + + https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html + + With GNU sed invalid multibyte strings would work without this; + it's documented in its Texinfo manual. Some other implementations + aren't so forgiving. + + src/scripts/xzgrep.in | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit b48f9d615f2c2e8d2f6e253d0e48ee66d0652b68 +Author: Lasse Collin +Date: 2022-07-17 20:55:16 +0300 + + xzgrep: Fix parsing of certain options. + + Fix handling of "xzgrep -25 foo" (in GNU grep "grep -25 foo" is + an alias for "grep -C25 foo"). xzgrep would treat "foo" as filename + instead of as a pattern. This bug was fixed in zgrep in gzip in 2012. + + Add -E, -F, -G, and -P to the "no argument required" list. + + Add -X to "argument required" list. It is an + intentionally-undocumented GNU grep option so this isn't + an important option for xzgrep but it seems that other grep + implementations (well, those that I checked) don't support -X + so I hope this change is an improvement still. + + grep -d (grep --directories=ACTION) requires an argument. In + contrast to zgrep, I kept -d in the "no argument required" list + because it's not supported in xzgrep (or zgrep). This way + "xzgrep -d" gives an error about option being unsupported instead + of telling that it requires an argument. Both zgrep and xzgrep + tell that it's unsupported if an argument is specified. + + Add comments. + + src/scripts/xzgrep.in | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +commit 2d2201bc6315deda4d43625aa510972467bd51d4 +Author: Lasse Collin +Date: 2022-07-14 20:33:05 +0300 + + Tests: Add the .lzma files to test_files.sh. + + tests/test_files.sh | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit ce5549a591bf126300618879f5b24023351baff6 +Author: Lasse Collin +Date: 2022-07-14 19:37:42 +0300 + + Tests: Add .lzma test files. + + tests/files/README | 63 ++++++++++++++++----- + tests/files/bad-too_big_size-with_eopm.lzma | Bin 0 -> 37 bytes + tests/files/bad-too_small_size-without_eopm-1.lzma | Bin 0 -> 31 bytes + tests/files/bad-too_small_size-without_eopm-2.lzma | Bin 0 -> 31 bytes + tests/files/bad-too_small_size-without_eopm-3.lzma | Bin 0 -> 36 bytes + tests/files/bad-unknown_size-without_eopm.lzma | Bin 0 -> 31 bytes + tests/files/good-known_size-with_eopm.lzma | Bin 0 -> 37 bytes + tests/files/good-known_size-without_eopm.lzma | Bin 0 -> 31 bytes + tests/files/good-unknown_size-with_eopm.lzma | Bin 0 -> 37 bytes + 9 files changed, 50 insertions(+), 13 deletions(-) + +commit 107c93ee5cad51a6ea0cee471209bfe8d76deaa3 +Author: Lasse Collin +Date: 2022-07-14 18:12:38 +0300 + + liblzma: Rename a variable and improve a comment. + + src/liblzma/lzma/lzma_decoder.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit 511feb5eadb988d641b025d597f4fac7502003b8 +Author: Lasse Collin +Date: 2022-07-13 22:24:41 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 9595a3119b9faf0ce01375329cad8bbf85c35ea2 +Author: Lasse Collin +Date: 2022-07-13 22:24:07 +0300 + + liblzma: Add optional autodetection of LZMA end marker. + + Turns out that this is needed for .lzma files as the spec in + LZMA SDK says that end marker may be present even if the size + is stored in the header. Such files are rare but exist in the + real world. The code in liblzma is so old that the spec didn't + exist in LZMA SDK back then and I had understood that such + files weren't possible (the lzma tool in LZMA SDK didn't + create such files). + + This modifies the internal API so that LZMA decoder can be told + if EOPM is allowed even when the uncompressed size is known. + It's allowed with .lzma and not with other uses. + + Thanks to Karl Beldan for reporting the problem. + + doc/lzma-file-format.txt | 11 +++- + src/liblzma/common/alone_decoder.c | 2 +- + src/liblzma/common/microlzma_decoder.c | 2 +- + src/liblzma/lz/lz_decoder.c | 10 +++- + src/liblzma/lz/lz_decoder.h | 8 +-- + src/liblzma/lzma/lzma2_decoder.c | 2 +- + src/liblzma/lzma/lzma_decoder.c | 99 ++++++++++++++++++++++++---------- + 7 files changed, 95 insertions(+), 39 deletions(-) + +commit 0c0f8e9761eb6eaf199082cf144db7ac5f9d8cb2 +Author: Lasse Collin +Date: 2022-07-12 18:53:04 +0300 + + xz: Document the special memlimit case of 2000 MiB on MIPS32. + + See commit fc3d3a7296ef58bb799a73943636b8bfd95339f7. + + src/xz/xz.1 | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit d1bfa3dc703325ecd974167e864a8712fdfe936e +Author: Jia Tan +Date: 2022-07-01 21:19:26 +0800 + + Created script to generate code coverage reports. + + The script uses lcov and genhtml after running the tests + to show the code coverage statistics. The script will create + a coverage directory where it is run. It can be run both in + and out of the source directory. + + .gitignore | 4 +++ + tests/code_coverage.sh | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 83 insertions(+) + +commit 86a30b0255d8064169fabfd213d907016d2f9f2a +Author: Jia Tan +Date: 2022-06-16 17:32:19 +0300 + + Tests: Add more tests into test_check. + + tests/test_check.c | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++-- + tests/tests.h | 23 +++++ + 2 files changed, 295 insertions(+), 7 deletions(-) + +commit 82e30fed66a89706388a8c15dc954d84e63f38fa +Author: Lasse Collin +Date: 2022-06-16 15:02:57 +0300 + + Tests: Use char[][24] array for enum_strings_lzma_ret. + + Array of pointers to short strings is a bit pointless here + and now it's fully const. + + tests/tests.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5ba9459e6c4a29f6870ca78ce8ac6e519d59c41e +Author: Lasse Collin +Date: 2022-06-16 14:12:14 +0300 + + Tests: tuktest.h: Add tuktest_error_impl to help with error conditions. + + tests/tuktest.h | 72 +++++++++++++++++++++++++-------------------------------- + 1 file changed, 32 insertions(+), 40 deletions(-) + +commit b339892668da20aea22a93668c82b87a38e4a97f +Author: Lasse Collin +Date: 2022-06-16 13:29:59 +0300 + + Tests: tuktest.h: Rename file_from_* and use tuktest_malloc there. + + tests/test_bcj_exact_size.c | 4 +--- + tests/tuktest.h | 52 +++++++++++++++++++++------------------------ + 2 files changed, 25 insertions(+), 31 deletions(-) + +commit d8b63a0ad68d1c461eb373466679ebc41fbc207d +Author: Lasse Collin +Date: 2022-06-16 13:08:19 +0300 + + Tests: tuktest.h: Add malloc wrapper with automatic freeing. + + tests/tuktest.h | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 124 insertions(+) + +commit 1d51536a4b19a8fae768f8eb462fc2238cb36d53 +Author: Lasse Collin +Date: 2022-06-16 11:47:37 +0300 + + Tests: tuktest.h: Move a function. + + tests/tuktest.h | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +commit 70c7555f6403553ee35539e869de0025592d8564 +Author: Lasse Collin +Date: 2022-06-14 22:21:15 +0300 + + Tests: test_vli: Remove an invalid test-assertion. + + lzma_vli is unsigned so trying a signed value results in + a compiler warning from -Wsign-conversion. (lzma_vli)-1 + equals to LZMA_VLI_UNKNOWN anyway which is the next assertion. + + tests/test_vli.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 154b73c5a1092c3f785e01666b564ad7ff1be555 +Author: Lasse Collin +Date: 2022-06-14 22:10:10 +0300 + + Tests: test_vli: Add const where appropriate. + + tests/test_vli.c | 53 ++++++++++++++++++++++++++++------------------------- + 1 file changed, 28 insertions(+), 25 deletions(-) + +commit 0354d6cce3ff98ea6f927107baf216253f6ce2bb +Author: Jia Tan +Date: 2022-06-13 20:27:03 +0800 + + Added vli tests to .gitignore + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit a08f5ccf6bdc20ef70e41f6f3321618ef146f96e +Author: Jia Tan +Date: 2022-06-12 11:31:40 +0800 + + Created tests for all functions exported in vli.h + + Achieved 100% code coverage vli_encoder.c, vli_decoder.c, and vli_size.c + + tests/Makefile.am | 4 +- + tests/test_vli.c | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 311 insertions(+), 1 deletion(-) + +commit 1e3eb61815a91c0a1bfbb802e2d95593f523491f +Author: jiat75 +Date: 2022-06-03 21:24:54 +0800 + + Added parallel test artifacts to .gitignore + + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit 00e3613f1212eaa84e721585fdb4de6967cf2476 +Author: Lasse Collin +Date: 2022-06-14 21:29:21 +0300 + + Tests: Use good-1-empty-bcj-lzma2.xz in test_bcj_exact_size. + + It's much nicer this way so that the test data isn't a hardcoded + table inside the C file. + + tests/test_bcj_exact_size.c | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +commit 86bab755be252bfd3e0a9aee8e7b83a9bbb23ed0 +Author: Lasse Collin +Date: 2022-06-14 21:26:13 +0300 + + Tests: Add file reading helpers to tuktest.h. + + tests/tuktest.h | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 176 insertions(+), 7 deletions(-) + +commit 83d2337b72dbf391c6f3b41889eea99e51679105 +Author: Lasse Collin +Date: 2022-06-14 18:21:57 +0300 + + Tests: tuktest.h: Move a printf from a macro to a helper function. + + tests/tuktest.h | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +commit f9e8176ea7d520797a2db2d49a5a632c285674a8 +Author: Lasse Collin +Date: 2022-06-14 17:20:49 +0300 + + Tests: Add test file good-1-empty-bcj-lzma2.xz. + + This is from test_bcj_exact_size.c. + It's good to have it as a standalone file. + + tests/files/README | 5 +++++ + tests/files/good-1-empty-bcj-lzma2.xz | Bin 0 -> 52 bytes + 2 files changed, 5 insertions(+) + +commit aa75c5563a760aea3aa23d997d519e702e82726b +Author: Jia Tan +Date: 2022-06-10 21:35:18 +0800 + + Tests: Created tests for hardware functions. + + Created tests for all API functions exported in + src/liblzma/api/lzma/hardware.h. The tests are fairly trivial + but are helpful because they will inform users if their machines + cannot support these functions. They also improve the code + coverage metrics. + + .gitignore | 1 + + tests/Makefile.am | 2 ++ + tests/test_hardware.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 48 insertions(+) + +commit 5c8ffdca20813939818843476fb212dfae8838a3 +Author: Lasse Collin +Date: 2022-06-02 21:01:45 +0300 + + Tests: Convert test_check to tuktest. + + Thanks to Jia Tan for help with all the tests. + + tests/test_check.c | 67 +++++++++++++++++++++++++++--------------------------- + 1 file changed, 33 insertions(+), 34 deletions(-) + +commit faf5ff8899d539b4dcd2a7e5280cb820a4746c86 +Author: Lasse Collin +Date: 2022-06-02 20:31:03 +0300 + + Tests: Convert test_block_header to tuktest. + + tests/test_block_header.c | 89 +++++++++++++++++++++++++++-------------------- + 1 file changed, 52 insertions(+), 37 deletions(-) + +commit 754d39fbebee3782258d42f154a223d3c5770ec7 +Author: Lasse Collin +Date: 2022-06-02 20:28:23 +0300 + + Tests: Convert test_bcj_exact_size to tuktest. + + The compress() and decompress() functions were merged because + the later depends on the former so they need to be a single + test case. + + tests/test_bcj_exact_size.c | 75 +++++++++++++++++++++++++-------------------- + 1 file changed, 41 insertions(+), 34 deletions(-) + +commit 96da21470f9570cd08286906a050a7c22631775b +Author: Lasse Collin +Date: 2022-06-02 20:27:00 +0300 + + Tests: Include tuktest.h in tests.h. + + This breaks -Werror because none of the tests so far use + tuktest.h and thus there are warnings about unused variables + and functions. + + tests/tests.h | 47 +++++++++++++++++++++++------------------------ + 1 file changed, 23 insertions(+), 24 deletions(-) + +commit df71ba1c991f60c3269aaadd398247e632714626 +Author: Lasse Collin +Date: 2022-06-02 20:25:21 +0300 + + Tests: Add tuktest.h mini-test-framework. + + tests/Makefile.am | 1 + + tests/tuktest.h | 752 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 753 insertions(+) + +commit 4773608554d1b684a05ff9c1d879cf5c42266d33 +Author: Lasse Collin +Date: 2022-05-23 21:31:36 +0300 + + Build: Enable Automake's parallel test harness. + + It has been the default for quite some time already and + the old serial harness isn't discouraged. The downside is + that with parallel tests one cannot print progress info or + other diagnostics to the terminal; all output from the tests + will be in the log files only. But now that the compression + tests are separated the parallel tests will speed things up. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9a6dd6d46f7f256a5573e5d874c1052033ed7b05 +Author: Lasse Collin +Date: 2022-05-23 21:17:47 +0300 + + Tests: Split test_compress.sh into separate test unit for each file. + + test_compress.sh now takes one command line argument: + a filename to be tested. If it begins with "compress_generated_" + the file will be created with create_compress_files. + + This will allow parallel execution of the slow tests. + + tests/Makefile.am | 11 +++- + tests/test_compress.sh | 91 +++++++++++++++++++--------------- + tests/test_compress_generated_abc | 3 ++ + tests/test_compress_generated_random | 3 ++ + tests/test_compress_generated_text | 3 ++ + tests/test_compress_prepared_bcj_sparc | 3 ++ + tests/test_compress_prepared_bcj_x86 | 3 ++ + 7 files changed, 77 insertions(+), 40 deletions(-) + +commit c7758ac9c734707514dd34f254173ebac5eea7f8 +Author: Lasse Collin +Date: 2022-05-23 20:32:49 +0300 + + Test: Make create_compress_files.c a little more flexible. + + If a command line argument is given, then only the test file + of that type is created. It's quite dumb in sense that unknown + names don't give an error but it's good enough here. + + Also use EXIT_FAILURE instead of 1 as exit status for errors. + + tests/create_compress_files.c | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 deletions(-) + +commit 4a8e4a7b0ad4b03c0ac6862716c3457452cdaf8c +Author: Lasse Collin +Date: 2022-05-23 20:17:42 +0300 + + Tests: Remove unneeded commented lines from test_compress.sh. + + tests/test_compress.sh | 13 ------------- + 1 file changed, 13 deletions(-) + +commit 2ee50d150ee009f36135540b459e6ff328549725 +Author: Lasse Collin +Date: 2022-05-23 20:16:00 +0300 + + Tests: Remove progress indicator from test_compress.sh. + + It will be useless with Automake's parallel tests. + + tests/test_compress.sh | 9 --------- + 1 file changed, 9 deletions(-) + +commit 2ce4f36f179a81d0c6e182a409f363df759d1ad0 +Author: Lasse Collin +Date: 2022-05-23 19:37:18 +0300 + + liblzma: Silence a warning. + + The actual initialization is done via mythread_sync and seems + that GCC doesn't necessarily see that it gets initialized there. + + src/liblzma/common/stream_decoder_mt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5d8f3764ef43c35910e6d7003c0900a961ef6544 +Author: Lasse Collin +Date: 2022-04-14 20:53:16 +0300 + + xz: Fix build with --disable-threads. + + src/xz/hardware.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1d592897278b172d8549aa29c3a1f3a4f432a9b9 +Author: Lasse Collin +Date: 2022-04-14 14:50:17 +0300 + + xz: Change the cap of the default -T0 memlimit for 32-bit xz. + + The SIZE_MAX / 3 was 1365 MiB. 1400 MiB gives little more room + and it looks like a round (artificial) number in --info-memory + once --info-memory is made to display it. + + Also, using #if avoids useless code on 64-bit builds. + + src/xz/hardware.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c77fe55ddb7752ed0fec46967c5ec9a72632ea0c +Author: Lasse Collin +Date: 2022-04-14 14:20:46 +0300 + + xz: Add a default soft memory usage limit for --threads=0. + + This is a soft limit in sense that it only affects the number of + threads. It never makes xz fail and it never makes xz change + settings that would affect the compressed output. + + The idea is to make -T0 have more reasonable behavior when + the system has very many cores or when a memory-hungry + compression options are used. This also helps with 32-bit xz, + preventing it from running out of address space. + + The downside of this commit is that now the number of threads + might become too low compared to what the user expected. I + hope this to be an acceptable compromise as the old behavior + has been a source of well-argued complaints for a long time. + + src/xz/coder.c | 28 ++++++++++++++++++++++++++-- + src/xz/hardware.c | 38 +++++++++++++++++++++++++++++--------- + src/xz/hardware.h | 27 +++++++++++++++++++++++++++ + 3 files changed, 82 insertions(+), 11 deletions(-) + +commit 0adc13bfe32c14f3e4c6ce9f2d4fdf4112ab53f4 +Author: Lasse Collin +Date: 2022-04-14 12:59:09 +0300 + + xz: Make -T0 use multithreaded mode on single-core systems. + + The main problem withi the old behavior is that the compressed + output is different on single-core systems vs. multicore systems. + This commit fixes it by making -T0 one thread in multithreaded mode + on single-core systems. + + The downside of this is that it uses more memory. However, if + --memlimit-compress is used, xz can (thanks to the previous commit) + drop to the single-threaded mode still. + + src/xz/coder.c | 18 +++++++++--------- + src/xz/hardware.c | 14 ++++++++++++++ + src/xz/hardware.h | 4 ++++ + 3 files changed, 27 insertions(+), 9 deletions(-) + +commit 898faa97287a756231c663a3ed5165672b417207 +Author: Lasse Collin +Date: 2022-04-14 12:38:00 +0300 + + xz: Changes to --memlimit-compress and --no-adjust. + + In single-threaded mode, --memlimit-compress can make xz scale down + the LZMA2 dictionary size to meet the memory usage limit. This + obviously affects the compressed output. However, if xz was in + threaded mode, --memlimit-compress could make xz reduce the number + of threads but it wouldn't make xz switch from multithreaded mode + to single-threaded mode or scale down the LZMA2 dictionary size. + This seemed illogical and there was even a "FIXME?" about it. + + Now --memlimit-compress can make xz switch to single-threaded + mode if one thread in multithreaded mode uses too much memory. + If memory usage is still too high, then the LZMA2 dictionary + size can be scaled down too. + + The option --no-adjust was also changed so that it no longer + prevents xz from scaling down the number of threads as that + doesn't affect compressed output (only performance). After + this commit --no-adjust only prevents adjustments that affect + compressed output, that is, with --no-adjust xz won't switch + from multithreaded mode to single-threaded mode and won't + scale down the LZMA2 dictionary size. + + The man page wasn't updated yet. + + src/xz/coder.c | 63 +++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 43 insertions(+), 20 deletions(-) + +commit cad299008cf73ec566f0662a9cf2b94f86a99659 +Author: Lasse Collin +Date: 2022-04-11 22:20:49 +0300 + + xz: Add --memlimit-mt-decompress along with a default limit value. + + --memlimit-mt-decompress allows specifying the limit for + multithreaded decompression. This matches memlimit_threading in + liblzma. This limit can only affect the number of threads being + used; it will never prevent xz from decompressing a file. The + old --memlimit-decompress option is still used at the same time. + + If the value of --memlimit-decompress (the default value or + one specified by the user) is less than the value of + --memlimit-mt-decompress , then --memlimit-mt-decompress is + reduced to match --memlimit-decompress. + + Man page wasn't updated yet. + + src/xz/args.c | 24 +++++++++++++++------- + src/xz/coder.c | 34 ++++++++++--------------------- + src/xz/hardware.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----- + src/xz/hardware.h | 17 ++++++++++------ + src/xz/message.c | 4 +++- + 5 files changed, 97 insertions(+), 42 deletions(-) + +commit fe87b4cd5364f5bbb6a75a0299f1500c852d7c9a +Author: Lasse Collin +Date: 2022-04-06 23:11:59 +0300 + + liblzma: Threaded decoder: Improve setting of pending_error. + + It doesn't need to be done conditionally. The comments try + to explain it. + + src/liblzma/common/stream_decoder_mt.c | 51 +++++++++++++++++++++++----------- + 1 file changed, 35 insertions(+), 16 deletions(-) + +commit 90621da7f6e1bfd6d91d60415eae04b2bca274c2 +Author: Lasse Collin +Date: 2022-04-06 12:39:49 +0300 + + liblzma: Add a new flag LZMA_FAIL_FAST for threaded decoder. + + In most cases if the input file is corrupt the application won't + care about the uncompressed content at all. With this new flag + the threaded decoder will return an error as soon as any thread + has detected an error; it won't wait to copy out the data before + the location of the error. + + I don't plan to use this in xz to keep the behavior consistent + between single-threaded and multi-threaded modes. + + src/liblzma/api/lzma/container.h | 25 ++++++++++++++++- + src/liblzma/common/common.h | 7 +++-- + src/liblzma/common/stream_decoder_mt.c | 50 +++++++++++++++++++--------------- + 3 files changed, 56 insertions(+), 26 deletions(-) + +commit 64b6d496dc815a176d8307f418f6834a26783484 +Author: Lasse Collin +Date: 2022-04-05 12:24:57 +0300 + + liblzma: Threaded decoder: Always wait for output if LZMA_FINISH is used. + + This makes the behavior consistent with the single-threaded + decoder when handling truncated .xz files. + + Thanks to Jia Tan for finding this issue. + + src/liblzma/common/stream_decoder_mt.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +commit e671bc8828b9c0c5406c3a22c541301d0eb54518 +Author: Lasse Collin +Date: 2022-04-02 21:49:59 +0300 + + liblzma: Threaded decoder: Support zpipe.c-style decoding loop. + + This makes it possible to call lzma_code() in a loop that only + reads new input when lzma_code() didn't fill the output buffer + completely. That isn't the calling style suggested by the + liblzma example program 02_decompress.c so perhaps the usefulness + of this feature is limited. + + Also, it is possible to write such a loop so that it works + with the single-threaded decoder but not with the threaded + decoder even after this commit, or so that it works only if + lzma_mt.timeout = 0. + + The zlib tutorial is a well-known + example of a loop where more input is read only when output isn't + full. Porting this as is to liblzma would work with the + single-threaded decoder (if LZMA_CONCATENATED isn't used) but it + wouldn't work with threaded decoder even after this commit because + the loop assumes that no more output is possible when it cannot + read more input ("if (strm.avail_in == 0) break;"). This cannot + be fixed at liblzma side; the loop has to be modified at least + a little. + + I'm adding this in any case because the actual code is simple + and short and should have no harmful side-effects in other + situations. + + src/liblzma/common/stream_decoder_mt.c | 77 +++++++++++++++++++++++++++++----- + 1 file changed, 67 insertions(+), 10 deletions(-) + +commit 2ba8173e27be4793edb46497e499ac2ae753a316 +Author: Lasse Collin +Date: 2022-03-31 00:05:07 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 69d1b3fc29677af8ade8dc15dba83f0589cb63d6 +Author: Lasse Collin +Date: 2022-03-29 19:19:12 +0300 + + xzgrep: Fix escaping of malicious filenames (ZDI-CAN-16587). + + Malicious filenames can make xzgrep to write to arbitrary files + or (with a GNU sed extension) lead to arbitrary code execution. + + xzgrep from XZ Utils versions up to and including 5.2.5 are + affected. 5.3.1alpha and 5.3.2alpha are affected as well. + This patch works for all of them. + + This bug was inherited from gzip's zgrep. gzip 1.12 includes + a fix for zgrep. + + The issue with the old sed script is that with multiple newlines, + the N-command will read the second line of input, then the + s-commands will be skipped because it's not the end of the + file yet, then a new sed cycle starts and the pattern space + is printed and emptied. So only the last line or two get escaped. + + One way to fix this would be to read all lines into the pattern + space first. However, the included fix is even simpler: All lines + except the last line get a backslash appended at the end. To ensure + that shell command substitution doesn't eat a possible trailing + newline, a colon is appended to the filename before escaping. + The colon is later used to separate the filename from the grep + output so it is fine to add it here instead of a few lines later. + + The old code also wasn't POSIX compliant as it used \n in the + replacement section of the s-command. Using \ is the + POSIX compatible method. + + LC_ALL=C was added to the two critical sed commands. POSIX sed + manual recommends it when using sed to manipulate pathnames + because in other locales invalid multibyte sequences might + cause issues with some sed implementations. In case of GNU sed, + these particular sed scripts wouldn't have such problems but some + other scripts could have, see: + + info '(sed)Locale Considerations' + + This vulnerability was discovered by: + cleemy desu wayo working with Trend Micro Zero Day Initiative + + Thanks to Jim Meyering and Paul Eggert discussing the different + ways to fix this and for coordinating the patch release schedule + with gzip. + + src/scripts/xzgrep.in | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +commit bd93b776c1bd15e90661033c918cdeb354dbcc38 +Author: Lasse Collin +Date: 2022-03-26 01:02:44 +0200 + + liblzma: Fix a deadlock in threaded decoder. + + If a worker thread has consumed all input so far and it's + waiting on thr->cond and then the main thread enables + partial update for that thread, the code used to deadlock. + This commit allows one dummy decoding pass to occur in this + situation which then also does the partial update. + + As part of the fix, this moves thr->progress_* updates to + avoid the second thr->mutex locking. + + Thanks to Jia Tan for finding, debugging, and reporting the bug. + + src/liblzma/common/stream_decoder_mt.c | 71 +++++++++++++++++++++++++--------- + 1 file changed, 52 insertions(+), 19 deletions(-) + +commit e0394e94230f208682ac1e1f4c41f22f9ad79916 +Author: Lasse Collin +Date: 2022-03-23 16:34:00 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 487c77d48760564b1949c5067630b675b87be4de +Author: Lasse Collin +Date: 2022-03-23 16:28:55 +0200 + + liblzma: Threaded decoder: Don't stop threads on LZMA_TIMED_OUT. + + LZMA_TIMED_OUT is not an error and thus stopping threads on + LZMA_TIMED_OUT breaks the decoder badly. + + Thanks to Jia Tan for finding the bug and for the patch. + + src/liblzma/common/stream_decoder_mt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6c6da57ae2aa962aabde6892442227063d87e88c +Author: Lasse Collin +Date: 2022-03-07 00:36:16 +0200 + + xz: Add initial support for threaded decompression. + + If threading support is enabled at build time, this will + use lzma_stream_decoder_mt() even for single-threaded mode. + With memlimit_threading=0 the behavior should be identical. + + This needs some work like adding --memlimit-threading=LIMIT. + + The original patch from Sebastian Andrzej Siewior included + a method to get currently available RAM on Linux. It might + be one way to go but as it is Linux-only, the available-RAM + approach needs work for portability or using a fallback method + on other OSes. + + The man page wasn't updated yet. + + src/xz/coder.c | 36 +++++++++++++++++++++++++++++++++++- + 1 file changed, 35 insertions(+), 1 deletion(-) + +commit 4cce3e27f529af33e0e7749a8cbcec59954946b5 +Author: Lasse Collin +Date: 2022-03-06 23:36:20 +0200 + + liblzma: Add threaded .xz decompressor. + + I realize that this is about a decade late. + + Big thanks to Sebastian Andrzej Siewior for the original patch. + I made a bunch of smaller changes but after a while quite a few + things got rewritten. So any bugs in the commit were created by me. + + src/liblzma/api/lzma/container.h | 90 +- + src/liblzma/common/Makefile.inc | 5 + + src/liblzma/common/common.h | 4 + + src/liblzma/common/stream_decoder_mt.c | 1814 ++++++++++++++++++++++++++++++++ + src/liblzma/liblzma.map | 1 + + 5 files changed, 1907 insertions(+), 7 deletions(-) + +commit 717631b9788dc9c100ee0c87d3c14a2782638ff4 +Author: Lasse Collin +Date: 2022-03-06 16:54:23 +0200 + + liblzma: Fix docs: lzma_block_decoder() cannot return LZMA_UNSUPPORTED_CHECK. + + If Check is unsupported, it will be silently ignored. + It's the caller's job to handle it. + + src/liblzma/api/lzma/block.h | 3 --- + 1 file changed, 3 deletions(-) + +commit 1a4bb97a00936535e30ac61945aeee38882b5d1a +Author: Lasse Collin +Date: 2022-03-06 16:41:19 +0200 + + liblzma: Add new output queue (lzma_outq) features. + + Add lzma_outq_clear_cache2() which may leave one buffer allocated + in the cache. + + Add lzma_outq_outbuf_memusage() to get the memory needed for + a single lzma_outbuf. This is now used internally in outqueue.c too. + + Track both the total amount of memory allocated and the amount of + memory that is in active use (not in cache). + + In lzma_outbuf, allow storing the current input position that + matches the current output position. This way the main thread + can notice when no more output is possible without first providing + more input. + + Allow specifying return code for lzma_outq_read() in a finished + lzma_outbuf. + + src/liblzma/common/outqueue.c | 43 +++++++++++++++++++++++++++++++++++------- + src/liblzma/common/outqueue.h | 44 ++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 79 insertions(+), 8 deletions(-) + +commit ddbc6f58c2de388eed24cd7ea91b523d397da5f4 +Author: Lasse Collin +Date: 2022-03-06 15:18:58 +0200 + + liblzma: Index hash: Change return value type of hash_append() to void. + + src/liblzma/common/index_hash.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 20e7a33e2d59c6a814447d3991f21e2702174b20 +Author: Lasse Collin +Date: 2022-02-22 03:42:57 +0200 + + liblzma: Minor addition to lzma_vli_size() API doc. + + Thanks to Jia Tan. + + src/liblzma/api/lzma/vli.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4f78f5fcf63592f2d77e921cfe0d5de300867374 +Author: Lasse Collin +Date: 2022-02-22 02:04:18 +0200 + + liblzma: Check the return value of lzma_index_append() in threaded encoder. + + If lzma_index_append() failed (most likely memory allocation failure) + it could have gone unnoticed and the resulting .xz file would have + an incorrect Index. Decompressing such a file would produce the + correct uncompressed data but then an error would occur when + verifying the Index field. + + src/liblzma/common/stream_encoder_mt.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 5313ad66b40aab822ddca3e9905254cb99a4080d +Author: Lasse Collin +Date: 2022-02-22 01:37:39 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 865e0a3689a25a7ee8eecae1a34c1775e3aa676e +Author: Ed Maste +Date: 2022-02-11 15:25:46 +0000 + + liblzma: Use non-executable stack on FreeBSD as on Linux + + src/liblzma/check/crc32_x86.S | 4 ++-- + src/liblzma/check/crc64_x86.S | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 1c9a5786d206b4abc8e427326651c8174baea753 +Author: Lasse Collin +Date: 2022-02-20 20:36:27 +0200 + + liblzma: Make Block decoder catch certain types of errors better. + + Now it limits the input and output buffer sizes that are + passed to a raw decoder. This way there's no need to check + if the sizes can grow too big or overflow when updating + Compressed Size and Uncompressed Size counts. This also means + that a corrupt file cannot cause the raw decoder to process + useless extra input or output that would exceed the size info + in Block Header (and thus cause LZMA_DATA_ERROR anyway). + + More importantly, now the size information is verified more + carefully in case raw decoder returns LZMA_OK. This doesn't + really matter with the current single-threaded .xz decoder + as the errors would be detected slightly later anyway. But + this helps avoiding corner cases in the upcoming threaded + decompressor, and it might help other Block decoder uses + outside liblzma too. + + The test files bad-1-lzma2-{9,10,11}.xz test these conditions. + With the single-threaded .xz decoder the only difference is + that LZMA_DATA_ERROR is detected in a difference place now. + + src/liblzma/common/block_decoder.c | 79 ++++++++++++++++++++++++++------------ + 1 file changed, 54 insertions(+), 25 deletions(-) + +commit 555de11873eb00c9b94a8be70645db502e5a9dbd +Author: Lasse Collin +Date: 2022-02-20 19:38:55 +0200 + + Tests: Add bad-1-lzma2-11.xz. + + tests/files/README | 5 +++++ + tests/files/bad-1-lzma2-11.xz | Bin 0 -> 64 bytes + 2 files changed, 5 insertions(+) + +commit f0da507f22e7f4e3edb75b45b74d344244ca03fb +Author: Lasse Collin +Date: 2022-02-18 18:51:10 +0200 + + Translations: Fix po4a failure with the French man page translations. + + Thanks to Mario Blättermann for the patch. + + po4a/fr_FR.po | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit f7711d228c3c32395460c82498c60a9f730d0239 +Author: Lasse Collin +Date: 2022-02-07 01:14:37 +0200 + + Translations: Add French translation of man pages. + + This matches xz-utils 5.2.5-2 in Debian. + + The translation was done by "bubu", proofread by the debian-l10n-french + mailing list contributors, and submitted to me on the xz-devel mailing + list by Jean-Pierre Giraud. Thanks to everyone! + + po4a/fr_FR.po | 3541 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + po4a/po4a.conf | 2 +- + 2 files changed, 3542 insertions(+), 1 deletion(-) + +commit 6468f7e41a8e9c611e4ba8d34e2175c5dacdbeb4 +Author: jiat75 +Date: 2022-01-28 20:47:55 +0800 + + liblzma: Add NULL checks to LZMA and LZMA2 properties encoders. + + Previously lzma_lzma_props_encode() and lzma_lzma2_props_encode() + assumed that the options pointers must be non-NULL because the + with these filters the API says it must never be NULL. It is + good to do these checks anyway. + + src/liblzma/lzma/lzma2_encoder.c | 3 +++ + src/liblzma/lzma/lzma_encoder.c | 3 +++ + 2 files changed, 6 insertions(+) + +commit 2523c30705f49eabd27b854aa656ae87cc224808 +Author: Lasse Collin +Date: 2022-02-06 23:19:32 +0200 + + liblzma: Fix uint64_t vs. size_t confusion. + + This broke 32-bit builds due to a pointer type mismatch. + + This bug was introduced with the output-size-limited encoding + in 625f4c7c99b2fcc4db9e7ab2deb4884790e2e17c. + + Thanks to huangqinjin for the bug report. + + src/liblzma/rangecoder/range_encoder.h | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 2bd36c91d03e03b31a4f12fd0afc100ae32d66e2 +Author: huangqinjin +Date: 2021-12-13 20:49:21 +0800 + + CMake: Keep compatible with Windows 95 for 32-bit build. + + CMakeLists.txt | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 2024fbf2794885277d05378d40b2b8015a7c3b40 +Author: Lasse Collin +Date: 2021-11-13 21:04:05 +0200 + + xzgrep: Update man page timestamp. + + src/scripts/xzgrep.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 400e7a239a53282cedaad927a41f3463d7f542e5 +Author: Lasse Collin +Date: 2021-11-13 18:23:24 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 3a512c7787b2642ca946f4adc6e9a0a5d9b0d5a0 +Author: Ville Skyttä +Date: 2021-11-13 10:11:57 +0200 + + xzgrep: use `grep -E/-F` instead of `egrep` and `fgrep` + + `egrep` and `fgrep` have been deprecated in GNU grep since 2007, and in + current post 3.7 Git they have been made to emit obsolescence warnings: + https://git.savannah.gnu.org/cgit/grep.git/commit/?id=a9515624709865d480e3142fd959bccd1c9372d1 + + src/scripts/xzgrep.1 | 8 ++++---- + src/scripts/xzgrep.in | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit edf525e2b1840dcaf377df472c67d8f11f8ace1b +Author: Lasse Collin +Date: 2021-10-28 23:02:11 +0300 + + Bump the version number for 5.3.2alpha. + + src/liblzma/api/lzma/version.h | 2 +- + src/liblzma/liblzma.map | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ea8c948655a86290524efe59cff067e06a886709 +Author: Lasse Collin +Date: 2021-10-28 22:59:52 +0300 + + Add NEWS for 5.3.2alpha. + + NEWS | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 86 insertions(+) + +commit 52435f302f4724157ec50b4210cbe42b285c3cbc +Author: Lasse Collin +Date: 2021-10-27 23:27:48 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit f2aea1d5a504b2021bf47a238390e4f12bdd518d +Author: Lasse Collin +Date: 2021-10-27 23:23:11 +0300 + + xz: Change the coding style of the previous commit. + + It isn't any better now but it's consistent with + the rest of the code base. + + src/xz/file_io.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 892b16cc282f5b4e1c49871b326f4db25c5b4d81 +Author: Alexander Bluhm +Date: 2021-10-05 23:33:16 +0200 + + xz: Avoid fchown(2) failure. + + OpenBSD does not allow to change the group of a file if the user + does not belong to this group. In contrast to Linux, OpenBSD also + fails if the new group is the same as the old one. Do not call + fchown(2) in this case, it would change nothing anyway. + + This fixes an issue with Perl Alien::Build module. + https://github.com/PerlAlien/Alien-Build/issues/62 + + src/xz/file_io.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 2b509c868cae3988bf21cd693fbf9021cdc85628 +Author: Lasse Collin +Date: 2021-09-17 17:31:11 +0300 + + liblzma: Fix liblzma.map for the lzma_microlzma_* symbols. + + This should have been part of d267d109c370a40b502e73f8664b154b15e4f253. + + Thanks to Gao Xiang. + + src/liblzma/liblzma.map | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cacb06a954b58255dfc084a0bc9708f43a0fd6d6 +Author: Lasse Collin +Date: 2021-09-09 22:21:07 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 6928aac9da6ba612780b9f72ba1d6ecbe1e8b54e +Author: Lasse Collin +Date: 2021-09-09 21:41:51 +0300 + + liblzma: Use _MSVC_LANG to detect when "noexcept" can be used with MSVC. + + By default, MSVC always sets __cplusplus to 199711L. The real + C++ standard version is available in _MSVC_LANG (or one could + use /Zc:__cplusplus to set __cplusplus correctly). + + Fixes . + + Thanks to Dan Weiss. + + src/liblzma/api/lzma.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d267d109c370a40b502e73f8664b154b15e4f253 +Author: Lasse Collin +Date: 2021-09-05 20:38:12 +0300 + + liblzma: Rename EROFS LZMA to MicroLZMA. + + It still exists primarily for EROFS but MicroLZMA is + a more generic name (that hopefully doesn't clash with + something that already exists). + + src/liblzma/api/lzma/container.h | 33 +++++++++++++--------- + src/liblzma/common/Makefile.inc | 4 +-- + .../{erofs_decoder.c => microlzma_decoder.c} | 32 ++++++++++----------- + .../{erofs_encoder.c => microlzma_encoder.c} | 30 ++++++++++---------- + 4 files changed, 52 insertions(+), 47 deletions(-) + +commit 3247e95115acb95bc27f41e8cf4501db5b0b4309 +Author: Lasse Collin +Date: 2021-06-04 19:02:38 +0300 + + xzdiff: Update the man page about the exit status. + + This was forgotten from 194029ffaf74282a81f0c299c07f73caca3232ca. + + src/scripts/xzdiff.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 96f5a28a46fc93ac4e296808ac0f8631d05498bc +Author: Lasse Collin +Date: 2021-06-04 18:52:48 +0300 + + xzless: Fix less(1) version detection when it contains a dot. + + Sometimes the version number from "less -V" contains a dot, + sometimes not. xzless failed detect the version number when + it does contain a dot. This fixes it. + + Thanks to nick87720z for reporting this. Apparently it had been + reported here in 2013. + + src/scripts/xzless.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5fb5212d816addbc523d0798cb482fdd0484f8fa +Author: Lasse Collin +Date: 2021-04-11 19:58:10 +0300 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit fc3d3a7296ef58bb799a73943636b8bfd95339f7 +Author: Ivan A. Melnikov +Date: 2021-04-09 11:45:10 +0300 + + Reduce maximum possible memory limit on MIPS32 + + Due to architectural limitations, address space available to a single + userspace process on MIPS32 is limited to 2 GiB, not 4, even on systems + that have more physical RAM -- e.g. 64-bit systems with 32-bit + userspace, or systems that use XPA (an extension similar to x86's PAE). + + So, for MIPS32, we have to impose stronger memory limits. I've chosen + 2000MiB to give the process some headroom. + + src/xz/hardware.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit e7da44d5151e21f153925781ad29334ae0786101 +Author: Lasse Collin +Date: 2021-02-13 23:31:27 +0200 + + CMake: Use interface library for better FindLibLZMA compatibility. + + https://www.mail-archive.com/xz-devel@tukaani.org/msg00446.html + + Thanks to Markus Rickert. + + CMakeLists.txt | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit a61dd82ada39030f41b4ffca9ea551714908bedc +Author: Lasse Collin +Date: 2021-01-30 18:36:04 +0200 + + CMake: Try to improve compatibility with the FindLibLZMA module. + + The naming conflict with FindLibLZMA module gets worse. + Not avoiding it in the first place was stupid. + + Normally find_package(LibLZMA) will use the module and + find_package(liblzma 5.2.5 REQUIRED CONFIG) will use the config + file even with a case insensitive file system. However, if + CMAKE_FIND_PACKAGE_PREFER_CONFIG is TRUE and the file system + is case insensitive, find_package(LibLZMA) will find our liblzma + config file instead of using FindLibLZMA module. + + One big problem with this is that FindLibLZMA uses + LibLZMA::LibLZMA and we use liblzma::liblzma as the target + name. With target names CMake happens to be case sensitive. + To workaround this, this commit adds + + add_library(LibLZMA::LibLZMA ALIAS liblzma::liblzma) + + to the config file. Then both spellings work. + + To make the behavior consistent between case sensitive and + insensitive file systems, the config and related files are + renamed from liblzmaConfig.cmake to liblzma-config.cmake style. + With this style CMake looks for lowercase version of the package + name so find_package(LiBLzmA 5.2.5 REQUIRED CONFIG) will work + to find our config file. + + There are other differences between our config file and + FindLibLZMA so it's still possible that things break for + reasons other than the spelling of the target name. Hopefully + those situations aren't too common. + + When the config file is available, it should always give as good or + better results as FindLibLZMA so this commit doesn't affect the + recommendation to use find_package(liblzma 5.2.5 REQUIRED CONFIG) + which explicitly avoids FindLibLZMA. + + Thanks to Markus Rickert. + + CMakeLists.txt | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit 5b7bc1b8ae766a76710ca1b99f909cf52c697f05 +Author: Lasse Collin +Date: 2021-01-29 21:19:43 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 6c6f0db340dcb8bb424411cedba713405d55f6b8 +Author: Lasse Collin +Date: 2021-01-29 21:19:08 +0200 + + liblzma: Fix unitialized variable. + + This was introduced two weeks ago in the commit + 625f4c7c99b2fcc4db9e7ab2deb4884790e2e17c. + + Thanks to Nathan Moinvaziri. + + src/liblzma/lzma/lzma_encoder.c | 1 + + 1 file changed, 1 insertion(+) + +commit bb1d5c1fdd30550d4221ecd336e0be1206132a5c +Author: Lasse Collin +Date: 2021-01-24 22:32:41 +0200 + + Tests: Add bad-1-lzma2-10.xz and also modify -9.xz. + + tests/files/README | 11 +++++++++-- + tests/files/bad-1-lzma2-10.xz | Bin 0 -> 60 bytes + tests/files/bad-1-lzma2-9.xz | Bin 72 -> 72 bytes + 3 files changed, 9 insertions(+), 2 deletions(-) + +commit 6b8abc84a5469792e0355d0bfc0784d41cfdfef7 +Author: Lasse Collin +Date: 2021-01-24 19:22:35 +0200 + + liblzma: Fix a wrong comment in stream_encoder_mt.c. + + src/liblzma/common/stream_encoder_mt.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 939fc5ed654aac25fe0c8684b2df8dbeadb2de1e +Author: Lasse Collin +Date: 2021-01-24 18:51:51 +0200 + + Tests: Add bad-1-lzma2-9.xz. + + tests/files/README | 4 ++++ + tests/files/bad-1-lzma2-9.xz | Bin 0 -> 72 bytes + 2 files changed, 4 insertions(+) + +commit fdd30032f8531ac89519b48c21d810ecf06825f6 +Author: Lasse Collin +Date: 2021-01-24 17:02:00 +0200 + + Tests: Add bad-1-check-crc32-2.xz. + + tests/files/README | 7 +++++++ + tests/files/bad-1-check-crc32-2.xz | Bin 0 -> 72 bytes + 2 files changed, 7 insertions(+) + +commit db465419ae26ec7fb9b9472183911ff521620c77 +Author: Lasse Collin +Date: 2021-01-17 19:20:50 +0200 + + liblzma: In EROFS LZMA decoder, verify that comp_size matches at the end. + + When the uncompressed size is known to be exact, after decompressing + the stream exactly comp_size bytes of input must have been consumed. + This is a minor improvement to error detection. + + src/liblzma/common/erofs_decoder.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 774cc0118ba2496581cb2621505a04bb6598cc75 +Author: Lasse Collin +Date: 2021-01-17 18:53:34 +0200 + + liblzma: Make EROFS LZMA decoder work when exact uncomp_size isn't known. + + The caller must still not specify an uncompressed size bigger + than the actual uncompressed size. + + As a downside, this now needs the exact compressed size. + + src/liblzma/api/lzma/container.h | 23 ++++++++--- + src/liblzma/common/erofs_decoder.c | 80 ++++++++++++++++++++++++++++++++++---- + 2 files changed, 91 insertions(+), 12 deletions(-) + +commit 421b0aa352da244075db10205cf33712f91b9835 +Author: Lasse Collin +Date: 2021-01-14 20:57:11 +0200 + + liblzma: Fix missing normalization in rc_encode_dummy(). + + Without this fix it could attempt to create too much output. + + src/liblzma/rangecoder/range_encoder.h | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 601ec0311e769fc704daaaa7dac0ca840aff080e +Author: Lasse Collin +Date: 2021-01-14 20:07:01 +0200 + + liblzma: Add EROFS LZMA encoder and decoder. + + Right now this is just a planned extra-compact format for use + in the EROFS file system in Linux. At this point it's possible + that the format will either change or be abandoned and removed + completely. + + The special thing about the encoder is that it uses the + output-size-limited encoding added in the previous commit. + EROFS uses fixed-sized blocks (e.g. 4 KiB) to hold compressed + data so the compressors must be able to create valid streams + that fill the given block size. + + src/liblzma/api/lzma/container.h | 76 +++++++++++++++++++ + src/liblzma/common/Makefile.inc | 2 + + src/liblzma/common/erofs_decoder.c | 148 +++++++++++++++++++++++++++++++++++++ + src/liblzma/common/erofs_encoder.c | 139 ++++++++++++++++++++++++++++++++++ + src/liblzma/liblzma.map | 2 + + 5 files changed, 367 insertions(+) + +commit 625f4c7c99b2fcc4db9e7ab2deb4884790e2e17c +Author: Lasse Collin +Date: 2021-01-13 19:16:32 +0200 + + liblzma: Add rough support for output-size-limited encoding in LZMA1. + + With this it is possible to encode LZMA1 data without EOPM so that + the encoder will encode as much input as it can without exceeding + the specified output size limit. The resulting LZMA1 stream will + be a normal LZMA1 stream without EOPM. The actual uncompressed size + will be available to the caller via the uncomp_size pointer. + + One missing thing is that the LZMA layer doesn't inform the LZ layer + when the encoding is finished and thus the LZ may read more input + when it won't be used. However, this doesn't matter if encoding is + done with a single call (which is the planned use case for now). + For proper multi-call encoding this should be improved. + + This commit only adds the functionality for internal use. + Nothing uses it yet. + + src/liblzma/common/common.h | 11 +++ + src/liblzma/lz/lz_encoder.c | 16 ++++ + src/liblzma/lz/lz_encoder.h | 4 + + src/liblzma/lzma/lzma_encoder.c | 127 +++++++++++++++++++++++--------- + src/liblzma/lzma/lzma_encoder_private.h | 12 +++ + src/liblzma/rangecoder/range_encoder.h | 111 ++++++++++++++++++++++++++++ + 6 files changed, 246 insertions(+), 35 deletions(-) + +commit 9cdabbeea891e8f1e7741b076f7db6ac05ae392a +Author: Lasse Collin +Date: 2021-01-11 23:57:11 +0200 + + Scripts: Add zstd support to xzdiff. + + src/scripts/xzdiff.1 | 6 ++++-- + src/scripts/xzdiff.in | 16 +++++++++++----- + 2 files changed, 15 insertions(+), 7 deletions(-) + +commit d9ec3add97cf4c999a7f594c6529680227b6c274 +Author: Lasse Collin +Date: 2021-01-11 23:41:30 +0200 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit 074259f4f3966aeac6edb205fecbc1a8d2b58bb2 +Author: Lasse Collin +Date: 2021-01-11 23:41:16 +0200 + + xz: Make --keep accept symlinks, hardlinks, and setuid/setgid/sticky. + + Previously this required using --force but that has other + effects too which might be undesirable. Changing the behavior + of --keep has a small risk of breaking existing scripts but + since this is a fairly special corner case I expect the + likehood of breakage to be low enough. + + I think the new behavior is more logical. The only reason for + the old behavior was to be consistent with gzip and bzip2. + + Thanks to Vincent Lefevre and Sebastian Andrzej Siewior. + + src/xz/file_io.c | 9 +++++---- + src/xz/xz.1 | 16 +++++++++++++++- + 2 files changed, 20 insertions(+), 5 deletions(-) + +commit 73c555b3077c19dda29b6f4592ced2af876f8333 +Author: Lasse Collin +Date: 2021-01-11 23:28:52 +0200 + + Scripts: Fix exit status of xzgrep. + + Omit the -q option from xz, gzip, and bzip2. With xz this shouldn't + matter. With gzip it's important because -q makes gzip replace SIGPIPE + with exit status 2. With bzip2 it's important because with -q bzip2 + is completely silent if input is corrupt while other decompressors + still give an error message. + + Avoiding exit status 2 from gzip is important because bzip2 uses + exit status 2 to indicate corrupt input. Before this commit xzgrep + didn't recognize corrupt .bz2 files because xzgrep was treating + exit status 2 as SIGPIPE for gzip compatibility. + + zstd still needs -q because otherwise it is noisy in normal + operation. + + The code to detect real SIGPIPE didn't check if the exit status + was due to a signal (>= 128) and so could ignore some other exit + status too. + + src/scripts/xzgrep.in | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +commit 194029ffaf74282a81f0c299c07f73caca3232ca +Author: Lasse Collin +Date: 2021-01-11 22:01:51 +0200 + + Scripts: Fix exit status of xzdiff/xzcmp. + + This is a minor fix since this affects only the situation when + the files differ and the exit status is something else than 0. + In such case there could be SIGPIPE from a decompression tool + and that would result in exit status of 2 from xzdiff/xzcmp + while the correct behavior would be to return 1 or whatever + else diff or cmp may have returned. + + This commit omits the -q option from xz/gzip/bzip2/lzop arguments. + I'm not sure why the -q was used in the first place, perhaps it + hides warnings in some situation that I cannot see at the moment. + Hopefully the removal won't introduce a new bug. + + With gzip the -q option was harmful because it made gzip return 2 + instead of >= 128 with SIGPIPE. Ignoring exit status 2 (warning + from gzip) isn't practical because bzip2 uses exit status 2 to + indicate corrupt input file. It's better if SIGPIPE results in + exit status >= 128. + + With bzip2 the removal of -q seems to be good because with -q + it prints nothing if input is corrupt. The other tools aren't + silent in this situation even with -q. On the other hand, if + zstd support is added, it will need -q since otherwise it's + noisy in normal situations. + + Thanks to Étienne Mollier and Sebastian Andrzej Siewior. + + src/scripts/xzdiff.in | 35 +++++++++++++++++++++-------------- + 1 file changed, 21 insertions(+), 14 deletions(-) + +commit f7fa309e1f7178d04c7bedc03b73077639371e97 +Author: Lasse Collin +Date: 2021-01-09 21:14:36 +0200 + + liblzma: Make lzma_outq usable for threaded decompression too. + + Before this commit all output queue buffers were allocated as + a single big allocation. Now each buffer is allocated separately + when needed. Used buffers are cached to avoid reallocation + overhead but the cache will keep only one buffer size at a time. + This should make things work OK in the decompression where most + of the time the buffer sizes will be the same but with some less + common files the buffer sizes may vary. + + While this should work fine, it's still a bit preliminary + and may even get reverted if it turns out to be useless for + decompression. + + src/liblzma/common/outqueue.c | 268 +++++++++++++++++++++------------ + src/liblzma/common/outqueue.h | 138 ++++++++++++----- + src/liblzma/common/stream_encoder_mt.c | 52 ++++--- + 3 files changed, 301 insertions(+), 157 deletions(-) + +commit a35a69d693ce37d4ba7c1855bda7d9cfa13d1778 +Author: Lasse Collin +Date: 2020-12-23 17:15:49 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 4fd79b90c52396d70e0b1206ceb1a873a0ad2589 +Author: H.J. Lu +Date: 2020-12-23 06:49:04 -0800 + + liblzma: Enable Intel CET in x86 CRC assembly codes + + When Intel CET is enabled, we need to include in assembly codes + to mark Intel CET support and add _CET_ENDBR to indirect jump targets. + + Tested on Intel Tiger Lake under CET enabled Linux. + + src/liblzma/check/crc32_x86.S | 9 +++++++++ + src/liblzma/check/crc64_x86.S | 9 +++++++++ + 2 files changed, 18 insertions(+) + +commit bb3b8c6a23e25db79f862b1de325c56052e0354b +Author: Lasse Collin +Date: 2020-12-16 18:33:29 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 21588ca34af98738954fc12ded1b89d7294ef646 +Author: Lasse Collin +Date: 2020-12-16 18:30:14 +0200 + + Build: Don't build bundles on Apple OSes. + + Thanks to Daniel Packard. + + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +commit d05b0c42dd8b38d8c6b8193c8af50e9bd3d16f28 +Author: Lasse Collin +Date: 2020-12-05 22:44:03 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 1890351f3423627ba5c4c495402f32d7e9ed90b7 +Author: Adam Borowski +Date: 2020-09-25 03:35:18 +0200 + + Scripts: Add zstd support to xzgrep. + + Thanks to Adam Borowski. + + src/scripts/xzgrep.1 | 9 ++++++--- + src/scripts/xzgrep.in | 1 + + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 2f108abb3d82e4e2313b438dae9c0c7c7a6366f2 +Author: Lasse Collin +Date: 2020-11-17 20:51:48 +0200 + + CMake: Fix compatibility with CMake 3.13. + + The syntax "if(DEFINED CACHE{FOO})" requires CMake 3.14. + In some other places the code treats the cache variables + like normal variables already (${FOO} or if(FOO) is used, + not ${CACHE{FOO}). + + Thanks to ygrek for reporting the bug on IRC. + + CMakeLists.txt | 2 +- + cmake/tuklib_cpucores.cmake | 4 ++-- + cmake/tuklib_physmem.cmake | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 5af726a79273fafa5de5745b117e567f21c90e49 +Author: Lasse Collin +Date: 2020-11-01 22:56:43 +0200 + + Update THANKS. + + THANKS | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4575d9d365c756ec189899f9f743e0b3515ce72d +Author: Lasse Collin +Date: 2020-11-01 22:34:25 +0200 + + xz: Avoid unneeded \f escapes on the man page. + + I don't want to use \c in macro arguments but groff_man(7) + suggests that \f has better portability. \f would be needed + for the .TP strings for portability reasons anyway. + + Thanks to Bjarni Ingi Gislason. + + src/xz/xz.1 | 31 ++++++++++++++++++++++--------- + 1 file changed, 22 insertions(+), 9 deletions(-) + +commit 620b32f5339f86710cb4435e01ecdac972ccac73 +Author: Lasse Collin +Date: 2020-11-01 19:09:53 +0200 + + xz: Use non-breaking spaces when intentionally using more than one space. + + This silences some style checker warnings. Seems that spaces + in the beginning of a line don't need this treatment. + + Thanks to Bjarni Ingi Gislason. + + src/xz/xz.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb1f34988c8a4130485091b2f8b641303d8f701b +Author: Lasse Collin +Date: 2020-11-01 18:49:37 +0200 + + xz: Protect the ellipsis (...) on the man page with \&. + + This does it only when ... appears outside macro calls. + + Thanks to Bjarni Ingi Gislason. + + src/xz/xz.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5d224da3da87400f2fab313abbd7c710e7169ef9 +Author: Lasse Collin +Date: 2020-11-01 18:41:21 +0200 + + xz: Avoid the abbreviation "e.g." on the man page. + + A few are simply omitted, most are converted to "for example" + and surrounded with commas. Sounds like that this is better + style, for example, man-pages(7) recommends avoiding such + abbreviations except in parenthesis. + + Thanks to Bjarni Ingi Gislason. + + src/xz/xz.1 | 66 ++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 33 insertions(+), 33 deletions(-) + +commit 90457dbe3e5717660f5b81f8c604860fc5137c0c +Author: Lasse Collin +Date: 2020-07-12 23:10:03 +0300 + + xz man page: Change \- (minus) to \(en (en-dash) for a numeric range. + + Docs of ancient troff/nroff mention \(em (em-dash) but not \(en + and \- was used for both minus and en-dash. I don't know how + portable \(en is nowadays but it can be changed back if someone + complains. At least GNU groff and OpenBSD's mandoc support it. + + Thanks to Bjarni Ingi Gislason for the patch. + + src/xz/xz.1 | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 352ba2d69af2136bc814aa1df1a132559d445616 +Author: Lasse Collin +Date: 2020-07-12 20:46:24 +0300 + + Windows: Fix building of resource files when config.h isn't used. + + Now CMake + Visual Studio works for building liblzma.dll. + + Thanks to Markus Rickert. + + src/common/common_w32res.rc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a9e2a87f1d61dcf684d809bf08c8ebea93f8a480 +Author: Lasse Collin +Date: 2020-04-06 19:31:50 +0300 + + src/scripts/xzgrep.1: Filenames to xzgrep are optional. + + xzgrep --help was correct already. + + src/scripts/xzgrep.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a7ba275d9b855d186abb29eb7a4f4cb6d9ca6fe0 +Author: Bjarni Ingi Gislason +Date: 2020-03-26 22:17:31 +0000 + + src/script/xzgrep.1: Remove superfluous '.RB' + + Output is from: test-groff -b -e -mandoc -T utf8 -rF0 -t -w w -z + + [ "test-groff" is a developmental version of "groff" ] + + Input file is ./src/scripts/xzgrep.1 + + :20 (macro RB): only 1 argument, but more are expected + :23 (macro RB): only 1 argument, but more are expected + :26 (macro RB): only 1 argument, but more are expected + :29 (macro RB): only 1 argument, but more are expected + :32 (macro RB): only 1 argument, but more are expected + + "abc..." does not mean the same as "abc ...". + + The output from nroff and troff is unchanged except for the space + between "file" and "...". + + Signed-off-by: Bjarni Ingi Gislason + + src/scripts/xzgrep.1 | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 133d498db0f4b14f066d192d64dbcade45deae6b +Author: Bjarni Ingi Gislason +Date: 2020-03-30 21:56:36 +0000 + + xzgrep.1: Delete superfluous '.PP' + + Summary: + + mandoc -T lint xzgrep.1 : + mandoc: xzgrep.1:79:2: WARNING: skipping paragraph macro: PP empty + + There is no change in the output of "nroff" and "troff". + + Signed-off-by: Bjarni Ingi Gislason + + src/scripts/xzgrep.1 | 1 - + 1 file changed, 1 deletion(-) + +commit 057839ca982f886387b66746bffe749cb14fd8cd +Author: Bjarni Ingi Gislason +Date: 2020-03-26 21:16:18 +0000 + + src/xz/xz.1: Correct misused two-fonts macros + + Output is from: test-groff -b -e -mandoc -T utf8 -rF0 -t -w w -z + + [ "test-groff" is a developmental version of "groff" ] + + Input file is ./src/xz/xz.1 + + :408 (macro BR): only 1 argument, but more are expected + :1009 (macro BR): only 1 argument, but more are expected + :1743 (macro BR): only 1 argument, but more are expected + :1920 (macro BR): only 1 argument, but more are expected + :2213 (macro BR): only 1 argument, but more are expected + + Output from nroff and troff is unchanged, except for a font change of a + full stop (.). + + Signed-off-by: Bjarni Ingi Gislason + + src/xz/xz.1 | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit b8e12f5ab4c9fd3cb09a4330b2861f6b979ababd +Author: Lasse Collin +Date: 2020-03-23 18:07:50 +0200 + + Typo fixes from fossies.org. + + https://fossies.org/linux/misc/xz-5.2.5.tar.xz/codespell.html + + Makefile.am | 2 +- + doc/examples/01_compress_easy.c | 2 +- + src/liblzma/api/lzma/base.h | 2 +- + src/liblzma/check/crc32_x86.S | 2 +- + src/liblzma/common/index.c | 2 +- + src/xz/xz.1 | 4 ++-- + 6 files changed, 7 insertions(+), 7 deletions(-) + +commit 869b9d1b4edd6df07f819d360d306251f8147353 +Author: Lasse Collin +Date: 2020-03-17 16:24:28 +0200 + + Update NEWS for 5.2.5. + + NEWS | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 105 insertions(+) + +commit a048e3a92d238c65f050a765174d9c75417231d4 +Author: Lasse Collin +Date: 2020-03-16 20:01:37 +0200 + + README: Update outdated sections. + + README | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit 29aed815ad4f98f3e4d355faa76a244ecd8ce716 +Author: Lasse Collin +Date: 2020-03-16 19:39:45 +0200 + + README: Mention that man pages can be translated. + + README | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 7fa7653940cc9dcfcbce2fbc5166ea343ad4e3c1 +Author: Lasse Collin +Date: 2020-03-16 16:43:29 +0200 + + Update INSTALL.generic from Automake 1.16.1. + + INSTALL.generic | 321 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 162 insertions(+), 159 deletions(-) + +commit 9bd317ef03ab9b3e6a927c27c2e9c4ac041182f0 +Author: Lasse Collin +Date: 2020-03-15 15:27:22 +0200 + + Update INSTALL for Windows and DOS and add preliminary info for z/OS. + + INSTALL | 51 +++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 41 insertions(+), 10 deletions(-) + +commit a3148c0446dc7fa96363752df414d22539c9007b +Author: Lasse Collin +Date: 2020-03-15 15:26:20 +0200 + + Build: Update m4/ax_pthread.m4 from Autoconf Archive (again). + + m4/ax_pthread.m4 | 219 +++++++++++++++++++++++++++++-------------------------- + 1 file changed, 117 insertions(+), 102 deletions(-) + +commit 7812002dd3ed319e42a14662a8531802cca8ca67 +Author: Lasse Collin +Date: 2020-03-11 21:15:35 +0200 + + xz: Never use thousand separators in DJGPP builds. + + DJGPP 2.05 added support for thousands separators but it's + broken at least under WinXP with Finnish locale that uses + a non-breaking space as the thousands separator. Workaround + by disabling thousands separators for DJGPP builds. + + src/xz/util.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 7c8f688bf7fccd65d396e0130cbf4ea5dff5c56f +Author: Lasse Collin +Date: 2020-03-11 19:38:08 +0200 + + DOS: Update dos/Makefile for DJGPP 2.05. + + It doesn't need -fgnu89-inline like 2.04beta did. + + dos/Makefile | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 319ca928d73de87940c54e30bffe69f9fa65efdf +Author: Lasse Collin +Date: 2020-03-11 19:36:07 +0200 + + DOS: Update instructions in dos/INSTALL.txt. + + dos/INSTALL.txt | 59 ++++++++++++++++++++++++++++----------------------------- + 1 file changed, 29 insertions(+), 30 deletions(-) + +commit cb6b227ce39932824812ccd8a0647bd968de27d2 +Author: Lasse Collin +Date: 2020-03-11 17:58:51 +0200 + + DOS: Update config.h. + + The added defines assume GCC >= 4.8. + + dos/config.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 4572d53e16e87eee375bc5624de2fd59bb0ae9cd +Author: Lasse Collin +Date: 2020-03-02 13:54:33 +0200 + + liblzma: Fix a comment and RC_SYMBOLS_MAX. + + The comment didn't match the value of RC_SYMBOLS_MAX and the value + itself was slightly larger than actually needed. The only harm + about this was that memory usage was a few bytes larger. + + src/liblzma/rangecoder/range_encoder.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 265daa873c0d871f5f23f9b56e133a6f20045a0a +Author: Lasse Collin +Date: 2020-02-27 20:58:52 +0200 + + Build: Make CMake build fail if tuklib_cpucores or tuklib_physmem fails. + + CMakeLists.txt | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 7c8b904527cdbe61248c80edcc2e20d840c4fef9 +Author: Lasse Collin +Date: 2020-02-27 20:24:27 +0200 + + Build: Add support for --no-po4a option to autogen.sh. + + Normally, if po4a isn't available, autogen.sh will return + with non-zero exit status. The option --no-po4a can be useful + when one knows that po4a isn't available but wants autogen.sh + to still return with zero exit status. + + autogen.sh | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 292a5c0f9c9b3a66f5a5c652dc46381836d4537f +Author: Lasse Collin +Date: 2020-02-25 21:35:14 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 474320e9908786ba2021035f9013191e16cde08a +Author: Lasse Collin +Date: 2020-02-25 20:42:31 +0200 + + Build: Fix bugs in the CMake files. + + Seems that the phrase "add more quotes" from sh/bash scripting + applies to CMake as well. E.g. passing an unquoted list ${FOO} + to a function that expects one argument results in only the + first element of the list being passed as an argument and + the rest get ignored. Adding quotes helps ("${FOO}"). + + list(INSERT ...) is weird. Inserting an empty string to an empty + variable results in empty list, but inserting it to a non-empty + variable does insert an empty element to the list. + + Since INSERT requires at least one element, + "${CMAKE_THREAD_LIBS_INIT}" needs to be quoted in CMakeLists.txt. + It might result in an empty element in the list. It seems to not + matter as empty elements consistently get ignored in that variable. + In fact, calling cmake_check_push_state() and cmake_check_pop_state() + will strip the empty elements from CMAKE_REQUIRED_LIBRARIES! + + In addition to quoting fixes, this fixes checks for the cache + variables in tuklib_cpucores.cmake and tuklib_physmem.cmake. + + Thanks to Martin Matuška for testing and reporting the problems. + These fixes aren't tested yet but hopefully they soon will be. + + CMakeLists.txt | 52 ++++++++++++++++++++++----------------------- + cmake/tuklib_common.cmake | 8 ++++--- + cmake/tuklib_cpucores.cmake | 30 ++++++++++++++------------ + cmake/tuklib_integer.cmake | 34 +++++++++++++++-------------- + cmake/tuklib_mbstr.cmake | 6 +++--- + cmake/tuklib_physmem.cmake | 29 +++++++++++++------------ + cmake/tuklib_progname.cmake | 4 ++-- + 7 files changed, 85 insertions(+), 78 deletions(-) + +commit 7e3493d40eac0c3fa3d5124097745a70e15c41f6 +Author: Lasse Collin +Date: 2020-02-24 23:38:16 +0200 + + Build: Add very limited experimental CMake support. + + This does *NOT* replace the Autotools-based build system in + the foreseeable future. See the comment in the beginning + of CMakeLists.txt. + + So far this has been tested only on GNU/Linux but I commit + it anyway to make it easier for others to test. Since I + haven't played much with CMake before, it's likely that + there are things that have been done in a silly or wrong + way and need to be fixed. + + CMakeLists.txt | 643 ++++++++++++++++++++++++++++++++++++++++++++ + cmake/tuklib_common.cmake | 47 ++++ + cmake/tuklib_cpucores.cmake | 173 ++++++++++++ + cmake/tuklib_integer.cmake | 100 +++++++ + cmake/tuklib_mbstr.cmake | 20 ++ + cmake/tuklib_physmem.cmake | 149 ++++++++++ + cmake/tuklib_progname.cmake | 19 ++ + 7 files changed, 1151 insertions(+) + +commit 21bd4701fca3e9002ce78bc135debca369ed8545 +Author: Lasse Collin +Date: 2020-02-24 23:37:07 +0200 + + Update m4/.gitignore. + + m4/.gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit e094d1d0f196a91ec703e8d0055948feef349ae8 +Author: Lasse Collin +Date: 2020-02-24 23:29:35 +0200 + + tuklib: Omit an unneeded from a tests. + + tuklib_cpucores.c and tuklib_physmem.c don't include + even via other files in this package, so clearly that header isn't + needed in the tests either (no one has reported build problems due + to a missing header in a .c file). + + m4/tuklib_cpucores.m4 | 1 - + m4/tuklib_physmem.m4 | 1 - + 2 files changed, 2 deletions(-) + +commit b3ed19a55fe99a45bd77614e149d39d18498075c +Author: Lasse Collin +Date: 2020-02-24 23:01:00 +0200 + + liblzma: Remove unneeded from fastpos_tablegen.c. + + This file only generates fastpos_table.c. + It isn't built as a part of liblzma. + + src/liblzma/lzma/fastpos_tablegen.c | 1 - + 1 file changed, 1 deletion(-) + +commit 7b8982b29179b3c586e0456dc9ecbd4f58dcea59 +Author: Lasse Collin +Date: 2020-02-22 14:15:07 +0200 + + Use defined(__GNUC__) before __GNUC__ in preprocessor lines. + + This should silence the equivalent of -Wundef in compilers that + don't define __GNUC__. + + src/common/sysdefs.h | 3 ++- + src/liblzma/api/lzma.h | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 43dfe04e6209c691cf4fbe3072d4ee91271748f1 +Author: Lasse Collin +Date: 2020-02-21 17:40:02 +0200 + + liblzma: Add more uses of lzma_memcmplen() to the normal mode of LZMA. + + This gives a tiny encoder speed improvement. This could have been done + in 2014 after the commit 544aaa3d13554e8640f9caf7db717a96360ec0f6 but + it was forgotten. + + src/liblzma/lzma/lzma_encoder_optimum_normal.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit 59e6eb4840b9f52fa3a61544974017279b448216 +Author: Lasse Collin +Date: 2020-02-21 17:01:15 +0200 + + Build: Add visibility.m4 from gnulib. + + Appears that this file used to get included as a side effect of + gettext. After the change to gettext version requirements this file + no longer got copied to the package and so the build was broken. + + m4/.gitignore | 1 - + m4/visibility.m4 | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 77 insertions(+), 1 deletion(-) + +commit 7fe3ef2eaa53d439cec043727ea1998f4ff0e22a +Author: Lasse Collin +Date: 2020-02-21 16:10:44 +0200 + + xz: Silence a warning when sig_atomic_t is long int. + + It can be true at least on z/OS. + + src/xz/signals.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b0a2a77d10940c42b449d47a005bfc2e50ab5db8 +Author: Lasse Collin +Date: 2020-02-21 15:59:26 +0200 + + xz: Avoid unneeded access of a volatile variable. + + src/xz/signals.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 524c2f12c762032b819757aeda8af7c47c4cabce +Author: Lasse Collin +Date: 2020-02-21 01:24:18 +0200 + + tuklib_integer.m4: Optimize the check order. + + The __builtin byteswapping is the preferred one so check for it first. + + m4/tuklib_integer.m4 | 56 +++++++++++++++++++++++++++------------------------- + 1 file changed, 29 insertions(+), 27 deletions(-) + +commit 57360bb4fd79b358b36d2877db26ac828d1fdfcb +Author: Lasse Collin +Date: 2020-02-20 18:54:04 +0200 + + tuklib_exit: Add missing header. + + strerror() needs which happened to be included via + tuklib_common.h -> tuklib_config.h -> sysdefs.h if HAVE_CONFIG_H + was defined. This wasn't tested without config.h before so it + had worked fine. + + src/common/tuklib_exit.c | 1 + + 1 file changed, 1 insertion(+) + +commit fddd31175e74a538997a939d930462fde17d2dd4 +Author: Lasse Collin +Date: 2020-02-18 19:12:35 +0200 + + Revert the previous commit and add a comment. + + The previous commit broke crc32_tablegen.c. + + If the whole package is built without config.h (with defines + set on the compiler command line) this should still work fine + as long as these headers conform to C99 well enough. + + src/common/tuklib_config.h | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +commit 4e4e9fbb7e66d45319525ac224bff48fbdd0cf6e +Author: Lasse Collin +Date: 2020-02-17 23:37:20 +0200 + + Do not check for HAVE_CONFIG_H in tuklib_config.h. + + In XZ Utils sysdefs.h takes care of it and the required headers. + + src/common/tuklib_config.h | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit 2d4cef954feba82073951358466a1d614141cf33 +Author: Lasse Collin +Date: 2020-02-16 11:18:28 +0200 + + sysdefs.h: Omit the conditionals around string.h and limits.h. + + string.h is used unconditionally elsewhere in the project and + configure has always stopped if limits.h is missing, so these + headers must have been always available even on the weirdest + systems. + + src/common/sysdefs.h | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit feb9c1969bc3eb33d4ecb72cfa897f92dae84939 +Author: Lasse Collin +Date: 2020-02-15 15:07:11 +0200 + + Build: Bump Autoconf and Libtool version requirements. + + There is no specific reason for this other than blocking + the most ancient versions. These are still old: + + Autoconf 2.69 (2012) + Automake 1.12 (2012) + gettext 0.19.6 (2015) + Libtool 2.4 (2010) + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3d576cf92158d62790017ad7f2dd6dc1dd6b42bb +Author: Lasse Collin +Date: 2020-02-15 03:08:32 +0200 + + Build: Use AM_GNU_GETTEXT_REQUIRE_VERSION and require 0.19.6. + + This bumps the version requirement from 0.19 (from 2014) to + 0.19.6 (2015). + + Using only the old AM_GNU_GETTEXT_VERSION results in old + gettext infrastructure being placed in the package. By using + both macros we get the latest gettext files while the other + programs in the Autotools family can still see the old macro. + + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit fa792b8befaf7cb3960b655e0a9410da866d756f +Author: Lasse Collin +Date: 2020-02-14 20:42:06 +0200 + + Translations: Add German translation of the man pages. + + Thanks to Mario Blättermann. + + po4a/de.po | 5532 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + po4a/po4a.conf | 2 +- + 2 files changed, 5533 insertions(+), 1 deletion(-) + +commit 6f7211b6bb47a895b47f533282dba9ee9a1b0c8b +Author: Lasse Collin +Date: 2020-02-07 15:32:21 +0200 + + Build: Add support for translated man pages using po4a. + + The dependency on po4a is optional. It's never required to install + the translated man pages when xz is built from a release tarball. + If po4a is missing when building from xz.git, the translated man + pages won't be generated but otherwise the build will work normally. + + The translations are only updated automatically by autogen.sh and + by "make mydist". This makes it easy to keep po4a as an optional + dependency and ensures that I won't forget to put updated + translations to a release tarball. + + The translated man pages aren't installed if --disable-nls is used. + + The installation of translated man pages abuses Automake internals + by calling "install-man" with redefined dist_man_MANS and man_MANS. + This makes the hairy script code slightly less hairy. If it breaks + some day, this code needs to be fixed; don't blame Automake developers. + + Also, this adds more quotes to the existing shell script code in + the Makefile.am "-hook"s. + + Makefile.am | 4 ++++ + autogen.sh | 8 ++++--- + po4a/.gitignore | 2 ++ + po4a/po4a.conf | 14 +++++++++++ + po4a/update-po | 45 ++++++++++++++++++++++++++++++++++ + src/scripts/Makefile.am | 64 +++++++++++++++++++++++++++++++++++++------------ + src/xz/Makefile.am | 50 +++++++++++++++++++++++++++----------- + src/xzdec/Makefile.am | 55 ++++++++++++++++++++++++++++++++---------- + 8 files changed, 197 insertions(+), 45 deletions(-) + +commit 426f9e5819ff7710a5ff573a96c02940be65d52f +Author: Lasse Collin +Date: 2020-02-06 17:31:38 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit e3a4481d020e4de89efa037f335cf50f3ca55592 +Author: Lasse Collin +Date: 2020-02-05 22:35:06 +0200 + + Update tests/.gitignore. + + .gitignore | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 07208de92f2d5bca764f6d0ebe9d9866051dc4ef +Author: Lasse Collin +Date: 2020-02-05 22:28:51 +0200 + + Update m4/.gitignore. + + m4/.gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit c91fbf223db46c3b3cb9df769863a1a60cd9c908 +Author: Lasse Collin +Date: 2020-02-05 20:47:38 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 15a133b6d1a3eab4faf6eb52a71fdc56bd65846f +Author: Lasse Collin +Date: 2020-02-05 20:40:14 +0200 + + xz: Make it a fatal error if enabling the sandbox fails. + + Perhaps it's too drastic but on the other hand it will let me + learn about possible problems if people report the errors. + This won't be backported to the v5.2 branch. + + src/xz/file_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit af0fb386ef55db66654ae39e2deec6e04190c4ff +Author: Lasse Collin +Date: 2020-02-05 20:33:50 +0200 + + xz: Comment out annoying sandboxing messages. + + src/xz/file_io.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 986d8c9b52b824474088e5bb3b6940651660f0e2 +Author: Lasse Collin +Date: 2020-02-05 19:33:37 +0200 + + Build: Workaround a POSIX shell detection problem on Solaris. + + I don't know if the problem is in gnulib's gl_POSIX_SHELL macro + or if xzgrep does something that isn't in POSIX. The workaround + adds a special case for Solaris: if /usr/xpg4/bin/sh exists and + gl_cv_posix_shell wasn't overriden on the configure command line, + use that shell for xzgrep and other scripts. That shell is known + to work and exists on most Solaris systems. + + configure.ac | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 6629ed929cc7d45a11e385f357ab58ec15e7e4ad +Author: Lasse Collin +Date: 2020-02-03 22:03:50 +0200 + + Build: Update m4/ax_pthread.m4 from Autoconf Archive. + + m4/ax_pthread.m4 | 398 ++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 279 insertions(+), 119 deletions(-) + +commit 353970510895f6a80adfe60cf71b70a95adfa8bc +Author: Lasse Collin +Date: 2020-02-01 19:56:18 +0200 + + xz: Limit --memlimit-compress to at most 4020 MiB for 32-bit xz. + + See the code comment for reasoning. It's far from perfect but + hopefully good enough for certain cases while hopefully doing + nothing bad in other situations. + + At presets -5 ... -9, 4020 MiB vs. 4096 MiB makes no difference + on how xz scales down the number of threads. + + The limit has to be a few MiB below 4096 MiB because otherwise + things like "xz --lzma2=dict=500MiB" won't scale down the dict + size enough and xz cannot allocate enough memory. With + "ulimit -v $((4096 * 1024))" on x86-64, the limit in xz had + to be no more than 4085 MiB. Some safety margin is good though. + + This is hack but it should be useful when running 32-bit xz on + a 64-bit kernel that gives full 4 GiB address space to xz. + Hopefully this is enough to solve this: + + https://bugzilla.redhat.com/show_bug.cgi?id=1196786 + + FreeBSD has a patch that limits the result in tuklib_physmem() + to SIZE_MAX on 32-bit systems. While I think it's not the way + to do it, the results on --memlimit-compress have been good. This + commit should achieve practically identical results for compression + while leaving decompression and tuklib_physmem() and thus + lzma_physmem() unaffected. + + src/xz/hardware.c | 32 +++++++++++++++++++++++++++++++- + src/xz/xz.1 | 21 ++++++++++++++++++++- + 2 files changed, 51 insertions(+), 2 deletions(-) + +commit ba76d67585f88677af9f48b48e7bdc3bb7687def +Author: Lasse Collin +Date: 2020-01-26 20:53:25 +0200 + + xz: Set the --flush-timeout deadline when the first input byte arrives. + + xz --flush-timeout=2000, old version: + + 1. xz is started. The next flush will happen after two seconds. + 2. No input for one second. + 3. A burst of a few kilobytes of input. + 4. No input for one second. + 5. Two seconds have passed and flushing starts. + + The first second counted towards the flush-timeout even though + there was no pending data. This can cause flushing to occur more + often than needed. + + xz --flush-timeout=2000, after this commit: + + 1. xz is started. + 2. No input for one second. + 3. A burst of a few kilobytes of input. The next flush will + happen after two seconds counted from the time when the + first bytes of the burst were read. + 4. No input for one second. + 5. No input for another second. + 6. Two seconds have passed and flushing starts. + + src/xz/coder.c | 6 +----- + src/xz/file_io.c | 6 +++++- + src/xz/mytime.c | 1 - + 3 files changed, 6 insertions(+), 7 deletions(-) + +commit fd47fd62bbb1bfd13ab63869137971d8b390025f +Author: Lasse Collin +Date: 2020-01-26 20:19:19 +0200 + + xz: Move flush_needed from mytime.h to file_pair struct in file_io.h. + + src/xz/coder.c | 3 ++- + src/xz/file_io.c | 3 ++- + src/xz/file_io.h | 3 +++ + src/xz/mytime.c | 3 --- + src/xz/mytime.h | 4 ---- + 5 files changed, 7 insertions(+), 9 deletions(-) + +commit 815035681063d5774d3640fc20b8ede783dd574e +Author: Lasse Collin +Date: 2020-01-26 14:49:22 +0200 + + xz: coder.c: Make writing output a separate function. + + The same code sequence repeats so it's nicer as a separate function. + Note that in one case there was no test for opt_mode != MODE_TEST, + but that was only because that condition would always be true, so + this commit doesn't change the behavior there. + + src/xz/coder.c | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +commit 5a49e081a098455bcdbd95cefb90e9b18780fe58 +Author: Lasse Collin +Date: 2020-01-26 14:13:42 +0200 + + xz: Fix semi-busy-waiting in xz --flush-timeout. + + When input blocked, xz --flush-timeout=1 would wake up every + millisecond and initiate flushing which would have nothing to + flush and thus would just waste CPU time. The fix disables the + timeout when no input has been seen since the previous flush. + + src/xz/coder.c | 4 ++++ + src/xz/file_io.c | 15 +++++++++++---- + src/xz/file_io.h | 4 ++++ + 3 files changed, 19 insertions(+), 4 deletions(-) + +commit dcca70fe9fa3c4bec56cf9c79e966166c9a9cf6a +Author: Lasse Collin +Date: 2020-01-26 13:47:31 +0200 + + xz: Refactor io_read() a bit. + + src/xz/file_io.c | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit 4ae9ab70cd3214395756435d13d8d000368ca2cb +Author: Lasse Collin +Date: 2020-01-26 13:37:08 +0200 + + xz: Update a comment in file_io.h. + + src/xz/file_io.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 3333ba4a6795a55cf0375329ba08152bd7fcbd46 +Author: Lasse Collin +Date: 2020-01-26 13:27:51 +0200 + + xz: Move the setting of flush_needed in file_io.c to a nicer location. + + src/xz/file_io.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit cf2df0f05ac98c1158c6e48145900b773223605d +Author: Lasse Collin +Date: 2020-01-19 21:54:33 +0200 + + Use $(LIB_FUZZING_ENGINE) in tests/ossfuzz/Makefile. + + https://github.com/google/oss-fuzz/pull/3219#issuecomment-573751048 + + Thanks to Bhargava Shastry for sending the patch. + + tests/ossfuzz/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7136f1735c60ac6967c4b8e277fcde53d485234f +Author: Lasse Collin +Date: 2019-12-31 00:41:28 +0200 + + Rename unaligned_read32ne to read32ne, and similarly for the others. + + src/common/tuklib_integer.h | 64 +++++++++++++++---------------- + src/liblzma/common/alone_encoder.c | 2 +- + src/liblzma/common/block_header_decoder.c | 2 +- + src/liblzma/common/block_header_encoder.c | 2 +- + src/liblzma/common/memcmplen.h | 9 ++--- + src/liblzma/common/stream_flags_decoder.c | 6 +-- + src/liblzma/common/stream_flags_encoder.c | 8 ++-- + src/liblzma/lz/lz_encoder_hash.h | 2 +- + src/liblzma/lzma/lzma_decoder.c | 2 +- + src/liblzma/lzma/lzma_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder_private.h | 3 +- + src/liblzma/simple/simple_decoder.c | 2 +- + src/liblzma/simple/simple_encoder.c | 2 +- + tests/test_block_header.c | 4 +- + tests/test_stream_flags.c | 6 +-- + 15 files changed, 54 insertions(+), 62 deletions(-) + +commit 5e78fcbf2eb21936022c9c5c3625d4da76f4b241 +Author: Lasse Collin +Date: 2019-12-31 00:29:48 +0200 + + Rename read32ne to aligned_read32ne, and similarly for the others. + + Using the aligned methods requires more care to ensure that + the address really is aligned, so it's nicer if the aligned + methods are prefixed. The next commit will remove the unaligned_ + prefix from the unaligned methods which in liblzma are used in + more places than the aligned ones. + + src/common/tuklib_integer.h | 56 +++++++++++++++++++++--------------------- + src/liblzma/check/crc32_fast.c | 4 +-- + src/liblzma/check/crc64_fast.c | 4 +-- + 3 files changed, 32 insertions(+), 32 deletions(-) + +commit 77bc5bc6dd67056cfd5888520ac930cfc57b4516 +Author: Lasse Collin +Date: 2019-12-31 00:18:24 +0200 + + Revise tuklib_integer.h and .m4. + + Add a configure option --enable-unsafe-type-punning to get the + old non-conforming memory access methods. It can be useful with + old compilers or in some other less typical situations but + shouldn't normally be used. + + Omit the packed struct trick for unaligned access. While it's + best in some cases, this is simpler. If the memcpy trick doesn't + work, one can request unsafe type punning from configure. + + Because CRC32/CRC64 code needs fast aligned reads, if no very + safe way to do it is found, type punning is used as a fallback. + This sucks but since it currently works in practice, it seems to + be the least bad option. It's never needed with GCC >= 4.7 or + Clang >= 3.6 since these support __builtin_assume_aligned and + thus fast aligned access can be done with the memcpy trick. + + Other things: + - Support GCC/Clang __builtin_bswapXX + - Cleaner bswap fallback macros + - Minor cleanups + + m4/tuklib_integer.m4 | 46 ++++- + src/common/tuklib_integer.h | 488 ++++++++++++++++++++++++-------------------- + 2 files changed, 316 insertions(+), 218 deletions(-) + +commit 8b72950a6b2e2a36c2d8fdc8857564b57191b088 +Author: Lasse Collin +Date: 2019-12-29 22:51:58 +0200 + + Tests: Hopefully fix test_check.c to work on EBCDIC systems. + + Thanks to Daniel Richard G. + + tests/test_check.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 43ce4ea7c762238d3df9717b34126d3e0d7cd51c +Author: Lasse Collin +Date: 2019-09-24 23:02:40 +0300 + + Scripts: Put /usr/xpg4/bin to the beginning of PATH on Solaris. + + This adds a configure option --enable-path-for-scripts=PREFIX + which defaults to empty except on Solaris it is /usr/xpg4/bin + to make POSIX grep and others available. The Solaris case had + been documented in INSTALL with a manual fix but it's better + to do this automatically since it is needed on most Solaris + systems anyway. + + Thanks to Daniel Richard G. + + INSTALL | 43 +++++++++++++++++++++++++++++++++++-------- + configure.ac | 26 ++++++++++++++++++++++++++ + src/scripts/xzdiff.in | 1 + + src/scripts/xzgrep.in | 1 + + src/scripts/xzless.in | 1 + + src/scripts/xzmore.in | 1 + + 6 files changed, 65 insertions(+), 8 deletions(-) + +commit 6a89e656ebedd53a10cd1a063a32a9e4ade0da1f +Author: Lasse Collin +Date: 2019-07-12 18:57:43 +0300 + + Fix comment typos in tuklib_mbstr* files. + + src/common/tuklib_mbstr.h | 2 +- + src/common/tuklib_mbstr_fw.c | 2 +- + src/common/tuklib_mbstr_width.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit ac0b4212656a48ef0c187c0c941d40ac9489ae36 +Author: Lasse Collin +Date: 2019-07-12 18:30:46 +0300 + + Add missing include to tuklib_mbstr_width.c. + + It didn't matter in XZ Utils because sysdefs.h + includes string.h anyway. + + src/common/tuklib_mbstr_width.c | 1 + + 1 file changed, 1 insertion(+) + +commit 72a443281fb0b91aebf8cdff2ab1f7c07b081240 +Author: Lasse Collin +Date: 2019-07-12 18:10:57 +0300 + + Update tuklib base headers to include stdbool.h. + + src/common/tuklib_common.h | 2 +- + src/common/tuklib_config.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit de1f47b2b40e960b7bc3acba754f66dd19705921 +Author: Lasse Collin +Date: 2019-06-28 00:54:31 +0300 + + xz: Automatically align the strings in --info-memory. + + This makes it easier to translate the strings. + + Also, the string for amount of RAM was shortened. + + src/xz/hardware.c | 45 ++++++++++++++++++++++++++++++++++----------- + 1 file changed, 34 insertions(+), 11 deletions(-) + +commit 8ce679125dbd0e2058d8f886e738d7f19a45cab5 +Author: Lasse Collin +Date: 2019-06-25 23:15:21 +0300 + + liblzma: Fix a buggy comment. + + src/liblzma/lz/lz_encoder_mf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fc77929e92e869f6869bf88931066103fd75f376 +Author: Lasse Collin +Date: 2019-06-25 00:16:06 +0300 + + configure.ac: Fix a typo in a comment. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e873902641794210ad7db59743f98e3e1cd6139f +Author: Lasse Collin +Date: 2019-06-25 00:08:13 +0300 + + Tests: Silence warnings from clang -Wassign-enum. + + Also changed 999 to 99 so it fits even if lzma_check happened + to be 8 bits wide. + + tests/test_block_header.c | 3 ++- + tests/test_stream_flags.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit d499e467d99efeaae688564eedc4548837c1416a +Author: Lasse Collin +Date: 2019-06-24 23:52:17 +0300 + + liblzma: Add a comment. + + src/liblzma/common/stream_encoder_mt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a12b13c5f0d54c684fa8446f93fdac08ab2a716b +Author: Lasse Collin +Date: 2019-06-24 23:45:21 +0300 + + liblzma: Silence clang -Wmissing-variable-declarations. + + src/liblzma/check/crc32_table.c | 3 +++ + src/liblzma/check/crc64_table.c | 3 +++ + 2 files changed, 6 insertions(+) + +commit 1b4675cebf7471f7cc9b7072c950e3de97147063 +Author: Lasse Collin +Date: 2019-06-24 23:25:41 +0300 + + Add LZMA_RET_INTERNAL1..8 to lzma_ret and use one for LZMA_TIMED_OUT. + + LZMA_TIMED_OUT is *internally* used as a value for lzma_ret + enumeration. Previously it was #defined to 32 and cast to lzma_ret. + That way it wasn't visible in the public API, but this was hackish. + + Now the public API has eight LZMA_RET_INTERNALx members and + LZMA_TIMED_OUT is #defined to LZMA_RET_INTERNAL1. This way + the code is cleaner overall although the public API has a few + extra mysterious enum members. + + src/liblzma/api/lzma/base.h | 15 ++++++++++++++- + src/liblzma/common/common.c | 4 +--- + src/liblzma/common/common.h | 5 ++--- + src/xz/message.c | 8 ++++++++ + 4 files changed, 25 insertions(+), 7 deletions(-) + +commit 159c43875eb25deea626ed651274464bae3e32ef +Author: Lasse Collin +Date: 2019-06-24 22:57:43 +0300 + + xz: Silence a warning from clang -Wsign-conversion in main.c. + + src/xz/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 466cfcd3e52f6750ce28a635997f3dd84fb18515 +Author: Lasse Collin +Date: 2019-06-24 22:52:20 +0300 + + xz: Make "headings" static in list.c. + + Caught by clang -Wmissing-variable-declarations. + + src/xz/list.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 608517b9b76c41fac6613dbda1193d6f41338e19 +Author: Lasse Collin +Date: 2019-06-24 22:47:39 +0300 + + liblzma: Remove incorrect uses of lzma_attribute((__unused__)). + + Caught by clang -Wused-but-marked-unused. + + src/liblzma/common/alone_decoder.c | 3 +-- + src/liblzma/common/alone_encoder.c | 3 +-- + src/liblzma/lz/lz_decoder.c | 3 +-- + 3 files changed, 3 insertions(+), 6 deletions(-) + +commit c2d2ab6a9d41a2b55d047c5b710aacf80d219255 +Author: Lasse Collin +Date: 2019-06-24 20:53:55 +0300 + + Tests: Silence a warning from -Wsign-conversion. + + tests/create_compress_files.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 2402f7873dcae719d0ebddd23bb579074519ac52 +Author: Lasse Collin +Date: 2019-06-24 20:45:49 +0300 + + xz: Fix an integer overflow with 32-bit off_t. + + Or any off_t which isn't very big (like signed 64 bit integer + that most system have). A small off_t could overflow if the + file being decompressed had long enough run of zero bytes, + which would result in corrupt output. + + src/xz/file_io.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 4fd3a8dd0b60f029e1c66a0ee634f9e9fda3caa9 +Author: Lasse Collin +Date: 2019-06-24 01:24:17 +0300 + + xz: Cleanup io_seek_src() a bit. + + lseek() returns -1 on error and checking for -1 is nicer. + + src/xz/file_io.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit dfda7cf6afa486e10df035327d68753896dfb48a +Author: Lasse Collin +Date: 2019-06-24 00:57:23 +0300 + + Tests: Remove a duplicate branch from tests/tests.h. + + The duplication was introduced about eleven years ago and + should have been cleaned up back then already. + + This was caught by -Wduplicated-branches. + + tests/tests.h | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit 1d4a904d8fb634bd5a04f7fbdd17d3739f3d8866 +Author: Lasse Collin +Date: 2019-06-24 00:40:45 +0300 + + xz: Change io_seek_src and io_pread arguments from off_t to uint64_t. + + This helps fixing warnings from -Wsign-conversion and makes the + code look better too. + + src/xz/file_io.c | 16 ++++++++++++---- + src/xz/file_io.h | 4 ++-- + src/xz/list.c | 9 ++++----- + 3 files changed, 18 insertions(+), 11 deletions(-) + +commit 50120deb0159fcb53ee1a6caffb2bb81a1ecd990 +Author: Lasse Collin +Date: 2019-06-24 00:12:38 +0300 + + xz: list.c: Fix some warnings from -Wsign-conversion. + + src/xz/list.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit d0a78751eb54fb1572002746c533936a118e4e42 +Author: Lasse Collin +Date: 2019-06-23 23:22:45 +0300 + + tuklib_mbstr_width: Fix a warning from -Wsign-conversion. + + src/common/tuklib_mbstr_width.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7883d73530b4b2a701ddd7d50c35676cbc158039 +Author: Lasse Collin +Date: 2019-06-23 23:19:34 +0300 + + xz: Fix some of the warnings from -Wsign-conversion. + + src/xz/args.c | 4 ++-- + src/xz/coder.c | 4 ++-- + src/xz/file_io.c | 5 +++-- + src/xz/message.c | 4 ++-- + src/xz/mytime.c | 4 ++-- + src/xz/options.c | 2 +- + src/xz/util.c | 4 ++-- + 7 files changed, 14 insertions(+), 13 deletions(-) + +commit c2b994fe3d35e9e575c28869a2f7f534f2495d05 +Author: Lasse Collin +Date: 2019-06-23 22:27:45 +0300 + + tuklib_cpucores: Silence warnings from -Wsign-conversion. + + src/common/tuklib_cpucores.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 07c4fa9e1a195e0543f271380c8de22a3ab145ff +Author: Lasse Collin +Date: 2019-06-23 21:40:47 +0300 + + xzdec: Fix warnings from -Wsign-conversion. + + src/xzdec/xzdec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dfac2c9a1d7d4a2b8a5d7c9c6d567dee48318bcf +Author: Lasse Collin +Date: 2019-06-23 21:38:56 +0300 + + liblzma: Fix warnings from -Wsign-conversion. + + Also, more parentheses were added to the literal_subcoder + macro in lzma_comon.h (better style but no functional change + in the current usage). + + src/liblzma/common/block_header_decoder.c | 2 +- + src/liblzma/delta/delta_decoder.c | 2 +- + src/liblzma/lzma/fastpos.h | 2 +- + src/liblzma/lzma/lzma2_decoder.c | 8 ++++---- + src/liblzma/lzma/lzma_common.h | 3 ++- + src/liblzma/lzma/lzma_decoder.c | 16 ++++++++-------- + src/liblzma/simple/arm.c | 6 +++--- + src/liblzma/simple/armthumb.c | 8 ++++---- + src/liblzma/simple/ia64.c | 2 +- + src/liblzma/simple/powerpc.c | 9 +++++---- + src/liblzma/simple/x86.c | 2 +- + 11 files changed, 31 insertions(+), 29 deletions(-) + +commit 41838dcc26375f6aa393a63e4d81e2f4d223de07 +Author: Lasse Collin +Date: 2019-06-23 19:33:55 +0300 + + tuklib_integer: Silence warnings from -Wsign-conversion. + + src/common/tuklib_integer.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 3ce05d235f736d392347a05086b8033416874b87 +Author: Lasse Collin +Date: 2019-06-20 19:40:30 +0300 + + tuklib_integer: Fix usage of conv macros. + + Use a temporary variable instead of e.g. + conv32le(unaligned_read32ne(buf)) because the macro can + evaluate its argument multiple times. + + src/common/tuklib_integer.h | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit b525b0c0ef40cd89b69294c9b8d57f4a8db58e1f +Author: Lasse Collin +Date: 2019-06-03 20:44:19 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 039a168e8cf201d5104a25ec41f0cf25eda6cc53 +Author: Lasse Collin +Date: 2019-06-03 20:41:54 +0300 + + liblzma: Fix comments. + + Thanks to Bruce Stark. + + src/liblzma/common/alone_encoder.c | 4 ++-- + src/liblzma/common/block_util.c | 2 +- + src/liblzma/common/common.c | 2 +- + src/liblzma/common/filter_common.h | 2 +- + src/liblzma/common/filter_decoder.h | 2 +- + src/liblzma/common/filter_flags_encoder.c | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +commit c460f6defebc5a81bbca90adc2476154ca244f69 +Author: Lasse Collin +Date: 2019-06-02 00:50:59 +0300 + + liblzma: Fix one more unaligned read to use unaligned_read16ne(). + + src/liblzma/lz/lz_encoder_hash.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c81d77c537f0b8c8672868e1dc6cf7290ce4a25b +Author: Lasse Collin +Date: 2019-06-01 21:41:55 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 386394fc9fcde2615391f804eaa466749f96f4ef +Author: Lasse Collin +Date: 2019-06-01 21:36:13 +0300 + + liblzma: memcmplen: Use ctz32() from tuklib_integer.h. + + The same compiler-specific #ifdefs are already in tuklib_integer.h + + src/liblzma/common/memcmplen.h | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +commit 264ab971ce2994baac41b1579c9c35aba7743fc8 +Author: Lasse Collin +Date: 2019-06-01 21:30:03 +0300 + + tuklib_integer: Cleanup MSVC-specific code. + + src/common/tuklib_integer.h | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +commit 33773c6f2a8711d4aa6656795db52c59a28580ec +Author: Lasse Collin +Date: 2019-06-01 19:01:21 +0300 + + liblzma: Use unaligned_readXXne functions instead of type punning. + + Now gcc -fsanitize=undefined should be clean. + + Thanks to Jeffrey Walton. + + src/liblzma/common/memcmplen.h | 12 ++++++------ + src/liblzma/lzma/lzma_encoder_private.h | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit e5f13a66567b1987e0aae42c6fdcd277bb5810ba +Author: Lasse Collin +Date: 2019-06-01 18:46:54 +0300 + + tuklib_integer: Autodetect support for unaligned access on ARM. + + The result is used as the default for --enable-unaligned-access. + The test should work with GCC and Clang. + + m4/tuklib_integer.m4 | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 3bc112c2d38d5f348bce7bc2422286b1692c7490 +Author: Lasse Collin +Date: 2019-06-01 18:41:16 +0300 + + tuklib_integer: Improve unaligned memory access. + + Now memcpy() or GNU C packed structs for unaligned access instead + of type punning. See the comment in this commit for details. + + Avoiding type punning with unaligned access is needed to + silence gcc -fsanitize=undefined. + + New functions: unaliged_readXXne and unaligned_writeXXne where + XX is 16, 32, or 64. + + src/common/tuklib_integer.h | 180 +++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 168 insertions(+), 12 deletions(-) + +commit 2a22de439ec63da1927b640eda309296a1e8dce5 +Author: Lasse Collin +Date: 2019-05-13 20:05:17 +0300 + + liblzma: Avoid memcpy(NULL, foo, 0) because it is undefined behavior. + + I should have always known this but I didn't. Here is an example + as a reminder to myself: + + int mycopy(void *dest, void *src, size_t n) + { + memcpy(dest, src, n); + return dest == NULL; + } + + In the example, a compiler may assume that dest != NULL because + passing NULL to memcpy() would be undefined behavior. Testing + with GCC 8.2.1, mycopy(NULL, NULL, 0) returns 1 with -O0 and -O1. + With -O2 the return value is 0 because the compiler infers that + dest cannot be NULL because it was already used with memcpy() + and thus the test for NULL gets optimized out. + + In liblzma, if a null-pointer was passed to memcpy(), there were + no checks for NULL *after* the memcpy() call, so I cautiously + suspect that it shouldn't have caused bad behavior in practice, + but it's hard to be sure, and the problematic cases had to be + fixed anyway. + + Thanks to Jeffrey Walton. + + src/liblzma/common/common.c | 6 +++++- + src/liblzma/lz/lz_decoder.c | 12 +++++++++--- + src/liblzma/simple/simple_coder.c | 10 +++++++++- + 3 files changed, 23 insertions(+), 5 deletions(-) + +commit d3fc850cfedc058247d9e334ce59bbc8f2286d8a +Author: Lasse Collin +Date: 2019-05-11 20:56:08 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 4adb8288ab61d5f14e212007b8742df0710baf73 +Author: Lasse Collin +Date: 2019-05-11 20:54:12 +0300 + + xz: Update xz man page date. + + src/xz/xz.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2fb0ddaa557ce86e38fe06439930fa8665f092fd +Author: Antoine Cœur +Date: 2019-05-08 13:30:57 +0800 + + spelling + + Doxyfile.in | 2 +- + NEWS | 2 +- + doc/examples/11_file_info.c | 2 +- + src/liblzma/api/lzma/block.h | 2 +- + src/liblzma/api/lzma/hardware.h | 2 +- + src/liblzma/api/lzma/lzma12.h | 2 +- + src/liblzma/api/lzma/vli.h | 2 +- + src/liblzma/common/file_info.c | 4 ++-- + src/liblzma/common/hardware_physmem.c | 2 +- + src/liblzma/common/index.c | 4 ++-- + src/liblzma/common/stream_encoder_mt.c | 2 +- + src/liblzma/common/vli_decoder.c | 2 +- + src/liblzma/lz/lz_decoder.c | 2 +- + src/scripts/xzgrep.in | 2 +- + src/xz/args.c | 2 +- + src/xz/coder.c | 4 ++-- + src/xz/list.c | 4 ++-- + src/xz/main.c | 2 +- + src/xz/mytime.h | 2 +- + src/xz/private.h | 2 +- + src/xz/xz.1 | 2 +- + windows/build.bash | 2 +- + 22 files changed, 26 insertions(+), 26 deletions(-) + +commit 4ed339606156bd313ed99237485cb8ed0362d64f +Author: Lasse Collin +Date: 2019-05-01 18:43:10 +0300 + + xz: In xz -lvv look at the widths of the check names too. + + Now the widths of the check names is used to adjust the width + of the Check column. This way there no longer is a need to restrict + the widths of the check names to be at most ten terminal-columns. + + src/xz/list.c | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) + +commit 2f4281a1001dcf7fdf1418c0c0d246c16561fb65 +Author: Lasse Collin +Date: 2019-05-01 18:33:25 +0300 + + xz: Fix xz -lvv column alignment to look at the translated strings. + + src/xz/list.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 01d01b7c7c0b8eaf7f780a5584ec52c22d10fa4a +Author: Lasse Collin +Date: 2019-05-01 16:52:36 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 64030c6b17f7743df03a9948a0ccfcdf40c6b97c +Author: Lasse Collin +Date: 2019-05-01 16:43:16 +0300 + + Windows: Update VS version in windows/vs2019/config.h. + + windows/vs2019/config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2dc9117f5fbfab31444a3ca1e55795ccfa8a9f51 +Author: Julien Marrec +Date: 2019-04-25 17:44:06 +0200 + + Windows: Upgrade solution itself + + windows/vs2019/xz_win.sln | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit ac31413916fa9b11bab17f0f0aa63e2869360f6f +Author: Julien Marrec +Date: 2019-04-25 17:40:24 +0200 + + Windows: Upgrade solution with VS2019 + + windows/vs2019/liblzma.vcxproj | 15 ++++++++------- + windows/vs2019/liblzma_dll.vcxproj | 15 ++++++++------- + 2 files changed, 16 insertions(+), 14 deletions(-) + +commit be25a0c37ba92a20c390b4d17fe502457fe96b71 +Author: Julien Marrec +Date: 2019-04-25 17:39:32 +0200 + + Windows: Duplicate windows/vs2017 before upgrading + + windows/vs2019/config.h | 148 ++++++++++++++ + windows/vs2019/liblzma.vcxproj | 356 ++++++++++++++++++++++++++++++++++ + windows/vs2019/liblzma_dll.vcxproj | 385 +++++++++++++++++++++++++++++++++++++ + windows/vs2019/xz_win.sln | 48 +++++ + 4 files changed, 937 insertions(+) + +commit d0e58b3a51e8e616f3dc26ec7b7e4aa0fa6991ad +Author: Lasse Collin +Date: 2019-03-04 22:49:04 +0200 + + README: Update translation instructions. + + XZ Utils is now part of the Translation Project + . + + README | 32 +++++++++++++------------------- + 1 file changed, 13 insertions(+), 19 deletions(-) + +commit a750c35a7d45a16c11c1d40fecee8443c32a9996 +Author: Lasse Collin +Date: 2019-03-04 21:20:39 +0200 + + xz: Automatically align column headings in xz -lvv. + + src/xz/list.c | 263 ++++++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 212 insertions(+), 51 deletions(-) + +commit 6cb42e8aa1dc37bf403a9f5acbd07e86036b7e77 +Author: Lasse Collin +Date: 2019-03-04 01:07:59 +0200 + + xz: Automatically align strings ending in a colon in --list output. + + This should avoid alignment errors in translations with these + strings. + + src/xz/list.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 102 insertions(+), 12 deletions(-) + +commit 1e3f29b62f2c03e50fc9ebea7b83c1497dd35484 +Author: Lasse Collin +Date: 2019-01-13 17:29:23 +0200 + + Windows/VS2017: Omit WindowsTargetPlatformVersion from project files. + + I understood that if a WTPV is specified, it's often wrong + because different VS installations have different SDK version + installed. Omitting the WTPV tag makes VS2017 default to + Windows SDK 8.1 which often is also missing, so in any case + people may need to specify the WTPV before building. But some + day in the future a missing WTPV tag will start to default to + the latest installed SDK which sounds reasonable: + + https://developercommunity.visualstudio.com/content/problem/140294/windowstargetplatformversion-makes-it-impossible-t.html + + Thanks to "dom". + + windows/INSTALL-MSVC.txt | 4 ++++ + windows/vs2017/liblzma.vcxproj | 1 - + windows/vs2017/liblzma_dll.vcxproj | 1 - + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit 4d86076332aece6314063d3712a5f364172bbb0f +Author: Lasse Collin +Date: 2018-12-20 20:42:29 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit b55d79461d1f6aeaac03c7dae84481e5eb8bea4c +Author: Lasse Collin +Date: 2018-12-14 20:34:30 +0200 + + xz: Fix a crash in progress indicator when in passthru mode. + + "xz -dcfv not_an_xz_file" crashed (all four options are + required to trigger it). It caused xz to call + lzma_get_progress(&strm, ...) when no coder was initialized + in strm. In this situation strm.internal is NULL which leads + to a crash in lzma_get_progress(). + + The bug was introduced when xz started using lzma_get_progress() + to get progress info for multi-threaded compression, so the + bug is present in versions 5.1.3alpha and higher. + + Thanks to Filip Palian for + the bug report. + + src/xz/coder.c | 11 +++++++---- + src/xz/message.c | 18 ++++++++++++++++-- + src/xz/message.h | 3 ++- + 3 files changed, 25 insertions(+), 7 deletions(-) + +commit 4ae5526de013efd1021686fa80bdd10cf1cb9c56 +Author: Lasse Collin +Date: 2018-11-22 17:20:31 +0200 + + xz: Update man page timestamp. + + src/xz/xz.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6a36d0d5f49e0080ff64dd9ef250abd489bea2ad +Author: Pavel Raiskup +Date: 2018-11-22 15:14:34 +0100 + + 'have have' typos + + src/xz/signals.c | 2 +- + src/xz/xz.1 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9eca51ef805ed8002a851df1b4995d71826c8b6e +Author: Lasse Collin +Date: 2018-11-02 20:40:48 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 106d1a663d4ba42b63231caa289f531548df81c1 +Author: Lasse Collin +Date: 2018-11-02 20:18:45 +0200 + + Tests: Add a fuzz test program and a config file for OSS-Fuzz. + + Thanks to Bhargava Shastry and Github user pdknsk. + + tests/Makefile.am | 1 + + tests/ossfuzz/Makefile | 7 ++++ + tests/ossfuzz/config/fuzz.dict | 2 + + tests/ossfuzz/config/fuzz.options | 2 + + tests/ossfuzz/fuzz.c | 82 +++++++++++++++++++++++++++++++++++++++ + 5 files changed, 94 insertions(+) + +commit a18ae42a79a19b1394b41eb3e238139fd28012ec +Author: Lasse Collin +Date: 2018-10-26 22:49:10 +0300 + + liblzma: Don't verify header CRC32s if building for fuzz testing. + + FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION is #defined when liblzma + is being built for fuzz testing. + + Most fuzzed inputs would normally get rejected because of incorrect + CRC32 and the actual header decoding code wouldn't get fuzzed. + Disabling CRC32 checks avoids this problem. The fuzzer program + must still use LZMA_IGNORE_CHECK flag to disable verification of + integrity checks of uncompressed data. + + src/liblzma/common/block_header_decoder.c | 5 ++++- + src/liblzma/common/index_decoder.c | 5 ++++- + src/liblzma/common/index_hash.c | 5 ++++- + src/liblzma/common/stream_flags_decoder.c | 10 ++++++++-- + 4 files changed, 20 insertions(+), 5 deletions(-) + +commit f76f7516d6a1c832f61810c82e92d151cc80966c +Author: Lasse Collin +Date: 2018-07-27 18:10:44 +0300 + + xzless: Rename unused variables to silence static analysers. + + In this particular case I don't see this affecting readability + of the code. + + Thanks to Pavel Raiskup. + + src/scripts/xzless.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3cbcaeb07eb7543735befd6f507fdb5fa4363cff +Author: Lasse Collin +Date: 2018-07-27 16:02:58 +0300 + + liblzma: Remove an always-true condition from lzma_index_cat(). + + This should help static analysis tools to see that newg + isn't leaked. + + Thanks to Pavel Raiskup. + + src/liblzma/common/index.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 76762ae6098ec55c326f4b4b4a42e8c1918ee81f +Author: Lasse Collin +Date: 2018-05-19 21:23:25 +0300 + + liblzma: Improve lzma_properties_decode() API documentation. + + src/liblzma/api/lzma/filter.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 2267f5b0d20a5d24e93fcd9f72ea7eeb0d89708c +Author: Lasse Collin +Date: 2018-04-29 18:58:19 +0300 + + Bump the version number to 5.3.1alpha. + + src/liblzma/api/lzma/version.h | 2 +- + src/liblzma/liblzma.map | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit cee3021d30704858e4bdd22240e7d28e570d7451 +Author: Lasse Collin +Date: 2018-04-29 18:48:00 +0300 + + extra/scanlzma: Fix compiler warnings. + + extra/scanlzma/scanlzma.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit c5c7ceb08a011b97d261798033e2c39613a69eb7 +Author: Lasse Collin +Date: 2018-04-29 18:44:47 +0300 + + DOS: Add file_info.c to the list of files to build. + + dos/Makefile | 1 + + 1 file changed, 1 insertion(+) + +commit 114cab97af766b21e0fc8620479202fb1e7a5e41 +Author: Lasse Collin +Date: 2018-04-29 18:33:10 +0300 + + Update NEWS for 5.3.1alpha. + + NEWS | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit b8139e11c512bbf32bf58ab0689f9bb6c52819da +Author: Lasse Collin +Date: 2018-04-29 18:15:37 +0300 + + Add NEWS for 5.2.4. + + NEWS | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +commit 47b59d47cfd904a420fbd45629d168ca1973721d +Author: Lasse Collin +Date: 2018-02-06 19:36:30 +0200 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit bc197991690ede24ab143665b5b0f0f9cb35cc46 +Author: Ben Boeckel +Date: 2018-01-29 13:58:18 -0500 + + nothrow: use noexcept for C++11 and newer + + In C++11, the `throw()` specifier is deprecated and `noexcept` is + preffered instead. + + src/liblzma/api/lzma.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit fb6d4f83cb6e144734f2a4216bb117bd56dc3cb5 +Author: Lasse Collin +Date: 2018-02-06 18:02:48 +0200 + + liblzma: Remove incorrect #ifdef from range_common.h. + + In most cases it was harmless but it could affect some + custom build systems. + + Thanks to Pippijn van Steenhoven. + + src/liblzma/rangecoder/range_common.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit bc577d35c2d0ed17f554d2d8107b2a2a9abbac76 +Author: Lasse Collin +Date: 2018-01-10 22:10:39 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 713bbc1a80f26d34c96ed3dbb9887362204de3a1 +Author: Lasse Collin +Date: 2018-01-10 21:54:27 +0200 + + tuklib_integer: New Intel C compiler needs immintrin.h. + + Thanks to Melanie Blower (Intel) for the patch. + + src/common/tuklib_integer.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit a0ee1afbd99da138b559cb27fa2022e7f1ab44f3 +Author: Lasse Collin +Date: 2017-09-24 20:04:24 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit a1e2c568de29c0b57d873eab40a2879b749da429 +Author: Lasse Collin +Date: 2017-09-16 20:36:20 +0300 + + Windows: Fix paths in VS project files. + + Some paths use slashes instead of backslashes as directory + separators... now it should work (I tested VS2013 version). + + windows/vs2013/liblzma.vcxproj | 12 ++++++------ + windows/vs2013/liblzma_dll.vcxproj | 24 ++++++++++++------------ + windows/vs2017/liblzma.vcxproj | 12 ++++++------ + windows/vs2017/liblzma_dll.vcxproj | 24 ++++++++++++------------ + 4 files changed, 36 insertions(+), 36 deletions(-) + +commit cea5cf8d26c9d1dc30a808614d79c0b25640e15e +Author: Lasse Collin +Date: 2017-09-16 12:56:20 +0300 + + Windows: Update VS2017 project files to include file info decoder. + + windows/vs2017/liblzma.vcxproj | 2 ++ + windows/vs2017/liblzma_dll.vcxproj | 2 ++ + 2 files changed, 4 insertions(+) + +commit 95d563db3ee497b223e522b699c4d4c29943eef0 +Author: Lasse Collin +Date: 2017-09-16 12:54:23 +0300 + + Windows: Add project files for VS2017. + + These files match the v5.2 branch (no file info decoder). + + windows/vs2017/config.h | 148 ++++++++++++++ + windows/vs2017/liblzma.vcxproj | 355 ++++++++++++++++++++++++++++++++++ + windows/vs2017/liblzma_dll.vcxproj | 384 +++++++++++++++++++++++++++++++++++++ + windows/vs2017/xz_win.sln | 48 +++++ + 4 files changed, 935 insertions(+) + +commit ab72416d62ea8f50ad31d5b8545fcb6a2bf96b73 +Author: Lasse Collin +Date: 2017-09-16 12:45:50 +0300 + + Windows: Update VS2013 project files to include file info decoder. + + windows/vs2013/liblzma.vcxproj | 2 ++ + windows/vs2013/liblzma_dll.vcxproj | 2 ++ + 2 files changed, 4 insertions(+) + +commit 82388980187b0e3794d187762054200bbdcc9a53 +Author: Lasse Collin +Date: 2017-09-16 12:39:43 +0300 + + Windows: Move VS2013 files into windows/vs2013 directory. + + windows/{ => vs2013}/config.h | 0 + windows/{ => vs2013}/liblzma.vcxproj | 278 +++++++++++++++--------------- + windows/{ => vs2013}/liblzma_dll.vcxproj | 280 +++++++++++++++---------------- + windows/{ => vs2013}/xz_win.sln | 0 + 4 files changed, 279 insertions(+), 279 deletions(-) + +commit 94e3f986aa4e14b4ff01ac24857f499630d6d180 +Author: Lasse Collin +Date: 2017-08-14 20:08:33 +0300 + + Fix or hide warnings from GCC 7's -Wimplicit-fallthrough. + + src/liblzma/lzma/lzma_decoder.c | 6 ++++++ + src/xz/list.c | 2 ++ + 2 files changed, 8 insertions(+) + +commit 0b0e1e6803456aac641a59332200f8e95e2b7ea8 +Author: Alexey Tourbin +Date: 2017-05-16 23:56:35 +0300 + + Docs: Fix a typo in a comment in doc/examples/02_decompress.c. + + doc/examples/02_decompress.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a015cd1f90116e655be4eaf4aad42c4c911c2807 +Author: Lasse Collin +Date: 2017-05-23 18:34:43 +0300 + + xz: Fix "xz --list --robot missing_or_bad_file.xz". + + It ended up printing an uninitialized char-array when trying to + print the check names (column 7) on the "totals" line. + + This also changes the column 12 (minimum xz version) to + 50000002 (xz 5.0.0) instead of 0 when there are no valid + input files. + + Thanks to kidmin for the bug report. + + src/xz/list.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit c2e29f06a7d1e3ba242ac2fafc69f5d6e92f62cd +Author: Lasse Collin +Date: 2017-04-24 20:20:11 +0300 + + Docs: Add doc/examples/11_file_info.c. + + doc/examples/11_file_info.c | 206 ++++++++++++++++++++++++++++++++++++++++++++ + doc/examples/Makefile | 3 +- + 2 files changed, 208 insertions(+), 1 deletion(-) + +commit 1520f6ec808896375ac7bf778c449e0f7dea5f46 +Author: Lasse Collin +Date: 2017-04-24 19:48:47 +0300 + + Build: Omit pre-5.0.0 entries from the generated ChangeLog. + + It makes ChangeLog significantly smaller. + + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8269782283806c90a8509c2ac2a308344f70e171 +Author: Lasse Collin +Date: 2017-04-24 19:48:23 +0300 + + xz: Use lzma_file_info_decoder() for --list. + + src/xz/list.c | 254 ++++++++++------------------------------------------------ + 1 file changed, 44 insertions(+), 210 deletions(-) + +commit e353d0b1cc0d3997ae5048faa8e6786414953e06 +Author: Lasse Collin +Date: 2017-04-24 19:35:50 +0300 + + liblzma: Add lzma_file_info_decoder(). + + src/liblzma/api/lzma/index.h | 66 ++++ + src/liblzma/common/Makefile.inc | 1 + + src/liblzma/common/file_info.c | 855 ++++++++++++++++++++++++++++++++++++++++ + src/liblzma/liblzma.map | 7 +- + 4 files changed, 928 insertions(+), 1 deletion(-) + +commit 144ef9e19e9496c995b21505dd1e111c442968d1 +Author: Lasse Collin +Date: 2017-04-24 19:30:22 +0300 + + Update the Git repository URL to HTTPS in ChangeLog. + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8c9842c265993d7dd4039f732d3546267fb5ecc4 +Author: Lasse Collin +Date: 2017-04-21 15:05:16 +0300 + + liblzma: Rename LZMA_SEEK to LZMA_SEEK_NEEDED and seek_in to seek_pos. + + src/liblzma/api/lzma/base.h | 18 +++++++++--------- + src/liblzma/common/common.c | 2 +- + src/xz/message.c | 2 +- + 3 files changed, 11 insertions(+), 11 deletions(-) + +commit 662b27c417cab248cb365dd7682121bdec4d5ae7 +Author: Lasse Collin +Date: 2017-04-19 22:17:35 +0300 + + Update the home page URLs to HTTPS. + + COPYING | 2 +- + README | 2 +- + configure.ac | 2 +- + doc/faq.txt | 4 ++-- + dos/config.h | 2 +- + src/common/common_w32res.rc | 2 +- + src/xz/xz.1 | 6 +++--- + src/xzdec/xzdec.1 | 4 ++-- + windows/README-Windows.txt | 2 +- + windows/config.h | 2 +- + 10 files changed, 14 insertions(+), 14 deletions(-) + +commit c28f0b3d00af87b92dda229831548d8eb0067d1d +Author: Lasse Collin +Date: 2017-04-05 18:47:22 +0300 + + xz: Add io_seek_src(). + + src/xz/file_io.c | 20 +++++++++++++++++--- + src/xz/file_io.h | 13 +++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +commit bba477257d7319c8764890f3669175b866d24944 +Author: Lasse Collin +Date: 2017-03-30 22:01:54 +0300 + + xz: Use POSIX_FADV_RANDOM for in "xz --list" mode. + + xz --list is random access so POSIX_FADV_SEQUENTIAL was clearly + wrong. + + src/xz/file_io.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 310d19816d1652b0c8bb1b82574d46345d924752 +Author: Lasse Collin +Date: 2017-03-30 20:03:05 +0300 + + liblzma: Make lzma_index_decoder_init() visible to other liblzma funcs. + + This is to allow other functions to use it without going + via the public API (lzma_index_decoder()). + + src/liblzma/common/Makefile.inc | 1 + + src/liblzma/common/index_decoder.c | 10 +++++----- + src/liblzma/common/index_decoder.h | 24 ++++++++++++++++++++++++ + 3 files changed, 30 insertions(+), 5 deletions(-) + +commit a27920002dbc469f778a134fc665b7c3ea73701b +Author: Lasse Collin +Date: 2017-03-30 20:00:09 +0300 + + liblzma: Add generic support for input seeking (LZMA_SEEK). + + Also mention LZMA_SEEK in xz/message.c to silence a warning. + + src/liblzma/api/lzma/base.h | 31 ++++++++++++++++++++++++++++++- + src/liblzma/common/common.c | 12 +++++++++++- + src/xz/message.c | 1 + + 3 files changed, 42 insertions(+), 2 deletions(-) + +commit a0b1dda409bc3e6e2957a2651663fc411d2caf2d +Author: Lasse Collin +Date: 2017-03-30 19:47:45 +0300 + + liblzma: Fix lzma_memlimit_set(strm, 0). + + The 0 got treated specially in a buggy way and as a result + the function did nothing. The API doc said that 0 was supposed + to return LZMA_PROG_ERROR but it didn't. + + Now 0 is treated as if 1 had been specified. This is done because + 0 is already used to indicate an error from lzma_memlimit_get() + and lzma_memusage(). + + In addition, lzma_memlimit_set() no longer checks that the new + limit is at least LZMA_MEMUSAGE_BASE. It's counter-productive + for the Index decoder and was actually needed only by the + auto decoder. Auto decoder has now been modified to check for + LZMA_MEMUSAGE_BASE. + + src/liblzma/api/lzma/base.h | 7 ++++++- + src/liblzma/common/auto_decoder.c | 3 +++ + src/liblzma/common/common.c | 6 ++++-- + 3 files changed, 13 insertions(+), 3 deletions(-) + +commit 84462afaada61379f5878e46f8f00e25a1cdcf29 +Author: Lasse Collin +Date: 2017-03-30 19:16:55 +0300 + + liblzma: Similar memlimit fix for stream_, alone_, and auto_decoder. + + src/liblzma/api/lzma/container.h | 21 +++++++++++++++++---- + src/liblzma/common/alone_decoder.c | 5 +---- + src/liblzma/common/auto_decoder.c | 5 +---- + src/liblzma/common/stream_decoder.c | 5 +---- + 4 files changed, 20 insertions(+), 16 deletions(-) + +commit cbc74017939690d13441b8926bb743fb03211b83 +Author: Lasse Collin +Date: 2017-03-30 18:58:18 +0300 + + liblzma: Fix handling of memlimit == 0 in lzma_index_decoder(). + + It returned LZMA_PROG_ERROR, which was done to avoid zero as + the limit (because it's a special value elsewhere), but using + LZMA_PROG_ERROR is simply inconvenient and can cause bugs. + + The fix/workaround is to treat 0 as if it were 1 byte. It's + effectively the same thing. The only weird consequence is + that then lzma_memlimit_get() will return 1 even when 0 was + specified as the limit. + + This fixes a very rare corner case in xz --list where a specific + memory usage limit and a multi-stream file could print the + error message "Internal error (bug)" instead of saying that + the memory usage limit is too low. + + src/liblzma/api/lzma/index.h | 18 +++++++++++------- + src/liblzma/common/index_decoder.c | 4 ++-- + 2 files changed, 13 insertions(+), 9 deletions(-) + +commit 78ae13bced912b1b92ae927992c99cbcc463cae7 +Author: Lasse Collin +Date: 2016-12-30 13:25:10 +0200 + + Update NEWS for 5.2.3. + + NEWS | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +commit 0297863fdb453aed1a25eb025f3ba7bacbbb1357 +Author: Lasse Collin +Date: 2016-12-26 20:55:52 +0200 + + Document --enable-sandbox configure option in INSTALL. + + INSTALL | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +commit d4a0462abe5478193521c14625e1c81fead87f9f +Author: Lasse Collin +Date: 2016-11-21 20:24:50 +0200 + + liblzma: Avoid multiple definitions of lzma_coder structures. + + Only one definition was visible in a translation unit. + It avoided a few casts and temp variables but seems that + this hack doesn't work with link-time optimizations in compilers + as it's not C99/C11 compliant. + + Fixes: + http://www.mail-archive.com/xz-devel@tukaani.org/msg00279.html + + src/liblzma/common/alone_decoder.c | 44 +++++---- + src/liblzma/common/alone_encoder.c | 34 ++++--- + src/liblzma/common/auto_decoder.c | 35 ++++--- + src/liblzma/common/block_decoder.c | 41 ++++---- + src/liblzma/common/block_encoder.c | 40 ++++---- + src/liblzma/common/common.h | 18 ++-- + src/liblzma/common/index_decoder.c | 33 ++++--- + src/liblzma/common/index_encoder.c | 16 ++-- + src/liblzma/common/stream_decoder.c | 50 +++++----- + src/liblzma/common/stream_encoder.c | 56 ++++++----- + src/liblzma/common/stream_encoder_mt.c | 124 ++++++++++++++----------- + src/liblzma/delta/delta_common.c | 25 ++--- + src/liblzma/delta/delta_decoder.c | 6 +- + src/liblzma/delta/delta_encoder.c | 12 ++- + src/liblzma/delta/delta_private.h | 4 +- + src/liblzma/lz/lz_decoder.c | 60 ++++++------ + src/liblzma/lz/lz_decoder.h | 13 ++- + src/liblzma/lz/lz_encoder.c | 57 +++++++----- + src/liblzma/lz/lz_encoder.h | 9 +- + src/liblzma/lzma/lzma2_decoder.c | 32 ++++--- + src/liblzma/lzma/lzma2_encoder.c | 51 +++++----- + src/liblzma/lzma/lzma_decoder.c | 27 +++--- + src/liblzma/lzma/lzma_encoder.c | 29 +++--- + src/liblzma/lzma/lzma_encoder.h | 9 +- + src/liblzma/lzma/lzma_encoder_optimum_fast.c | 3 +- + src/liblzma/lzma/lzma_encoder_optimum_normal.c | 23 ++--- + src/liblzma/lzma/lzma_encoder_private.h | 6 +- + src/liblzma/simple/arm.c | 2 +- + src/liblzma/simple/armthumb.c | 2 +- + src/liblzma/simple/ia64.c | 2 +- + src/liblzma/simple/powerpc.c | 2 +- + src/liblzma/simple/simple_coder.c | 61 ++++++------ + src/liblzma/simple/simple_private.h | 12 +-- + src/liblzma/simple/sparc.c | 2 +- + src/liblzma/simple/x86.c | 15 +-- + 35 files changed, 532 insertions(+), 423 deletions(-) + +commit a01794c52add98263b49119842c3e7141d1b9ced +Author: Lasse Collin +Date: 2016-10-24 18:53:25 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit df8f446e3ad47e5148b8c8d8b6e519d3ce29cb9d +Author: Lasse Collin +Date: 2016-10-24 18:51:36 +0300 + + tuklib_cpucores: Add support for sched_getaffinity(). + + It's available in glibc (GNU/Linux, GNU/kFreeBSD). It's better + than sysconf(_SC_NPROCESSORS_ONLN) because sched_getaffinity() + gives the number of cores available to the process instead of + the total number of cores online. + + As a side effect, this commit fixes a bug on GNU/kFreeBSD where + configure would detect the FreeBSD-specific cpuset_getaffinity() + but it wouldn't actually work because on GNU/kFreeBSD it requires + using -lfreebsd-glue when linking. Now the glibc-specific function + will be used instead. + + Thanks to Sebastian Andrzej Siewior for the original patch + and testing. + + m4/tuklib_cpucores.m4 | 30 +++++++++++++++++++++++++++++- + src/common/tuklib_cpucores.c | 9 +++++++++ + 2 files changed, 38 insertions(+), 1 deletion(-) + +commit 446e4318fa79788e09299d5953b5dd428953d14b +Author: Lasse Collin +Date: 2016-06-30 20:27:36 +0300 + + xz: Fix copying of timestamps on Windows. + + xz used to call utime() on Windows, but its result gets lost + on close(). Using _futime() seems to work. + + Thanks to Martok for reporting the bug: + http://www.mail-archive.com/xz-devel@tukaani.org/msg00261.html + + configure.ac | 2 +- + src/xz/file_io.c | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) + +commit 1b0ac0c53c761263e91e34195cb21dfdcfeac0bd +Author: Lasse Collin +Date: 2016-06-16 22:46:02 +0300 + + xz: Silence warnings from -Wlogical-op. + + Thanks to Evan Nemerson. + + src/xz/file_io.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit c83b7a03342c3325ff10400b22ee21edfcd1e026 +Author: Lasse Collin +Date: 2016-04-10 20:55:49 +0300 + + Build: Fix = to += for xz_SOURCES in src/xz/Makefile.am. + + Thanks to Christian Kujau. + + src/xz/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ade31a2bfb95c94d05fbfc0ecbba5d6377f2506e +Author: Lasse Collin +Date: 2016-04-10 20:54:17 +0300 + + Build: Bump GNU Gettext version requirement to 0.19. + + It silences a few warnings and most people probably have + 0.19 even on stable distributions. + + Thanks to Christian Kujau. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac398c3bafa6e4c80e20571373a96947db863b3d +Author: Lasse Collin +Date: 2016-03-13 20:21:49 +0200 + + liblzma: Disable external SHA-256 by default. + + This is the sane thing to do. The conflict with OpenSSL + on some OSes and especially that the OS-provided versions + can be significantly slower makes it clear that it was + a mistake to have the external SHA-256 support enabled by + default. + + Those who want it can now pass --enable-external-sha256 to + configure. INSTALL was updated with notes about OSes where + this can be a bad idea. + + The SHA-256 detection code in configure.ac had some bugs that + could lead to a build failure in some situations. These were + fixed, although it doesn't matter that much now that the + external SHA-256 is disabled by default. + + MINIX >= 3.2.0 uses NetBSD's libc and thus has SHA256_Init + in libc instead of libutil. Support for the libutil version + was removed. + + INSTALL | 36 ++++++++++++++++++++++ + configure.ac | 76 +++++++++++++++++++++++------------------------ + src/liblzma/check/check.h | 16 ++++------ + 3 files changed, 79 insertions(+), 49 deletions(-) + +commit 6fd5ecb589a9fdd7a576ea48c4850d496bab9ce5 +Author: Lasse Collin +Date: 2016-03-10 20:27:05 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 473ef0dc69a30e64d5fa0d34aca02f7309faa3e9 +Author: Lasse Collin +Date: 2016-03-10 20:26:49 +0200 + + Build: Avoid SHA256_Init on FreeBSD and MINIX 3. + + On FreeBSD 10 and older, SHA256_Init from libmd conflicts + with libcrypto from OpenSSL. The OpenSSL version has + different sizeof(SHA256_CTX) and it can cause weird + problems if wrong SHA256_Init gets used. + + Looking at the source, MINIX 3 seems to have a similar issue but + I'm not sure. To be safe, I disabled SHA256_Init on MINIX 3 too. + + NetBSD has SHA256_Init in libc and they had a similar problem, + but they already fixed it in 2009. + + Thanks to Jim Wilcoxson for the bug report that helped + in finding the problem. + + configure.ac | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +commit faf302137e54d605b44ecf0373cb51a6403a2de1 +Author: Lasse Collin +Date: 2015-11-08 20:16:10 +0200 + + tuklib_physmem: Hopefully silence a warning on Windows. + + src/common/tuklib_physmem.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e52e9151cf8613022d1de4712ff39dbcb666e991 +Author: Lasse Collin +Date: 2015-11-04 23:17:43 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 14115f84a38161d55eaa2d070f08739bde37e966 +Author: Lasse Collin +Date: 2015-11-04 23:14:00 +0200 + + liblzma: Make Valgrind happier with optimized (gcc -O2) liblzma. + + When optimizing, GCC can reorder code so that an uninitialized + value gets used in a comparison, which makes Valgrind unhappy. + It doesn't happen when compiled with -O0, which I tend to use + when running Valgrind. + + Thanks to Rich Prohaska. I remember this being mentioned long + ago by someone else but nothing was done back then. + + src/liblzma/lz/lz_encoder.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit f4c95ba94beb71a608eb6eadbf82b44f53a0260e +Author: Lasse Collin +Date: 2015-11-03 20:55:45 +0200 + + liblzma: Rename lzma_presets.c back to lzma_encoder_presets.c. + + It would be too annoying to update other build systems + just because of this. + + src/liblzma/lzma/Makefile.inc | 2 +- + src/liblzma/lzma/{lzma_presets.c => lzma_encoder_presets.c} | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c7bc20a6f3e71920871d48db31a79ab58b5a0a4b +Author: Lasse Collin +Date: 2015-11-03 20:47:07 +0200 + + Build: Disable xzdec, lzmadec, and lzmainfo when they cannot be built. + + They all need decoder support and if that isn't available, + there's no point trying to build them. + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit 5cbca1205deeb6fb7afe7a864fa68a57466d928a +Author: Lasse Collin +Date: 2015-11-03 20:35:19 +0200 + + Build: Simplify $enable_{encoders,decoders} usage a bit. + + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit af13781886c8e7a0aabebb5141ea282dc364f5c6 +Author: Lasse Collin +Date: 2015-11-03 20:31:31 +0200 + + Windows/MSVC: Update config.h. + + windows/config.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 9fa5949330f162c5a2f6653f83025327837e8f39 +Author: Lasse Collin +Date: 2015-11-03 20:29:58 +0200 + + DOS: Update config.h. + + dos/config.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit cb3111e3ed84152912b5138d690c8d9f00c6ef02 +Author: Lasse Collin +Date: 2015-11-03 20:29:33 +0200 + + xz: Make xz buildable even when encoders or decoders are disabled. + + The patch is quite long but it's mostly about adding new #ifdefs + to omit code when encoders or decoders have been disabled. + + This adds two new #defines to config.h: HAVE_ENCODERS and + HAVE_DECODERS. + + configure.ac | 4 ++++ + src/xz/Makefile.am | 8 ++++++-- + src/xz/args.c | 16 ++++++++++++++++ + src/xz/coder.c | 33 +++++++++++++++++++++++++-------- + src/xz/main.c | 9 +++++++-- + src/xz/private.h | 5 ++++- + 6 files changed, 62 insertions(+), 13 deletions(-) + +commit 4cc584985c0b7a13901da1b7a64ef9f7cc36e8ab +Author: Lasse Collin +Date: 2015-11-03 18:06:40 +0200 + + Build: Build LZMA1/2 presets also when only decoder is wanted. + + People shouldn't rely on the presets when decoding raw streams, + but xz uses the presets as the starting point for raw decoder + options anyway. + + lzma_encocder_presets.c was renamed to lzma_presets.c to + make it clear it's not used solely by the encoder code. + + src/liblzma/lzma/Makefile.inc | 6 +++++- + src/liblzma/lzma/{lzma_encoder_presets.c => lzma_presets.c} | 3 ++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 23ed1d41489f632155bbc9660f323d57e09da180 +Author: Lasse Collin +Date: 2015-11-03 17:54:48 +0200 + + Build: Fix configure to handle LZMA1 dependency with LZMA2. + + Now it gives an error if LZMA1 encoder/decoder is missing + when LZMA2 encoder/decoder was requested. Even better would + be LZMA2 implicitly enabling LZMA1 but it would need more code. + + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +commit b0bc3e03852af13419ea2960881824258d451117 +Author: Lasse Collin +Date: 2015-11-03 17:41:54 +0200 + + Build: Don't omit lzma_cputhreads() unless using --disable-threads. + + Previously it was omitted if encoders were disabled + with --disable-encoders. It didn't make sense and + it also broke the build. + + src/liblzma/common/Makefile.inc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit c6bf438ab39e0fb4a47d3c81725c227919502726 +Author: Lasse Collin +Date: 2015-11-02 18:16:51 +0200 + + liblzma: Fix a build failure related to external SHA-256 support. + + If an appropriate header and structure were found by configure, + but a library with a usable SHA-256 functions wasn't, the build + failed. + + src/liblzma/check/check.h | 32 +++++++++++++++++++++++--------- + 1 file changed, 23 insertions(+), 9 deletions(-) + +commit e18adc56f2262aa9394d46681e9e4b9981ed5e97 +Author: Lasse Collin +Date: 2015-11-02 15:19:10 +0200 + + xz: Always close the file before trying to delete it. + + unlink() can return EBUSY in errno for open files on some + operating systems and file systems. + + src/xz/file_io.c | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) + +commit 282e768a1484e88c8b7ec35655ee4959954ec87a +Author: Lasse Collin +Date: 2015-10-12 21:08:42 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 372e402713a1d4337ffce5f56d5c5c9ed99a66d0 +Author: Lasse Collin +Date: 2015-10-12 21:07:41 +0300 + + Tests: Add tests for the two bugs fixed in index.c. + + tests/test_index.c | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +commit 21515d79d778b8730a434f151b07202d52a04611 +Author: Lasse Collin +Date: 2015-10-12 20:45:15 +0300 + + liblzma: Fix lzma_index_dup() for empty Streams. + + Stream Flags and Stream Padding weren't copied from + empty Streams. + + src/liblzma/common/index.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 09f395b6b360c0b13e8559eece1d179b908ebd3a +Author: Lasse Collin +Date: 2015-10-12 20:31:44 +0300 + + liblzma: Add a note to index.c for those using static analyzers. + + src/liblzma/common/index.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 3bf857edfef51374f6f3fffae3d817f57d3264a0 +Author: Lasse Collin +Date: 2015-10-12 20:29:09 +0300 + + liblzma: Fix a memory leak in error path of lzma_index_dup(). + + lzma_index_dup() calls index_dup_stream() which, in case of + an error, calls index_stream_end() to free memory allocated + by index_stream_init(). However, it illogically didn't + actually free the memory. To make it logical, the tree + handling code was modified a bit in addition to changing + index_stream_end(). + + Thanks to Evan Nemerson for the bug report. + + src/liblzma/common/index.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 7f05803979b4b79642d5be4218a79da7a0b12c47 +Author: Lasse Collin +Date: 2015-09-29 13:57:28 +0300 + + Update NEWS for 5.2.2. + + NEWS | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 397fcc0946315b55c3c6d80e37e82a2a78bc15c1 +Author: Hauke Henningsen +Date: 2015-08-17 04:59:54 +0200 + + Update German translation, mostly wrt orthography + + Provide an update of the German translation. + * A lot of compound words were previously written with spaces, while + German orthography is relatively clear in that the components + should not be separated. + * When referring to the actual process of (de)compression rather than the + concept, replace “(De-)Kompression” with “(De-)Komprimierung”. + Previously, both forms were used in this context and are now used in a + manner consistent with “Komprimierung” being more likely to refer to + a process. + * Consistently translate “standard input”/“output” + * Use “Zeichen” instead of false friend “Charakter” for “character” + * Insert commas around relative clauses (as required in German) + * Some other minor corrections + * Capitalize “ß” as “ẞ” + * Consistently start option descriptions in --help with capital letters + + Acked-By: Andre Noll + + * Update after msgmerge + + po/de.po | 383 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 196 insertions(+), 187 deletions(-) + +commit cbc9e39bae715accb44168930a71888480aad569 +Author: Lasse Collin +Date: 2015-08-11 13:23:04 +0300 + + Build: Minor Cygwin cleanup. + + Some tests used "cygwin*" and some used "cygwin". I changed + them all to use "cygwin". Shouldn't affect anything in practice. + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bcacd8ce7a031566858e5e03c1009064c3f1c89e +Author: Lasse Collin +Date: 2015-08-11 13:21:52 +0300 + + Build: Support building of MSYS2 binaries. + + configure.ac | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit 0275a5398c01d57b724dec7fea52dec3bd6edc6c +Author: Lasse Collin +Date: 2015-08-09 21:06:26 +0300 + + Windows: Define DLL_EXPORT when building liblzma.dll with MSVC. + + src/liblzma/common/common.h uses it to set __declspec(dllexport) + for the API symbols. + + Thanks to Adam Walling. + + windows/liblzma_dll.vcxproj | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit a74525cf9b945fb0b370e64cf406104beb31729b +Author: Lasse Collin +Date: 2015-08-09 21:02:20 +0300 + + Windows: Omit unneeded header files from MSVC project files. + + windows/liblzma.vcxproj | 5 ----- + windows/liblzma_dll.vcxproj | 5 ----- + 2 files changed, 10 deletions(-) + +commit fbbb295a91caf39faf8838c8c39526e4cb4dc121 +Author: Lasse Collin +Date: 2015-07-12 20:48:19 +0300 + + liblzma: A MSVC-specific hack isn't needed with MSVC 2013 and newer. + + src/liblzma/api/lzma.h | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit 713dbe5c230fe00865a54f5c32358ea30f9a1156 +Author: Lasse Collin +Date: 2015-06-19 20:38:55 +0300 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3a5d755d055d51f99c523b4c2952727e1e69cfa1 +Author: Lasse Collin +Date: 2015-06-19 20:21:30 +0300 + + Windows: Update the docs. + + INSTALL | 29 ++++++++----- + windows/INSTALL-MSVC.txt | 47 ++++++++++++++++++++++ + windows/{INSTALL-Windows.txt => INSTALL-MinGW.txt} | 2 +- + 3 files changed, 67 insertions(+), 11 deletions(-) + +commit b0798c6aa6184efcefd0bdcca20f96121a13feda +Author: Lasse Collin +Date: 2015-06-19 17:25:31 +0300 + + Windows: Add MSVC project files for building liblzma. + + Thanks to Adam Walling for creating these files. + + windows/liblzma.vcxproj | 359 ++++++++++++++++++++++++++++++++++++++++ + windows/liblzma_dll.vcxproj | 388 ++++++++++++++++++++++++++++++++++++++++++++ + windows/xz_win.sln | 48 ++++++ + 3 files changed, 795 insertions(+) + +commit 9b02a4ffdac1b9f066658ec4c95c0834f4cd2fb7 +Author: Andre Noll +Date: 2015-05-28 15:50:00 +0200 + + Fix typo in German translation. + + As pointed out by Robert Pollak, there's a typo in the German + translation of the compression preset option (-0 ... -9) help text. + "The compressor" translates to "der Komprimierer", and the genitive + form is "des Komprimierers". The old word makes no sense at all. + + po/de.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c7f4041f6b8f4729f88d3bc888b2a4080ae51f72 +Author: Lasse Collin +Date: 2015-05-13 20:57:55 +0300 + + Tests: Fix a memory leak in test_bcj_exact_size. + + Thanks to Cristian Rodríguez. + + tests/test_bcj_exact_size.c | 1 + + 1 file changed, 1 insertion(+) + +commit 17b29d4f0ae0f780fbd69e15a398dc478d8492f8 +Author: Lasse Collin +Date: 2015-05-12 18:08:24 +0300 + + Fix NEWS about threading in 5.2.0. + + Thanks to Andy Hochhaus. + + NEWS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 49c26920d6e2d85e5c6123e34958aed2e77485ad +Author: Lasse Collin +Date: 2015-05-11 21:26:16 +0300 + + xz: Document that threaded decompression hasn't been implemented yet. + + src/xz/xz.1 | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 5b2458cb244ed237efe4de1ebcf06e1b3a1f4256 +Author: Lasse Collin +Date: 2015-04-20 20:20:29 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 6bd0349c58451b13442e8f463e35de83548bf985 +Author: Lasse Collin +Date: 2015-04-20 19:59:18 +0300 + + Revert "xz: Use pipe2() if available." + + This reverts commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd. + It is a problem when libc has pipe2() but the kernel is too + old to have pipe2() and thus pipe2() fails. In xz it's pointless + to have a fallback for non-functioning pipe2(); it's better to + avoid pipe2() completely. + + Thanks to Michael Fox for the bug report. + + configure.ac | 4 ++-- + src/xz/file_io.c | 9 +-------- + 2 files changed, 3 insertions(+), 10 deletions(-) + +commit fc0df0f8db87dff45543708a711e17d29c37f632 +Author: Lasse Collin +Date: 2015-04-01 14:45:25 +0300 + + xz: Fix the Capsicum rights on user_abort_pipe. + + src/xz/file_io.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 57393615b31b3788dd77280452d845bcc12d33af +Author: Lasse Collin +Date: 2015-03-31 22:20:11 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 1238381143a9a7ce84839c2582ccd56ff750a440 +Author: Lasse Collin +Date: 2015-03-31 22:19:34 +0300 + + xz: Add support for sandboxing with Capsicum. + + The sandboxing is used conditionally as described in main.c. + This isn't optimal but it was much easier to implement than + a full sandboxing solution and it still covers the most common + use cases where xz is writing to standard output. This should + have practically no effect on performance even with small files + as fork() isn't needed. + + C and locale libraries can open files as needed. This has been + fine in the past, but it's a problem with things like Capsicum. + io_sandbox_enter() tries to ensure that various locale-related + files have been loaded before cap_enter() is called, but it's + possible that there are other similar problems which haven't + been seen yet. + + Currently Capsicum is available on FreeBSD 10 and later + and there is a port to Linux too. + + Thanks to Loganaden Velvindron for help. + + configure.ac | 41 +++++++++++++++++++++++++++ + src/xz/Makefile.am | 2 +- + src/xz/file_io.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/xz/file_io.h | 6 ++++ + src/xz/main.c | 18 ++++++++++++ + src/xz/private.h | 4 +++ + 6 files changed, 151 insertions(+), 1 deletion(-) + +commit 29a087fb5a0c879f0b1bc4c6b989f7b87bacdf9e +Author: Lasse Collin +Date: 2015-03-31 21:12:30 +0300 + + Fix bugs and otherwise improve ax_check_capsicum.m4. + + AU_ALIAS was removed because the new version is incompatible + with the old version. + + It no longer checks for separately. + It's enough to test for it as part of AC_CHECK_DECL. + The defines HAVE_CAPSICUM_SYS_CAPSICUM_H and + HAVE_CAPSICUM_SYS_CAPABILITY_H were removed as unneeded. + HAVE_SYS_CAPSICUM_H from AC_CHECK_HEADERS is enough. + + It no longer does a useless search for the Capsicum library + if the header wasn't found. + + Fixed a bug in ACTION-IF-FOUND (the first argument). Specifying + the argument omitted the default action but the given action + wasn't used instead. + + AC_DEFINE([HAVE_CAPSICUM]) is now always called when Capsicum + support is found. Previously it was part of the default + ACTION-IF-FOUND which a custom action would override. Now + the default action only prepends ${CAPSICUM_LIB} to LIBS. + + The documentation was updated. + + Since there as no serial number, "#serial 2" was added. + + m4/ax_check_capsicum.m4 | 103 ++++++++++++++++++++++++------------------------ + 1 file changed, 51 insertions(+), 52 deletions(-) + +commit 6e845c6a3eddf2fde9db5a29950421dff60a43ac +Author: Lasse Collin +Date: 2015-03-31 19:20:24 +0300 + + Add m4/ax_check_capsicum.m4 for detecting Capsicum support. + + The file was loaded from this web page: + https://github.com/google/capsicum-test/blob/dev/autoconf/m4/ax_check_capsicum.m4 + + Thanks to Loganaden Velvindron for pointing it out for me. + + m4/ax_check_capsicum.m4 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 86 insertions(+) + +commit 3717885f9ef2c06f1bcbad9f4c2ed2d5695f844e +Author: Lasse Collin +Date: 2015-03-30 22:44:02 +0300 + + Bump version to 5.3.0alpha and soname to 5.3.99. + + The idea of 99 is that it looks a bit weird in this context. + For new features there's no API/ABI stability in devel versions. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit eccd8155e107c5ada03d13e7730675cdf1a44ddc +Author: Lasse Collin +Date: 2015-03-29 22:14:47 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 25263fd9e7a8a913395cb93d7c104cd48c2b4a00 +Author: Lasse Collin +Date: 2015-03-29 22:13:48 +0300 + + Fix the detection of installed RAM on QNX. + + The earlier version compiled but didn't actually work + since sysconf(_SC_PHYS_PAGES) always fails (or so I was told). + + Thanks to Ole André Vadla Ravnås for the patch and testing. + + m4/tuklib_physmem.m4 | 6 +++--- + src/common/tuklib_physmem.c | 14 +++++++++++++- + 2 files changed, 16 insertions(+), 4 deletions(-) + +commit 4c544d2410903d38402221cb783ed85585b6a007 +Author: Lasse Collin +Date: 2015-03-27 22:39:07 +0200 + + Fix CPU core count detection on QNX. + + It tried to use sysctl() on QNX but + - it broke the build because sysctl() needs -lsocket on QNX; + - sysctl() doesn't work for detecting the core count on QNX + even if it compiled. + + sysconf() works. An alternative would have been to use + QNX-specific SYSPAGE_ENTRY(num_cpu) from . + + Thanks to Ole André Vadla Ravnås. + + m4/tuklib_cpucores.m4 | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit e0ea6737b03e83ccaff4514d00e31bb926f8f0f3 +Author: Lasse Collin +Date: 2015-03-07 22:05:57 +0200 + + xz: size_t/uint32_t cleanup in options.c. + + src/xz/options.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 8bcca29a65335fd679c13814b70b35b68fa5daed +Author: Lasse Collin +Date: 2015-03-07 22:04:23 +0200 + + xz: Fix a comment and silence a warning in message.c. + + src/xz/message.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit f243f5f44c6b19a7c289a0ec73a03ee08364cb5b +Author: Lasse Collin +Date: 2015-03-07 22:01:00 +0200 + + liblzma: Silence more uint32_t vs. size_t warnings. + + src/liblzma/lz/lz_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 7f0a4c50f4a374c40acf4b86848f301ad1e82d34 +Author: Lasse Collin +Date: 2015-03-07 19:54:00 +0200 + + xz: Make arg_count an unsigned int to silence a warning. + + Actually the value of arg_count cannot exceed INT_MAX + but it's nicer as an unsigned int. + + src/xz/args.h | 2 +- + src/xz/main.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f6ec46801588b1be29c07c9db98558b521304002 +Author: Lasse Collin +Date: 2015-03-07 19:33:17 +0200 + + liblzma: Fix a warning in index.c. + + src/liblzma/common/index.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a24518971cc621315af142dd3bb7614fab04ad27 +Author: Lasse Collin +Date: 2015-02-26 20:46:14 +0200 + + Build: Fix a CR+LF problem when running autoreconf -fi on OS/2. + + build-aux/version.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dec11497a71518423b5ff0e759100cf8aadf6c7b +Author: Lasse Collin +Date: 2015-02-26 16:53:44 +0200 + + Bump version and soname for 5.2.1. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 29e39c79975ab89ee5dd671e97064534a9f3a649 +Author: Lasse Collin +Date: 2015-02-26 13:01:09 +0200 + + Update NEWS for 5.2.1. + + NEWS | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd +Author: Lasse Collin +Date: 2015-02-22 19:38:48 +0200 + + xz: Use pipe2() if available. + + configure.ac | 4 ++-- + src/xz/file_io.c | 9 ++++++++- + 2 files changed, 10 insertions(+), 3 deletions(-) + +commit 117d962685c72682c63edc9bb765367189800202 +Author: Lasse Collin +Date: 2015-02-21 23:40:26 +0200 + + liblzma: Fix a compression-ratio regression in LZMA1/2 in fast mode. + + The bug was added in the commit + f48fce093b07aeda95c18850f5e086d9f2383380 and thus + affected 5.1.4beta and 5.2.0. Luckily the bug cannot + cause data corruption or other nasty things. + + src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae984e31c167d3bc52972ec422dd1ebd5f5d5719 +Author: Lasse Collin +Date: 2015-02-21 23:00:19 +0200 + + xz: Fix the fcntl() usage when creating a pipe for the self-pipe trick. + + Now it reads the old flags instead of blindly setting O_NONBLOCK. + The old code may have worked correctly, but this is better. + + src/xz/file_io.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit 2205bb5853098aea36a56df6f5747037175f66b4 +Author: Lasse Collin +Date: 2015-02-10 15:29:34 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit d935b0cdf3db440269b9d952b2b281b18f8c7b08 +Author: Lasse Collin +Date: 2015-02-10 15:28:30 +0200 + + tuklib_cpucores: Use cpuset_getaffinity() on FreeBSD if available. + + In FreeBSD, cpuset_getaffinity() is the preferred way to get + the number of available cores. + + Thanks to Rui Paulo for the patch. I edited it slightly, but + hopefully I didn't break anything. + + m4/tuklib_cpucores.m4 | 23 ++++++++++++++++++++++- + src/common/tuklib_cpucores.c | 18 ++++++++++++++++++ + 2 files changed, 40 insertions(+), 1 deletion(-) + +commit eb61bc58c20769cac4d05f363b9c0e8c9c71a560 +Author: Lasse Collin +Date: 2015-02-09 22:08:37 +0200 + + xzdiff: Make the mktemp usage compatible with FreeBSD's mktemp. + + Thanks to Rui Paulo for the fix. + + src/scripts/xzdiff.in | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit b9a5b6b7a29029680af733082b6a46e0fc01623a +Author: Lasse Collin +Date: 2015-02-03 21:45:53 +0200 + + Add a few casts to tuklib_integer.h to silence possible warnings. + + I heard that Visual Studio 2013 gave warnings without the casts. + + Thanks to Gabi Davar. + + src/common/tuklib_integer.h | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit c45757135f40e4a0de730ba5fff0100219493982 +Author: Lasse Collin +Date: 2015-01-26 21:24:39 +0200 + + liblzma: Set LZMA_MEMCMPLEN_EXTRA depending on the compare method. + + src/liblzma/common/memcmplen.h | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit 3c500174ed5485f550972a2a6109c361e875f069 +Author: Lasse Collin +Date: 2015-01-26 20:40:16 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit fec88d41e672d9e197c9442aecf02bd0dfa6d516 +Author: Lasse Collin +Date: 2015-01-26 20:39:28 +0200 + + liblzma: Silence harmless Valgrind errors. + + Thanks to Torsten Rupp for reporting this. I had + forgotten to run Valgrind before the 5.2.0 release. + + src/liblzma/lz/lz_encoder.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a9b45badfec0928d20a27c7176c005fa637f7d1e +Author: Lasse Collin +Date: 2015-01-09 21:50:19 +0200 + + xz: Fix comments. + + src/xz/file_io.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 541aee6dd4aa97a809aba281475a21b641bb89e2 +Author: Lasse Collin +Date: 2015-01-09 21:35:06 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 4170edc914655310d2363baccf5e615e09b04911 +Author: Lasse Collin +Date: 2015-01-09 21:34:06 +0200 + + xz: Don't fail if stdout doesn't support O_NONBLOCK. + + This is similar to the case with stdin. + + Thanks to Brad Smith for the bug report and testing + on OpenBSD. + + src/xz/file_io.c | 36 +++++++++++++++--------------------- + 1 file changed, 15 insertions(+), 21 deletions(-) + +commit 04bbc0c2843c50c8ad1cba42b937118e38b0508d +Author: Lasse Collin +Date: 2015-01-07 19:18:20 +0200 + + xz: Fix a memory leak in DOS-specific code. + + src/xz/file_io.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit f0f1f6c7235ffa901cf76fe18e33749e200b3eea +Author: Lasse Collin +Date: 2015-01-07 19:08:06 +0200 + + xz: Don't fail if stdin doesn't support O_NONBLOCK. + + It's a problem at least on OpenBSD which doesn't support + O_NONBLOCK on e.g. /dev/null. I'm not surprised if it's + a problem on other OSes too since this behavior is allowed + in POSIX-1.2008. + + The code relying on this behavior was committed in June 2013 + and included in 5.1.3alpha released on 2013-10-26. Clearly + the development releases only get limited testing. + + src/xz/file_io.c | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +commit d2d484647d9d9d679f03c75abb0404f67069271c +Author: Lasse Collin +Date: 2015-01-06 20:30:15 +0200 + + Tests: Don't hide unexpected error messages in test_files.sh. + + Hiding them makes no sense since normally there's no error + when testing the "good" files. With "bad" files errors are + expected and then it makes sense to keep the messages hidden. + + tests/test_files.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aae6a6aeda51cf94a47e39ad624728f9bee75e30 +Author: Lasse Collin +Date: 2014-12-30 11:17:16 +0200 + + Update Solaris notes in INSTALL. + + Mention the possible "make check" failure on Solaris in the + Solaris-specific section of INSTALL. It was already in + section 4.5 but it is better mention it in the OS-specific + section too. + + INSTALL | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 7815112153178800a3521b9f31960e7cdc26cfba +Author: Lasse Collin +Date: 2014-12-26 12:00:05 +0200 + + Build: POSIX shell isn't required if scripts are disabled. + + INSTALL | 3 ++- + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a +Author: Lasse Collin +Date: 2014-12-21 20:48:37 +0200 + + DOS: Update Makefile. + + dos/Makefile | 1 + + 1 file changed, 1 insertion(+) + +commit b85ee0905ec4ab7656d22e63519fdd3bedb21f2e +Author: Lasse Collin +Date: 2014-12-21 19:50:38 +0200 + + Windows: Fix bin_i486 to bin_i686 in build.bash. + + windows/build.bash | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cbafa710918195dbba3db02c3fab4f0538235206 +Author: Lasse Collin +Date: 2014-12-21 18:58:44 +0200 + + Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c. + + doc/examples/04_compress_easy_mt.c | 30 ++++++++++++++++++++++++++---- + 1 file changed, 26 insertions(+), 4 deletions(-) + +commit 8dbb57238d372c7263cfeb3e7f7fd9a73173156a +Author: Lasse Collin +Date: 2014-12-21 18:56:44 +0200 + + Docs: Update docs/examples/00_README.txt. + + doc/examples/00_README.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6 +Author: Lasse Collin +Date: 2014-12-21 18:11:17 +0200 + + Bump version and soname for 5.2.0. + + I know that soname != app version, but I skip AGE=1 + in -version-info to make the soname match the liblzma + version anyway. It doesn't hurt anything as long as + it doesn't conflict with library versioning rules. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 6 +++--- + src/liblzma/liblzma.map | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) diff -Nru xz-utils-5.6.0/INSTALL xz-utils-5.6.1+really5.4.5/INSTALL --- xz-utils-5.6.0/INSTALL 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/INSTALL 2023-11-01 12:19:29.000000000 +0000 @@ -143,37 +143,43 @@ 1.2.7. Windows - The "windows" directory contains instructions for a few types - of builds: + If it is enough to build liblzma (no command line tools): - - INSTALL-MinGW-w64_with_CMake.txt - Simple instructions how to build XZ Utils natively on - Windows using only CMake and a prebuilt toolchain - (GCC + MinGW-w64 or Clang/LLVM + MinGW-w64). - - - INSTALL-MinGW-w64_with_Autotools.txt - Native build under MSYS2 or cross-compilation from - GNU/Linux using a bash script that creates a .zip - and .7z archives of the binaries and documentation. - The related file README-Windows.txt is for the - resulting binary package. - - - INSTALL-MSVC.txt - Building with MSVC / Visual Studio and CMake. - - - liblzma-crt-mixing.txt - Documentation what to take into account as a programmer - if liblzma.dll and the application don't use the same - CRT (MSVCRT or UCRT). - - Other choices: - - - Cygwin: https://cygwin.com/ - Building on Cygwin can be done like on many POSIX operating - systems. XZ Utils >= 5.2.0 isn't compatible with Cygwin older - than 1.7.35 (data loss!). 1.7.35 was released on 2015-03-04. - - - MSYS2: https://www.msys2.org/ + - There is CMake support. It should be good enough to build + static liblzma or liblzma.dll with Visual Studio. The CMake + support may work with MinGW or MinGW-w64. Read the comment + in the beginning of CMakeLists.txt before running CMake! + + - There are Visual Studio project files under the "windows" + directory. See windows/INSTALL-MSVC.txt. In the future the + project files will be removed when CMake support is good + enough. Thus, please test the CMake version and help fix + possible issues. + + To build also the command line tools: + + - MinGW-w64 + MSYS (32-bit and 64-bit x86): This is used + for building the official binary packages for Windows. + There is windows/build.bash to ease packaging XZ Utils with + MinGW(-w64) + MSYS into a redistributable .zip or .7z file. + See windows/INSTALL-MinGW.txt for more information. + + - MinGW + MSYS (32-bit x86): I haven't recently tested this. + + - Cygwin 1.7.35 and later: NOTE that using XZ Utils >= 5.2.0 + under Cygwin older than 1.7.35 can lead to DATA LOSS! If + you must use an old Cygwin version, stick to XZ Utils 5.0.x + which is safe under older Cygwin versions. You can check + the Cygwin version with the command "cygcheck -V". + + It may be possible to build liblzma with other toolchains too, but + that will probably require writing a separate makefile. Building + the command line tools with non-GNU toolchains will be harder than + building only liblzma. + + Even if liblzma is built with MinGW(-w64), the resulting DLL can + be used by other compilers and linkers, including MSVC. See + windows/README-Windows.txt for details. 1.2.8. DOS @@ -353,20 +359,20 @@ with --docdir=DIR. --disable-assembler - This disables CRC32 and CRC64 assembly code on - 32-bit x86. This option currently does nothing - on other architectures (not even on x86-64). - - The 32-bit x86 assembly is position-independent code - which is suitable for use in shared libraries and - position-independent executables. It uses only i386 - instructions but the code is optimized for i686 class - CPUs. If you are compiling liblzma exclusively for + liblzma includes some assembler optimizations. Currently + there is only assembler code for CRC32 and CRC64 for + 32-bit x86. + + All the assembler code in liblzma is position-independent + code, which is suitable for use in shared libraries and + position-independent executables. So far only i386 + instructions are used, but the code is optimized for i686 + class CPUs. If you are compiling liblzma exclusively for pre-i686 systems, you may want to disable the assembler code. --disable-clmul-crc - Disable the use of carryless multiplication for CRC + Disable the use carryless multiplication for CRC calculation even if compiler support for it is detected. The code uses runtime detection of SSSE3, SSE4.1, and CLMUL instructions on x86. On 32-bit x86 this currently @@ -377,16 +383,6 @@ required extensions (-msse4.1 -mpclmul) then runtime detection isn't used and the generic code is omitted. - --disable-arm64-crc32 - Disable the use of the ARM64 CRC32 instruction extension - even if compiler support for it is detected. The code will - detect support for the instruction at runtime. - - If using compiler options that unconditionally allow the - required extensions (-march=armv8-a+crc or -march=armv8.1-a - and later) then runtime detection isn't used and the - generic code is omitted. - --enable-unaligned-access Allow liblzma to use unaligned memory access for 16-bit, 32-bit, and 64-bit loads and stores. This should be @@ -396,43 +392,8 @@ slow. This option shouldn't be used on systems that rely on such emulation. - Unaligned access is enabled by default on these: - - 32-bit x86 - - 64-bit x86-64 - - 32-bit big endian PowerPC - - 64-bit big endian PowerPC - - 64-bit little endian PowerPC - - some RISC-V [1] - - some 32-bit ARM [2] - - some 64-bit ARM64 [2] (NOTE: Autodetection bug - if using GCC -mstrict-align, see below.) - - [1] Unaligned access is enabled by default if - configure sees that the C compiler - #defines __riscv_misaligned_fast. - - [2] Unaligned access is enabled by default if - configure sees that the C compiler - #defines __ARM_FEATURE_UNALIGNED: - - - ARMv7 + GCC or Clang: It works. The options - -munaligned-access and -mno-unaligned-access - affect this macro correctly. - - - ARM64 + Clang: It works. The options - -munaligned-access, -mno-unaligned-access, - and -mstrict-align affect this macro correctly. - Clang >= 17 supports -mno-strict-align too. - - - ARM64 + GCC: It partially works. The macro - is always #defined by GCC versions at least - up to 13.2, even when using -mstrict-align. - If building for strict-align ARM64, the - configure option --disable-unaligned-access - should be used if using a GCC version that has - this issue because otherwise the performance - may be degraded. It likely won't crash due to - how unaligned access is done in the C code. + Unaligned access is enabled by default on x86, x86-64, + big endian PowerPC, some ARM, and some ARM64 systems. --enable-unsafe-type-punning This enables use of code like @@ -499,14 +460,14 @@ too. This is the default for 32-bit x86 Windows builds. Unless the compiler supports __attribute__((__constructor__)), - the 'win95' threading is incompatible with + the `win95' threading is incompatible with --enable-small. vista Use Windows Vista compatible threads. The resulting binaries won't run on Windows XP or older. This is the default for Windows excluding 32-bit x86 builds (that is, on - x86-64 the default is 'vista'). + x86-64 the default is `vista'). no Disable threading support. This is the same as using --disable-threads. @@ -518,25 +479,14 @@ calls any liblzma functions from more than one thread, something bad may happen. - --enable-ifunc - Use __attribute__((__ifunc__())) in liblzma. This is - enabled by default on GNU/Linux and FreeBSD. - - The ifunc attribute is incompatible with - -fsanitize=address. --disable-ifunc must be used - if any -fsanitize= option is specified in CFLAGS. - --enable-sandbox=METHOD - There is limited sandboxing support in the xz and xzdec - tools. If built with sandbox support, xz uses it - automatically when (de)compressing exactly one file to - standard output when the options --files or --files0 aren't - used. This is a common use case, for example, - (de)compressing .tar.xz files via GNU tar. The sandbox is - also used for single-file 'xz --test' or 'xz --list'. - xzdec always uses the sandbox, except when more than one - file are decompressed. In this case it will enable the - sandbox for the last file that is decompressed. + There is limited sandboxing support in the xz tool. If + built with sandbox support, it's used automatically when + (de)compressing exactly one file to standard output and + the options --files or --files0 weren't used. This is a + common use case, for example, (de)compressing .tar.xz + files via GNU tar. The sandbox is also used for + single-file `xz --test' or `xz --list'. Supported METHODs: @@ -548,7 +498,7 @@ no Disable sandboxing support. capsicum - Use Capsicum (FreeBSD >= 10.2) for + Use Capsicum (FreeBSD >= 10) for sandboxing. If no Capsicum support is found, configure will give an error. @@ -556,11 +506,6 @@ sandboxing. If pledge(2) isn't found, configure will give an error. - landlock - Use Landlock (Linux >= 5.13) for - sandboxing. If no Landlock support - is found, configure will give an error. - --enable-symbol-versions Use symbol versioning for liblzma. This is enabled by default on GNU/Linux, other GNU-based systems, and diff -Nru xz-utils-5.6.0/Makefile.am xz-utils-5.6.1+really5.4.5/Makefile.am --- xz-utils-5.6.0/Makefile.am 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/Makefile.am 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,9 @@ -## SPDX-License-Identifier: 0BSD +## ## Author: Lasse Collin +## +## This file has been put into the public domain. +## You can do whatever you want with this file. +## # Use -n to prevent gzip from adding a timestamp to the .gz headers. GZIP_ENV = -9n @@ -17,11 +21,11 @@ dist_doc_DATA = \ AUTHORS \ COPYING \ - COPYING.0BSD \ COPYING.GPLv2 \ NEWS \ README \ THANKS \ + TODO \ doc/faq.txt \ doc/history.txt \ doc/xz-file-format.txt \ @@ -34,9 +38,13 @@ doc/examples/02_decompress.c \ doc/examples/03_compress_custom.c \ doc/examples/04_compress_easy_mt.c \ - doc/examples/11_file_info.c \ doc/examples/Makefile +examplesolddir = $(docdir)/examples_old +dist_examplesold_DATA = \ + doc/examples_old/xz_pipe_comp.c \ + doc/examples_old/xz_pipe_decomp.c + # Install the Doxygen generated documentation if they were built. install-data-local: if test -d "$(srcdir)/doc/api" ; then \ @@ -51,25 +59,22 @@ endif EXTRA_DIST = \ - cmake \ + po4a \ + extra \ dos \ doxygen \ - extra \ - po4a \ windows \ + macosx \ + cmake \ CMakeLists.txt \ - COPYING.CC-BY-SA-4.0 \ + autogen.sh \ COPYING.GPLv2 \ COPYING.GPLv3 \ COPYING.LGPLv2.1 \ INSTALL.generic \ PACKAGERS \ - TODO \ - autogen.sh \ build-aux/manconv.sh \ - build-aux/version.sh \ - doc/xz-logo.png \ - po/xz.pot-header + build-aux/version.sh ACLOCAL_AMFLAGS = -I m4 @@ -88,7 +93,7 @@ dist-hook: if test -d "$(srcdir)/.git" && type git > /dev/null 2>&1; then \ ( cd "$(srcdir)" && git log --date=iso --stat \ - b69da6d4bb6bb11fc0cf066920791990d2b22a06^..HEAD ) \ + 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6^..HEAD ) \ > "$(distdir)/ChangeLog"; \ fi if type groff > /dev/null 2>&1 && type ps2pdf > /dev/null 2>&1; then \ diff -Nru xz-utils-5.6.0/Makefile.in xz-utils-5.6.1+really5.4.5/Makefile.in --- xz-utils-5.6.0/Makefile.in 2024-02-24 08:28:04.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/Makefile.in 2023-11-01 12:27:09.000000000 +0000 @@ -91,8 +91,8 @@ @COND_GNULIB_TRUE@am__append_1 = lib subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/build-to-host.m4 $(top_srcdir)/m4/getopt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \ + $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/host-cpu-c-abi.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -112,7 +112,8 @@ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(am__dist_doc_DATA_DIST) \ - $(am__dist_examples_DATA_DIST) $(am__DIST_COMMON) + $(am__dist_examples_DATA_DIST) \ + $(am__dist_examplesold_DATA_DIST) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -146,9 +147,9 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__dist_doc_DATA_DIST = AUTHORS COPYING COPYING.0BSD COPYING.GPLv2 \ - NEWS README THANKS doc/faq.txt doc/history.txt \ - doc/xz-file-format.txt doc/lzma-file-format.txt +am__dist_doc_DATA_DIST = AUTHORS COPYING COPYING.GPLv2 NEWS README \ + THANKS TODO doc/faq.txt doc/history.txt doc/xz-file-format.txt \ + doc/lzma-file-format.txt am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -176,13 +177,15 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)" +am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)" \ + "$(DESTDIR)$(examplesolddir)" am__dist_examples_DATA_DIST = doc/examples/00_README.txt \ doc/examples/01_compress_easy.c doc/examples/02_decompress.c \ doc/examples/03_compress_custom.c \ - doc/examples/04_compress_easy_mt.c doc/examples/11_file_info.c \ - doc/examples/Makefile -DATA = $(dist_doc_DATA) $(dist_examples_DATA) + doc/examples/04_compress_easy_mt.c doc/examples/Makefile +am__dist_examplesold_DATA_DIST = doc/examples_old/xz_pipe_comp.c \ + doc/examples_old/xz_pipe_decomp.c +DATA = $(dist_doc_DATA) $(dist_examples_DATA) $(dist_examplesold_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -274,6 +277,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +CAPSICUM_LIB = @CAPSICUM_LIB@ CC = @CC@ CCAS = @CCAS@ CCASDEPMODE = @CCASDEPMODE@ @@ -402,8 +406,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -430,11 +432,11 @@ @COND_DOC_TRUE@dist_doc_DATA = \ @COND_DOC_TRUE@ AUTHORS \ @COND_DOC_TRUE@ COPYING \ -@COND_DOC_TRUE@ COPYING.0BSD \ @COND_DOC_TRUE@ COPYING.GPLv2 \ @COND_DOC_TRUE@ NEWS \ @COND_DOC_TRUE@ README \ @COND_DOC_TRUE@ THANKS \ +@COND_DOC_TRUE@ TODO \ @COND_DOC_TRUE@ doc/faq.txt \ @COND_DOC_TRUE@ doc/history.txt \ @COND_DOC_TRUE@ doc/xz-file-format.txt \ @@ -447,29 +449,30 @@ @COND_DOC_TRUE@ doc/examples/02_decompress.c \ @COND_DOC_TRUE@ doc/examples/03_compress_custom.c \ @COND_DOC_TRUE@ doc/examples/04_compress_easy_mt.c \ -@COND_DOC_TRUE@ doc/examples/11_file_info.c \ @COND_DOC_TRUE@ doc/examples/Makefile +@COND_DOC_TRUE@examplesolddir = $(docdir)/examples_old +@COND_DOC_TRUE@dist_examplesold_DATA = \ +@COND_DOC_TRUE@ doc/examples_old/xz_pipe_comp.c \ +@COND_DOC_TRUE@ doc/examples_old/xz_pipe_decomp.c + EXTRA_DIST = \ - cmake \ + po4a \ + extra \ dos \ doxygen \ - extra \ - po4a \ windows \ + macosx \ + cmake \ CMakeLists.txt \ - COPYING.CC-BY-SA-4.0 \ + autogen.sh \ COPYING.GPLv2 \ COPYING.GPLv3 \ COPYING.LGPLv2.1 \ INSTALL.generic \ PACKAGERS \ - TODO \ - autogen.sh \ build-aux/manconv.sh \ - build-aux/version.sh \ - doc/xz-logo.png \ - po/xz.pot-header + build-aux/version.sh ACLOCAL_AMFLAGS = -I m4 @@ -586,6 +589,27 @@ @list='$(dist_examples_DATA)'; test -n "$(examplesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(examplesdir)'; $(am__uninstall_files_from_dir) +install-dist_examplesoldDATA: $(dist_examplesold_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_examplesold_DATA)'; test -n "$(examplesolddir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(examplesolddir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(examplesolddir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesolddir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesolddir)" || exit $$?; \ + done + +uninstall-dist_examplesoldDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_examplesold_DATA)'; test -n "$(examplesolddir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(examplesolddir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -902,7 +926,7 @@ all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)"; do \ + for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(examplesolddir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -960,7 +984,7 @@ info-am: install-data-am: install-data-local install-dist_docDATA \ - install-dist_examplesDATA + install-dist_examplesDATA install-dist_examplesoldDATA install-dvi: install-dvi-recursive @@ -1007,7 +1031,7 @@ ps-am: uninstall-am: uninstall-dist_docDATA uninstall-dist_examplesDATA \ - uninstall-local + uninstall-dist_examplesoldDATA uninstall-local .MAKE: $(am__recursive_targets) all install-am install-strip @@ -1020,15 +1044,16 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-data-local \ - install-dist_docDATA install-dist_examplesDATA install-dvi \ - install-dvi-am 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-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-dist_docDATA uninstall-dist_examplesDATA \ + install-dist_docDATA install-dist_examplesDATA \ + install-dist_examplesoldDATA install-dvi install-dvi-am \ + 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-dist_docDATA \ + uninstall-dist_examplesDATA uninstall-dist_examplesoldDATA \ uninstall-local .PRECIOUS: Makefile @@ -1051,7 +1076,7 @@ dist-hook: if test -d "$(srcdir)/.git" && type git > /dev/null 2>&1; then \ ( cd "$(srcdir)" && git log --date=iso --stat \ - b69da6d4bb6bb11fc0cf066920791990d2b22a06^..HEAD ) \ + 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6^..HEAD ) \ > "$(distdir)/ChangeLog"; \ fi if type groff > /dev/null 2>&1 && type ps2pdf > /dev/null 2>&1; then \ diff -Nru xz-utils-5.6.0/NEWS xz-utils-5.6.1+really5.4.5/NEWS --- xz-utils-5.6.0/NEWS 2024-02-24 08:21:29.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/NEWS 2023-11-01 12:26:11.000000000 +0000 @@ -2,316 +2,7 @@ XZ Utils Release Notes ====================== -5.6.0 (2024-02-24) - - This bumps the minor version of liblzma because new features were - added. The API and ABI are still backward compatible with liblzma - 5.4.x and 5.2.x and 5.0.x. - - NOTE: As described in the NEWS for 5.5.2beta, the core components - are now under the BSD Zero Clause License (0BSD). - - Since 5.5.2beta: - - * liblzma: - - - Disabled the branchless C variant in the LZMA decoder based - on the benchmark results from the community. - - - Disabled x86-64 inline assembly on x32 to fix the build. - - * Sandboxing support in xz: - - - Landlock is now used even when xz needs to create files. - In this case the sandbox is has to be more permissive than - when no files need to be created. A similar thing was - already in use with pledge(2) since 5.3.4alpha. - - - Landlock and pledge(2) are now stricter when reading from - more than one input file and only writing to standard output. - - - Added support for Landlock ABI version 4. - - * CMake: - - - Default to -O2 instead of -O3 with CMAKE_BUILD_TYPE=Release. - -O3 is not useful for speed and makes the code larger. - - - Now builds lzmainfo and lzmadec. - - - xzdiff, xzgrep, xzless, xzmore, and their symlinks are now - installed. The scripts are also tested during "make test". - - - Added translation support for xz, lzmainfo, and the - man pages. - - - Applied the symbol versioning workaround for MicroBlaze that - is used in the Autotools build. - - - The general XZ Utils and liblzma API documentation is now - installed. - - - The CMake component names were changed a little and several - were added. liblzma_Runtime and liblzma_Development are - unchanged. - - - Minimum required CMake version is now 3.14. However, - translation support is disabled with CMake versions - older than 3.20. - - - The CMake-based build is now close to feature parity with the - Autotools-based build. Most importantly a few tests aren't - run yet. Testing the CMake-based build on different operating - systems would be welcome now. See the comment at the top of - CMakeLists.txt. - - * Fixed a bug in the Autotools feature test for ARM64 CRC32 - instruction support for old versions of Clang. This did not - affect the CMake build. - - * Windows: - - - The build instructions in INSTALL and windows/INSTALL*.txt - were revised completely. - - - windows/build-with-cmake.bat along with the instructions - in windows/INSTALL-MinGW-w64_with_CMake.txt should make - it very easy to build liblzma.dll and xz.exe on Windows - using CMake and MinGW-w64 with either GCC or Clang/LLVM. - - - windows/build.bash was updated. It now works on MSYS2 and - on GNU/Linux (cross-compiling) to create a .zip and .7z - package for 32-bit and 64-bit x86 using GCC + MinGW-w64. - - * The TODO file is no longer installed as part of the - documentation. The file is out of date and does not reflect - the actual tasks that will be completed in the future. - - * Translations: - - - Translated lzmainfo man pages are now installed. These - had been forgotten in earlier versions. - - - Updated Croatian, Esperanto, German, Hungarian, Korean, - Polish, Romanian, Spanish, Swedish, Vietnamese, and Ukrainian - translations. - - - Updated German, Korean, Romanian, and Ukrainian man page - translations. - - * Added a few tests. - - Summary of new features added in the 5.5.x development releases: - - * liblzma: - - - LZMA decoder: Speed optimizations to the C code and - added GCC & Clang compatible inline assembly for x86-64. - - - Added lzma_mt_block_size() to recommend a Block size for - multithreaded encoding. - - - Added CLMUL-based CRC32 on x86-64 and E2K with runtime - processor detection. Similar to CRC64, on 32-bit x86 it - isn't available unless --disable-assembler is used. - - - Optimized the CRC32 calculation on ARM64 platforms using the - CRC32 instructions. Runtime detection for the instruction is - used on GNU/Linux, FreeBSD, Windows, and macOS. If the - compiler flags indicate unconditional CRC32 instruction - support (+crc) then the generic version is not built. - - - Added definitions of mask values like - LZMA_INDEX_CHECK_MASK_CRC32 to . - - * xz: - - - Multithreaded mode is now the default. This improves - compression speed and creates .xz files that can be - decompressed in multithreaded mode. The downsides are - increased memory usage and slightly worse compression ratio. - - - Added a new command line option --filters to set the filter - chain using the liblzma filter string syntax. - - - Added new command line options --filters1 ... --filters9 to - set additional filter chains using the liblzma filter string - syntax. The --block-list option now allows specifying filter - chains that were set using these new options. - - - Ported the command line tools to Windows MSVC. - Visual Studio 2015 or later is required. - - * Added lz4 support to xzdiff/xzcmp and xzgrep. - - -5.5.2beta (2024-02-14) - - * Licensing change: The core components are now under the - BSD Zero Clause License (0BSD). In XZ Utils 5.4.6 and older - and 5.5.1alpha these components are in the public domain and - obviously remain so; the change affects the new releases only. - - 0BSD is an extremely permissive license which doesn't require - retaining or reproducing copyright or license notices when - distributing the code, thus in practice there is extremely - little difference to public domain. - - * liblzma - - - Significant speed optimizations to the LZMA decoder were - made. There are now three variants that can be chosen at - build time: - - * Basic C version: This is a few percent faster than - 5.4.x due to some new optimizations. - - * Branchless C: This is currently the default on platforms - for which there is no assembly code. This should be a few - percent faster than the basic C version. - - * x86-64 inline assembly. This works with GCC and Clang. - - The default choice can currently be overridden by setting - LZMA_RANGE_DECODER_CONFIG in CPPFLAGS: 0 means the basic - version and 3 means that branchless C version. - - - Optimized the CRC32 calculation on ARM64 platforms using the - CRC32 instructions. The instructions are optional in ARMv8.0 - and are required in ARMv8.1 and later. Runtime detection for - the instruction is used on GNU/Linux, FreeBSD, Windows, and - macOS. If the compiler flags indicate unconditional CRC32 - instruction support (+crc) then the generic version is not - built. - - * Added lz4 support to xzdiff/xzcmp and xzgrep. - - * Man pages of xzdiff/xzcmp, xzgrep, and xzmore were rewritten - to simplify licensing of the man page translations. - - * Translations: - - - Updated Chinese (simplified), German, Korean, Polish, - Romanian, Spanish, Swedish, and Ukrainian translations. - - - Updated German, Korean, Romanian, and Ukrainian man page - translations. - - * Small improvements to the tests. - - * Added doc/examples/11_file_info.c. It was added to the Git - repository in 2017 but forgotten to be added into distribution - tarballs. - - * Removed doc/examples_old. These were from 2012. - - * Removed the macos/build.sh script. It had not been updated - since 2013. - - -5.5.1alpha (2024-01-26) - - * Added a new filter for RISC-V binaries. The filter can be used - for 32-bit and 64-bit binaries with either little or big - endianness. In liblzma, the Filter ID is LZMA_FILTER_RISCV (0x0B) - and the xz option is --riscv. liblzma filter string syntax - recognizes this filter as "riscv". - - * liblzma: - - - Added lzma_mt_block_size() to recommend a Block size for - multithreaded encoding - - - Added CLMUL-based CRC32 on x86-64 and E2K with runtime - processor detection. Similar to CRC64, on 32-bit x86 it - isn't available unless --disable-assembler is used. - - - Implemented GNU indirect function (IFUNC) as a runtime - function dispatching method for CRC32 and CRC64 fast - implementations on x86. Only GNU/Linux (glibc) and FreeBSD - builds will use IFUNC, unless --enable-ifunc is specified to - configure. - - - Added definitions of mask values like - LZMA_INDEX_CHECK_MASK_CRC32 to . - - - The XZ logo is now included in the Doxygen generated - documentation. It is licensed under Creative Commons - Attribution-ShareAlike 4.0. - - * xz: - - - Multithreaded mode is now the default. This improves - compression speed and creates .xz files that can be - decompressed multithreaded at the cost of increased memory - usage and slightly worse compression ratio. - - - Added new command line option --filters to set the filter - chain using liblzma filter string syntax. - - - Added new command line options --filters1 ... --filters9 to - set additional filter chains using liblzma filter string - syntax. The --block-list option now allows specifying filter - chains that were set using these new options. - - - Added support for Linux Landlock as a sandboxing method. - - - xzdec now supports pledge(2), Capsicum, and Linux Landlock as - sandboxing methods. - - - Progress indicator time stats remain accurate after pausing - xz with SIGTSTP. - - - Ported xz and xzdec to Windows MSVC. Visual Studio 2015 or - later is required. - - * CMake Build: - - - Supports pledge(2), Capsicum, and Linux Landlock sandboxing - methods. - - - Replacement functions for getopt_long() are used on platforms - that do not have it. - - * Enabled unaligned access by default on PowerPC64LE and on RISC-V - targets that define __riscv_misaligned_fast. - - * Tests: - - - Added two new fuzz targets to OSS-Fuzz. - - - Implemented Continuous Integration (CI) testing using - GitHub Actions. - - * Changed quoting style from `...' to '...' in all messages, - scripts, and documentation. - - * Added basic Codespell support to help catch typo errors. - - -5.4.6 (2024-01-26) - - * Fixed a bug involving internal function pointers in liblzma not - being initialized to NULL. The bug can only be triggered if - lzma_filters_update() is called on a LZMA1 encoder, so it does - not affect xz or any application known to us that uses liblzma. - - * xz: - - - Fixed a regression introduced in 5.4.2 that caused encoding - in the raw format to unnecessarily fail if --suffix was not - used. For instance, the following command no longer reports - that --suffix must be used: - - echo foo | xz --format=raw --lzma2 | wc -c - - - Fixed an issue on MinGW-w64 builds that prevented reading - from or writing to non-terminal character devices like NUL. - - * Added a new test. - - -5.4.5 (2023-11-31) +5.4.5 (2023-11-01) * liblzma: @@ -1113,47 +804,6 @@ (FreeBSD >= 10). -5.2.12 (2023-05-04) - - * Fixed a build system bug that prevented building liblzma as a - shared library when configured with --disable-threads. This bug - affected releases 5.2.6 to 5.2.11 and 5.4.0 to 5.4.2. - - * Include for Windows intrinsic functions where they are - needed. This fixed a bug that prevented building liblzma using - clang-cl on Windows. - - * Minor update to the Croatian translation. The small change - applies to a string in both 5.2 and 5.4 branches. - - -5.2.11 (2023-03-18) - - * Removed all possible cases of null pointer + 0. It is undefined - behavior in C99 and C17. This was detected by a sanitizer and had - not caused any known issues. - - * Build systems: - - - Added a workaround for building with GCC on MicroBlaze Linux. - GCC 12 on MicroBlaze doesn't support the __symver__ attribute - even though __has_attribute(__symver__) returns true. The - build is now done without the extra RHEL/CentOS 7 symbols - that were added in XZ Utils 5.2.7. The workaround only - applies to the Autotools build (not CMake). - - - CMake: Ensure that the C compiler language is set to C99 or - a newer standard. - - - CMake changes from XZ Utils 5.4.1: - - * Added a workaround for a build failure with - windres from GNU binutils. - - * Included the Windows resource files in the xz - and xzdec build rules. - - 5.2.10 (2022-12-13) * xz: Don't modify argv[] when parsing the --memlimit* and diff -Nru xz-utils-5.6.0/PACKAGERS xz-utils-5.6.1+really5.4.5/PACKAGERS --- xz-utils-5.6.0/PACKAGERS 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/PACKAGERS 2023-10-31 14:24:02.000000000 +0000 @@ -124,15 +124,14 @@ If the package manager supports a license field, you probably should put GPLv2+ there (GNU GPL v2 or later). The interesting parts of - XZ Utils are under the BSD Zero Clause License (0BSD), but some less - important files ending up into the binary package are under GPLv2+. - So it is simplest to just say GPLv2+ if you cannot specify - "BSD0 and GPLv2+". + XZ Utils are in the public domain, but some less important files + ending up into the binary package are under GPLv2+. So it is simplest + to just say GPLv2+ if you cannot specify "public domain and GPLv2+". If you split XZ Utils into multiple packages as described earlier in this file, liblzma and liblzma-dev packages will contain only - 0BSD-licensed code from XZ Utils (compiler or linker may add some - third-party code which may have other licenses). + public domain code (from XZ Utils at least; compiler or linker may + add some third-party code, which may be copyrighted). 4. configure options diff -Nru xz-utils-5.6.0/README xz-utils-5.6.1+really5.4.5/README --- xz-utils-5.6.0/README 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/README 2023-10-31 14:24:02.000000000 +0000 @@ -67,27 +67,24 @@ 1.1. Overall documentation - README This file + README This file - INSTALL.generic Generic install instructions for those not - familiar with packages using GNU Autotools - INSTALL Installation instructions specific to XZ Utils - PACKAGERS Information to packagers of XZ Utils - - COPYING XZ Utils copyright and license information - COPYING.0BSD BSD Zero Clause License - COPYING.GPLv2 GNU General Public License version 2 - COPYING.GPLv3 GNU General Public License version 3 - COPYING.LGPLv2.1 GNU Lesser General Public License version 2.1 - COPYING.CC-BY-SA-4.0 Creative Commons Attribution-ShareAlike 4.0 - International Public License - - AUTHORS The main authors of XZ Utils - THANKS Incomplete list of people who have helped making - this software - NEWS User-visible changes between XZ Utils releases - ChangeLog Detailed list of changes (commit log) - TODO Known bugs and some sort of to-do list + INSTALL.generic Generic install instructions for those not familiar + with packages using GNU Autotools + INSTALL Installation instructions specific to XZ Utils + PACKAGERS Information to packagers of XZ Utils + + COPYING XZ Utils copyright and license information + COPYING.GPLv2 GNU General Public License version 2 + COPYING.GPLv3 GNU General Public License version 3 + COPYING.LGPLv2.1 GNU Lesser General Public License version 2.1 + + AUTHORS The main authors of XZ Utils + THANKS Incomplete list of people who have helped making + this software + NEWS User-visible changes between XZ Utils releases + ChangeLog Detailed list of changes (commit log) + TODO Known bugs and some sort of to-do list Note that only some of the above files are included in binary packages. @@ -290,11 +287,11 @@ XZ Embedded is a limited implementation written for use in the Linux kernel, but it is also suitable for other embedded use. - https://xz.tukaani.org/xz-embedded/ + https://tukaani.org/xz/embedded.html XZ for Java is a complete implementation written in pure Java. - https://xz.tukaani.org/xz-for-java/ + https://tukaani.org/xz/java.html 6. Contact information diff -Nru xz-utils-5.6.0/THANKS xz-utils-5.6.1+really5.4.5/THANKS --- xz-utils-5.6.0/THANKS 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/THANKS 2023-11-01 12:19:29.000000000 +0000 @@ -5,7 +5,6 @@ Some people have helped more, some less, but nevertheless everyone's help has been important. :-) In alphabetical order: - Mark Adler - - Kian-Meng Ang - H. Peter Anvin - Jeff Bastian - Nelson H. F. Beebe @@ -52,11 +51,9 @@ - Bjarni Ingi Gislason - John Paul Adrian Glaubitz - Bill Glessner - - Matthew Good - Michał Górny - Jason Gorski - Juan Manuel Guerrero - - Gabriela Gutierrez - Diederik de Haas - Joachim Henke - Christian Hesse @@ -65,7 +62,6 @@ - Nicholas Jackson - Sam James - Hajin Jang - - Hans Jansen - Jouk Jansen - Jun I Jin - Kiyoshi Kanazawa @@ -83,7 +79,6 @@ - Ilya Kurdyukov - Peter Lawler - James M Leddy - - Kelvin Lee - Vincent Lefevre - Hin-Tak Leung - Andraž 'ruskie' Levstik @@ -94,7 +89,6 @@ - Lorenzo De Liso - H.J. Lu - Bela Lubkin - - Chenxi Mao - Gregory Margo - Julien Marrec - Ed Maste @@ -156,7 +150,6 @@ - Mohammed Adnène Trojette - Alexey Tourbin - Taiki Tsunekawa - - Maksym Vatsyk - Loganaden Velvindron - Patrick J. Volkerding - Martin Väth diff -Nru xz-utils-5.6.0/TODO xz-utils-5.6.1+really5.4.5/TODO --- xz-utils-5.6.0/TODO 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/TODO 2023-11-01 12:19:29.000000000 +0000 @@ -24,6 +24,10 @@ tuklib_exit() doesn't block signals => EINTR is possible. + SIGTSTP is not handled. If xz is stopped, the estimated remaining + time and calculated (de)compression speed won't make sense in the + progress indicator (xz --verbose). + If liblzma has created threads and fork() gets called, liblzma code will break in the child process unless it calls exec() and doesn't touch liblzma. diff -Nru xz-utils-5.6.0/aclocal.m4 xz-utils-5.6.1+really5.4.5/aclocal.m4 --- xz-utils-5.6.0/aclocal.m4 2024-02-24 08:28:02.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/aclocal.m4 2023-11-01 12:27:08.000000000 +0000 @@ -14,8 +14,8 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],, -[m4_warning([this file was generated for autoconf 2.72. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. 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'.])]) @@ -1168,8 +1168,8 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_check_capsicum.m4]) m4_include([m4/ax_pthread.m4]) -m4_include([m4/build-to-host.m4]) m4_include([m4/getopt.m4]) m4_include([m4/gettext.m4]) m4_include([m4/host-cpu-c-abi.m4]) diff -Nru xz-utils-5.6.0/autogen.sh xz-utils-5.6.1+really5.4.5/autogen.sh --- xz-utils-5.6.0/autogen.sh 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/autogen.sh 2023-10-31 14:24:02.000000000 +0000 @@ -1,10 +1,12 @@ #!/bin/sh -# SPDX-License-Identifier: 0BSD ############################################################################### # # Author: Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################### set -e -x diff -Nru xz-utils-5.6.0/build-aux/config.rpath xz-utils-5.6.1+really5.4.5/build-aux/config.rpath --- xz-utils-5.6.0/build-aux/config.rpath 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/build-aux/config.rpath 2023-10-31 14:32:49.000000000 +0000 @@ -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-2023 Free Software Foundation, Inc. +# Copyright 1996-2022 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # diff -Nru xz-utils-5.6.0/build-aux/manconv.sh xz-utils-5.6.1+really5.4.5/build-aux/manconv.sh --- xz-utils-5.6.0/build-aux/manconv.sh 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/build-aux/manconv.sh 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: 0BSD - +# ############################################################################### # # Wrapper for GNU groff to convert man pages to a few formats @@ -18,6 +17,9 @@ # # Author: Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################### FORMAT=$1 diff -Nru xz-utils-5.6.0/build-aux/version.sh xz-utils-5.6.1+really5.4.5/build-aux/version.sh --- xz-utils-5.6.0/build-aux/version.sh 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/build-aux/version.sh 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: 0BSD - +# ############################################################################# # # Get the version string from version.h and print it out without @@ -10,6 +9,9 @@ # # Author: Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################# sed -n 's/LZMA_VERSION_STABILITY_ALPHA/alpha/ diff -Nru xz-utils-5.6.0/cmake/remove-ordinals.cmake xz-utils-5.6.1+really5.4.5/cmake/remove-ordinals.cmake --- xz-utils-5.6.0/cmake/remove-ordinals.cmake 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/cmake/remove-ordinals.cmake 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: 0BSD - ############################################################################# # # remove-ordinals.cmake @@ -18,6 +16,9 @@ # # Author: Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################# file(READ "${INPUT_FILE}" STR) diff -Nru xz-utils-5.6.0/cmake/tuklib_common.cmake xz-utils-5.6.1+really5.4.5/cmake/tuklib_common.cmake --- xz-utils-5.6.0/cmake/tuklib_common.cmake 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/cmake/tuklib_common.cmake 2023-10-31 14:24:02.000000000 +0000 @@ -1,12 +1,11 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # tuklib_common.cmake - common functions and macros for tuklib_*.cmake files # # Author: Lasse Collin # -############################################################################# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# function(tuklib_add_definitions TARGET_OR_ALL DEFINITIONS) # DEFINITIONS may be an empty string/list but it's fine here. There is diff -Nru xz-utils-5.6.0/cmake/tuklib_cpucores.cmake xz-utils-5.6.1+really5.4.5/cmake/tuklib_cpucores.cmake --- xz-utils-5.6.0/cmake/tuklib_cpucores.cmake 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/cmake/tuklib_cpucores.cmake 2023-10-31 14:24:02.000000000 +0000 @@ -1,12 +1,11 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # tuklib_cpucores.cmake - see tuklib_cpucores.m4 for description and comments # # Author: Lasse Collin # -############################################################################# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# include("${CMAKE_CURRENT_LIST_DIR}/tuklib_common.cmake") include(CheckCSourceCompiles) diff -Nru xz-utils-5.6.0/cmake/tuklib_integer.cmake xz-utils-5.6.1+really5.4.5/cmake/tuklib_integer.cmake --- xz-utils-5.6.0/cmake/tuklib_integer.cmake 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/cmake/tuklib_integer.cmake 2023-11-01 12:19:29.000000000 +0000 @@ -1,12 +1,11 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # tuklib_integer.cmake - see tuklib_integer.m4 for description and comments # # Author: Lasse Collin # -############################################################################# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# include("${CMAKE_CURRENT_LIST_DIR}/tuklib_common.cmake") include(TestBigEndian) @@ -60,64 +59,25 @@ endif() endif() - # Guess that unaligned access is fast on these archs: - # - 32/64-bit x86 / x86-64 - # - 32/64-bit big endian PowerPC - # - 64-bit little endian PowerPC - # - Some 32-bit ARM - # - Some 64-bit ARM64 (AArch64) - # - Some 32/64-bit RISC-V + # Unaligned access is fast on x86(-64), big endian PowerPC, and usually on + # 32/64-bit ARM too. There are others too and ARM could be a false match. + # + # Guess the default value for the option. + # CMake's ability to give info about the target arch seems bad. + # The the same arch can have different name depending on the OS. # - # CMake doesn't provide a standardized/normalized list of processor arch - # names. For example, x86-64 may be "x86_64" (Linux), "AMD64" (Windows), - # or even "EM64T" (64-bit WinXP). + # FIXME: The regex is based on guessing, not on factual information! + # + # NOTE: Compared to the Autoconf test, this lacks the GCC/Clang test + # on ARM and always assumes that unaligned is fast on ARM. set(FAST_UNALIGNED_GUESS OFF) - string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" PROCESSOR) - - # There is no ^ in the first regex branch to allow "i" at the beginning - # so it can match "i386" to "i786", and "x86_64". - if(PROCESSOR MATCHES "[x34567]86|^x64|^amd64|^em64t") - set(FAST_UNALIGNED_GUESS ON) - - elseif(PROCESSOR MATCHES "^powerpc|^ppc") - if(WORDS_BIGENDIAN OR PROCESSOR MATCHES "64") - set(FAST_UNALIGNED_GUESS ON) - endif() - - elseif(PROCESSOR MATCHES "^arm|^aarch64|^riscv") - # On 32-bit and 64-bit ARM, GCC and Clang - # #define __ARM_FEATURE_UNALIGNED if - # unaligned access is supported. - # - # Exception: GCC at least up to 13.2.0 - # defines it even when using -mstrict-align - # so in that case this autodetection goes wrong. - # Most of the time -mstrict-align isn't used so it - # shouldn't be a common problem in practice. See: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111555 - # - # RISC-V C API Specification says that if - # __riscv_misaligned_fast is defined then - # unaligned access is known to be fast. - # - # MSVC is handled as a special case: We assume that - # 32/64-bit ARM supports fast unaligned access. - # If MSVC gets RISC-V support then this will assume - # fast unaligned access on RISC-V too. - check_c_source_compiles(" - #if !defined(__ARM_FEATURE_UNALIGNED) \ - && !defined(__riscv_misaligned_fast) \ - && !defined(_MSC_VER) - compile error - #endif - int main(void) { return 0; } - " - TUKLIB_FAST_UNALIGNED_DEFINED_BY_PREPROCESSOR) - if(TUKLIB_FAST_UNALIGNED_DEFINED_BY_PREPROCESSOR) - set(FAST_UNALIGNED_GUESS ON) + if(CMAKE_SYSTEM_PROCESSOR MATCHES + "[Xx3456]86|^[Xx]64|^[Aa][Mm][Dd]64|^[Aa][Rr][Mm]|^aarch|^powerpc|^ppc") + if(NOT WORDS_BIGENDIAN OR + NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc|^ppc") + set(FAST_UNALIGNED_GUESS ON) endif() endif() - option(TUKLIB_FAST_UNALIGNED_ACCESS "Enable if the system supports *fast* unaligned memory access \ with 16-bit, 32-bit, and 64-bit integers." diff -Nru xz-utils-5.6.0/cmake/tuklib_large_file_support.cmake xz-utils-5.6.1+really5.4.5/cmake/tuklib_large_file_support.cmake --- xz-utils-5.6.0/cmake/tuklib_large_file_support.cmake 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/cmake/tuklib_large_file_support.cmake 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # tuklib_large_file_support.cmake # @@ -11,7 +8,9 @@ # # Author: Lasse Collin # -############################################################################# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# include("${CMAKE_CURRENT_LIST_DIR}/tuklib_common.cmake") include(CheckCSourceCompiles) diff -Nru xz-utils-5.6.0/cmake/tuklib_mbstr.cmake xz-utils-5.6.1+really5.4.5/cmake/tuklib_mbstr.cmake --- xz-utils-5.6.0/cmake/tuklib_mbstr.cmake 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/cmake/tuklib_mbstr.cmake 2023-10-31 14:24:02.000000000 +0000 @@ -1,12 +1,11 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # tuklib_mbstr.cmake - see tuklib_mbstr.m4 for description and comments # # Author: Lasse Collin # -############################################################################# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# include("${CMAKE_CURRENT_LIST_DIR}/tuklib_common.cmake") include(CheckSymbolExists) diff -Nru xz-utils-5.6.0/cmake/tuklib_physmem.cmake xz-utils-5.6.1+really5.4.5/cmake/tuklib_physmem.cmake --- xz-utils-5.6.0/cmake/tuklib_physmem.cmake 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/cmake/tuklib_physmem.cmake 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # tuklib_physmem.cmake - see tuklib_physmem.m4 for description and comments # @@ -9,7 +6,9 @@ # # Author: Lasse Collin # -############################################################################# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# include("${CMAKE_CURRENT_LIST_DIR}/tuklib_common.cmake") include(CheckCSourceCompiles) diff -Nru xz-utils-5.6.0/cmake/tuklib_progname.cmake xz-utils-5.6.1+really5.4.5/cmake/tuklib_progname.cmake --- xz-utils-5.6.0/cmake/tuklib_progname.cmake 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/cmake/tuklib_progname.cmake 2023-10-31 14:24:02.000000000 +0000 @@ -1,12 +1,11 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # tuklib_progname.cmake - see tuklib_progname.m4 for description and comments # # Author: Lasse Collin # -############################################################################# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# include("${CMAKE_CURRENT_LIST_DIR}/tuklib_common.cmake") include(CheckSymbolExists) diff -Nru xz-utils-5.6.0/config.h.in xz-utils-5.6.1+really5.4.5/config.h.in --- xz-utils-5.6.0/config.h.in 2024-02-24 08:31:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/config.h.in 2023-11-01 12:27:56.000000000 +0000 @@ -10,10 +10,6 @@ language is requested. */ #undef ENABLE_NLS -/* Define to 1 if ARM64 CRC32 instruction is supported. See configure.ac for - details. */ -#undef HAVE_ARM64_CRC32 - /* Define to 1 if bswap_16 is available. */ #undef HAVE_BSWAP_16 @@ -26,13 +22,13 @@ /* Define to 1 if you have the header file. */ #undef HAVE_BYTESWAP_H -/* Define to 1 if you have the 'cap_rights_limit' function. */ -#undef HAVE_CAP_RIGHTS_LIMIT +/* Define to 1 if Capsicum is available. */ +#undef HAVE_CAPSICUM -/* Define to 1 if the system has the type 'CC_SHA256_CTX'. */ +/* Define to 1 if the system has the type `CC_SHA256_CTX'. */ #undef HAVE_CC_SHA256_CTX -/* Define to 1 if you have the 'CC_SHA256_Init' function. */ +/* Define to 1 if you have the `CC_SHA256_Init' function. */ #undef HAVE_CC_SHA256_INIT /* Define to 1 if you have the Mac OS X function @@ -52,10 +48,10 @@ /* Define to 1 if sha256 integrity check is enabled. */ #undef HAVE_CHECK_SHA256 -/* Define to 1 if you have the 'clock_gettime' function. */ +/* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME -/* Define to 1 if 'CLOCK_MONOTONIC' is declared in . */ +/* Define to 1 if `CLOCK_MONOTONIC' is declared in . */ #undef HAVE_CLOCK_MONOTONIC /* Define to 1 if you have the header file. */ @@ -95,9 +91,6 @@ /* Define to 1 if powerpc decoder is enabled. */ #undef HAVE_DECODER_POWERPC -/* Define to 1 if riscv decoder is enabled. */ -#undef HAVE_DECODER_RISCV - /* Define to 1 if sparc decoder is enabled. */ #undef HAVE_DECODER_SPARC @@ -107,9 +100,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the 'elf_aux_info' function. */ -#undef HAVE_ELF_AUX_INFO - /* Define to 1 if any of HAVE_ENCODER_foo have been defined. */ #undef HAVE_ENCODERS @@ -137,9 +127,6 @@ /* Define to 1 if powerpc encoder is enabled. */ #undef HAVE_ENCODER_POWERPC -/* Define to 1 if riscv encoder is enabled. */ -#undef HAVE_ENCODER_RISCV - /* Define to 1 if sparc encoder is enabled. */ #undef HAVE_ENCODER_SPARC @@ -153,25 +140,19 @@ */ #undef HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR -/* Define to 1 if __attribute__((__ifunc__())) is supported for functions. */ -#undef HAVE_FUNC_ATTRIBUTE_IFUNC - -/* Define to 1 if you have the 'futimens' function. */ +/* Define to 1 if you have the `futimens' function. */ #undef HAVE_FUTIMENS -/* Define to 1 if you have the 'futimes' function. */ +/* Define to 1 if you have the `futimes' function. */ #undef HAVE_FUTIMES -/* Define to 1 if you have the 'futimesat' function. */ +/* Define to 1 if you have the `futimesat' function. */ #undef HAVE_FUTIMESAT -/* Define to 1 if you have the 'getauxval' function. */ -#undef HAVE_GETAUXVAL - /* Define to 1 if you have the header file. */ #undef HAVE_GETOPT_H -/* Define to 1 if you have the 'getopt_long' function. */ +/* Define to 1 if you have the `getopt_long' function. */ #undef HAVE_GETOPT_LONG /* Define if the GNU gettext() function is already present or preinstalled. */ @@ -189,9 +170,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_LANDLOCK_H - /* Define to 1 if .lz (lzip) decompression support is enabled. */ #undef HAVE_LZIP_DECODER @@ -213,43 +191,40 @@ /* Define to 1 to enable hc4 match finder. */ #undef HAVE_MF_HC4 -/* Define to 1 if MicroLZMA support is enabled. */ -#undef HAVE_MICROLZMA - /* Define to 1 if you have the header file. */ #undef HAVE_MINIX_CONFIG_H /* Define to 1 if getopt.h declares extern int optreset. */ #undef HAVE_OPTRESET -/* Define to 1 if you have the 'pledge' function. */ +/* Define to 1 if you have the `pledge' function. */ #undef HAVE_PLEDGE -/* Define to 1 if you have the 'posix_fadvise' function. */ +/* Define to 1 if you have the `posix_fadvise' function. */ #undef HAVE_POSIX_FADVISE -/* Define to 1 if 'program_invocation_name' is declared in . */ +/* Define to 1 if `program_invocation_name' is declared in . */ #undef HAVE_PROGRAM_INVOCATION_NAME -/* Define to 1 if you have the 'pthread_condattr_setclock' function. */ +/* Define to 1 if you have the `pthread_condattr_setclock' function. */ #undef HAVE_PTHREAD_CONDATTR_SETCLOCK /* Have PTHREAD_PRIO_INHERIT. */ #undef HAVE_PTHREAD_PRIO_INHERIT -/* Define to 1 if you have the 'SHA256Init' function. */ +/* Define to 1 if you have the `SHA256Init' function. */ #undef HAVE_SHA256INIT -/* Define to 1 if the system has the type 'SHA256_CTX'. */ +/* Define to 1 if the system has the type `SHA256_CTX'. */ #undef HAVE_SHA256_CTX /* Define to 1 if you have the header file. */ #undef HAVE_SHA256_H -/* Define to 1 if you have the 'SHA256_Init' function. */ +/* Define to 1 if you have the `SHA256_Init' function. */ #undef HAVE_SHA256_INIT -/* Define to 1 if the system has the type 'SHA2_CTX'. */ +/* Define to 1 if the system has the type `SHA2_CTX'. */ #undef HAVE_SHA2_CTX /* Define to 1 if you have the header file. */ @@ -276,19 +251,19 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if 'st_atimensec' is a member of 'struct stat'. */ +/* Define to 1 if `st_atimensec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIMENSEC -/* Define to 1 if 'st_atimespec.tv_nsec' is a member of 'struct stat'. */ +/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC -/* Define to 1 if 'st_atim.st__tim.tv_nsec' is a member of 'struct stat'. */ +/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC -/* Define to 1 if 'st_atim.tv_nsec' is a member of 'struct stat'. */ +/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC -/* Define to 1 if 'st_uatime' is a member of 'struct stat'. */ +/* Define to 1 if `st_uatime' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_UATIME /* Define to 1 to if GNU/Linux-specific details are unconditionally wanted for @@ -298,14 +273,11 @@ must be used together with liblzma_linux.map. */ #undef HAVE_SYMBOL_VERSIONS_LINUX -/* Define to 1 if you have the 'sysctlbyname' function. */ -#undef HAVE_SYSCTLBYNAME - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_BYTEORDER_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_CDEFS_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_CAPSICUM_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_ENDIAN_H @@ -322,7 +294,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* Define to 1 if the system has the type 'uintptr_t'. */ +/* Define to 1 if the system has the type `uintptr_t'. */ #undef HAVE_UINTPTR_T /* Define to 1 if you have the header file. */ @@ -332,10 +304,10 @@ configure.ac for details. */ #undef HAVE_USABLE_CLMUL -/* Define to 1 if you have the 'utime' function. */ +/* Define to 1 if you have the `utime' function. */ #undef HAVE_UTIME -/* Define to 1 if you have the 'utimes' function. */ +/* Define to 1 if you have the `utimes' function. */ #undef HAVE_UTIMES /* Define to 1 or 0, depending whether the compiler supports simple visibility @@ -345,13 +317,13 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WCHAR_H -/* Define to 1 if you have the 'wcwidth' function. */ +/* Define to 1 if you have the `wcwidth' function. */ #undef HAVE_WCWIDTH -/* Define to 1 if the system has the type '_Bool'. */ +/* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL -/* Define to 1 if you have the '_futime' function. */ +/* Define to 1 if you have the `_futime' function. */ #undef HAVE__FUTIME /* Define to 1 if _mm_movemask_epi8 is available. */ @@ -407,10 +379,10 @@ your system. */ #undef PTHREAD_CREATE_JOINABLE -/* The size of 'size_t', as computed by sizeof. */ +/* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* Define to 1 if all of the C89 standard headers exist (not just the ones +/* Define to 1 if all of the C90 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS @@ -472,7 +444,7 @@ and might result in broken code. */ #undef TUKLIB_USE_UNSAFE_TYPE_PUNNING -/* Enable extensions on AIX, Interix, z/OS. */ +/* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif @@ -533,15 +505,11 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif -/* Enable extensions specified by C23 Annex F. */ -#ifndef __STDC_WANT_IEC_60559_EXT__ -# undef __STDC_WANT_IEC_60559_EXT__ -#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -582,12 +550,9 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Define to 1 on platforms where this makes off_t a 64-bit type. */ +/* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES -/* Number of bits in time_t, on hosts where this is settable. */ -#undef _TIME_BITS - /* Define for Solaris 2.5.1 so the uint32_t typedef from , , or is not used. If the typedef were allowed, the #define below would cause a syntax error. */ @@ -607,9 +572,6 @@ used. */ #undef __GETOPT_PREFIX -/* Define to 1 on platforms where this makes time_t a 64-bit type. */ -#undef __MINGW_USE_VC2005_COMPAT - /* Define to the type of a signed integer type of width exactly 32 bits if such a type exists and the standard includes do not define it. */ #undef int32_t diff -Nru xz-utils-5.6.0/configure xz-utils-5.6.1+really5.4.5/configure --- xz-utils-5.6.0/configure 2024-02-24 08:28:03.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/configure 2023-11-01 12:27:08.000000000 +0000 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for XZ Utils 5.6.0. +# Generated by GNU Autoconf 2.71 for XZ Utils 5.4.5. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, # Inc. # # @@ -17,6 +17,7 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -25,13 +26,12 @@ # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -103,7 +103,7 @@ ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -133,14 +133,15 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -148,13 +149,12 @@ # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else case e in #( - e) case \`(set -o) 2>/dev/null\` in #( +else \$as_nop + case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi " @@ -172,9 +172,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else case e in #( - e) exitcode=1; echo positional parameters were not saved. ;; -esac +else \$as_nop + exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -196,15 +195,14 @@ if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else case e in #( - e) as_have_required=no ;; -esac +else $as_nop + as_have_required=no fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -237,13 +235,12 @@ if $as_found then : -else case e in #( - e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi ;; -esac +fi fi @@ -265,7 +262,7 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -285,8 +282,7 @@ $0: have one." fi exit 1 -fi ;; -esac +fi fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -325,6 +321,14 @@ as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -393,12 +397,11 @@ { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -412,14 +415,21 @@ { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -493,8 +503,6 @@ /[$]LINENO/= ' <$as_myself | sed ' - t clear - :clear s/[$]LINENO.*/&-/ t lineno b @@ -543,6 +551,7 @@ as_echo='printf %s\n' as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -554,9 +563,9 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -581,12 +590,10 @@ as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" SHELL=${CONFIG_SHELL-/bin/sh} @@ -614,10 +621,10 @@ # Identity of this package. PACKAGE_NAME='XZ Utils' PACKAGE_TARNAME='xz' -PACKAGE_VERSION='5.6.0' -PACKAGE_STRING='XZ Utils 5.6.0' +PACKAGE_VERSION='5.4.5' +PACKAGE_STRING='XZ Utils 5.4.5' PACKAGE_BUGREPORT='xz@tukaani.org' -PACKAGE_URL='https://xz.tukaani.org/xz-utils/' +PACKAGE_URL='https://tukaani.org/xz/' ac_unique_file="src/liblzma/common/common.h" # Factoring default headers for most tests. @@ -653,7 +660,6 @@ ac_header_c_list= gt_needs= -enable_year2038=no ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -663,12 +669,11 @@ COND_GNULIB_TRUE HAVE_VISIBILITY CFLAG_VISIBILITY +CAPSICUM_LIB COND_INTERNAL_SHA256_FALSE COND_INTERNAL_SHA256_TRUE GETOPT_H LIBOBJS -localedir_c_make -localedir_c POSUB LTLIBINTL LIBINTL @@ -709,8 +714,6 @@ DUMPBIN LD FGREP -EGREP -GREP LIBTOOL OBJDUMP DLLTOOL @@ -722,6 +725,8 @@ PTHREAD_CXX PTHREAD_CC ax_pthread_config +EGREP +GREP CPP SED am__fastdepCCAS_FALSE @@ -819,12 +824,6 @@ COND_ENCODER_SIMPLE_TRUE COND_FILTER_SIMPLE_FALSE COND_FILTER_SIMPLE_TRUE -COND_DECODER_RISCV_FALSE -COND_DECODER_RISCV_TRUE -COND_ENCODER_RISCV_FALSE -COND_ENCODER_RISCV_TRUE -COND_FILTER_RISCV_FALSE -COND_FILTER_RISCV_TRUE COND_DECODER_SPARC_FALSE COND_DECODER_SPARC_TRUE COND_ENCODER_SPARC_FALSE @@ -953,7 +952,6 @@ enable_lzip_decoder enable_assembler enable_clmul_crc -enable_arm64_crc32 enable_small enable_threads enable_assume_ram @@ -982,11 +980,9 @@ with_libiconv_prefix with_libintl_prefix enable_largefile -enable_ifunc enable_unaligned_access enable_unsafe_type_punning enable_werror -enable_year2038 ' ac_precious_vars='build_alias host_alias @@ -1108,7 +1104,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1134,7 +1130,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1347,7 +1343,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1363,7 +1359,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1393,8 +1389,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: '$ac_option' -Try '$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1402,7 +1398,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1452,7 +1448,7 @@ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: '$host' +# There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1520,7 +1516,7 @@ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1548,7 +1544,7 @@ # 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 XZ Utils 5.6.0 to adapt to many kinds of systems. +\`configure' configures XZ Utils 5.4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1562,11 +1558,11 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print 'checking ...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for '--cache-file=config.cache' + -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or '..'] + --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1574,10 +1570,10 @@ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, 'make install' will install all the files in -'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -an installation prefix other than '$ac_default_prefix' using '--prefix', -for instance '--prefix=\$HOME'. +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. For better control, use the options below. @@ -1619,7 +1615,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of XZ Utils 5.6.0:";; + short | recursive ) echo "Configuration of XZ Utils 5.4.5:";; esac cat <<\_ACEOF @@ -1630,7 +1626,7 @@ --enable-debug Enable debugging code. --enable-encoders=LIST Comma-separated list of encoders to build. Default=all. Available encoders: lzma1 lzma2 delta - x86 powerpc ia64 arm armthumb arm64 sparc riscv + x86 powerpc ia64 arm armthumb arm64 sparc --enable-decoders=LIST Comma-separated list of decoders to build. Default=all. Available decoders are the same as available encoders. @@ -1653,12 +1649,10 @@ exist for the architecture. --disable-clmul-crc Do not use carryless multiplication for CRC calculation even if support for it is detected. - --disable-arm64-crc32 Do not use ARM64 CRC32 instructions even if support - for it is detected. --enable-small Make liblzma smaller and a little slower. This is disabled by default to optimize for speed. - --enable-threads=METHOD Supported METHODS are 'yes', 'no', 'posix', 'win95', - and 'vista'. The default is 'yes'. Using 'no' + --enable-threads=METHOD Supported METHODS are `yes', `no', `posix', `win95', + and `vista'. The default is `yes'. Using `no' together with --enable-small makes liblzma thread unsafe. --enable-assume-ram=SIZE @@ -1676,10 +1670,10 @@ xzmore, and their symlinks --disable-doc do not install documentation files to docdir (man pages will still be installed) - --enable-sandbox=METHOD Sandboxing METHOD can be 'auto', 'no', 'capsicum', - 'pledge', or 'landlock'. The default is 'auto' which - enables sandboxing if a supported sandboxing method - is found. + --enable-sandbox=METHOD Sandboxing METHOD can be `auto', `no', `capsicum', + or `pledge'. The default is `auto' which enables + sandboxing if a supported sandboxing method is + found. --enable-path-for-scripts=PREFIX If PREFIX isn't empty, PATH=PREFIX:$PATH will be set in the beginning of the scripts (xzgrep and others). @@ -1703,15 +1697,11 @@ --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --disable-largefile omit support for large files - --enable-ifunc Use __attribute__((__ifunc__())). Enabled by default - on GNU/Linux (glibc) and FreeBSD. --enable-unaligned-access Enable if the system supports *fast* unaligned memory access with 16-bit, 32-bit, and 64-bit - integers. By default, this is enabled on x86, - x86-64, 32/64-bit big endian PowerPC, 64-bit little - endian PowerPC, and some ARM, ARM64, and RISC-V - systems. + integers. By default, this is enabled only on x86, + x86_64, big endian PowerPC, and some ARM systems. --enable-unsafe-type-punning This introduces strict aliasing violations and may result in broken code. However, this might improve @@ -1720,7 +1710,6 @@ on ARMv6 and ARMv7). --enable-werror Enable -Werror to abort compilation on all compiler warnings. - --enable-year2038 support timestamps after 2038 Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1753,11 +1742,11 @@ LT_SYS_LIBRARY_PATH User-defined run-time library search path. -Use these variables to override the choices made by 'configure' or to help +Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . -XZ Utils home page: . +XZ Utils home page: . _ACEOF ac_status=$? fi @@ -1821,10 +1810,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -XZ Utils configure 5.6.0 -generated by GNU Autoconf 2.72 +XZ Utils configure 5.4.5 +generated by GNU Autoconf 2.71 -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1863,12 +1852,11 @@ } && test -s conftest.$ac_objext then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1887,8 +1875,8 @@ if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1896,12 +1884,10 @@ if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac +else $as_nop + eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1941,12 +1927,11 @@ } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1985,12 +1970,11 @@ } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -2008,15 +1992,15 @@ if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. For example, HP-UX 11i declares gettimeofday. */ #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (void); below. */ + which can conflict with char $2 (); below. */ #include #undef $2 @@ -2027,7 +2011,7 @@ #ifdef __cplusplus extern "C" #endif -char $2 (void); +char $2 (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ @@ -2046,13 +2030,11 @@ if ac_fn_c_try_link "$LINENO" then : eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac +else $as_nop + eval "$3=no" fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext ;; -esac + conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2061,6 +2043,58 @@ } # ac_fn_c_check_func +# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR +# ------------------------------------------------------------------ +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. +ac_fn_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +printf %s "checking whether $as_decl_name is declared... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + eval ac_save_FLAGS=\$$6 + as_fn_append $6 " $5" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else $as_nop + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + eval $6=\$ac_save_FLAGS + +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_check_decl + # ac_fn_c_try_run LINENO # ---------------------- # Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that @@ -2091,13 +2125,12 @@ test $ac_status = 0; }; } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=$ac_status ;; -esac + ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -2117,8 +2150,8 @@ if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) eval "$3=no" +else $as_nop + eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 @@ -2148,14 +2181,12 @@ if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) eval "$3=yes" ;; -esac +else $as_nop + eval "$3=yes" fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2176,8 +2207,8 @@ if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) eval "$3=no" +else $as_nop + eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \ @@ -2209,12 +2240,10 @@ if eval test \"x\$"$3"\" = x"no" then : -else case e in #( - e) break ;; -esac +else $as_nop + break fi - done ;; -esac + done fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2235,8 +2264,8 @@ if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) eval "$3=no" +else $as_nop + eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. for ac_type in int$2_t 'int' 'long int' \ @@ -2277,13 +2306,12 @@ if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) case $ac_type in #( +else $as_nop + case $ac_type in #( int$2_t) : eval "$3=yes" ;; #( *) : eval "$3=\$ac_type" ;; -esac ;; esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -2292,12 +2320,10 @@ if eval test \"x\$"$3"\" = x"no" then : -else case e in #( - e) break ;; -esac +else $as_nop + break fi - done ;; -esac + done fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2351,19 +2377,18 @@ if ac_fn_c_try_compile "$LINENO" then : ac_hi=$ac_mid; break -else case e in #( - e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val +else $as_nop + as_fn_arith $ac_mid + 1 && ac_lo=$as_val if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= break fi - as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;; -esac + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int @@ -2398,23 +2423,20 @@ if ac_fn_c_try_compile "$LINENO" then : ac_lo=$ac_mid; break -else case e in #( - e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val +else $as_nop + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= break fi - as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;; -esac + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else case e in #( - e) ac_lo= ac_hi= ;; -esac +else $as_nop + ac_lo= ac_hi= fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Binary search between lo and hi bounds. @@ -2437,9 +2459,8 @@ if ac_fn_c_try_compile "$LINENO" then : ac_hi=$ac_mid -else case e in #( - e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;; -esac +else $as_nop + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done @@ -2487,9 +2508,8 @@ if ac_fn_c_try_run "$LINENO" then : echo >>conftest.val; read $3 &6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int @@ -2530,8 +2550,8 @@ if ac_fn_c_try_compile "$LINENO" then : eval "$4=yes" -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int @@ -2547,15 +2567,12 @@ if ac_fn_c_try_compile "$LINENO" then : eval "$4=yes" -else case e in #( - e) eval "$4=no" ;; -esac +else $as_nop + eval "$4=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$4 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2563,60 +2580,6 @@ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member - -# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR -# ------------------------------------------------------------------ -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. -ac_fn_check_decl () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -printf %s "checking whether $as_decl_name is declared... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - eval ac_save_FLAGS=\$$6 - as_fn_append $6 " $5" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main (void) -{ -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - eval $6=\$ac_save_FLAGS - ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_check_decl ac_configure_args_raw= for ac_arg do @@ -2641,8 +2604,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by XZ Utils $as_me 5.6.0, which was -generated by GNU Autoconf 2.72. Invocation command line was +It was created by XZ Utils $as_me 5.4.5, which was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2888,10 +2851,10 @@ printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2927,7 +2890,9 @@ /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (char **p, int i) +static char *e (p, i) + char **p; + int i; { return p[i]; } @@ -2941,21 +2906,6 @@ return s; } -/* C89 style stringification. */ -#define noexpand_stringify(a) #a -const char *stringified = noexpand_stringify(arbitrary+token=sequence); - -/* C89 style token pasting. Exercises some of the corner cases that - e.g. old MSVC gets wrong, but not very hard. */ -#define noexpand_concat(a,b) a##b -#define expand_concat(a,b) noexpand_concat(a,b) -extern int vA; -extern int vbee; -#define aye A -#define bee B -int *pvA = &expand_concat(v,aye); -int *pvbee = &noexpand_concat(v,bee); - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2983,19 +2933,16 @@ # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -/* Does the compiler advertise C99 conformance? */ +// Does the compiler advertise C99 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif -// See if C++-style comments work. - #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); -extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -3045,6 +2992,7 @@ static inline int test_restrict (ccp restrict text) { + // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -3110,8 +3058,6 @@ ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; - // Work around memory leak warnings. - free (ia); // Check named initializers. struct named_init ni = { @@ -3133,7 +3079,7 @@ # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -/* Does the compiler advertise C11 conformance? */ +// Does the compiler advertise C11 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -3249,7 +3195,6 @@ as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" gt_needs="$gt_needs " -as_fn_append ac_header_c_list " sys/cdefs.h sys_cdefs_h HAVE_SYS_CDEFS_H" # Auxiliary files required by this configure script. ac_aux_files="config.rpath ltmain.sh compile missing install-sh config.guess config.sub" @@ -3329,9 +3274,8 @@ if $as_found then : -else case e in #( - e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; -esac +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 fi @@ -3359,12 +3303,12 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -3373,18 +3317,18 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -3400,11 +3344,11 @@ fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -3442,16 +3386,15 @@ if test ${ac_cv_build+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_build_alias=$build_alias +else $as_nop + ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 printf "%s\n" "$ac_cv_build" >&6; } @@ -3478,15 +3421,14 @@ if test ${ac_cv_host+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test "x$host_alias" = x; then +else $as_nop + if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 printf "%s\n" "$ac_cv_host" >&6; } @@ -3554,9 +3496,8 @@ if test ${enable_debug+y} then : enableval=$enable_debug; -else case e in #( - e) enable_debug=no ;; -esac +else $as_nop + enable_debug=no fi if test "x$enable_debug" = xyes; then @@ -3608,9 +3549,6 @@ enable_filter_sparc=no enable_encoder_sparc=no enable_decoder_sparc=no -enable_filter_riscv=no -enable_encoder_riscv=no -enable_decoder_riscv=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which encoders to build" >&5 printf %s "checking which encoders to build... " >&6; } @@ -3618,9 +3556,8 @@ if test ${enable_encoders+y} then : enableval=$enable_encoders; -else case e in #( - e) enable_encoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv ;; -esac +else $as_nop + enable_encoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc fi enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'` @@ -3702,13 +3639,6 @@ printf "%s\n" "#define HAVE_ENCODER_SPARC 1" >>confdefs.h ;; - riscv) - enable_filter_riscv=yes - enable_encoder_riscv=yes - -printf "%s\n" "#define HAVE_ENCODER_RISCV 1" >>confdefs.h - - ;; *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 printf "%s\n" "" >&6; } @@ -3729,9 +3659,8 @@ if test ${enable_decoders+y} then : enableval=$enable_decoders; -else case e in #( - e) enable_decoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv ;; -esac +else $as_nop + enable_decoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc fi enable_decoders=`echo "$enable_decoders" | sed 's/,/ /g'` @@ -3813,13 +3742,6 @@ printf "%s\n" "#define HAVE_DECODER_SPARC 1" >>confdefs.h ;; - riscv) - enable_filter_riscv=yes - enable_decoder_riscv=yes - -printf "%s\n" "#define HAVE_DECODER_RISCV 1" >>confdefs.h - - ;; *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 printf "%s\n" "" >&6; } @@ -4096,30 +4018,6 @@ COND_DECODER_SPARC_FALSE= fi - if test "x$enable_filter_riscv" = xyes; then - COND_FILTER_RISCV_TRUE= - COND_FILTER_RISCV_FALSE='#' -else - COND_FILTER_RISCV_TRUE='#' - COND_FILTER_RISCV_FALSE= -fi - - if test "x$enable_encoder_riscv" = xyes; then - COND_ENCODER_RISCV_TRUE= - COND_ENCODER_RISCV_FALSE='#' -else - COND_ENCODER_RISCV_TRUE='#' - COND_ENCODER_RISCV_FALSE= -fi - - if test "x$enable_decoder_riscv" = xyes; then - COND_DECODER_RISCV_TRUE= - COND_DECODER_RISCV_FALSE='#' -else - COND_DECODER_RISCV_TRUE='#' - COND_DECODER_RISCV_FALSE= -fi - # The so called "simple filters" share common code. enable_filter_simple=no @@ -4146,9 +4044,6 @@ test "x$enable_filter_sparc" = xyes && enable_filter_simple=yes test "x$enable_encoder_sparc" = xyes && enable_encoder_simple=yes test "x$enable_decoder_sparc" = xyes && enable_decoder_simple=yes -test "x$enable_filter_riscv" = xyes && enable_filter_simple=yes -test "x$enable_encoder_riscv" = xyes && enable_encoder_simple=yes -test "x$enable_decoder_riscv" = xyes && enable_decoder_simple=yes if test "x$enable_filter_simple" = xyes; then COND_FILTER_SIMPLE_TRUE= COND_FILTER_SIMPLE_FALSE='#' @@ -4229,9 +4124,8 @@ if test ${enable_match_finders+y} then : enableval=$enable_match_finders; -else case e in #( - e) enable_match_finders=hc3,hc4,bt2,bt3,bt4 ;; -esac +else $as_nop + enable_match_finders=hc3,hc4,bt2,bt3,bt4 fi enable_match_finders=`echo "$enable_match_finders" | sed 's/,/ /g'` @@ -4304,9 +4198,8 @@ if test ${enable_checks+y} then : enableval=$enable_checks; -else case e in #( - e) enable_checks=crc32,crc64,sha256 ;; -esac +else $as_nop + enable_checks=crc32,crc64,sha256 fi enable_checks=`echo "$enable_checks" | sed 's/,/ /g'` @@ -4380,9 +4273,8 @@ if test ${enable_external_sha256+y} then : enableval=$enable_external_sha256; -else case e in #( - e) enable_external_sha256=no ;; -esac +else $as_nop + enable_external_sha256=no fi if test "x$enable_check_sha256" != "xyes"; then @@ -4407,27 +4299,19 @@ if test ${enable_microlzma+y} then : enableval=$enable_microlzma; -else case e in #( - e) enable_microlzma=yes ;; -esac +else $as_nop + enable_microlzma=yes fi case $enable_microlzma in - yes) - -printf "%s\n" "#define HAVE_MICROLZMA 1" >>confdefs.h - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - ;; - no) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + yes | no) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_microlzma" >&5 +printf "%s\n" "$enable_microlzma" >&6; } ;; *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 printf "%s\n" "" >&6; } - as_fn_error $? "--enable-microlzma accepts only 'yes' or 'no'." "$LINENO" 5 + as_fn_error $? "--enable-microlzma accepts only \`yes' or \`no'." "$LINENO" 5 ;; esac if test "x$enable_microlzma" = xyes; then @@ -4450,9 +4334,8 @@ if test ${enable_lzip_decoder+y} then : enableval=$enable_lzip_decoder; -else case e in #( - e) enable_lzip_decoder=yes ;; -esac +else $as_nop + enable_lzip_decoder=yes fi if test "x$enable_decoder_lzma1" != xyes; then @@ -4489,9 +4372,8 @@ if test ${enable_assembler+y} then : enableval=$enable_assembler; -else case e in #( - e) enable_assembler=yes ;; -esac +else $as_nop + enable_assembler=yes fi if test "x$enable_assembler" = xyes; then @@ -4514,7 +4396,7 @@ *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 printf "%s\n" "" >&6; } - as_fn_error $? "--enable-assembler accepts only 'yes', 'no', or 'x86' (32-bit)." "$LINENO" 5 + as_fn_error $? "--enable-assembler accepts only \`yes', \`no', or \`x86' (32-bit)." "$LINENO" 5 ;; esac if test "x$enable_assembler" = xx86; then @@ -4535,24 +4417,8 @@ if test ${enable_clmul_crc+y} then : enableval=$enable_clmul_crc; -else case e in #( - e) enable_clmul_crc=yes ;; -esac -fi - - - -############################ -# ARM64 CRC32 Instructions # -############################ - -# Check whether --enable-arm64-crc32 was given. -if test ${enable_arm64_crc32+y} -then : - enableval=$enable_arm64_crc32; -else case e in #( - e) enable_arm64_crc32=yes ;; -esac +else $as_nop + enable_clmul_crc=yes fi @@ -4567,9 +4433,8 @@ if test ${enable_small+y} then : enableval=$enable_small; -else case e in #( - e) enable_small=no ;; -esac +else $as_nop + enable_small=no fi if test "x$enable_small" = xyes; then @@ -4579,7 +4444,7 @@ elif test "x$enable_small" != xno; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 printf "%s\n" "" >&6; } - as_fn_error $? "--enable-small accepts only 'yes' or 'no'" "$LINENO" 5 + as_fn_error $? "--enable-small accepts only \`yes' or \`no'" "$LINENO" 5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_small" >&5 printf "%s\n" "$enable_small" >&6; } @@ -4603,9 +4468,8 @@ if test ${enable_threads+y} then : enableval=$enable_threads; -else case e in #( - e) enable_threads=yes ;; -esac +else $as_nop + enable_threads=yes fi @@ -4635,7 +4499,7 @@ *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 printf "%s\n" "" >&6; } - as_fn_error $? "--enable-threads only accepts 'yes', 'no', 'posix', 'win95', or 'vista'" "$LINENO" 5 + as_fn_error $? "--enable-threads only accepts \`yes', \`no', \`posix', \`win95', or \`vista'" "$LINENO" 5 ;; esac @@ -4656,9 +4520,8 @@ if test ${enable_assume_ram+y} then : enableval=$enable_assume_ram; -else case e in #( - e) enable_assume_ram=128 ;; -esac +else $as_nop + enable_assume_ram=128 fi assume_ram_check=`echo "$enable_assume_ram" | tr -d 0123456789` @@ -4682,9 +4545,8 @@ if test ${enable_xz+y} then : enableval=$enable_xz; -else case e in #( - e) enable_xz=yes ;; -esac +else $as_nop + enable_xz=yes fi if test x$enable_xz != xno; then @@ -4700,9 +4562,8 @@ if test ${enable_xzdec+y} then : enableval=$enable_xzdec; -else case e in #( - e) enable_xzdec=yes ;; -esac +else $as_nop + enable_xzdec=yes fi test "x$enable_decoders" = xno && enable_xzdec=no @@ -4719,9 +4580,8 @@ if test ${enable_lzmadec+y} then : enableval=$enable_lzmadec; -else case e in #( - e) enable_lzmadec=yes ;; -esac +else $as_nop + enable_lzmadec=yes fi test "x$enable_decoder_lzma1" = xno && enable_lzmadec=no @@ -4738,9 +4598,8 @@ if test ${enable_lzmainfo+y} then : enableval=$enable_lzmainfo; -else case e in #( - e) enable_lzmainfo=yes ;; -esac +else $as_nop + enable_lzmainfo=yes fi test "x$enable_decoder_lzma1" = xno && enable_lzmainfo=no @@ -4757,9 +4616,8 @@ if test ${enable_lzma_links+y} then : enableval=$enable_lzma_links; -else case e in #( - e) enable_lzma_links=yes ;; -esac +else $as_nop + enable_lzma_links=yes fi if test x$enable_lzma_links != xno; then @@ -4775,9 +4633,8 @@ if test ${enable_scripts+y} then : enableval=$enable_scripts; -else case e in #( - e) enable_scripts=yes ;; -esac +else $as_nop + enable_scripts=yes fi if test x$enable_scripts != xno; then @@ -4793,9 +4650,8 @@ if test ${enable_doc+y} then : enableval=$enable_doc; -else case e in #( - e) enable_doc=yes ;; -esac +else $as_nop + enable_doc=yes fi if test x$enable_doc != xno; then @@ -4818,29 +4674,23 @@ if test ${enable_sandbox+y} then : enableval=$enable_sandbox; -else case e in #( - e) enable_sandbox=auto ;; -esac +else $as_nop + enable_sandbox=auto fi -case $enable_xzdec-$enable_xz-$enable_sandbox in - no-no-*) - enable_sandbox=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, --disable-xz and --disable-xzdec was used" >&5 -printf "%s\n" "no, --disable-xz and --disable-xzdec was used" >&6; } - ;; - *-*-auto) +case $enable_sandbox in + auto) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: maybe (autodetect)" >&5 printf "%s\n" "maybe (autodetect)" >&6; } ;; - *-*-no | *-*-capsicum | *-*-pledge | *-*-landlock) + no | capsicum | pledge) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_sandbox" >&5 printf "%s\n" "$enable_sandbox" >&6; } ;; *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 printf "%s\n" "" >&6; } - as_fn_error $? "--enable-sandbox only accepts 'auto', 'no', 'capsicum', 'pledge', or 'landlock'." "$LINENO" 5 + as_fn_error $? "--enable-sandbox only accepts \`auto', \`no', \`capsicum', or \`pledge'." "$LINENO" 5 ;; esac @@ -4855,14 +4705,13 @@ if test ${enable_path_for_scripts+y} then : enableval=$enable_path_for_scripts; -else case e in #( - e) +else $as_nop + case $host_os in solaris*) enable_path_for_scripts=/usr/xpg4/bin ;; *) enable_path_for_scripts= ;; esac - ;; -esac + fi if test -n "$enable_path_for_scripts" && test "x$enable_path_for_scripts" != xno ; then @@ -4894,8 +4743,8 @@ if test ${gl_cv_posix_shell+y} then : printf %s "(cached) " >&6 -else case e in #( - e) gl_test_posix_shell_script=' +else $as_nop + gl_test_posix_shell_script=' func_return () { (exit $1) } @@ -4929,8 +4778,7 @@ "$gl_cv_posix_shell" -c "$gl_test_posix_shell_script" 2>/dev/null \ && break;; esac - done ;; -esac + done fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_posix_shell" >&5 printf "%s\n" "$gl_cv_posix_shell" >&6; } @@ -4980,8 +4828,8 @@ if test ${ac_cv_path_install+y} then : printf %s "(cached) " >&6 -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS @@ -5035,8 +4883,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir - ;; -esac + fi if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install @@ -5132,7 +4979,7 @@ test "$program_suffix" != NONE && program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. -# By default was 's,x,x', remove it if useless. +# By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` @@ -5175,8 +5022,8 @@ if test ${ac_cv_prog_STRIP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$STRIP"; then +else $as_nop + if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5198,8 +5045,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -5221,8 +5067,8 @@ if test ${ac_cv_prog_ac_ct_STRIP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_STRIP"; then +else $as_nop + if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5244,8 +5090,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -5281,8 +5126,8 @@ if test ${ac_cv_path_mkdir+y} then : printf %s "(cached) " >&6 -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS @@ -5296,7 +5141,7 @@ as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir ('*'coreutils) '* | \ - *'BusyBox '* | \ + 'BusyBox '* | \ 'mkdir (fileutils) '4.1*) ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; @@ -5305,17 +5150,18 @@ done done IFS=$as_save_IFS - ;; -esac + fi test -d ./--version && rmdir ./--version if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else - # As a last resort, use plain mkdir -p, - # in the hope it doesn't have the bugs of ancient mkdir. - MKDIR_P='mkdir -p' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 @@ -5330,8 +5176,8 @@ if test ${ac_cv_prog_AWK+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$AWK"; then +else $as_nop + if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5353,8 +5199,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then @@ -5376,8 +5221,8 @@ if eval test \${ac_cv_prog_make_${ac_make}_set+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat >conftest.make <<\_ACEOF +else $as_nop + cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' @@ -5389,8 +5234,7 @@ *) eval ac_cv_prog_make_${ac_make}_set=no;; esac -rm -f conftest.make ;; -esac +rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -5428,8 +5272,8 @@ if test ${am_cv_make_support_nested_variables+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if printf "%s\n" 'TRUE=$(BAR$(V)) +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -5439,8 +5283,7 @@ am_cv_make_support_nested_variables=yes else am_cv_make_support_nested_variables=no -fi ;; -esac +fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } @@ -5475,7 +5318,7 @@ # Define the identity of the package. PACKAGE='xz' - VERSION='5.6.0' + VERSION='5.4.5' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -5676,8 +5519,8 @@ if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5699,8 +5542,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5722,8 +5564,8 @@ if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5745,8 +5587,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -5781,8 +5622,8 @@ if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5804,8 +5645,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5827,8 +5667,8 @@ if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -5867,8 +5707,7 @@ ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5892,8 +5731,8 @@ if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5915,8 +5754,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5942,8 +5780,8 @@ if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5965,8 +5803,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -6004,8 +5841,8 @@ if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -6027,8 +5864,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -6050,8 +5886,8 @@ if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -6073,8 +5909,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -6103,10 +5938,10 @@ fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -6178,8 +6013,8 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. -# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -6199,7 +6034,7 @@ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an '-o' + # safe: cross compilers may not add the suffix if given an `-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -6210,9 +6045,8 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= -else case e in #( - e) ac_file='' ;; -esac +else $as_nop + ac_file='' fi if test -z "$ac_file" then : @@ -6221,14 +6055,13 @@ printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See 'config.log' for more details" "$LINENO" 5; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -6252,10 +6085,10 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) -# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will -# work properly (i.e., refer to 'conftest.exe'), while it won't with -# 'rm'. + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -6265,12 +6098,11 @@ * ) break;; esac done -else case e in #( - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -6286,8 +6118,6 @@ main (void) { FILE *f = fopen ("conftest.out", "w"); - if (!f) - return 1; return ferror (f) || fclose (f) != 0; ; @@ -6327,27 +6157,26 @@ if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use '--host'. -See 'config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext \ - conftest.o conftest.obj conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6379,18 +6208,16 @@ break;; esac done -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; -esac +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -6401,8 +6228,8 @@ if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6419,14 +6246,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else case e in #( - e) ac_compiler_gnu=no ;; -esac +else $as_nop + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -6444,8 +6269,8 @@ if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_c_werror_flag=$ac_c_werror_flag +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -6463,8 +6288,8 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else case e in #( - e) CFLAGS="" +else $as_nop + CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6479,8 +6304,8 @@ if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) ac_c_werror_flag=$ac_save_c_werror_flag +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6497,15 +6322,12 @@ then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag ;; -esac + ac_c_werror_flag=$ac_save_c_werror_flag fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -6532,8 +6354,8 @@ if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c11=no +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6550,28 +6372,25 @@ test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c11" = x +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" ;; -esac + CC="$CC $ac_cv_prog_cc_c11" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 ;; -esac + ac_prog_cc_stdc=c11 fi fi if test x$ac_prog_cc_stdc = xno @@ -6581,8 +6400,8 @@ if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c99=no +else $as_nop + ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6599,28 +6418,25 @@ test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c99" = x +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" ;; -esac + CC="$CC $ac_cv_prog_cc_c99" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 ;; -esac + ac_prog_cc_stdc=c99 fi fi if test x$ac_prog_cc_stdc = xno @@ -6630,8 +6446,8 @@ if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c89=no +else $as_nop + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6648,28 +6464,25 @@ test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c89" = x +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" ;; -esac + CC="$CC $ac_cv_prog_cc_c89" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 ;; -esac + ac_prog_cc_stdc=c89 fi fi @@ -6690,8 +6503,8 @@ if test ${am_cv_prog_cc_c_o+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6721,8 +6534,7 @@ fi done rm -f core conftest* - unset am_i ;; -esac + unset am_i fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } @@ -6748,8 +6560,8 @@ if test ${am_cv_CC_dependencies_compiler_type+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +else $as_nop + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up @@ -6853,8 +6665,7 @@ else am_cv_CC_dependencies_compiler_type=none fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } @@ -6891,8 +6702,8 @@ if test ${am_cv_CCAS_dependencies_compiler_type+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +else $as_nop + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up @@ -6994,8 +6805,7 @@ else am_cv_CCAS_dependencies_compiler_type=none fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 printf "%s\n" "$am_cv_CCAS_dependencies_compiler_type" >&6; } @@ -7053,8 +6863,8 @@ if test ${ac_cv_safe_to_define___extensions__+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # define __EXTENSIONS__ 1 @@ -7070,12 +6880,10 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_safe_to_define___extensions__=yes -else case e in #( - e) ac_cv_safe_to_define___extensions__=no ;; -esac +else $as_nop + ac_cv_safe_to_define___extensions__=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } @@ -7085,8 +6893,8 @@ if test ${ac_cv_should_define__xopen_source+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_should_define__xopen_source=no +else $as_nop + ac_cv_should_define__xopen_source=no if test $ac_cv_header_wchar_h = yes then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7105,8 +6913,8 @@ if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _XOPEN_SOURCE 500 @@ -7124,12 +6932,10 @@ then : ac_cv_should_define__xopen_source=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi ;; -esac +fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } @@ -7154,8 +6960,6 @@ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h - printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h - printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h @@ -7175,9 +6979,8 @@ printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h -else case e in #( - e) MINIX= ;; -esac +else $as_nop + MINIX= fi if test $ac_cv_safe_to_define___extensions__ = yes then : @@ -7196,8 +6999,8 @@ if test ${ac_cv_path_SED+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +else $as_nop + 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 @@ -7222,10 +7025,9 @@ as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in #( +case `"$ac_path_SED" --version 2>&1` in *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -7260,8 +7062,7 @@ else ac_cv_path_SED=$SED fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 printf "%s\n" "$ac_cv_path_SED" >&6; } @@ -7283,8 +7084,8 @@ if test ${ac_cv_prog_CPP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) # Double quotes because $CC needs to be expanded +else $as_nop + # Double quotes because $CC needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp do ac_preproc_ok=false @@ -7302,10 +7103,9 @@ if ac_fn_c_try_cpp "$LINENO" then : -else case e in #( - e) # Broken: fails on valid input. -continue ;; -esac +else $as_nop + # Broken: fails on valid input. +continue fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -7319,16 +7119,15 @@ then : # Broken: success on invalid input. continue -else case e in #( - e) # Passes both tests. +else $as_nop + # Passes both tests. ac_preproc_ok=: -break ;; -esac +break fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : @@ -7337,8 +7136,7 @@ done ac_cv_prog_CPP=$CPP - ;; -esac + fi CPP=$ac_cv_prog_CPP else @@ -7361,10 +7159,9 @@ if ac_fn_c_try_cpp "$LINENO" then : -else case e in #( - e) # Broken: fails on valid input. -continue ;; -esac +else $as_nop + # Broken: fails on valid input. +continue fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -7378,26 +7175,24 @@ then : # Broken: success on invalid input. continue -else case e in #( - e) # Passes both tests. +else $as_nop + # Passes both tests. ac_preproc_ok=: -break ;; -esac +break fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : -else case e in #( - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -7407,14 +7202,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5 -printf %s "checking for egrep -e... " >&6; } -if test ${ac_cv_path_EGREP_TRADITIONAL+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -z "$EGREP_TRADITIONAL"; then - ac_path_EGREP_TRADITIONAL_found=false +else $as_nop + if test -z "$GREP"; then + ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin @@ -7428,14 +7223,13 @@ for ac_prog in grep ggrep do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue -# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. - # Check for GNU $ac_path_EGREP_TRADITIONAL -case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in *GNU*) - ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; -#( + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -7444,14 +7238,14 @@ cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" - "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + printf "%s\n" 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then + if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" - ac_path_EGREP_TRADITIONAL_max=$ac_count + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count fi # 10*(2^10) chars as input seems more than enough test $ac_count -gt 10 && break @@ -7459,24 +7253,35 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - $ac_path_EGREP_TRADITIONAL_found && break 3 + $ac_path_GREP_found && break 3 done done done IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then - : + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else - ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL + ac_cv_path_GREP=$GREP +fi + fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" - if test "$ac_cv_path_EGREP_TRADITIONAL" + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} then : - ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E" -else case e in #( - e) if test -z "$EGREP_TRADITIONAL"; then - ac_path_EGREP_TRADITIONAL_found=false + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin @@ -7490,14 +7295,13 @@ for ac_prog in egrep do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue -# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. - # Check for GNU $ac_path_EGREP_TRADITIONAL -case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in *GNU*) - ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; -#( + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -7506,14 +7310,14 @@ cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" - "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then + if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" - ac_path_EGREP_TRADITIONAL_max=$ac_count + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count fi # 10*(2^10) chars as input seems more than enough test $ac_count -gt 10 && break @@ -7521,25 +7325,104 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - $ac_path_EGREP_TRADITIONAL_found && break 3 + $ac_path_EGREP_found && break 3 done done done IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then + if test -z "$ac_cv_path_EGREP"; then as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else - ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL + ac_cv_path_EGREP=$EGREP fi - ;; -esac -fi ;; -esac + + fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5 -printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; } - EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +if test ${ac_cv_c_undeclared_builtin_options+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_CFLAGS=$CFLAGS + ac_cv_c_undeclared_builtin_options='cannot detect' + for ac_arg in '' -fno-builtin; do + CFLAGS="$ac_save_CFLAGS $ac_arg" + # This test program should *not* compile successfully. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +(void) strchr; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else $as_nop + # This test program should compile successfully. + # No library function is consistently available on + # freestanding implementations, so test against a dummy + # declaration. Include always-available headers on the + # off chance that they somehow elicit warnings. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +extern void ac_decl (int, char *); + +int +main (void) +{ +(void) ac_decl (0, (char *) 0); + (void) ac_decl; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_arg" = x +then : + ac_cv_c_undeclared_builtin_options='none needed' +else $as_nop + ac_cv_c_undeclared_builtin_options=$ac_arg +fi + break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + CFLAGS=$ac_save_CFLAGS + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 +printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } + case $ac_cv_c_undeclared_builtin_options in #( + 'cannot detect') : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot make $CC report undeclared builtins +See \`config.log' for more details" "$LINENO" 5; } ;; #( + 'none needed') : + ac_c_undeclared_builtin_options='' ;; #( + *) : + ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; +esac case $enable_threads in #( posix) : @@ -7586,14 +7469,8 @@ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_join (void); + builtin and then its argument prototype would still apply. */ +char pthread_join (); int main (void) { @@ -7687,7 +7564,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP_TRADITIONAL "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1 + $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1 then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5 printf "%s\n" "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;} @@ -7717,8 +7594,8 @@ if test ${ax_cv_PTHREAD_CLANG+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ax_cv_PTHREAD_CLANG=no +else $as_nop + ax_cv_PTHREAD_CLANG=no # Note that Autoconf sets GCC=yes for Clang as well as GCC if test "x$GCC" = "xyes"; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7730,15 +7607,14 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP_TRADITIONAL "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1 + $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1 then : ax_cv_PTHREAD_CLANG=yes fi rm -rf conftest* fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5 printf "%s\n" "$ax_cv_PTHREAD_CLANG" >&6; } @@ -7788,9 +7664,8 @@ if test "x$ax_pthread_check_macro" = "x--" then : ax_pthread_check_cond=0 -else case e in #( - e) ax_pthread_check_cond="!defined($ax_pthread_check_macro)" ;; -esac +else $as_nop + ax_pthread_check_cond="!defined($ax_pthread_check_macro)" fi @@ -7824,8 +7699,8 @@ if test ${ac_cv_prog_ax_pthread_config+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ax_pthread_config"; then +else $as_nop + if test -n "$ax_pthread_config"; then ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7848,8 +7723,7 @@ IFS=$as_save_IFS test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no" -fi ;; -esac +fi fi ax_pthread_config=$ac_cv_prog_ax_pthread_config if test -n "$ax_pthread_config"; then @@ -7982,8 +7856,8 @@ if test ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown +else $as_nop + ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown # Create an alternate version of $ac_link that compiles and # links in two steps (.c -> .o, .o -> exe) instead of one # (.c -> exe), because the warning occurs only in the second @@ -8029,8 +7903,7 @@ ax_pthread_try=no fi ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5 printf "%s\n" "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; } @@ -8057,8 +7930,8 @@ if test ${ax_cv_PTHREAD_JOINABLE_ATTR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ax_cv_PTHREAD_JOINABLE_ATTR=unknown +else $as_nop + ax_cv_PTHREAD_JOINABLE_ATTR=unknown for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8078,8 +7951,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext done - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5 printf "%s\n" "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; } @@ -8099,15 +7971,14 @@ if test ${ax_cv_PTHREAD_SPECIAL_FLAGS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ax_cv_PTHREAD_SPECIAL_FLAGS=no +else $as_nop + ax_cv_PTHREAD_SPECIAL_FLAGS=no case $host_os in solaris*) ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" ;; esac - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5 printf "%s\n" "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; } @@ -8123,8 +7994,8 @@ if test ${ax_cv_PTHREAD_PRIO_INHERIT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -8139,14 +8010,12 @@ if ac_fn_c_try_link "$LINENO" then : ax_cv_PTHREAD_PRIO_INHERIT=yes -else case e in #( - e) ax_cv_PTHREAD_PRIO_INHERIT=no ;; -esac +else $as_nop + ax_cv_PTHREAD_PRIO_INHERIT=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 printf "%s\n" "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } @@ -8196,8 +8065,8 @@ if test ${ac_cv_prog_PTHREAD_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$PTHREAD_CC"; then +else $as_nop + if test -n "$PTHREAD_CC"; then ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -8219,8 +8088,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then @@ -8247,8 +8115,8 @@ if test ${ac_cv_prog_PTHREAD_CXX+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$PTHREAD_CXX"; then +else $as_nop + if test -n "$PTHREAD_CXX"; then ac_cv_prog_PTHREAD_CXX="$PTHREAD_CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -8270,8 +8138,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi PTHREAD_CXX=$ac_cv_prog_PTHREAD_CXX if test -n "$PTHREAD_CXX"; then @@ -8330,16 +8197,95 @@ printf "%s\n" "#define MYTHREAD_POSIX 1" >>confdefs.h - # This is nice to have but not mandatory. + # These are nice to have but not mandatory. + # + # FIXME: xz uses clock_gettime if it is available and can do + # it even when threading is disabled. Moving this outside + # of pthread detection may be undesirable because then + # liblzma may get linked against librt even when librt isn't + # needed by liblzma. OLD_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - ac_fn_c_check_func "$LINENO" "pthread_condattr_setclock" "ac_cv_func_pthread_condattr_setclock" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +printf %s "checking for library containing clock_gettime... " >&6; } +if test ${ac_cv_search_clock_gettime+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char clock_gettime (); +int +main (void) +{ +return clock_gettime (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_clock_gettime=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_clock_gettime+y} +then : + break +fi +done +if test ${ac_cv_search_clock_gettime+y} +then : + +else $as_nop + ac_cv_search_clock_gettime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +printf "%s\n" "$ac_cv_search_clock_gettime" >&6; } +ac_res=$ac_cv_search_clock_gettime +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" +if test "x$ac_cv_func_clock_gettime" = xyes +then : + printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pthread_condattr_setclock" "ac_cv_func_pthread_condattr_setclock" if test "x$ac_cv_func_pthread_condattr_setclock" = xyes then : printf "%s\n" "#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1" >>confdefs.h fi + ac_fn_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_have_decl_CLOCK_MONOTONIC" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_CLOCK_MONOTONIC" = xyes +then : + +printf "%s\n" "#define HAVE_CLOCK_MONOTONIC 1" >>confdefs.h + +fi CFLAGS=$OLD_CFLAGS ;; #( win95) : @@ -8470,8 +8416,8 @@ if test ${ac_cv_path_SED+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +else $as_nop + 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 @@ -8496,10 +8442,9 @@ as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in #( +case `"$ac_path_SED" --version 2>&1` in *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -8534,8 +8479,7 @@ else ac_cv_path_SED=$SED fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 printf "%s\n" "$ac_cv_path_SED" >&6; } @@ -8555,161 +8499,13 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -printf %s "checking for grep that handles long lines and -e... " >&6; } -if test ${ac_cv_path_GREP+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in grep ggrep - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in #( -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -#( -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf "%s\n" "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -printf %s "checking for egrep... " >&6; } -if test ${ac_cv_path_EGREP+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in egrep - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in #( -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -#( -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf "%s\n" "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - EGREP_TRADITIONAL=$EGREP - ac_cv_path_EGREP_TRADITIONAL=$EGREP - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 printf %s "checking for fgrep... " >&6; } if test ${ac_cv_path_FGREP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +else $as_nop + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else if test -z "$FGREP"; then @@ -8731,10 +8527,9 @@ as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in #( +case `"$ac_path_FGREP" --version 2>&1` in *GNU*) ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -8770,8 +8565,7 @@ ac_cv_path_FGREP=$FGREP fi - fi ;; -esac + fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 printf "%s\n" "$ac_cv_path_FGREP" >&6; } @@ -8802,9 +8596,8 @@ if test ${with_gnu_ld+y} then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes -else case e in #( - e) with_gnu_ld=no ;; -esac +else $as_nop + with_gnu_ld=no fi ac_prog=ld @@ -8849,8 +8642,8 @@ if test ${lt_cv_path_LD+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -z "$LD"; then +else $as_nop + if test -z "$LD"; then lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do IFS=$lt_save_ifs @@ -8873,8 +8666,7 @@ IFS=$lt_save_ifs else lt_cv_path_LD=$LD # Let the user override the test with a path. -fi ;; -esac +fi fi LD=$lt_cv_path_LD @@ -8891,8 +8683,8 @@ if test ${lt_cv_prog_gnu_ld+y} then : printf %s "(cached) " >&6 -else case e in #( - e) # I'd rather use --version here, but apparently some GNU lds only accept -v. +else $as_nop + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 @@ -8920,8 +8711,8 @@ if test ${lt_cv_path_NM+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$NM"; then +else $as_nop + if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM=$NM else @@ -8968,8 +8759,7 @@ IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} -fi ;; -esac +fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 printf "%s\n" "$lt_cv_path_NM" >&6; } @@ -8990,8 +8780,8 @@ if test ${ac_cv_prog_DUMPBIN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$DUMPBIN"; then +else $as_nop + if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9013,8 +8803,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then @@ -9040,8 +8829,8 @@ if test ${ac_cv_prog_ac_ct_DUMPBIN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_DUMPBIN"; then +else $as_nop + if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9063,8 +8852,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then @@ -9118,8 +8906,8 @@ if test ${lt_cv_nm_interface+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_nm_interface="BSD nm" +else $as_nop + lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) @@ -9132,8 +8920,7 @@ if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi - rm -f conftest* ;; -esac + rm -f conftest* fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 printf "%s\n" "$lt_cv_nm_interface" >&6; } @@ -9144,8 +8931,8 @@ if test ${lt_cv_sys_max_cmd_len+y} then : printf %s "(cached) " >&6 -else case e in #( - e) i=0 +else $as_nop + i=0 teststring=ABCD case $build_os in @@ -9267,8 +9054,7 @@ fi ;; esac - ;; -esac + fi if test -n "$lt_cv_sys_max_cmd_len"; then @@ -9325,8 +9111,8 @@ if test ${lt_cv_to_host_file_cmd+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $host in +else $as_nop + case $host in *-*-mingw* ) case $build in *-*-mingw* ) # actually msys @@ -9357,8 +9143,7 @@ lt_cv_to_host_file_cmd=func_convert_file_noop ;; esac - ;; -esac + fi to_host_file_cmd=$lt_cv_to_host_file_cmd @@ -9374,8 +9159,8 @@ if test ${lt_cv_to_tool_file_cmd+y} then : printf %s "(cached) " >&6 -else case e in #( - e) #assume ordinary cross tools, or native build. +else $as_nop + #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in *-*-mingw* ) @@ -9386,8 +9171,7 @@ esac ;; esac - ;; -esac + fi to_tool_file_cmd=$lt_cv_to_tool_file_cmd @@ -9403,9 +9187,8 @@ if test ${lt_cv_ld_reload_flag+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_ld_reload_flag='-r' ;; -esac +else $as_nop + lt_cv_ld_reload_flag='-r' fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } @@ -9446,8 +9229,8 @@ if test ${ac_cv_prog_FILECMD+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$FILECMD"; then +else $as_nop + if test -n "$FILECMD"; then ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9469,8 +9252,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi FILECMD=$ac_cv_prog_FILECMD if test -n "$FILECMD"; then @@ -9492,8 +9274,8 @@ if test ${ac_cv_prog_ac_ct_FILECMD+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_FILECMD"; then +else $as_nop + if test -n "$ac_ct_FILECMD"; then ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9515,8 +9297,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD if test -n "$ac_ct_FILECMD"; then @@ -9556,8 +9337,8 @@ if test ${ac_cv_prog_OBJDUMP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$OBJDUMP"; then +else $as_nop + if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9579,8 +9360,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then @@ -9602,8 +9382,8 @@ if test ${ac_cv_prog_ac_ct_OBJDUMP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_OBJDUMP"; then +else $as_nop + if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9625,8 +9405,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then @@ -9664,8 +9443,8 @@ if test ${lt_cv_deplibs_check_method+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_file_magic_cmd='$MAGIC_CMD' +else $as_nop + lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' # Need to set the preceding variable on all platforms that support @@ -9858,8 +9637,7 @@ lt_cv_deplibs_check_method=pass_all ;; esac - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } @@ -9911,8 +9689,8 @@ if test ${ac_cv_prog_DLLTOOL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$DLLTOOL"; then +else $as_nop + if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9934,8 +9712,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then @@ -9957,8 +9734,8 @@ if test ${ac_cv_prog_ac_ct_DLLTOOL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_DLLTOOL"; then +else $as_nop + if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9980,8 +9757,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then @@ -10020,8 +9796,8 @@ if test ${lt_cv_sharedlib_from_linklib_cmd+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_sharedlib_from_linklib_cmd='unknown' +else $as_nop + lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in cygwin* | mingw* | pw32* | cegcc*) @@ -10041,8 +9817,7 @@ lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } @@ -10065,8 +9840,8 @@ if test ${ac_cv_prog_AR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$AR"; then +else $as_nop + if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -10088,8 +9863,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then @@ -10115,8 +9889,8 @@ if test ${ac_cv_prog_ac_ct_AR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_AR"; then +else $as_nop + if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -10138,8 +9912,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then @@ -10201,8 +9974,8 @@ if test ${lt_cv_ar_at_file+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_ar_at_file=no +else $as_nop + lt_cv_ar_at_file=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10239,8 +10012,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 printf "%s\n" "$lt_cv_ar_at_file" >&6; } @@ -10265,8 +10037,8 @@ if test ${ac_cv_prog_STRIP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$STRIP"; then +else $as_nop + if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -10288,8 +10060,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -10311,8 +10082,8 @@ if test ${ac_cv_prog_ac_ct_STRIP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_STRIP"; then +else $as_nop + if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -10334,8 +10105,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -10376,8 +10146,8 @@ if test ${ac_cv_prog_RANLIB+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$RANLIB"; then +else $as_nop + if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -10399,8 +10169,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then @@ -10422,8 +10191,8 @@ if test ${ac_cv_prog_ac_ct_RANLIB+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_RANLIB"; then +else $as_nop + if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -10445,8 +10214,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then @@ -10557,8 +10325,8 @@ if test ${lt_cv_sys_global_symbol_pipe+y} then : printf %s "(cached) " >&6 -else case e in #( - e) +else $as_nop + # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -10813,8 +10581,7 @@ lt_cv_sys_global_symbol_pipe= fi done - ;; -esac + fi if test -z "$lt_cv_sys_global_symbol_pipe"; then @@ -10878,9 +10645,8 @@ if test ${with_sysroot+y} then : withval=$with_sysroot; -else case e in #( - e) with_sysroot=no ;; -esac +else $as_nop + with_sysroot=no fi @@ -10915,8 +10681,8 @@ if test ${ac_cv_path_lt_DD+y} then : printf %s "(cached) " >&6 -else case e in #( - e) printf 0123456789abcdef0123456789abcdef >conftest.i +else $as_nop + printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i : ${lt_DD:=$DD} if test -z "$lt_DD"; then @@ -10952,8 +10718,7 @@ ac_cv_path_lt_DD=$lt_DD fi -rm -f conftest.i conftest2.i conftest.out ;; -esac +rm -f conftest.i conftest2.i conftest.out fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 printf "%s\n" "$ac_cv_path_lt_DD" >&6; } @@ -10964,8 +10729,8 @@ if test ${lt_cv_truncate_bin+y} then : printf %s "(cached) " >&6 -else case e in #( - e) printf 0123456789abcdef0123456789abcdef >conftest.i +else $as_nop + printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i lt_cv_truncate_bin= if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then @@ -10973,8 +10738,7 @@ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" fi rm -f conftest.i conftest2.i conftest.out -test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;; -esac +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 printf "%s\n" "$lt_cv_truncate_bin" >&6; } @@ -11184,8 +10948,8 @@ if test ${lt_cv_cc_needs_belf+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_ext=c +else $as_nop + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -11205,9 +10969,8 @@ if ac_fn_c_try_link "$LINENO" then : lt_cv_cc_needs_belf=yes -else case e in #( - e) lt_cv_cc_needs_belf=no ;; -esac +else $as_nop + lt_cv_cc_needs_belf=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11216,8 +10979,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } @@ -11275,8 +11037,8 @@ if test ${ac_cv_prog_MANIFEST_TOOL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$MANIFEST_TOOL"; then +else $as_nop + if test -n "$MANIFEST_TOOL"; then ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11298,8 +11060,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then @@ -11321,8 +11082,8 @@ if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_MANIFEST_TOOL"; then +else $as_nop + if test -n "$ac_ct_MANIFEST_TOOL"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11344,8 +11105,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -11377,16 +11137,15 @@ if test ${lt_cv_path_mainfest_tool+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_path_mainfest_tool=no +else $as_nop + lt_cv_path_mainfest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out cat conftest.err >&5 if $GREP 'Manifest Tool' conftest.out > /dev/null; then lt_cv_path_mainfest_tool=yes fi - rm -f conftest* ;; -esac + rm -f conftest* fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; } @@ -11409,8 +11168,8 @@ if test ${ac_cv_prog_DSYMUTIL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$DSYMUTIL"; then +else $as_nop + if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11432,8 +11191,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then @@ -11455,8 +11213,8 @@ if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_DSYMUTIL"; then +else $as_nop + if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11478,8 +11236,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then @@ -11513,8 +11270,8 @@ if test ${ac_cv_prog_NMEDIT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$NMEDIT"; then +else $as_nop + if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11536,8 +11293,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then @@ -11559,8 +11315,8 @@ if test ${ac_cv_prog_ac_ct_NMEDIT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_NMEDIT"; then +else $as_nop + if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11582,8 +11338,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then @@ -11617,8 +11372,8 @@ if test ${ac_cv_prog_LIPO+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$LIPO"; then +else $as_nop + if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11640,8 +11395,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then @@ -11663,8 +11417,8 @@ if test ${ac_cv_prog_ac_ct_LIPO+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_LIPO"; then +else $as_nop + if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11686,8 +11440,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then @@ -11721,8 +11474,8 @@ if test ${ac_cv_prog_OTOOL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$OTOOL"; then +else $as_nop + if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11744,8 +11497,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then @@ -11767,8 +11519,8 @@ if test ${ac_cv_prog_ac_ct_OTOOL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_OTOOL"; then +else $as_nop + if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11790,8 +11542,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then @@ -11825,8 +11576,8 @@ if test ${ac_cv_prog_OTOOL64+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$OTOOL64"; then +else $as_nop + if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11848,8 +11599,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then @@ -11871,8 +11621,8 @@ if test ${ac_cv_prog_ac_ct_OTOOL64+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_OTOOL64"; then +else $as_nop + if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11894,8 +11644,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then @@ -11952,8 +11701,8 @@ if test ${lt_cv_apple_cc_single_mod+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_apple_cc_single_mod=no +else $as_nop + lt_cv_apple_cc_single_mod=no if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE @@ -11979,8 +11728,7 @@ fi rm -rf libconftest.dylib* rm -f conftest.* - fi ;; -esac + fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } @@ -11990,8 +11738,8 @@ if test ${lt_cv_ld_exported_symbols_list+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_ld_exported_symbols_list=no +else $as_nop + lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" @@ -12009,15 +11757,13 @@ if ac_fn_c_try_link "$LINENO" then : lt_cv_ld_exported_symbols_list=yes -else case e in #( - e) lt_cv_ld_exported_symbols_list=no ;; -esac +else $as_nop + lt_cv_ld_exported_symbols_list=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } @@ -12027,8 +11773,8 @@ if test ${lt_cv_ld_force_load+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_ld_force_load=no +else $as_nop + lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF int forced_loaded() { return 2;} _LT_EOF @@ -12053,8 +11799,7 @@ fi rm -f conftest.err libconftest.a conftest conftest.c rm -rf conftest.dSYM - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 printf "%s\n" "$lt_cv_ld_force_load" >&6; } @@ -12148,8 +11893,8 @@ if test ${ac_cv_prog_AS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$AS"; then +else $as_nop + if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12171,8 +11916,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then @@ -12194,8 +11938,8 @@ if test ${ac_cv_prog_ac_ct_AS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_AS"; then +else $as_nop + if test -n "$ac_ct_AS"; then ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12217,8 +11961,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then @@ -12252,8 +11995,8 @@ if test ${ac_cv_prog_DLLTOOL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$DLLTOOL"; then +else $as_nop + if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12275,8 +12018,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then @@ -12298,8 +12040,8 @@ if test ${ac_cv_prog_ac_ct_DLLTOOL+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_DLLTOOL"; then +else $as_nop + if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12321,8 +12063,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then @@ -12356,8 +12097,8 @@ if test ${ac_cv_prog_OBJDUMP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$OBJDUMP"; then +else $as_nop + if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12379,8 +12120,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then @@ -12402,8 +12142,8 @@ if test ${ac_cv_prog_ac_ct_OBJDUMP+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_OBJDUMP"; then +else $as_nop + if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12425,8 +12165,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then @@ -12499,9 +12238,8 @@ IFS=$lt_save_ifs ;; esac -else case e in #( - e) enable_shared=yes ;; -esac +else $as_nop + enable_shared=yes fi @@ -12532,9 +12270,8 @@ IFS=$lt_save_ifs ;; esac -else case e in #( - e) enable_static=yes ;; -esac +else $as_nop + enable_static=yes fi @@ -12565,9 +12302,8 @@ IFS=$lt_save_ifs ;; esac -else case e in #( - e) pic_mode=default ;; -esac +else $as_nop + pic_mode=default fi @@ -12597,9 +12333,8 @@ IFS=$lt_save_ifs ;; esac -else case e in #( - e) enable_fast_install=yes ;; -esac +else $as_nop + enable_fast_install=yes fi @@ -12626,17 +12361,15 @@ ;; esac lt_cv_with_aix_soname=$with_aix_soname -else case e in #( - e) if test ${lt_cv_with_aix_soname+y} +else $as_nop + if test ${lt_cv_with_aix_soname+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_with_aix_soname=aix ;; -esac +else $as_nop + lt_cv_with_aix_soname=aix fi - with_aix_soname=$lt_cv_with_aix_soname ;; -esac + with_aix_soname=$lt_cv_with_aix_soname fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 @@ -12727,8 +12460,8 @@ if test ${lt_cv_objdir+y} then : printf %s "(cached) " >&6 -else case e in #( - e) rm -f .libs 2>/dev/null +else $as_nop + rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then lt_cv_objdir=.libs @@ -12736,8 +12469,7 @@ # MS-DOS does not allow filenames that begin with a dot. lt_cv_objdir=_libs fi -rmdir .libs 2>/dev/null ;; -esac +rmdir .libs 2>/dev/null fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 printf "%s\n" "$lt_cv_objdir" >&6; } @@ -12798,8 +12530,8 @@ if test ${lt_cv_path_MAGIC_CMD+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $MAGIC_CMD in +else $as_nop + case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; @@ -12842,7 +12574,6 @@ IFS=$lt_save_ifs MAGIC_CMD=$lt_save_MAGIC_CMD ;; -esac ;; esac fi @@ -12866,8 +12597,8 @@ if test ${lt_cv_path_MAGIC_CMD+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $MAGIC_CMD in +else $as_nop + case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; @@ -12910,7 +12641,6 @@ IFS=$lt_save_ifs MAGIC_CMD=$lt_save_MAGIC_CMD ;; -esac ;; esac fi @@ -13010,8 +12740,8 @@ if test ${lt_cv_prog_compiler_rtti_exceptions+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_prog_compiler_rtti_exceptions=no +else $as_nop + lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment @@ -13039,8 +12769,7 @@ fi fi $RM conftest* - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } @@ -13405,9 +13134,8 @@ if test ${lt_cv_prog_compiler_pic+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;; -esac +else $as_nop + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } @@ -13422,8 +13150,8 @@ if test ${lt_cv_prog_compiler_pic_works+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_prog_compiler_pic_works=no +else $as_nop + lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment @@ -13451,8 +13179,7 @@ fi fi $RM conftest* - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } @@ -13488,8 +13215,8 @@ if test ${lt_cv_prog_compiler_static_works+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_prog_compiler_static_works=no +else $as_nop + lt_cv_prog_compiler_static_works=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -13510,8 +13237,7 @@ fi $RM -r conftest* LDFLAGS=$save_LDFLAGS - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } @@ -13533,8 +13259,8 @@ if test ${lt_cv_prog_compiler_c_o+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_prog_compiler_c_o=no +else $as_nop + lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest cd conftest @@ -13574,8 +13300,7 @@ cd .. $RM -r conftest $RM conftest* - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } @@ -13590,8 +13315,8 @@ if test ${lt_cv_prog_compiler_c_o+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_prog_compiler_c_o=no +else $as_nop + lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest cd conftest @@ -13631,8 +13356,7 @@ cd .. $RM -r conftest $RM conftest* - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } @@ -14227,8 +13951,8 @@ if test ${lt_cv_aix_libpath_+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -14260,8 +13984,7 @@ if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib fi - ;; -esac + fi aix_libpath=$lt_cv_aix_libpath_ @@ -14283,8 +14006,8 @@ if test ${lt_cv_aix_libpath_+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -14316,8 +14039,7 @@ if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib fi - ;; -esac + fi aix_libpath=$lt_cv_aix_libpath_ @@ -14568,8 +14290,8 @@ if test ${lt_cv_prog_compiler__b+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_prog_compiler__b=no +else $as_nop + lt_cv_prog_compiler__b=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -14590,8 +14312,7 @@ fi $RM -r conftest* LDFLAGS=$save_LDFLAGS - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } @@ -14639,8 +14360,8 @@ if test ${lt_cv_irix_exported_symbol+y} then : printf %s "(cached) " >&6 -else case e in #( - e) save_LDFLAGS=$LDFLAGS +else $as_nop + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14649,14 +14370,12 @@ if ac_fn_c_try_link "$LINENO" then : lt_cv_irix_exported_symbol=yes -else case e in #( - e) lt_cv_irix_exported_symbol=no ;; -esac +else $as_nop + lt_cv_irix_exported_symbol=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS ;; -esac + LDFLAGS=$save_LDFLAGS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } @@ -14982,8 +14701,8 @@ if test ${lt_cv_archive_cmds_need_lc+y} then : printf %s "(cached) " >&6 -else case e in #( - e) $RM conftest* +else $as_nop + $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -15019,8 +14738,7 @@ cat conftest.err 1>&5 fi $RM conftest* - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } @@ -15747,8 +15465,8 @@ if test ${lt_cv_shlibpath_overrides_runpath+y} then : printf %s "(cached) " >&6 -else case e in #( - e) lt_cv_shlibpath_overrides_runpath=no +else $as_nop + lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ @@ -15775,8 +15493,7 @@ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir - ;; -esac + fi shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath @@ -16201,22 +15918,16 @@ if test ${ac_cv_lib_dl_dlopen+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (void); + builtin and then its argument prototype would still apply. */ +char dlopen (); int main (void) { @@ -16228,27 +15939,24 @@ if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dl_dlopen=yes -else case e in #( - e) ac_cv_lib_dl_dlopen=no ;; -esac +else $as_nop + ac_cv_lib_dl_dlopen=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else case e in #( - e) +else $as_nop + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes - ;; -esac + fi ;; @@ -16266,28 +15974,22 @@ if test "x$ac_cv_func_shl_load" = xyes then : lt_cv_dlopen=shl_load -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 printf %s "checking for shl_load in -ldld... " >&6; } if test ${ac_cv_lib_dld_shl_load+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (void); + builtin and then its argument prototype would still apply. */ +char shl_load (); int main (void) { @@ -16299,47 +16001,39 @@ if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dld_shl_load=yes -else case e in #( - e) ac_cv_lib_dld_shl_load=no ;; -esac +else $as_nop + ac_cv_lib_dld_shl_load=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes then : lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld -else case e in #( - e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +else $as_nop + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes then : lt_cv_dlopen=dlopen -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 printf %s "checking for dlopen in -ldl... " >&6; } if test ${ac_cv_lib_dl_dlopen+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (void); + builtin and then its argument prototype would still apply. */ +char dlopen (); int main (void) { @@ -16351,42 +16045,34 @@ if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dl_dlopen=yes -else case e in #( - e) ac_cv_lib_dl_dlopen=no ;; -esac +else $as_nop + ac_cv_lib_dl_dlopen=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 printf %s "checking for dlopen in -lsvld... " >&6; } if test ${ac_cv_lib_svld_dlopen+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (void); + builtin and then its argument prototype would still apply. */ +char dlopen (); int main (void) { @@ -16398,42 +16084,34 @@ if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_svld_dlopen=yes -else case e in #( - e) ac_cv_lib_svld_dlopen=no ;; -esac +else $as_nop + ac_cv_lib_svld_dlopen=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 printf %s "checking for dld_link in -ldld... " >&6; } if test ${ac_cv_lib_dld_dld_link+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_check_lib_save_LIBS=$LIBS +else $as_nop + ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (void); + builtin and then its argument prototype would still apply. */ +char dld_link (); int main (void) { @@ -16445,14 +16123,12 @@ if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dld_dld_link=yes -else case e in #( - e) ac_cv_lib_dld_dld_link=no ;; -esac +else $as_nop + ac_cv_lib_dld_dld_link=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS ;; -esac +LIBS=$ac_check_lib_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } @@ -16461,24 +16137,19 @@ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi - ;; -esac + fi - ;; -esac + fi - ;; -esac + fi - ;; -esac + fi - ;; -esac + fi ;; @@ -16506,8 +16177,8 @@ if test ${lt_cv_dlopen_self+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test yes = "$cross_compiling"; then : +else $as_nop + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -16601,8 +16272,7 @@ fi rm -fr conftest* - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 printf "%s\n" "$lt_cv_dlopen_self" >&6; } @@ -16614,8 +16284,8 @@ if test ${lt_cv_dlopen_self_static+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test yes = "$cross_compiling"; then : +else $as_nop + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -16709,8 +16379,7 @@ fi rm -fr conftest* - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } @@ -16884,8 +16553,8 @@ if test ${ac_cv_prog_RC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$RC"; then +else $as_nop + if test -n "$RC"; then ac_cv_prog_RC="$RC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -16907,8 +16576,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi RC=$ac_cv_prog_RC if test -n "$RC"; then @@ -16930,8 +16598,8 @@ if test ${ac_cv_prog_ac_ct_RC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_RC"; then +else $as_nop + if test -n "$ac_ct_RC"; then ac_cv_prog_ac_ct_RC="$ac_ct_RC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -16953,8 +16621,7 @@ done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_RC=$ac_cv_prog_ac_ct_RC if test -n "$ac_ct_RC"; then @@ -17085,9 +16752,8 @@ if test ${enable_symbol_versions+y} then : enableval=$enable_symbol_versions; -else case e in #( - e) enable_symbol_versions=auto ;; -esac +else $as_nop + enable_symbol_versions=auto fi if test "x$enable_symbol_versions" = xauto; then @@ -17206,9 +16872,8 @@ if test ${enable_nls+y} then : enableval=$enable_nls; USE_NLS=$enableval -else case e in #( - e) USE_NLS=yes ;; -esac +else $as_nop + USE_NLS=yes fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 @@ -17256,8 +16921,8 @@ if test ${ac_cv_path_MSGFMT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case "$MSGFMT" in +else $as_nop + case "$MSGFMT" in [\\/]* | ?:[\\/]*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; @@ -17280,7 +16945,6 @@ IFS="$ac_save_IFS" test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" ;; -esac ;; esac fi MSGFMT="$ac_cv_path_MSGFMT" @@ -17299,8 +16963,8 @@ if test ${ac_cv_path_GMSGFMT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $GMSGFMT in +else $as_nop + case $GMSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; @@ -17326,7 +16990,6 @@ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; -esac ;; esac fi GMSGFMT=$ac_cv_path_GMSGFMT @@ -17381,8 +17044,8 @@ if test ${ac_cv_path_XGETTEXT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case "$XGETTEXT" in +else $as_nop + case "$XGETTEXT" in [\\/]* | ?:[\\/]*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; @@ -17405,7 +17068,6 @@ IFS="$ac_save_IFS" test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ;; -esac ;; esac fi XGETTEXT="$ac_cv_path_XGETTEXT" @@ -17460,8 +17122,8 @@ if test ${ac_cv_path_MSGMERGE+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case "$MSGMERGE" in +else $as_nop + case "$MSGMERGE" in [\\/]* | ?:[\\/]*) ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ;; @@ -17483,7 +17145,6 @@ IFS="$ac_save_IFS" test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" ;; -esac ;; esac fi MSGMERGE="$ac_cv_path_MSGMERGE" @@ -17535,9 +17196,8 @@ if test ${with_gnu_ld+y} then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else case e in #( - e) with_gnu_ld=no ;; -esac +else $as_nop + with_gnu_ld=no fi # Prepare PATH_SEPARATOR. @@ -17573,14 +17233,14 @@ if test ${acl_cv_path_LD+y} then : printf %s "(cached) " >&6 -else case e in #( - e) +else $as_nop + acl_cv_path_LD= # Final result of this test ac_prog=ld # Program to search in $PATH if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. case $host in - *-*-mingw* | windows*) + *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) @@ -17667,21 +17327,19 @@ if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) # The compiler produces 32-bit code. Add option '-m elf32_sparc' +else $as_nop + # The compiler produces 32-bit code. Add option '-m elf32_sparc' # so that the linker groks 32-bit object files. case "$acl_cv_path_LD " in *" -m elf32_sparc "*) ;; *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;; esac - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac - ;; -esac + fi LD="$acl_cv_path_LD" @@ -17699,8 +17357,8 @@ if test ${acl_cv_prog_gnu_ld+y} then : printf %s "(cached) " >&6 -else case e in #( - e) # I'd rather use --version here, but apparently some GNU lds only accept -v. +else $as_nop + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 @@ -17724,15 +17381,14 @@ if test ${acl_cv_rpath+y} then : printf %s "(cached) " >&6 -else case e in #( - e) +else $as_nop + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh . ./conftest.sh rm -f ./conftest.sh acl_cv_rpath=done - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 printf "%s\n" "$acl_cv_rpath" >&6; } @@ -17749,9 +17405,8 @@ if test ${enable_rpath+y} then : enableval=$enable_rpath; : -else case e in #( - e) enable_rpath=yes ;; -esac +else $as_nop + enable_rpath=yes fi @@ -17762,12 +17417,12 @@ if test ${gl_cv_host_cpu_c_abi_32bit+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$gl_cv_host_cpu_c_abi"; then - case "$gl_cv_host_cpu_c_abi" in +else $as_nop + 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 ;; - x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) gl_cv_host_cpu_c_abi_32bit=no ;; *) gl_cv_host_cpu_c_abi_32bit=unknown ;; @@ -17827,14 +17482,13 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=no -else case e in #( - e) gl_cv_host_cpu_c_abi_32bit=yes ;; -esac +else $as_nop + gl_cv_host_cpu_c_abi_32bit=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; - arm* | aarch64 | aarch64c ) + arm* | aarch64 ) # Assume arm with EABI. # On arm64 systems, the C compiler may be generating code in one of # these ABIs: @@ -17853,9 +17507,8 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=no -else case e in #( - e) gl_cv_host_cpu_c_abi_32bit=yes ;; -esac +else $as_nop + gl_cv_host_cpu_c_abi_32bit=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -17875,9 +17528,8 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=no -else case e in #( - e) gl_cv_host_cpu_c_abi_32bit=yes ;; -esac +else $as_nop + gl_cv_host_cpu_c_abi_32bit=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -17897,9 +17549,8 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=yes -else case e in #( - e) gl_cv_host_cpu_c_abi_32bit=no ;; -esac +else $as_nop + gl_cv_host_cpu_c_abi_32bit=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -17919,9 +17570,8 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=no -else case e in #( - e) gl_cv_host_cpu_c_abi_32bit=yes ;; -esac +else $as_nop + gl_cv_host_cpu_c_abi_32bit=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -17945,9 +17595,8 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=no -else case e in #( - e) gl_cv_host_cpu_c_abi_32bit=yes ;; -esac +else $as_nop + gl_cv_host_cpu_c_abi_32bit=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -17971,9 +17620,8 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=no -else case e in #( - e) gl_cv_host_cpu_c_abi_32bit=yes ;; -esac +else $as_nop + gl_cv_host_cpu_c_abi_32bit=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -17993,9 +17641,8 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=no -else case e in #( - e) gl_cv_host_cpu_c_abi_32bit=yes ;; -esac +else $as_nop + gl_cv_host_cpu_c_abi_32bit=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -18015,9 +17662,8 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_host_cpu_c_abi_32bit=no -else case e in #( - e) gl_cv_host_cpu_c_abi_32bit=yes ;; -esac +else $as_nop + gl_cv_host_cpu_c_abi_32bit=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -18027,8 +17673,7 @@ ;; esac fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5 printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; } @@ -18044,8 +17689,8 @@ if test ${gl_cv_elf+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined __ELF__ || (defined __linux__ && defined __EDG__) Extensible Linking Format @@ -18053,17 +17698,15 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1 + $EGREP "Extensible Linking Format" >/dev/null 2>&1 then : gl_cv_elf=yes -else case e in #( - e) gl_cv_elf=no ;; -esac +else $as_nop + gl_cv_elf=no fi rm -rf conftest* - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5 printf "%s\n" "$gl_cv_elf" >&6; } @@ -18122,8 +17765,8 @@ if test ${acl_cv_libdirstems+y} then : printf %s "(cached) " >&6 -else case e in #( - e) acl_libdirstem=lib +else $as_nop + acl_libdirstem=lib acl_libdirstem2= acl_libdirstem3= case "$host_os" in @@ -18184,8 +17827,7 @@ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem" acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3" - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5 printf "%s\n" "$acl_cv_libdirstems" >&6; } @@ -18690,23 +18332,6 @@ - gl_am_configmake=`grep -aErls "#{4}[[:alnum:]]{5}#{4}$" $srcdir/ 2>/dev/null` - if test -n "$gl_am_configmake"; then - HAVE_PKG_CONFIGMAKE=1 - else - HAVE_PKG_CONFIGMAKE=0 - fi - - gl_sed_double_backslashes='s/\\/\\\\/g' - gl_sed_escape_doublequotes='s/"/\\"/g' - gl_path_map='tr "\t \-_" " \t_\-"' - gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" - gl_sed_escape_for_make_2='s,\$,\\$$,g' - case `echo r | tr -d '\r'` in - '') gl_tr_cr='\015' ;; - *) gl_tr_cr='\r' ;; - esac - @@ -18734,8 +18359,8 @@ if test ${gt_cv_func_CFPreferencesCopyAppValue+y} then : printf %s "(cached) " >&6 -else case e in #( - e) gt_save_LIBS="$LIBS" +else $as_nop + gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18751,14 +18376,12 @@ if ac_fn_c_try_link "$LINENO" then : gt_cv_func_CFPreferencesCopyAppValue=yes -else case e in #( - e) gt_cv_func_CFPreferencesCopyAppValue=no ;; -esac +else $as_nop + gt_cv_func_CFPreferencesCopyAppValue=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" ;; -esac + LIBS="$gt_save_LIBS" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } @@ -18772,8 +18395,8 @@ if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y} then : printf %s "(cached) " >&6 -else case e in #( - e) gt_save_LIBS="$LIBS" +else $as_nop + gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18789,14 +18412,12 @@ if ac_fn_c_try_link "$LINENO" then : gt_cv_func_CFLocaleCopyPreferredLanguages=yes -else case e in #( - e) gt_cv_func_CFLocaleCopyPreferredLanguages=no ;; -esac +else $as_nop + gt_cv_func_CFLocaleCopyPreferredLanguages=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" ;; -esac + LIBS="$gt_save_LIBS" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5 printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; } @@ -18808,7 +18429,7 @@ INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" fi @@ -18853,8 +18474,8 @@ if eval test \${$gt_func_gnugettext_libc+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -18881,13 +18502,11 @@ if ac_fn_c_try_link "$LINENO" then : eval "$gt_func_gnugettext_libc=yes" -else case e in #( - e) eval "$gt_func_gnugettext_libc=no" ;; -esac +else $as_nop + eval "$gt_func_gnugettext_libc=no" fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext ;; -esac + conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$gt_func_gnugettext_libc { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -18929,8 +18548,8 @@ if test ${am_cv_func_iconv+y} then : printf %s "(cached) " >&6 -else case e in #( - e) +else $as_nop + am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18983,8 +18602,7 @@ conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 printf "%s\n" "$am_cv_func_iconv" >&6; } @@ -18994,8 +18612,8 @@ if test ${am_cv_func_iconv_works+y} then : printf %s "(cached) " >&6 -else case e in #( - e) +else $as_nop + am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" @@ -19008,8 +18626,8 @@ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; esac -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -19138,15 +18756,13 @@ am_cv_func_iconv_works=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac + conftest.$ac_objext conftest.beam conftest.$ac_ext fi test "$am_cv_func_iconv_works" = no || break done LIBS="$am_save_LIBS" - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 printf "%s\n" "$am_cv_func_iconv_works" >&6; } @@ -19672,8 +19288,8 @@ if eval test \${$gt_func_gnugettext_libintl+y} then : printf %s "(cached) " >&6 -else case e in #( - e) gt_save_CPPFLAGS="$CPPFLAGS" +else $as_nop + gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" @@ -19708,20 +19324,13 @@ if ac_fn_c_try_link "$LINENO" then : eval "$gt_func_gnugettext_libintl=yes" -else case e in #( - e) eval "$gt_func_gnugettext_libintl=no" ;; -esac +else $as_nop + eval "$gt_func_gnugettext_libintl=no" fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" - - case "$host_os" in - aix*) gt_LIBINTL_EXTRA="-lpthread" ;; - esac - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \ - && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then - LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA" + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19752,8 +19361,8 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : - LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA" - LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA" + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" eval "$gt_func_gnugettext_libintl=yes" fi @@ -19761,8 +19370,7 @@ conftest$ac_exeext conftest.$ac_ext fi CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS" ;; -esac + LIBS="$gt_save_LIBS" fi eval ac_res=\$$gt_func_gnugettext_libintl { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -19772,8 +19380,7 @@ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools \ - && test "$PACKAGE" != libintl; }; then + && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes else LIBINTL= @@ -19867,53 +19474,7 @@ - - INTLLIBS="$LIBINTL" - - - - - - - - gt_save_prefix="${prefix}" - gt_save_datarootdir="${datarootdir}" - gt_save_localedir="${localedir}" - if test "X$prefix" = "XNONE"; then - prefix="$ac_default_prefix" - fi - eval datarootdir="$datarootdir" - eval localedir="$localedir" - - - - - - gl_final_localedir="$localedir" - gl_localedir_prefix=`echo $gl_am_configmake | sed "s/.*\.//g"` - case "$build_os" in - cygwin*) - case "$host_os" in - mingw* | windows*) - gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;; - esac - ;; - esac - localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"` - localedir_c='"'"$localedir_c"'"' - - - localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"` - if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then - localedir_c_make='\"$(localedir)\"' - fi - if test "x$gl_am_configmake" != "x"; then - gl_localedir_config='sed \"r\n\" $gl_am_configmake | eval $gl_path_map | $gl_localedir_prefix -d 2>/dev/null' - else - gl_localedir_config='' - fi - - + INTLLIBS="$LIBINTL" @@ -19922,27 +19483,6 @@ - - - - - - - - - - - - - ac_config_commands="$ac_config_commands build-to-host" - - - localedir="${gt_save_localedir}" - datarootdir="${gt_save_datarootdir}" - prefix="${gt_save_prefix}" - - - ############################################################################### # Checks for header files. ############################################################################### @@ -19954,17 +19494,16 @@ # these headers are missing. for ac_header in fcntl.h limits.h sys/time.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"` + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes" then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 +#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else case e in #( - e) as_fn_error $? "Required header file(s) are missing." "$LINENO" 5 ;; -esac +else $as_nop + as_fn_error $? "Required header file(s) are missing." "$LINENO" 5 fi done @@ -19999,25 +19538,25 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99 or later" >&5 -printf %s "checking for stdbool.h that conforms to C99 or later... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 +printf %s "checking for stdbool.h that conforms to C99... " >&6; } if test ${ac_cv_header_stdbool_h+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - /* "true" and "false" should be usable in #if expressions and - integer constant expressions, and "bool" should be a valid - type name. - - Although C99 requires bool, true, and false to be macros, - C23 and C++11 overrule that, so do not test for that. - Although C99 requires __bool_true_false_are_defined and - _Bool, C23 says they are obsolescent, so do not require - them. */ + #ifndef __bool_true_false_are_defined + #error "__bool_true_false_are_defined is not defined" + #endif + char a[__bool_true_false_are_defined == 1 ? 1 : -1]; + + /* Regardless of whether this is C++ or "_Bool" is a + valid type name, "true" and "false" should be usable + in #if expressions and integer constant expressions, + and "bool" should be a valid type name. */ #if !true #error "'true' is not true" @@ -20051,12 +19590,43 @@ char n[sizeof m == h * sizeof m[0] ? 1 : -1]; char o[-1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See - https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html */ bool p = true; bool *pp = &p; + /* C 1999 specifies that bool, true, and false are to be + macros, but C++ 2011 and later overrule this. */ + #if __cplusplus < 201103 + #ifndef bool + #error "bool is not defined" + #endif + #ifndef false + #error "false is not defined" + #endif + #ifndef true + #error "true is not defined" + #endif + #endif + + /* If _Bool is available, repeat with it all the tests + above that used bool. */ + #ifdef HAVE__BOOL + struct sB { _Bool s: 1; _Bool t; } t; + + char q[(_Bool) 0.5 == true ? 1 : -1]; + char r[(_Bool) 0.0 == false ? 1 : -1]; + char u[sizeof (_Bool) > 0 ? 1 : -1]; + char v[sizeof t.t > 0 ? 1 : -1]; + + _Bool w[h]; + char x[sizeof m == h * sizeof m[0] ? 1 : -1]; + char y[-1 - (_Bool) 0 < 0 ? 1 : -1]; + _Bool z = true; + _Bool *pz = &p; + #endif + int main (void) { @@ -20065,10 +19635,20 @@ *pp |= p; *pp |= ! p; + #ifdef HAVE__BOOL + _Bool pt = &t; + *pz |= z; + *pz |= ! z; + #endif + /* Refer to every declared value, so they cannot be discarded as unused. */ - return (!b + !c + !d + !e + !f + !g + !h + !i + !j + !k - + !l + !m + !n + !o + !p + !pp + !ps); + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k + + !l + !m + !n + !o + !p + !pp + !ps + #ifdef HAVE__BOOL + + !q + !r + !u + !v + !w + !x + !y + !z + !pt + #endif + ); ; return 0; @@ -20077,12 +19657,10 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_header_stdbool_h=yes -else case e in #( - e) ac_cv_header_stdbool_h=no ;; -esac +else $as_nop + ac_cv_header_stdbool_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 printf "%s\n" "$ac_cv_header_stdbool_h" >&6; } @@ -20165,8 +19743,8 @@ printf "%s\n" "#define HAVE_UINTPTR_T 1" >>confdefs.h -else case e in #( - e) for ac_type in 'unsigned int' 'unsigned long int' \ +else $as_nop + for ac_type in 'unsigned int' 'unsigned long int' \ 'unsigned long long int'; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20191,38 +19769,35 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test -z "$ac_type" && break - done ;; -esac + done fi # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 printf %s "checking size of size_t... " >&6; } if test ${ac_cv_sizeof_size_t+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default" +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default" then : -else case e in #( - e) if test "$ac_cv_type_size_t" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + if test "$ac_cv_type_size_t" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (size_t) -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_size_t=0 - fi ;; -esac + fi fi - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 printf "%s\n" "$ac_cv_sizeof_size_t" >&6; } @@ -20283,34 +19858,31 @@ then : enableval=$enable_largefile; fi -if test "$enable_largefile,$enable_year2038" != no,no -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5 -printf %s "checking for $CC option to enable large file support... " >&6; } -if test ${ac_cv_sys_largefile_opts+y} + +if test "$enable_largefile" != no; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_CC="$CC" - ac_opt_found=no - for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do - if test x"$ac_opt" != x"none needed" -then : - CC="$ac_save_CC $ac_opt" -fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -#ifndef FTYPE -# define FTYPE off_t -#endif - /* Check that FTYPE can represent 2**63 - 1 correctly. - We can't simply define LARGE_FTYPE to be 9223372036854775807, + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31)) - int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721 - && LARGE_FTYPE % 2147483647 == 1) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int main (void) @@ -20320,88 +19892,142 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - if test x"$ac_opt" = x"none needed" -then : - # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. - CC="$CC -DFTYPE=ino_t" if ac_fn_c_try_compile "$LINENO" then : - -else case e in #( - e) CC="$CC -D_FILE_OFFSET_BITS=64" - if ac_fn_c_try_compile "$LINENO" -then : - ac_opt='-D_FILE_OFFSET_BITS=64' + break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_largefile_CC=' -n32'; break fi rm -f core conftest.err conftest.$ac_objext conftest.beam + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi fi - ac_cv_sys_largefile_opts=$ac_opt - ac_opt_found=yes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=no; break fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - test $ac_opt_found = no || break - done - CC="$ac_save_CC" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ - test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;; -esac + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=64; break fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 -printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; } - -ac_have_largefile=yes -case $ac_cv_sys_largefile_opts in #( - "none needed") : - ;; #( - "supported through gnulib") : - ;; #( - "support not detected") : - ac_have_largefile=no ;; #( - "-D_FILE_OFFSET_BITS=64") : - -printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h - ;; #( - "-D_LARGE_FILES=1") : - -printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h - ;; #( - "-n32") : - CC="$CC -n32" ;; #( - *) : - as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;; +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h +;; esac - -if test "$enable_year2038" != no -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5 -printf %s "checking for $CC option for timestamps after 2038... " >&6; } -if test ${ac_cv_sys_year2038_opts+y} +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_CPPFLAGS="$CPPFLAGS" - ac_opt_found=no - for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do - if test x"$ac_opt" != x"none needed" +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" then : - CPPFLAGS="$ac_save_CPPFLAGS $ac_opt" + ac_cv_sys_large_files=no; break fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - #include - /* Check that time_t can represent 2**32 - 1 correctly. */ - #define LARGE_TIME_T \\ - ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) - int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 - && LARGE_TIME_T % 65537 == 0) - ? 1 : -1]; - +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main (void) { @@ -20412,54 +20038,32 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_year2038_opts="$ac_opt" - ac_opt_found=yes + ac_cv_sys_large_files=1; break fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - test $ac_opt_found = no || break - done - CPPFLAGS="$ac_save_CPPFLAGS" - test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;; -esac + ac_cv_sys_large_files=unknown + break +done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 -printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; } - -ac_have_year2038=yes -case $ac_cv_sys_year2038_opts in #( - "none needed") : - ;; #( - "support not detected") : - ac_have_year2038=no ;; #( - "-D_TIME_BITS=64") : - -printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h - ;; #( - "-D__MINGW_USE_VC2005_COMPAT") : - -printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h - ;; #( - "-U_USE_32_BIT_TIME_T"*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} -as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It -will stop working after mid-January 2038. Remove -_USE_32BIT_TIME_T from the compiler flags. -See 'config.log' for more details" "$LINENO" 5; } ;; #( - *) : - as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h +;; esac - +rm -rf conftest* + fi fi -fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 printf %s "checking whether byte ordering is bigendian... " >&6; } if test ${ac_cv_c_bigendian+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_c_bigendian=unknown +else $as_nop + ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20505,8 +20109,8 @@ int main (void) { -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ && LITTLE_ENDIAN) bogus endian macros #endif @@ -20537,9 +20141,8 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_bigendian=yes -else case e in #( - e) ac_cv_c_bigendian=no ;; -esac +else $as_nop + ac_cv_c_bigendian=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -20583,9 +20186,8 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_bigendian=yes -else case e in #( - e) ac_cv_c_bigendian=no ;; -esac +else $as_nop + ac_cv_c_bigendian=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -20612,23 +20214,22 @@ int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; } - int - main (int argc, char **argv) - { - /* Intimidate the compiler so that it does not - optimize the arrays away. */ - char *p = argv[0]; - ascii_mm[1] = *p++; ebcdic_mm[1] = *p++; - ascii_ii[1] = *p++; ebcdic_ii[1] = *p++; - return use_ascii (argc) == use_ebcdic (*p); - } + extern int foo; + +int +main (void) +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} _ACEOF -if ac_fn_c_try_link "$LINENO" +if ac_fn_c_try_compile "$LINENO" then : - if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi - if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then if test "$ac_cv_c_bigendian" = unknown; then ac_cv_c_bigendian=no else @@ -20637,10 +20238,9 @@ fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -20663,17 +20263,14 @@ if ac_fn_c_try_run "$LINENO" then : ac_cv_c_bigendian=no -else case e in #( - e) ac_cv_c_bigendian=yes ;; -esac +else $as_nop + ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi ;; -esac + fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 printf "%s\n" "$ac_cv_c_bigendian" >&6; } @@ -20726,16 +20323,16 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$OLD_CFLAGS" + # The Win95 threading lacks a thread-safe one-time initialization function. # The one-time initialization is needed for crc32_small.c and crc64_small.c # create the CRC tables. So if small mode is enabled, the threading mode is @@ -20750,194 +20347,13 @@ __attribute__((__constructor__))" "$LINENO" 5 fi -# __attribute__((__ifunc__())) can be used to choose between different -# implementations of the same function at runtime. This is slightly more -# efficient than using __attribute__((__constructor__)) and setting -# a function pointer. -# Check whether --enable-ifunc was given. -if test ${enable_ifunc+y} -then : - enableval=$enable_ifunc; -else case e in #( - e) enable_ifunc=auto ;; -esac -fi - - -# When enable_ifunc is 'auto', allow the use of __attribute__((__ifunc__())) -# if compiler support is detected and we are building for GNU/Linux (glibc) -# or FreeBSD. uClibc and musl don't support ifunc in their dynamic linkers -# but some compilers still accept the attribute when compiling for these -# C libraries, which results in broken binaries. That's why we need to -# check which libc is being used. -if test "x$enable_ifunc" = xauto ; then - OLD_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if __attribute__((__ifunc__())) can be used" >&5 -printf %s "checking if __attribute__((__ifunc__())) can be used... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - /* - * Force a compilation error when not using glibc on Linux - * or if we are not using FreeBSD. uClibc will define - * __GLIBC__ but does not support ifunc, so we must have - * an extra check to disable with uClibc. - */ - #if defined(__linux__) - # include - # if !defined(__GLIBC__) || defined(__UCLIBC__) - compile error - # endif - #elif !defined(__FreeBSD__) - compile error - #endif - - static void func(void) { return; } - static void (*resolve_func (void)) (void) { return func; } - void func_ifunc (void) - __attribute__((__ifunc__("resolve_func"))); - /* - * 'clang -Wall' incorrectly warns that resolve_func is - * unused (-Wunused-function). Correct assembly output is - * still produced. This problem exists at least in Clang - * versions 4 to 17. The following silences the bogus warning: - */ - void make_clang_quiet(void); - void make_clang_quiet(void) { resolve_func()(); } - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - enable_ifunc=yes - -else case e in #( - e) - enable_ifunc=no - ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_ifunc" >&5 -printf "%s\n" "$enable_ifunc" >&6; } - - CFLAGS="$OLD_CFLAGS" -fi - -if test "x$enable_ifunc" = xyes ; then - -printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_IFUNC 1" >>confdefs.h - - - # ifunc explicitly does not work with -fsanitize=address. - # If configured, it will result in a liblzma build that will fail - # when liblzma is loaded at runtime (when the ifunc resolver - # executes). - case $CFLAGS in #( - *-fsanitize=*) : - as_fn_error $? " - CFLAGS contains '-fsanitize=' which is incompatible with ifunc. - Use --disable-ifunc when using '-fsanitize'." "$LINENO" 5 ;; #( - *) : - ;; -esac -fi - - ############################################################################### # Checks for library functions. ############################################################################### # Gnulib replacements as needed -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 -printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } -if test ${ac_cv_c_undeclared_builtin_options+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) ac_save_CFLAGS=$CFLAGS - ac_cv_c_undeclared_builtin_options='cannot detect' - for ac_arg in '' -fno-builtin; do - CFLAGS="$ac_save_CFLAGS $ac_arg" - # This test program should *not* compile successfully. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main (void) -{ -(void) strchr; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - -else case e in #( - e) # This test program should compile successfully. - # No library function is consistently available on - # freestanding implementations, so test against a dummy - # declaration. Include always-available headers on the - # off chance that they somehow elicit warnings. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -extern void ac_decl (int, char *); - -int -main (void) -{ -(void) ac_decl (0, (char *) 0); - (void) ac_decl; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - if test x"$ac_arg" = x -then : - ac_cv_c_undeclared_builtin_options='none needed' -else case e in #( - e) ac_cv_c_undeclared_builtin_options=$ac_arg ;; -esac -fi - break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - done - CFLAGS=$ac_save_CFLAGS - ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 -printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } - case $ac_cv_c_undeclared_builtin_options in #( - 'cannot detect') : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} -as_fn_error $? "cannot make $CC report undeclared builtins -See 'config.log' for more details" "$LINENO" 5; } ;; #( - 'none needed') : - ac_c_undeclared_builtin_options='' ;; #( - *) : - ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; -esac - - - gl_replace_getopt= - - if test -z "$gl_replace_getopt"; then + if test -z "$GETOPT_H"; then for ac_header in getopt.h do : ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" @@ -20945,15 +20361,14 @@ then : printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h -else case e in #( - e) gl_replace_getopt=yes ;; -esac +else $as_nop + GETOPT_H=getopt.h fi done fi - if test -z "$gl_replace_getopt"; then + if test -z "$GETOPT_H"; then for ac_func in getopt_long do : @@ -20962,15 +20377,14 @@ then : printf "%s\n" "#define HAVE_GETOPT_LONG 1" >>confdefs.h -else case e in #( - e) gl_replace_getopt=yes ;; -esac +else $as_nop + GETOPT_H=getopt.h fi done fi - if test -z "$gl_replace_getopt"; then + if test -z "$GETOPT_H"; then ac_fn_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" "#include " "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_optreset" = xyes @@ -20984,11 +20398,8 @@ - - - - - if test -n "$gl_replace_getopt"; then + if test -n "$GETOPT_H" +then : case " $LIBOBJS " in *" getopt.$ac_objext "* ) ;; @@ -21003,121 +20414,26 @@ esac - - - -printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h - - GETOPT_H=getopt.h +printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h - fi - - -# If clock_gettime() is available, liblzma with pthreads may use it, and -# xz may use it even when threading support is disabled. In XZ Utils 5.4.x -# and older, configure checked for clock_gettime() only when using pthreads. -# This way non-threaded builds of liblzma didn't get a useless dependency on -# librt which further had a dependency on libpthread. Avoiding these was -# useful when a small build was needed, for example, for initramfs use. -# -# The above reasoning is thoroughly obsolete: On GNU/Linux, librt hasn't -# been needed for clock_gettime() since glibc 2.17 (2012-12-25). -# Solaris 10 needs librt but Solaris 11 doesn't anymore. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 -printf %s "checking for library containing clock_gettime... " >&6; } -if test ${ac_cv_search_clock_gettime+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char clock_gettime (void); -int -main (void) -{ -return clock_gettime (); - ; - return 0; -} -_ACEOF -for ac_lib in '' rt -do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO" -then : - ac_cv_search_clock_gettime=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext - if test ${ac_cv_search_clock_gettime+y} -then : - break -fi -done -if test ${ac_cv_search_clock_gettime+y} -then : - -else case e in #( - e) ac_cv_search_clock_gettime=no ;; -esac -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 -printf "%s\n" "$ac_cv_search_clock_gettime" >&6; } -ac_res=$ac_cv_search_clock_gettime -if test "$ac_res" != no -then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -fi -ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" -if test "x$ac_cv_func_clock_gettime" = xyes -then : - printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h fi -ac_fn_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_have_decl_CLOCK_MONOTONIC" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_CLOCK_MONOTONIC" = xyes -then : - -printf "%s\n" "#define HAVE_CLOCK_MONOTONIC 1" >>confdefs.h - -fi # Find the best function to set timestamps. for ac_func in futimens futimes futimesat utimes _futime utime do : - as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"` + as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" if eval test \"x\$"$as_ac_var"\" = x"yes" then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 +#define `printf "%s\n" "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF break fi @@ -21177,20 +20493,20 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } # Look for other byteswapping methods. for ac_header in byteswap.h sys/endian.h sys/byteorder.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"` + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes" then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 +#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF break fi @@ -21223,10 +20539,9 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; -esac +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -21255,10 +20570,9 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; -esac +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -21287,17 +20601,15 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } ;; -esac +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -21308,44 +20620,25 @@ if test ${enable_unaligned_access+y} then : enableval=$enable_unaligned_access; -else case e in #( - e) enable_unaligned_access=auto ;; -esac +else $as_nop + enable_unaligned_access=auto fi if test "x$enable_unaligned_access" = xauto ; then - # NOTE: There might be other architectures on which unaligned access - # is fast. + # TODO: There may be other architectures, on which unaligned access + # is OK. case $host_cpu in - i?86|x86_64|powerpc|powerpc64|powerpc64le) + i?86|x86_64|powerpc|powerpc64) enable_unaligned_access=yes ;; - arm*|aarch64*|riscv*) + arm*|aarch64*) # On 32-bit and 64-bit ARM, GCC and Clang # #define __ARM_FEATURE_UNALIGNED if # unaligned access is supported. - # - # Exception: GCC at least up to 13.2.0 - # defines it even when using -mstrict-align - # so in that case this autodetection goes wrong. - # Most of the time -mstrict-align isn't used so it - # shouldn't be a common problem in practice. See: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111555 - # - # RISC-V C API Specification says that if - # __riscv_misaligned_fast is defined then - # unaligned access is known to be fast. - # - # MSVC is handled as a special case: We assume that - # 32/64-bit ARM supports fast unaligned access. - # If MSVC gets RISC-V support then this will assume - # fast unaligned access on RISC-V too. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if !defined(__ARM_FEATURE_UNALIGNED) \ - && !defined(__riscv_misaligned_fast) \ - && !defined(_MSC_VER) +#ifndef __ARM_FEATURE_UNALIGNED compile error #endif int main(void) { return 0; } @@ -21354,9 +20647,8 @@ if ac_fn_c_try_compile "$LINENO" then : enable_unaligned_access=yes -else case e in #( - e) enable_unaligned_access=no ;; -esac +else $as_nop + enable_unaligned_access=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -21382,9 +20674,8 @@ if test ${enable_unsafe_type_punning+y} then : enableval=$enable_unsafe_type_punning; -else case e in #( - e) enable_unsafe_type_punning=no ;; -esac +else $as_nop + enable_unsafe_type_punning=no fi if test "x$enable_unsafe_type_punning" = xyes ; then @@ -21420,12 +20711,11 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -21447,8 +20737,8 @@ if test ${tuklib_cv_physmem_method+y} then : printf %s "(cached) " >&6 -else case e in #( - e) +else $as_nop + # Maybe checking $host_os would be enough but this matches what # tuklib_physmem.c does. @@ -21470,8 +20760,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_physmem_method=special -else case e in #( - e) +else $as_nop + # Look for AIX-specific solution before sysconf(), because the test # for sysconf() will pass on AIX but won't actually work @@ -21492,8 +20782,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_physmem_method=aix -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21512,8 +20802,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_physmem_method=sysconf -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21536,8 +20826,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_physmem_method=sysctl -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21558,8 +20848,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_physmem_method=getsysinfo -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21581,8 +20871,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_physmem_method=pstat_getstatic -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21602,8 +20892,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_physmem_method=getinvent_r -else case e in #( - e) +else $as_nop + # This version of sysinfo() is Linux-specific. Some non-Linux systems have # different sysinfo() so we must check $host_os. @@ -21627,11 +20917,10 @@ tuklib_cv_physmem_method=sysinfo -else case e in #( - e) +else $as_nop + tuklib_cv_physmem_method=unknown - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -21639,29 +20928,21 @@ tuklib_cv_physmem_method=unknown ;; esac - ;; -esac + fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tuklib_cv_physmem_method" >&5 printf "%s\n" "$tuklib_cv_physmem_method" >&6; } @@ -21721,8 +21002,8 @@ if test ${tuklib_cv_cpucores_method+y} then : printf %s "(cached) " >&6 -else case e in #( - e) +else $as_nop + # Maybe checking $host_os would be enough but this matches what # tuklib_cpucores.c does. @@ -21742,8 +21023,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_cpucores_method=special -else case e in #( - e) +else $as_nop + # glibc-based systems (GNU/Linux and GNU/kFreeBSD) have sched_getaffinity(). # The CPU_COUNT() macro was added in glibc 2.9 so we try to link the @@ -21766,8 +21047,8 @@ if ac_fn_c_try_link "$LINENO" then : tuklib_cv_cpucores_method=sched_getaffinity -else case e in #( - e) +else $as_nop + # FreeBSD has both cpuset and sysctl. Look for cpuset first because # it's a better approach. @@ -21795,8 +21076,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_cpucores_method=cpuset -else case e in #( - e) +else $as_nop + # On OS/2, both sysconf() and sysctl() pass the tests in this file, # but only sysctl() works. On QNX it's the opposite: only sysconf() works @@ -21834,8 +21115,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_cpucores_method=sysctl -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21859,8 +21140,8 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_cpucores_method=sysconf -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21881,31 +21162,24 @@ if ac_fn_c_try_compile "$LINENO" then : tuklib_cv_cpucores_method=pstat_getdynamic -else case e in #( - e) +else $as_nop + tuklib_cv_cpucores_method=unknown - ;; -esac + fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext ;; -esac + conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tuklib_cv_cpucores_method" >&5 printf "%s\n" "$tuklib_cv_cpucores_method" >&6; } @@ -21946,8 +21220,8 @@ if test ${ac_cv_func_mbrtowc+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -21965,13 +21239,11 @@ if ac_fn_c_try_link "$LINENO" then : ac_cv_func_mbrtowc=yes -else case e in #( - e) ac_cv_func_mbrtowc=no ;; -esac +else $as_nop + ac_cv_func_mbrtowc=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext ;; -esac + conftest$ac_exeext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mbrtowc" >&5 printf "%s\n" "$ac_cv_func_mbrtowc" >&6; } @@ -22016,12 +21288,12 @@ # succeed. for ac_header in CommonCrypto/CommonDigest.h sha256.h sha2.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"` + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes" then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 +#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF sha256_header_found=yes ; break fi @@ -22095,21 +21367,15 @@ if test ${ac_cv_search_SHA256Init+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char SHA256Init (void); + builtin and then its argument prototype would still apply. */ +char SHA256Init (); int main (void) { @@ -22140,13 +21406,11 @@ if test ${ac_cv_search_SHA256Init+y} then : -else case e in #( - e) ac_cv_search_SHA256Init=no ;; -esac +else $as_nop + ac_cv_search_SHA256Init=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256Init" >&5 printf "%s\n" "$ac_cv_search_SHA256Init" >&6; } @@ -22162,21 +21426,15 @@ if test ${ac_cv_search_SHA256_Init+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char SHA256_Init (void); + builtin and then its argument prototype would still apply. */ +char SHA256_Init (); int main (void) { @@ -22207,13 +21465,11 @@ if test ${ac_cv_search_SHA256_Init+y} then : -else case e in #( - e) ac_cv_search_SHA256_Init=no ;; -esac +else $as_nop + ac_cv_search_SHA256_Init=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256_Init" >&5 printf "%s\n" "$ac_cv_search_SHA256_Init" >&6; } @@ -22227,12 +21483,12 @@ for ac_func in CC_SHA256_Init SHA256Init SHA256_Init do : - as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"` + as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" if eval test \"x\$"$as_ac_var"\" = x"yes" then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 +#define `printf "%s\n" "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF sha256_func_found=yes ; break fi @@ -22291,8 +21547,8 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, --disable-clmul-crc was used" >&5 printf "%s\n" "no, --disable-clmul-crc was used" >&6; } -else case e in #( - e) +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22322,141 +21578,141 @@ printf "%s\n" "#define HAVE_USABLE_CLMUL 1" >>confdefs.h - enable_clmul_crc=yes + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } -else case e in #( - e) - enable_clmul_crc=no - ;; -esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_clmul_crc" >&5 -printf "%s\n" "$enable_clmul_crc" >&6; } - ;; -esac -fi - -# ARM64 C Language Extensions define CRC32 functions in arm_acle.h. -# These are supported by at least GCC and Clang which both need -# __attribute__((__target__("+crc"))), unless the needed compiler flags -# are used to support the CRC instruction. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ARM64 CRC32 instruction is usable" >&5 -printf %s "checking if ARM64 CRC32 instruction is usable... " >&6; } -if test "x$enable_arm64_crc32" = xno -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, --disable-arm64-crc32 was used" >&5 -printf "%s\n" "no, --disable-arm64-crc32 was used" >&6; } - -else case e in #( - e) - # Set -Werror here because some versions of Clang (14 and older) - # do not report the unsupported __attribute__((__target__("+crc"))) - # or __crc32d() as an error, only as a warning. This does not need - # to be done with CMake because tests will attempt to link and the - # error will be reported then. - OLD_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +fi -#include -#include +# Check for sandbox support. If one is found, set enable_sandbox=found. +case $enable_sandbox in #( + auto | capsicum) : -#if (defined(__GNUC__) || defined(__clang__)) && !defined(__EDG__) -__attribute__((__target__("+crc"))) -#endif -uint32_t my_crc(uint32_t a, uint64_t b) -{ - return __crc32d(a, b); -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" +# On FreeBSD >= 11.x and Linux, Capsicum is uses . +# If this header is found, it is assumed to be the right one. +capsicum_header_found=no + for ac_header in sys/capsicum.h +do : + ac_fn_c_check_header_compile "$LINENO" "sys/capsicum.h" "ac_cv_header_sys_capsicum_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_capsicum_h" = xyes then : - - -printf "%s\n" "#define HAVE_ARM64_CRC32 1" >>confdefs.h - - enable_arm64_crc32=yes - -else case e in #( - e) - enable_arm64_crc32=no - ;; -esac + printf "%s\n" "#define HAVE_SYS_CAPSICUM_H 1" >>confdefs.h + capsicum_header_found=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_arm64_crc32" >&5 -printf "%s\n" "$enable_arm64_crc32" >&6; } - CFLAGS="$OLD_CFLAGS" - ;; -esac +done +if test "$capsicum_header_found" = no ; then + # On FreeBSD 10.x Capsicum uses . Such a header exists + # on Linux too but it describes POSIX.1e capabilities. Look for the + # declaration of cap_rights_limit to check if is + # a Capsicum header. + ac_fn_check_decl "$LINENO" "cap_rights_limit" "ac_cv_have_decl_cap_rights_limit" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_cap_rights_limit" = xyes +then : + capsicum_header_found=yes +fi fi -# Check for ARM64 CRC32 instruction runtime detection. -# getauxval() is supported on Linux, elf_aux_info() on FreeBSD, and -# sysctlbyname("hw.optional.armv8_crc32", ...) is supported on Darwin -# (macOS, iOS, etc.). Note that sysctlbyname() is supported on FreeBSD, -# NetBSD, and possibly others too but the string is specific to Apple OSes. -# The C code is responsible for checking defined(__APPLE__) before using -# sysctlbyname("hw.optional.armv8_crc32", ...). -if test "x$enable_arm64_crc32" = xyes -then : +capsicum_lib_found=no +CAPSICUM_LIB= +if test "$capsicum_header_found" = yes ; then + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_fn_c_check_func "$LINENO" "getauxval" "ac_cv_func_getauxval" -if test "x$ac_cv_func_getauxval" = xyes -then : - printf "%s\n" "#define HAVE_GETAUXVAL 1" >>confdefs.h + # FreeBSD >= 10.x has Capsicum functions in libc. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char cap_rights_limit (); +int +main (void) +{ +return cap_rights_limit (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + capsicum_lib_found=yes fi -ac_fn_c_check_func "$LINENO" "elf_aux_info" "ac_cv_func_elf_aux_info" -if test "x$ac_cv_func_elf_aux_info" = xyes +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + # Linux has Capsicum functions in libcaprights. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cap_rights_limit in -lcaprights" >&5 +printf %s "checking for cap_rights_limit in -lcaprights... " >&6; } +if test ${ac_cv_lib_caprights_cap_rights_limit+y} then : - printf "%s\n" "#define HAVE_ELF_AUX_INFO 1" >>confdefs.h + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcaprights $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char cap_rights_limit (); +int +main (void) +{ +return cap_rights_limit (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_caprights_cap_rights_limit=yes +else $as_nop + ac_cv_lib_caprights_cap_rights_limit=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname" -if test "x$ac_cv_func_sysctlbyname" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_caprights_cap_rights_limit" >&5 +printf "%s\n" "$ac_cv_lib_caprights_cap_rights_limit" >&6; } +if test "x$ac_cv_lib_caprights_cap_rights_limit" = xyes then : - printf "%s\n" "#define HAVE_SYSCTLBYNAME 1" >>confdefs.h - + CAPSICUM_LIB=-lcaprights + capsicum_lib_found=yes fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -# Check for sandbox support. If one is found, set enable_sandbox=found. -# -# About -fsanitize: Of our three sandbox methods, only Landlock is -# incompatible with -fsanitize. FreeBSD 13.2 with Capsicum was tested with -# -fsanitize=address,undefined and had no issues. OpenBSD (as of version -# 7.4) has minimal support for process instrumentation. OpenBSD does not -# distribute the additional libraries needed (libasan, libubsan, etc.) with -# GCC or Clang needed for runtime sanitization support and instead only -# support -fsanitize-minimal-runtime for minimal undefined behavior -# sanitization. This minimal support is compatible with our use of the -# Pledge sandbox. So only Landlock will result in a build that cannot -# compress or decompress a single file to standard out. -case $enable_sandbox in #( - auto | capsicum) : +if test "$capsicum_lib_found" = yes ; then +printf "%s\n" "#define HAVE_CAPSICUM 1" >>confdefs.h - for ac_func in cap_rights_limit -do : - ac_fn_c_check_func "$LINENO" "cap_rights_limit" "ac_cv_func_cap_rights_limit" -if test "x$ac_cv_func_cap_rights_limit" = xyes -then : - printf "%s\n" "#define HAVE_CAP_RIGHTS_LIMIT 1" >>confdefs.h - enable_sandbox=found + enable_sandbox=found +else + : fi -done - ;; #( *) : ;; @@ -22471,36 +21727,7 @@ if test "x$ac_cv_func_pledge" = xyes then : printf "%s\n" "#define HAVE_PLEDGE 1" >>confdefs.h - enable_sandbox=found -fi - -done - - ;; #( - *) : - ;; -esac -case $enable_sandbox in #( - auto | landlock) : - - for ac_header in linux/landlock.h -do : - ac_fn_c_check_header_compile "$LINENO" "linux/landlock.h" "ac_cv_header_linux_landlock_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_landlock_h" = xyes -then : - printf "%s\n" "#define HAVE_LINUX_LANDLOCK_H 1" >>confdefs.h - - enable_sandbox=found - - case $CFLAGS in #( - *-fsanitize=*) : - as_fn_error $? " - CFLAGS contains '-fsanitize=' which is incompatible with the Landlock - sandboxing. Use --disable-sandbox when using '-fsanitize'." "$LINENO" 5 ;; #( - *) : - ;; -esac - + enable_sandbox=found ; break fi done @@ -22542,8 +21769,8 @@ if test ${gl_cv_cc_vis_werror+y} then : printf %s "(cached) " >&6 -else case e in #( - e) gl_save_CFLAGS="$CFLAGS" +else $as_nop + gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22559,14 +21786,12 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_cc_vis_werror=yes -else case e in #( - e) gl_cv_cc_vis_werror=no ;; -esac +else $as_nop + gl_cv_cc_vis_werror=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$gl_save_CFLAGS" - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 printf "%s\n" "$gl_cv_cc_vis_werror" >&6; } @@ -22575,8 +21800,8 @@ if test ${gl_cv_cc_visibility+y} then : printf %s "(cached) " >&6 -else case e in #( - e) gl_save_CFLAGS="$CFLAGS" +else $as_nop + gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" if test $gl_cv_cc_vis_werror = yes; then CFLAGS="$CFLAGS -Werror" @@ -22605,14 +21830,12 @@ if ac_fn_c_try_compile "$LINENO" then : gl_cv_cc_visibility=yes -else case e in #( - e) gl_cv_cc_visibility=no ;; -esac +else $as_nop + gl_cv_cc_visibility=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$gl_save_CFLAGS" - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 printf "%s\n" "$gl_cv_cc_visibility" >&6; } @@ -22652,6 +21875,7 @@ -Wall \ -Wextra \ -Wvla \ + -Wc99-c11-compat \ -Wformat=2 \ -Winit-self \ -Wmissing-include-dirs \ @@ -22708,12 +21932,11 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else case e in #( - e) +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; -esac + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$OLD_CFLAGS" @@ -22723,9 +21946,8 @@ if test ${enable_werror+y} then : enableval=$enable_werror; -else case e in #( - e) enable_werror=no ;; -esac +else $as_nop + enable_werror=no fi if test "x$enable_werror" = "xyes"; then @@ -22780,8 +22002,8 @@ # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# 'ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* 'ac_cv_foo' will be assigned the +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. _ACEOF @@ -22811,14 +22033,14 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # 'set' does not quote correctly, so add quotes: double-quote + # `set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # 'set' quotes correctly as required by POSIX, so do not add quotes. + # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -23011,18 +22233,6 @@ as_fn_error $? "conditional \"COND_DECODER_SPARC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${COND_FILTER_RISCV_TRUE}" && test -z "${COND_FILTER_RISCV_FALSE}"; then - as_fn_error $? "conditional \"COND_FILTER_RISCV\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${COND_ENCODER_RISCV_TRUE}" && test -z "${COND_ENCODER_RISCV_FALSE}"; then - as_fn_error $? "conditional \"COND_ENCODER_RISCV\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${COND_DECODER_RISCV_TRUE}" && test -z "${COND_DECODER_RISCV_FALSE}"; then - as_fn_error $? "conditional \"COND_DECODER_RISCV\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${COND_FILTER_SIMPLE_TRUE}" && test -z "${COND_FILTER_SIMPLE_FALSE}"; then as_fn_error $? "conditional \"COND_FILTER_SIMPLE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23147,12 +22357,6 @@ as_fn_error $? "conditional \"COND_SYMVERS_GENERIC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -# Check whether --enable-year2038 was given. -if test ${enable_year2038+y} -then : - enableval=$enable_year2038; -fi - if test -z "${COND_INTERNAL_SHA256_TRUE}" && test -z "${COND_INTERNAL_SHA256_FALSE}"; then as_fn_error $? "conditional \"COND_INTERNAL_SHA256\" was never defined. @@ -23191,6 +22395,7 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -23199,13 +22404,12 @@ # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -23277,7 +22481,7 @@ ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -23306,6 +22510,7 @@ } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -23345,12 +22550,11 @@ { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -23364,12 +22568,11 @@ { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith @@ -23452,9 +22655,9 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -23535,12 +22738,10 @@ as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 @@ -23555,8 +22756,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by XZ Utils $as_me 5.6.0, which was -generated by GNU Autoconf 2.72. Invocation command line was +This file was extended by XZ Utils $as_me 5.4.5, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -23588,7 +22789,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -'$as_me' instantiates files and other configuration actions +\`$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -23616,7 +22817,7 @@ $config_commands Report bugs to . -XZ Utils home page: ." +XZ Utils home page: ." _ACEOF ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` @@ -23624,11 +22825,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -XZ Utils config.status 5.6.0 -configured by $0, generated by GNU Autoconf 2.72, +XZ Utils config.status 5.4.5 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -23690,8 +22891,8 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: '$1' -Try '$0 --help' for more information.";; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -23699,8 +22900,8 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: '$1' -Try '$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -23891,11 +23092,6 @@ enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' -gl_path_map='`$ECHO "$gl_path_map" | $SED "$delay_single_quote_subst"`' -gl_localedir_prefix='`$ECHO "$gl_localedir_prefix" | $SED "$delay_single_quote_subst"`' -gl_am_configmake='`$ECHO "$gl_am_configmake" | $SED "$delay_single_quote_subst"`' -localedir_c_make='`$ECHO "$localedir_c_make" | $SED "$delay_single_quote_subst"`' -gl_localedir_config='`$ECHO "$gl_localedir_config" | $SED "$delay_single_quote_subst"`' LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`' reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`' reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`' @@ -23938,8 +23134,6 @@ postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`' file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`' hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`' -gl_path_map_RC='`$ECHO "$gl_path_map_RC" | $SED "$delay_single_quote_subst"`' -gl_am_configmake_RC='`$ECHO "$gl_am_configmake_RC" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' @@ -24073,8 +23267,6 @@ sys_lib_search_path_spec \ configure_time_dlsearch_path \ configure_time_lt_sys_library_path \ -gl_path_map \ -gl_am_configmake \ reload_cmds_RC \ old_archive_cmds_RC \ old_archive_from_new_cmds_RC \ @@ -24085,9 +23277,7 @@ module_expsym_cmds_RC \ export_symbols_cmds_RC \ prelink_cmds_RC \ -postlink_cmds_RC \ -gl_path_map_RC \ -gl_am_configmake_RC; do +postlink_cmds_RC; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes @@ -24122,7 +23312,6 @@ # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" -gl_config_gt="eval \$gl_localedir_config" _ACEOF @@ -24136,7 +23325,6 @@ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; - "build-to-host") CONFIG_COMMANDS="$CONFIG_COMMANDS build-to-host" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; @@ -24154,7 +23342,7 @@ "src/scripts/xzmore") CONFIG_FILES="$CONFIG_FILES src/scripts/xzmore" ;; "src/scripts/xzless") CONFIG_FILES="$CONFIG_FILES src/scripts/xzless" ;; - *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -24174,7 +23362,7 @@ # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to '$tmp'. +# after its creation but before its name has been assigned to `$tmp'. $debug || { tmp= ac_tmp= @@ -24198,7 +23386,7 @@ # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with './config.status config.h'. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -24356,13 +23544,13 @@ # Set up the scripts for CONFIG_HEADERS section. # No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with './config.status Makefile'. +# This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF -# Transform confdefs.h into an awk script 'defines.awk', embedded as +# Transform confdefs.h into an awk script `defines.awk', embedded as # here-document in config.status, that substitutes the proper values into # config.h.in to produce config.h. @@ -24472,7 +23660,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -24494,19 +23682,19 @@ -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain ':'. + # because $ac_f cannot contain `:'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is 'configure' which instantiates (i.e., don't + # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -24639,7 +23827,7 @@ esac _ACEOF -# Neutralize VPATH when '$srcdir' = '.'. +# Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -24670,9 +23858,9 @@ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -24827,15 +24015,15 @@ (exit $ac_status); } || am_rc=$? done if test $am_rc -ne 0; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments for automatic dependency tracking. If GNU make was not used, consider re-running the configure script with MAKE=\"gmake\" (or whatever is necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi { am_dirpart=; unset am_dirpart;} { am_filepart=; unset am_filepart;} @@ -25301,8 +24489,6 @@ # How to hardcode a shared library path into an executable. hardcode_action=$hardcode_action -gl_path_map=$lt_gl_path_map -gl_am_configmake=$lt_gl_am_configmake # ### END LIBTOOL CONFIG @@ -25532,8 +24718,6 @@ # How to hardcode a shared library path into an executable. hardcode_action=$hardcode_action_RC -gl_path_map=$lt_gl_path_map_RC -gl_am_configmake=$lt_gl_am_configmake_RC # ### END LIBTOOL TAG CONFIG: RC _LT_EOF @@ -25652,7 +24836,6 @@ ;; esac done ;; - "build-to-host":C) eval $gl_config_gt | $SHELL 2>/dev/null ;; "src/scripts/xzdiff":F) chmod +x src/scripts/xzdiff ;; "src/scripts/xzgrep":F) chmod +x src/scripts/xzgrep ;; "src/scripts/xzmore":F) chmod +x src/scripts/xzmore ;; diff -Nru xz-utils-5.6.0/configure.ac xz-utils-5.6.1+really5.4.5/configure.ac --- xz-utils-5.6.0/configure.ac 2024-02-24 08:21:29.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/configure.ac 2023-11-01 12:19:29.000000000 +0000 @@ -1,12 +1,13 @@ # -*- Autoconf -*- -# SPDX-License-Identifier: 0BSD +# Process this file with autoconf to produce a configure script. ############################################################################### # -# Process this file with autoconf to produce a configure script. -# # Author: Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################### # NOTE: Don't add useless checks. autoscan detects this and that, but don't @@ -17,7 +18,7 @@ AC_PREREQ([2.69]) AC_INIT([XZ Utils], m4_esyscmd([/bin/sh build-aux/version.sh]), - [xz@tukaani.org], [xz], [https://xz.tukaani.org/xz-utils/]) + [xz@tukaani.org], [xz], [https://tukaani.org/xz/]) AC_CONFIG_SRCDIR([src/liblzma/common/common.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -78,8 +79,8 @@ # Filters # ########### -m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv])dnl -m4_define([SIMPLE_FILTERS], [x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv]) +m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc])dnl +m4_define([SIMPLE_FILTERS], [x86,powerpc,ia64,arm,armthumb,arm64,sparc]) m4_define([LZ_FILTERS], [lzma1,lzma2]) m4_foreach([NAME], [SUPPORTED_FILTERS], @@ -304,17 +305,12 @@ for example, erofs-utils.]), [], [enable_microlzma=yes]) case $enable_microlzma in - yes) - AC_DEFINE([HAVE_MICROLZMA], [1], - [Define to 1 if MicroLZMA support is enabled.]) - AC_MSG_RESULT([yes]) - ;; - no) - AC_MSG_RESULT([no]) + yes | no) + AC_MSG_RESULT([$enable_microlzma]) ;; *) AC_MSG_RESULT([]) - AC_MSG_ERROR([--enable-microlzma accepts only 'yes' or 'no'.]) + AC_MSG_ERROR([--enable-microlzma accepts only `yes' or `no'.]) ;; esac AM_CONDITIONAL(COND_MICROLZMA, test "x$enable_microlzma" = xyes) @@ -368,7 +364,7 @@ ;; *) AC_MSG_RESULT([]) - AC_MSG_ERROR([--enable-assembler accepts only 'yes', 'no', or 'x86' (32-bit).]) + AC_MSG_ERROR([--enable-assembler accepts only `yes', `no', or `x86' (32-bit).]) ;; esac AM_CONDITIONAL(COND_ASM_X86, test "x$enable_assembler" = xx86) @@ -384,16 +380,6 @@ [], [enable_clmul_crc=yes]) -############################ -# ARM64 CRC32 Instructions # -############################ - -AC_ARG_ENABLE([arm64-crc32], AS_HELP_STRING([--disable-arm64-crc32], - [Do not use ARM64 CRC32 instructions even if support for it - is detected.]), - [], [enable_arm64_crc32=yes]) - - ##################### # Size optimization # ##################### @@ -407,7 +393,7 @@ AC_DEFINE([HAVE_SMALL], [1], [Define to 1 if optimizing for size.]) elif test "x$enable_small" != xno; then AC_MSG_RESULT([]) - AC_MSG_ERROR([--enable-small accepts only 'yes' or 'no']) + AC_MSG_ERROR([--enable-small accepts only `yes' or `no']) fi AC_MSG_RESULT([$enable_small]) AM_CONDITIONAL(COND_SMALL, test "x$enable_small" = xyes) @@ -419,8 +405,8 @@ AC_MSG_CHECKING([if threading support is wanted]) AC_ARG_ENABLE([threads], AS_HELP_STRING([--enable-threads=METHOD], - [Supported METHODS are 'yes', 'no', 'posix', 'win95', and - 'vista'. The default is 'yes'. Using 'no' together with + [Supported METHODS are `yes', `no', `posix', `win95', and + `vista'. The default is `yes'. Using `no' together with --enable-small makes liblzma thread unsafe.]), [], [enable_threads=yes]) @@ -447,7 +433,7 @@ ;; *) AC_MSG_RESULT([]) - AC_MSG_ERROR([--enable-threads only accepts 'yes', 'no', 'posix', 'win95', or 'vista']) + AC_MSG_ERROR([--enable-threads only accepts `yes', `no', `posix', `win95', or `vista']) ;; esac @@ -533,24 +519,20 @@ AC_MSG_CHECKING([if sandboxing should be used]) AC_ARG_ENABLE([sandbox], [AS_HELP_STRING([--enable-sandbox=METHOD], [Sandboxing METHOD can be - 'auto', 'no', 'capsicum', 'pledge', or 'landlock'. - The default is 'auto' which enables sandboxing if + `auto', `no', `capsicum', or `pledge'. + The default is `auto' which enables sandboxing if a supported sandboxing method is found.])], [], [enable_sandbox=auto]) -case $enable_xzdec-$enable_xz-$enable_sandbox in - no-no-*) - enable_sandbox=no - AC_MSG_RESULT([no, --disable-xz and --disable-xzdec was used]) - ;; - *-*-auto) +case $enable_sandbox in + auto) AC_MSG_RESULT([maybe (autodetect)]) ;; - *-*-no | *-*-capsicum | *-*-pledge | *-*-landlock) + no | capsicum | pledge) AC_MSG_RESULT([$enable_sandbox]) ;; *) AC_MSG_RESULT([]) - AC_MSG_ERROR([--enable-sandbox only accepts 'auto', 'no', 'capsicum', 'pledge', or 'landlock'.]) + AC_MSG_ERROR([--enable-sandbox only accepts `auto', `no', `capsicum', or `pledge'.]) ;; esac @@ -640,10 +622,21 @@ AC_DEFINE([MYTHREAD_POSIX], [1], [Define to 1 when using POSIX threads (pthreads).]) - # This is nice to have but not mandatory. + # These are nice to have but not mandatory. + # + # FIXME: xz uses clock_gettime if it is available and can do + # it even when threading is disabled. Moving this outside + # of pthread detection may be undesirable because then + # liblzma may get linked against librt even when librt isn't + # needed by liblzma. OLD_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - AC_CHECK_FUNCS([pthread_condattr_setclock]) + AC_SEARCH_LIBS([clock_gettime], [rt]) + AC_CHECK_FUNCS([clock_gettime pthread_condattr_setclock]) + AC_CHECK_DECL([CLOCK_MONOTONIC], [AC_DEFINE( + [HAVE_CLOCK_MONOTONIC], [1], [Define to 1 if + `CLOCK_MONOTONIC' is declared in .])], [], + [[#include ]]) CFLAGS=$OLD_CFLAGS ], [win95], [ @@ -865,6 +858,7 @@ ]) CFLAGS="$OLD_CFLAGS" + # The Win95 threading lacks a thread-safe one-time initialization function. # The one-time initialization is needed for crc32_small.c and crc64_small.c # create the CRC tables. So if small mode is enabled, the threading mode is @@ -879,79 +873,6 @@ __attribute__((__constructor__))]) fi -# __attribute__((__ifunc__())) can be used to choose between different -# implementations of the same function at runtime. This is slightly more -# efficient than using __attribute__((__constructor__)) and setting -# a function pointer. -AC_ARG_ENABLE([ifunc], [AS_HELP_STRING([--enable-ifunc], - [Use __attribute__((__ifunc__())). Enabled by default on - GNU/Linux (glibc) and FreeBSD.])], - [], [enable_ifunc=auto]) - -# When enable_ifunc is 'auto', allow the use of __attribute__((__ifunc__())) -# if compiler support is detected and we are building for GNU/Linux (glibc) -# or FreeBSD. uClibc and musl don't support ifunc in their dynamic linkers -# but some compilers still accept the attribute when compiling for these -# C libraries, which results in broken binaries. That's why we need to -# check which libc is being used. -if test "x$enable_ifunc" = xauto ; then - OLD_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - AC_MSG_CHECKING([if __attribute__((__ifunc__())) can be used]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - /* - * Force a compilation error when not using glibc on Linux - * or if we are not using FreeBSD. uClibc will define - * __GLIBC__ but does not support ifunc, so we must have - * an extra check to disable with uClibc. - */ - #if defined(__linux__) - # include - # if !defined(__GLIBC__) || defined(__UCLIBC__) - compile error - # endif - #elif !defined(__FreeBSD__) - compile error - #endif - - static void func(void) { return; } - static void (*resolve_func (void)) (void) { return func; } - void func_ifunc (void) - __attribute__((__ifunc__("resolve_func"))); - /* - * 'clang -Wall' incorrectly warns that resolve_func is - * unused (-Wunused-function). Correct assembly output is - * still produced. This problem exists at least in Clang - * versions 4 to 17. The following silences the bogus warning: - */ - void make_clang_quiet(void); - void make_clang_quiet(void) { resolve_func()(); } - ]])], [ - enable_ifunc=yes - ], [ - enable_ifunc=no - ]) - - AC_MSG_RESULT([$enable_ifunc]) - - CFLAGS="$OLD_CFLAGS" -fi - -if test "x$enable_ifunc" = xyes ; then - AC_DEFINE([HAVE_FUNC_ATTRIBUTE_IFUNC], [1], - [Define to 1 if __attribute__((__ifunc__())) - is supported for functions.]) - - # ifunc explicitly does not work with -fsanitize=address. - # If configured, it will result in a liblzma build that will fail - # when liblzma is loaded at runtime (when the ifunc resolver - # executes). - AS_CASE([$CFLAGS], [*-fsanitize=*], [AC_MSG_ERROR([ - CFLAGS contains '-fsanitize=' which is incompatible with ifunc. - Use --disable-ifunc when using '-fsanitize'.])]) -fi - - ############################################################################### # Checks for library functions. ############################################################################### @@ -959,22 +880,6 @@ # Gnulib replacements as needed gl_GETOPT -# If clock_gettime() is available, liblzma with pthreads may use it, and -# xz may use it even when threading support is disabled. In XZ Utils 5.4.x -# and older, configure checked for clock_gettime() only when using pthreads. -# This way non-threaded builds of liblzma didn't get a useless dependency on -# librt which further had a dependency on libpthread. Avoiding these was -# useful when a small build was needed, for example, for initramfs use. -# -# The above reasoning is thoroughly obsolete: On GNU/Linux, librt hasn't -# been needed for clock_gettime() since glibc 2.17 (2012-12-25). -# Solaris 10 needs librt but Solaris 11 doesn't anymore. -AC_SEARCH_LIBS([clock_gettime], [rt]) -AC_CHECK_FUNCS([clock_gettime]) -AC_CHECK_DECL([CLOCK_MONOTONIC], [AC_DEFINE([HAVE_CLOCK_MONOTONIC], [1], - [Define to 1 if 'CLOCK_MONOTONIC' is declared in .])], [], - [[#include ]]) - # Find the best function to set timestamps. AC_CHECK_FUNCS([futimens futimes futimesat utimes _futime utime], [break]) @@ -1094,96 +999,21 @@ [Define to 1 if _mm_set_epi64x and _mm_clmulepi64_si128 are usable. See configure.ac for details.]) - enable_clmul_crc=yes - ], [ - enable_clmul_crc=no - ]) - AC_MSG_RESULT([$enable_clmul_crc]) -]) - -# ARM64 C Language Extensions define CRC32 functions in arm_acle.h. -# These are supported by at least GCC and Clang which both need -# __attribute__((__target__("+crc"))), unless the needed compiler flags -# are used to support the CRC instruction. -AC_MSG_CHECKING([if ARM64 CRC32 instruction is usable]) -AS_IF([test "x$enable_arm64_crc32" = xno], [ - AC_MSG_RESULT([no, --disable-arm64-crc32 was used]) -], [ - # Set -Werror here because some versions of Clang (14 and older) - # do not report the unsupported __attribute__((__target__("+crc"))) - # or __crc32d() as an error, only as a warning. This does not need - # to be done with CMake because tests will attempt to link and the - # error will be reported then. - OLD_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -#include -#include - -#if (defined(__GNUC__) || defined(__clang__)) && !defined(__EDG__) -__attribute__((__target__("+crc"))) -#endif -uint32_t my_crc(uint32_t a, uint64_t b) -{ - return __crc32d(a, b); -} - ]])], [ - AC_DEFINE([HAVE_ARM64_CRC32], [1], - [Define to 1 if ARM64 CRC32 instruction is supported. - See configure.ac for details.]) - enable_arm64_crc32=yes + AC_MSG_RESULT([yes]) ], [ - enable_arm64_crc32=no + AC_MSG_RESULT([no]) ]) - AC_MSG_RESULT([$enable_arm64_crc32]) - - CFLAGS="$OLD_CFLAGS" -]) - -# Check for ARM64 CRC32 instruction runtime detection. -# getauxval() is supported on Linux, elf_aux_info() on FreeBSD, and -# sysctlbyname("hw.optional.armv8_crc32", ...) is supported on Darwin -# (macOS, iOS, etc.). Note that sysctlbyname() is supported on FreeBSD, -# NetBSD, and possibly others too but the string is specific to Apple OSes. -# The C code is responsible for checking defined(__APPLE__) before using -# sysctlbyname("hw.optional.armv8_crc32", ...). -AS_IF([test "x$enable_arm64_crc32" = xyes], [ - AC_CHECK_FUNCS([getauxval elf_aux_info sysctlbyname]) ]) - # Check for sandbox support. If one is found, set enable_sandbox=found. -# -# About -fsanitize: Of our three sandbox methods, only Landlock is -# incompatible with -fsanitize. FreeBSD 13.2 with Capsicum was tested with -# -fsanitize=address,undefined and had no issues. OpenBSD (as of version -# 7.4) has minimal support for process instrumentation. OpenBSD does not -# distribute the additional libraries needed (libasan, libubsan, etc.) with -# GCC or Clang needed for runtime sanitization support and instead only -# support -fsanitize-minimal-runtime for minimal undefined behavior -# sanitization. This minimal support is compatible with our use of the -# Pledge sandbox. So only Landlock will result in a build that cannot -# compress or decompress a single file to standard out. AS_CASE([$enable_sandbox], [auto | capsicum], [ - AC_CHECK_FUNCS([cap_rights_limit], [enable_sandbox=found]) + AX_CHECK_CAPSICUM([enable_sandbox=found], [:]) ] ) AS_CASE([$enable_sandbox], [auto | pledge], [ - AC_CHECK_FUNCS([pledge], [enable_sandbox=found]) - ] -) -AS_CASE([$enable_sandbox], - [auto | landlock], [ - AC_CHECK_HEADERS([linux/landlock.h], [ - enable_sandbox=found - - AS_CASE([$CFLAGS], [*-fsanitize=*], [AC_MSG_ERROR([ - CFLAGS contains '-fsanitize=' which is incompatible with the Landlock - sandboxing. Use --disable-sandbox when using '-fsanitize'.])]) - ]) + AC_CHECK_FUNCS([pledge], [enable_sandbox=found ; break]) ] ) @@ -1233,6 +1063,7 @@ -Wall \ -Wextra \ -Wvla \ + -Wc99-c11-compat \ -Wformat=2 \ -Winit-self \ -Wmissing-include-dirs \ diff -Nru xz-utils-5.6.0/debian/changelog xz-utils-5.6.1+really5.4.5/debian/changelog --- xz-utils-5.6.0/debian/changelog 2024-02-28 19:03:45.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/changelog 2024-03-28 14:59:38.000000000 +0000 @@ -1,3 +1,18 @@ +xz-utils (5.6.1+really5.4.5-1) unstable; urgency=critical + + * Non-maintainer upload by the Security Team. + * Revert back to the 5.4.5-0.2 version + + -- Salvatore Bonaccorso Thu, 28 Mar 2024 15:59:38 +0100 + +xz-utils (5.6.1-1) unstable; urgency=medium + + * Non-maintainer upload. + * Import 5.6.1 (Closes: #1067708). + * Takeover maintenance of the package. + + -- Sebastian Andrzej Siewior Wed, 27 Mar 2024 22:53:21 +0100 + xz-utils (5.6.0-0.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru xz-utils-5.6.0/debian/control xz-utils-5.6.1+really5.4.5/debian/control --- xz-utils-5.6.0/debian/control 2024-02-26 06:47:42.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/control 2023-12-23 18:01:27.000000000 +0000 @@ -11,7 +11,7 @@ Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/debian/xz-utils Vcs-Git: https://salsa.debian.org/debian/xz-utils.git -Homepage: https://xz.tukaani.org/xz-utils/ +Homepage: https://tukaani.org/xz/ Rules-Requires-Root: no Package: liblzma5 @@ -44,7 +44,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: foreign Conflicts: lzma (<< 9.22-1), xz-lzma -Breaks: lzip (<< 1.8~rc2), manpages-de (<< 4.17.0-2~bpo11+1), manpages-fr (<< 4.17.0-2~bpo11+1), pristine-tar (<< 1.50+nmu1) +Breaks: lzip (<< 1.8~rc2), manpages-de (<< 4.17.0-2~bpo11+1), manpages-fr (<< 4.17.0-2~bpo11+1) Replaces: lzip (<< 1.8~rc2), xz-lzma, manpages-de (<< 4.17.0-2~bpo11+1), manpages-fr (<< 4.17.0-2~bpo11+1) Provides: lzma Description: XZ-format compression utilities @@ -112,7 +112,6 @@ Package: liblzma-doc Section: doc -Multi-Arch: foreign Architecture: all Depends: ${misc:Depends} Suggests: liblzma-dev diff -Nru xz-utils-5.6.0/debian/copyright xz-utils-5.6.1+really5.4.5/debian/copyright --- xz-utils-5.6.0/debian/copyright 2024-02-26 06:47:42.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/copyright 2023-12-23 17:53:18.000000000 +0000 @@ -1,11 +1,11 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: XZ Utils Upstream-Contact: - xz@tukaani.org - https://xz.tukaani.org/contact.html + Lasse Collin + https://tukaani.org/xz/lists.html Source: - https://xz.tukaani.org/xz-utils - https://github.com/tukaani-project/xz + https://tukaani.org/xz + https://git.tukaani.org/xz.git Comment: XZ Utils is developed and maintained upstream by Lasse Collin. Major portions are based on code by other authors; see AUTHORS for details. @@ -20,105 +20,104 @@ is a rough summary of which licenses apply to which parts of this package (but check the individual files to be sure!): . - - liblzma is under the BSD Zero Clause License (0BSD). + - liblzma is in the public domain. . - - The command line tools xz, xzdec, lzmadec, and lzmainfo are - under 0BSD except that, on systems that don't have a usable - getopt_long, GNU getopt_long is compiled and linked in from the - 'lib' directory. The getopt_long code is under GNU LGPLv2.1+. + - xz, xzdec, and lzmadec command line tools are in the public + domain unless GNU getopt_long had to be compiled and linked + in from the lib directory. The getopt_long code is under + GNU LGPLv2.1+. . - The scripts to grep, diff, and view compressed files have been - adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless, - and xzmore) are under GNU GPLv2+. The man pages of the scripts - are under 0BSD; they aren't based on the man pages of GNU gzip. + adapted from gzip. These scripts and their documentation are + under GNU GPLv2+. . - - Most of the XZ Utils specific documentation that is in - plain text files (like README, INSTALL, PACKAGERS, NEWS, - and ChangeLog) are under 0BSD unless stated otherwise in - the file itself. The files xz-file-format.txt and - lzma-file-format.xt are in the public domain but may - be distributed under the terms of 0BSD too. + - All the documentation in the doc directory and most of the + XZ Utils specific documentation files in other directories + are in the public domain. . - - Doxygen-generated HTML version of the liblzma API documentation: - While Doxygen is under the GNU GPLv2, the license information - in Doxygen includes the following exception: + - Translated messages are in the public domain. . - Documents produced by doxygen are derivative works - derived from the input used in their production; - they are not affected by this license. + - The build system contains public domain files, and files that + are under GNU GPLv2+ or GNU GPLv3+. None of these files end up + in the binaries being built. . - Note: The JavaScript files (under the MIT license) have - been removed from the Doxygen output. + - Test files and test code in the tests directory, and debugging + utilities in the debug directory are in the public domain. . - - The XZ logo (xz-logo.png) included in the Doxygen-generated - documentation is under the Creative Commons BY-SA 4.0 license. + - The extra directory may contain public domain files, and files + that are under various free software licenses. . - - Translated messages and man pages are under 0BSD except that - some old translations are in the public domain. + You can do whatever you want with the files that have been put into + the public domain. If you find public domain legally problematic, + take the previous sentence as a license grant. If you still find + the lack of copyright legally problematic, you have too many + lawyers. . - - Test files and test code in the 'tests' directory, and - debugging utilities in the 'debug' directory are under - the BSD Zero Clause License (0BSD). + As usual, this software is provided "as is", without any warranty. . - - The GNU Autotools based build system contains files that are - under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses. - These files don't affect the licensing of the binaries being - built. - . - - The extra directory contain files that are under various - free software licenses. - . - For the files under the BSD Zero Clause License (0BSD), if - a copyright notice is needed, the following is sufficient: - . - Copyright (C) The XZ Utils authors and contributors - . - If you copy significant amounts of 0BSD-licensed code from XZ Utils + If you copy significant amounts of public domain code from XZ Utils into your project, acknowledging this somewhere in your software is polite (especially if it is proprietary, non-free software), but - it is not legally required by the license terms. Here is an example - of a good notice to put into "about box" or into documentation: + naturally it is not legally required. Here is an example of a good + notice to put into "about box" or into documentation: . - This software includes code from XZ Utils - . + This software includes code from XZ Utils . . The following license texts are included in the following files: - - COPYING.0BSD: BSD Zero Clause License - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1 - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 - - COPYING.CC-BY-SA-4.0: Creative Commons Attribution-ShareAlike 4.0 - International Public License . - If you have questions, don't hesitate to ask for more information. - The contact information is in the README file. + Note that the toolchain (compiler, linker etc.) may add some code + pieces that are copyrighted. Thus, it is possible that e.g. liblzma + binary wouldn't actually be in the public domain in its entirety + even though it contains no copyrighted code from the XZ Utils source + package. + . + If you have questions, don't hesitate to ask the author(s) for more + information. Files: * -Copyright: Lasse Collin - Igor Pavlov - Jia Tan - Andrew Dudman - Chenxi Mao - Ilya Kurdyukov - Jonathan Nieder - Joachim Henke - Hans Jansen - Maksym Vatsyk - Michał Górny - Sebastian Andrzej Siewior - Wei Dai -License: 0BSD - Permission to use, copy, modify, and/or distribute this - software for any purpose with or without fee is hereby granted. - . - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +Copyright: 2006-2018, Lasse Collin + 1999-2008, Igor Pavlov + 2006, Ville Koskinen + 1998, Steve Reid + 2000, Wei Dai + 2003, Kevin Springle + 2009, Jonathan Nieder + 2010, Anders F Björklund +License: PD + This file has been put in the public domain. + You can do whatever you want with this file. +Comment: + From: Lasse Collin + To: Jonathan Nieder + Subject: Re: XZ utils for Debian + Date: Sun, 19 Jul 2009 13:28:23 +0300 + Message-Id: <200907191328.23816.lasse.collin@tukaani.org> + . + [...] + . + > AUTHORS, ChangeLog, COPYING, README, THANKS, TODO, + > dos/README, windows/README + . + COPYING says that most docs are in the public domain. Maybe that's not + clear enough, but on the other hand it looks a bit stupid to put + copyright information in tiny and relatively small docs like README. + . + I don't dare to say that _all_ XZ Utils specific docs are in the public + domain unless otherwise mentioned in the file. I'm including PDF files + generated by groff + ps2pdf, and some day I might include Doxygen- + generated HTML docs too. Those don't include any copyright notices, but + it seems likely that groff + ps2pdf or at least Doxygen put some + copyrighted content into the generated files. + +Files: INSTALL NEWS PACKAGERS + windows/README-Windows.txt + windows/INSTALL-MinGW.txt +Copyright: 2009-2010, Lasse Collin +License: probably-PD + See the note on AUTHORS, README, and so on above. Files: src/scripts/* lib/* extra/scanlzma/scanlzma.c Copyright: © 1993, Jean-loup Gailly @@ -130,78 +129,159 @@ Other-Authors: Paul Eggert, Ulrich Drepper License: GPL-2+ -Files: lib/getopt* +Files: src/scripts/Makefile.am src/scripts/xzless.1 +Copyright: 2009, Andrew Dudman + 2009, Lasse Collin +License: PD + This file has been put in the public domain. + You can do whatever you want with this file. + +Files: doc/examples/xz_pipe_comp.c doc/examples/xz_pipe_decomp.c +Copyright: 2010, Daniel Mealha Cabrita +License: PD + Not copyrighted -- provided to the public domain. + +Files: lib/getopt.c lib/getopt1.c lib/getopt.in.h Copyright: © 1987-2007 Free Software Foundation, Inc. Other-Authors: Ulrich Drepper License: LGPL-2.1+ Files: m4/getopt.m4 m4/posix-shell.m4 -Copyright: © 2002-2006, 2008-2023 Free Software Foundation, Inc. -Other-Authors: Paul Eggert -License: FSFULLR - -Files: m4/ax_pthread.m4 -Copyright: © 2008 Steven G. Johnson - © 2011 Daniel Richard G. - © 2019 Marc Stevens -License: GPL-3.0-or-later-WITH-Autoconf-exception-macro - -Files: doc/xz-logo.png -Copyright: © 2023 by Jia Tan -License: CC-BY-SA-4.0 +Copyright: © 2002-2006, 2008 Free Software Foundation, Inc. + © 2007-2008 Free Software Foundation, Inc. +Other-Authors: Bruno Haible, Paul Eggert +License: permissive-fsf + +Files: m4/acx_pthread.m4 +Copyright: © 2008, Steven G. Johnson +License: Autoconf + +files: m4/ax_check_capsicum.m4 +Copyright: © 2014, Google Inc. + © 2015, Lasse Collin +License: permissive-nowarranty -Files: po4a/.gitignore po/LINGUAS +Files: Doxyfile.in +Copyright: © 1997-2007 by Dimitri van Heesch +Origin: Doxygen 1.4.7 +License: GPL-2 + +Files: src/liblzma/check/crc32_table_?e.h + src/liblzma/check/crc64_table_?e.h + src/liblzma/lzma/fastpos_table.c + src/liblzma/rangecoder/price_table.c +Copyright: none, automatically generated data +Generated-With: + src/liblzma/check/crc32_tablegen.c + src/liblzma/check/crc64_tablegen.c + src/liblzma/lzma/fastpos_tablegen.c + src/liblzma/rangecoder/price_tablegen.c +License: none + No copyright to license. + +Files: .gitignore m4/.gitignore po/.gitignore po/LINGUAS po/POTFILES.in Copyright: none; these are just short lists. License: none No copyright to license. -Files: po/ca.po po/cs.po po/da.po po/fr.po po/it.po po/pt_BR.po po/pt.po po/sr.po po/tr.po po/zh_CN.po po/zh_TW.po -Copyright: Jordi Mas i Hernàndez - Marek Černocký - Joe Hansen - Adrien Nader - Stéphane Aulery - Gruppo traduzione italiano di Ubuntu-it - Lorenzo De Liso - Milo Casagrande - Rafael Fontenelle - Pedro Albuquerque - Мирослав Николић - Emir SARI - Boyuan Yang - Yi-Jyun Pan +Files: tests/compress_prepared_bcj_* +Copyright: 2008-2009, Lasse Collin +Source-Code: tests/bcj_test.c +License: PD + This file has been put into the public domain. + You can do whatever you want with this file. +Comment: + changelog.gz (commit 975d8fd) explains: + . + Recreated the BCJ test files for x86 and SPARC. The old files + were linked with crt*.o, which are copyrighted, and thus the + old test files were not in the public domain as a whole. They + are freely distributable though, but it is better to be careful + and avoid including any copyrighted pieces in the test files. + The new files are just compiled and assembled object files, + and thus don't contain any copyrighted code. + +Files: po/cs.po po/de.po po/fr.po +Copyright: 2010, Marek Černocký + 2010, Andre Noll + 2011, Adrien Nader License: PD This file is put in the public domain. -Files: po/de.po po/eo.po po/es.po po/fi.po po/hr.po po/hu.po po/ko.po po/pl.po po/ro.po po/sv.po po/uk.po po/vi.po -Copyright: André Noll - Anna Henningsen - Mario Blättermann - Keith Bowes - Cristian Othón Martínez Vera - Lauri Nurmi - Božidar Putanec - Meskó Balázs - Seong-ho Cho - Jakub Bogusz - Remus-Gabriel Chelu - Sebastian Rasmussen - Luna Jernberg - Anders Jonsson - Yuri Chornoivan - Trần Ngọc Quân -License: 0BSD +Files: po/it.po po/pl.po +Copyright: 2009, 2010, Gruppo traduzione italiano di Ubuntu-it + 2010, Lorenzo De Liso + 2009, 2010, 2011, Milo Casagrande + 2011, Jakub Bogusz +License: PD + This file is in the public domain Files: INSTALL.generic Copyright: © 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. License: permissive-nowarranty +Files: dos/config.h +Copyright: © 1992, 1993, 1994, 1999, 2000, 2001, 2002, 2005 + Free Software Foundation, Inc. + 2007-2010, Lasse Collin +Other-Authors: Roland McGrath, Akim Demaille, Paul Eggert, + David Mackenzie, Bruno Haible, and many others. +Origin: configure.ac from XZ Utils, + visibility.m4 serial 1 (gettext-0.15), + Autoconf 2.52g +License: config-h + configure.ac: + . + # Author: Lasse Collin + # + # This file has been put into the public domain. + # You can do whatever you want with this file. + . + visibility.m4: + . + dnl Copyright (C) 2005 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. + . + comments from Autoconf 2.52g: + . + # Copyright 1992, 1993, 1994, 1999, 2000, 2001, 2002 + # Free Software Foundation, Inc. + . + [...] + . + # As a special exception, the Free Software Foundation gives unlimited + # permission to copy, distribute and modify the configure scripts that + # are the output of Autoconf. You need not follow the terms of the GNU + # General Public License when using or distributing such scripts, even + # though portions of the text of Autoconf appear in them. The GNU + # General Public License (GPL) does govern all other use of the material + # that constitutes the Autoconf program. + . + On Debian systems, the complete text of the GNU General Public + License version 2 can be found in ‘/usr/share/common-licenses/GPL-2’. + dos/config.h was generated with autoheader, which tells Autoconf to + output a script to generate a config.h file and then runs it. + Files: po/Makevars -Copyright: © 2003-2019 Free Software Foundation, Inc -License: FSFUL - This file is free software; the Free Software Foundation gives - unlimited permission to use, copy, distribute, and modify it. +Origin: gettext-runtime/po/Makevars (gettext-0.12) +Copyright: © 2003 Free Software Foundation, Inc. +Authors: Bruno Haible +License: LGPL-2.1+ + The gettext-runtime package is under the LGPL, see files intl/COPYING.LIB-2.0 + and intl/COPYING.LIB-2.1. + . + On Debian systems, the complete text of intl/COPYING.LIB-2.0 from + gettext-runtime 0.12 can be found in ‘/usr/share/common-licenses/LGPL-2’ + and the text of intl/COPYING.LIB-2.1 can be found in + ‘/usr/share/common-licenses/LGPL-2.1’. + . + po/Makevars consists mostly of helpful comments and does not contain a + copyright and license notice. Files: COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 Copyright: © 1989, 1991, 1999, 2007 Free Software Foundation, Inc. @@ -296,7 +376,7 @@ On Debian systems, the complete text of the GNU General Public License version 3 can be found in ‘/usr/share/common-licenses/GPL-3’. -License: FSFULLR +License: permissive-fsf 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. @@ -306,9 +386,3 @@ are permitted in any medium without royalty provided the copyright notice and this notice are preserved. This file is offered as-is, without warranty of any kind. - -License: CC-BY-SA-4.0 - This work is licenced under the Creative Commons Attribution-Share Alike 4.0 - International License. To view a copy of this licence, visit - https://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative - Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. diff -Nru xz-utils-5.6.0/debian/gbp.conf xz-utils-5.6.1+really5.4.5/debian/gbp.conf --- xz-utils-5.6.0/debian/gbp.conf 2024-02-26 06:48:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/gbp.conf 2023-12-23 17:53:18.000000000 +0000 @@ -1,6 +1,6 @@ [DEFAULT] debian-branch=debian/unstable -upstream-branch=upstream/v5.5 +upstream-branch=upstream/v5.4 [pq] patch-numbers = False diff -Nru xz-utils-5.6.0/debian/liblzma-dev.docs xz-utils-5.6.1+really5.4.5/debian/liblzma-dev.docs --- xz-utils-5.6.0/debian/liblzma-dev.docs 2024-02-26 06:47:42.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/liblzma-dev.docs 2023-12-23 17:53:18.000000000 +0000 @@ -1,3 +1,5 @@ usr/share/doc/xz/xz-file-format.txt usr/share/doc/xz/lzma-file-format.txt +usr/share/doc/xz/TODO usr/share/doc/xz/examples +usr/share/doc/xz/examples_old diff -Nru xz-utils-5.6.0/debian/not-installed xz-utils-5.6.1+really5.4.5/debian/not-installed --- xz-utils-5.6.0/debian/not-installed 2024-02-26 06:47:42.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/not-installed 2023-12-23 17:53:18.000000000 +0000 @@ -10,8 +10,8 @@ usr/bin/unlzma usr/lib/*/liblzma.la usr/share/doc/xz/COPYING -usr/share/doc/xz/COPYING.0BSD usr/share/doc/xz/COPYING.GPLv2 +usr/share/doc/xz/TODO usr/share/man/man1/lzcat.1 usr/share/man/man1/lzcmp.1 usr/share/man/man1/lzdiff.1 @@ -22,16 +22,4 @@ usr/share/man/man1/lzma.1 usr/share/man/man1/lzmore.1 usr/share/man/man1/unlzma.1 -usr/share/man/*/man1/lzcmp.1 -usr/share/man/*/man1/lzdiff.1 -usr/share/man/*/man1/lzegrep.1 -usr/share/man/*/man1/lzfgrep.1 -usr/share/man/*/man1/lzgrep.1 -usr/share/man/*/man1/lzmore.1 -usr/share/man/*/man1/xzcmp.1 -usr/share/man/*/man1/xzdiff.1 -usr/share/man/*/man1/xzegrep.1 -usr/share/man/*/man1/xzfgrep.1 -usr/share/man/*/man1/xzgrep.1 -usr/share/man/*/man1/xzmore.1 usr/share/doc/xz/api/* diff -Nru xz-utils-5.6.0/debian/patches/series xz-utils-5.6.1+really5.4.5/debian/patches/series --- xz-utils-5.6.0/debian/patches/series 2024-02-28 18:58:06.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xz-Add-missing-RISC-V-on-the-filter-list-in-the-man-page.patch -xz-Change-logging-level-for-thread-reduction-to-highest-v.patch diff -Nru xz-utils-5.6.0/debian/patches/xz-Add-missing-RISC-V-on-the-filter-list-in-the-man-page.patch xz-utils-5.6.1+really5.4.5/debian/patches/xz-Add-missing-RISC-V-on-the-filter-list-in-the-man-page.patch --- xz-utils-5.6.0/debian/patches/xz-Add-missing-RISC-V-on-the-filter-list-in-the-man-page.patch 2024-02-28 18:58:06.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/patches/xz-Add-missing-RISC-V-on-the-filter-list-in-the-man-page.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -From: Chien Wong -Date: Sun, 25 Feb 2024 21:38:13 +0800 -Subject: xz: Add missing RISC-V on the filter list in the man page - -Signed-off-by: Chien Wong ---- - src/xz/xz.1 | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/xz/xz.1 b/src/xz/xz.1 -index 6c8a52f..6c34062 100644 ---- a/src/xz/xz.1 -+++ b/src/xz/xz.1 -@@ -4,7 +4,7 @@ - .\" Authors: Lasse Collin - .\" Jia Tan - .\" --.TH XZ 1 "2024-02-13" "Tukaani" "XZ Utils" -+.TH XZ 1 "2024-02-25" "Tukaani" "XZ Utils" - . - .SH NAME - xz, unxz, xzcat, lzma, unlzma, lzcat \- Compress or decompress .xz and .lzma files -@@ -1812,6 +1812,8 @@ and - \fB\-\-ia64\fR[\fB=\fIoptions\fR] - .TP - \fB\-\-sparc\fR[\fB=\fIoptions\fR] -+.TP -+\fB\-\-riscv\fR[\fB=\fIoptions\fR] - .PD - Add a branch/call/jump (BCJ) filter to the filter chain. - These filters can be used only as a non-last filter diff -Nru xz-utils-5.6.0/debian/patches/xz-Change-logging-level-for-thread-reduction-to-highest-v.patch xz-utils-5.6.1+really5.4.5/debian/patches/xz-Change-logging-level-for-thread-reduction-to-highest-v.patch --- xz-utils-5.6.0/debian/patches/xz-Change-logging-level-for-thread-reduction-to-highest-v.patch 2024-02-28 18:58:06.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/patches/xz-Change-logging-level-for-thread-reduction-to-highest-v.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -From: Jia Tan -Date: Tue, 27 Feb 2024 23:42:41 +0800 -Subject: xz: Change logging level for thread reduction to highest verbosity - only. - -Now that multi threaded encoding is the default, users do not need to -see a warning message everytime the number of threads is reduced. On -some machines, this could happen very often. It is not unreasonable for -users to need to set double verbose mode to see this kind of -information. - -To see these warning messages -vv or --verbose --verbose must be passed -to set xz into the highest possible verbosity mode. - -These warnings had caused automated testing frameworks to fail when they -expected no output to stderr. - -Thanks to Sebastian Andrzej Siewior for reporting this and for the -initial version of the patch. ---- - src/xz/coder.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/xz/coder.c b/src/xz/coder.c -index 4efaa80..a408173 100644 ---- a/src/xz/coder.c -+++ b/src/xz/coder.c -@@ -581,7 +581,7 @@ coder_set_compression_settings(void) - - if (memory_usage <= memory_limit) { - // The memory usage is now low enough. -- message(V_WARNING, _("Reduced the number of " -+ message(V_DEBUG, _("Reduced the number of " - "threads from %s to %s to not exceed " - "the memory usage limit of %s MiB"), - uint64_to_str( -@@ -601,7 +601,7 @@ coder_set_compression_settings(void) - // time the soft limit will never make xz fail and never make - // xz change settings that would affect the compressed output. - if (hardware_memlimit_mtenc_is_default()) { -- message(V_WARNING, _("Reduced the number of threads " -+ message(V_DEBUG, _("Reduced the number of threads " - "from %s to one. The automatic memory usage " - "limit of %s MiB is still being exceeded. " - "%s MiB of memory is required. " diff -Nru xz-utils-5.6.0/debian/symbols xz-utils-5.6.1+really5.4.5/debian/symbols --- xz-utils-5.6.0/debian/symbols 2024-02-26 06:47:42.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/symbols 2023-12-23 17:53:18.000000000 +0000 @@ -24,5 +24,3 @@ (arch=linux-any)lzma_stream_encoder_mt@XZ_5.2.2 5.2.2 (arch=linux-any)lzma_stream_encoder_mt_memusage@XZ_5.1.2alpha 5.4 (arch=linux-any)lzma_stream_encoder_mt_memusage@XZ_5.2.2 5.2.2 - XZ_5.6.0@XZ_5.6.0 5.6.0 - lzma_mt_block_size@XZ_5.6.0 5.6.0 diff -Nru xz-utils-5.6.0/debian/tests/control xz-utils-5.6.1+really5.4.5/debian/tests/control --- xz-utils-5.6.0/debian/tests/control 2024-02-26 06:47:42.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/tests/control 2023-12-23 17:53:18.000000000 +0000 @@ -1,3 +1,3 @@ Tests: testsuite Depends: debhelper-compat (= 13), autoconf (>= 2.64~), automake, libtool (>= 2.2), gettext, @ -Restrictions: rw-build-tree, allow-stderr +Restrictions: rw-build-tree diff -Nru xz-utils-5.6.0/debian/watch xz-utils-5.6.1+really5.4.5/debian/watch --- xz-utils-5.6.0/debian/watch 2024-02-26 06:47:42.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/watch 2023-12-23 17:53:18.000000000 +0000 @@ -1,4 +1,3 @@ version=4 opts=dversionmangle=s/\+\d{8}$//,pgpsigurlmangle=s/$/.sig/ \ -https://xz.tukaani.org/xz-utils/ \ -https://github.com/tukaani-project/xz/releases/download/v[^/]+/xz-([\d\.]*(?:beta|alpha)?)\.tar\.xz +https://tukaani.org/xz/xz-([\d.]*(?:beta)?)\.tar\.xz diff -Nru xz-utils-5.6.0/debian/xz-utils.install xz-utils-5.6.1+really5.4.5/debian/xz-utils.install --- xz-utils-5.6.0/debian/xz-utils.install 2024-02-26 06:47:42.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debian/xz-utils.install 2023-12-23 17:53:18.000000000 +0000 @@ -9,14 +9,25 @@ usr/bin/xzmore usr/share/locale/*/LC_MESSAGES/xz.mo usr/share/man/*/man1/lzcat.1 +usr/share/man/*/man1/lzcmp.1 +usr/share/man/*/man1/lzdiff.1 +usr/share/man/*/man1/lzegrep.1 +usr/share/man/*/man1/lzfgrep.1 +usr/share/man/*/man1/lzgrep.1 usr/share/man/*/man1/lzless.1 usr/share/man/*/man1/lzma.1 -usr/share/man/*/man1/lzmainfo.1 +usr/share/man/*/man1/lzmore.1 usr/share/man/*/man1/unlzma.1 usr/share/man/*/man1/unxz.1 usr/share/man/*/man1/xz.1 usr/share/man/*/man1/xzcat.1 +usr/share/man/*/man1/xzcmp.1 +usr/share/man/*/man1/xzdiff.1 +usr/share/man/*/man1/xzegrep.1 +usr/share/man/*/man1/xzfgrep.1 +usr/share/man/*/man1/xzgrep.1 usr/share/man/*/man1/xzless.1 +usr/share/man/*/man1/xzmore.1 usr/share/man/man1/lzmainfo.1 usr/share/man/man1/unxz.1 usr/share/man/man1/xz*grep.1 diff -Nru xz-utils-5.6.0/debug/Makefile.am xz-utils-5.6.1+really5.4.5/debug/Makefile.am --- xz-utils-5.6.0/debug/Makefile.am 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/Makefile.am 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,9 @@ -## SPDX-License-Identifier: 0BSD +## ## Author: Lasse Collin +## +## This file has been put into the public domain. +## You can do whatever you want with this file. +## EXTRA_DIST = \ translation.bash diff -Nru xz-utils-5.6.0/debug/Makefile.in xz-utils-5.6.1+really5.4.5/debug/Makefile.in --- xz-utils-5.6.0/debug/Makefile.in 2024-02-24 08:28:04.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/Makefile.in 2023-11-01 12:27:09.000000000 +0000 @@ -94,8 +94,8 @@ @COND_GNULIB_TRUE@am__append_1 = $(top_builddir)/lib/libgnu.a subdir = debug ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/build-to-host.m4 $(top_srcdir)/m4/getopt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \ + $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/host-cpu-c-abi.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -236,6 +236,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +CAPSICUM_LIB = @CAPSICUM_LIB@ CC = @CC@ CCAS = @CCAS@ CCASDEPMODE = @CCASDEPMODE@ @@ -364,8 +365,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ diff -Nru xz-utils-5.6.0/debug/crc32.c xz-utils-5.6.1+really5.4.5/debug/crc32.c --- xz-utils-5.6.0/debug/crc32.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/crc32.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file crc32.c @@ -7,6 +5,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include "sysdefs.h" diff -Nru xz-utils-5.6.0/debug/full_flush.c xz-utils-5.6.1+really5.4.5/debug/full_flush.c --- xz-utils-5.6.0/debug/full_flush.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/full_flush.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file full_flush.c @@ -7,6 +5,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include "sysdefs.h" diff -Nru xz-utils-5.6.0/debug/hex2bin.c xz-utils-5.6.1+really5.4.5/debug/hex2bin.c --- xz-utils-5.6.0/debug/hex2bin.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/hex2bin.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file hex2bin.c @@ -7,6 +5,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include "sysdefs.h" diff -Nru xz-utils-5.6.0/debug/known_sizes.c xz-utils-5.6.1+really5.4.5/debug/known_sizes.c --- xz-utils-5.6.0/debug/known_sizes.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/known_sizes.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file known_sizes.c @@ -11,6 +9,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include "sysdefs.h" diff -Nru xz-utils-5.6.0/debug/memusage.c xz-utils-5.6.1+really5.4.5/debug/memusage.c --- xz-utils-5.6.0/debug/memusage.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/memusage.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file memusage.c @@ -7,6 +5,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include "sysdefs.h" diff -Nru xz-utils-5.6.0/debug/repeat.c xz-utils-5.6.1+really5.4.5/debug/repeat.c --- xz-utils-5.6.0/debug/repeat.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/repeat.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file repeat.c @@ -11,6 +9,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include "sysdefs.h" diff -Nru xz-utils-5.6.0/debug/sync_flush.c xz-utils-5.6.1+really5.4.5/debug/sync_flush.c --- xz-utils-5.6.0/debug/sync_flush.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/sync_flush.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file sync_flush.c @@ -7,6 +5,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include "sysdefs.h" diff -Nru xz-utils-5.6.0/debug/translation.bash xz-utils-5.6.1+really5.4.5/debug/translation.bash --- xz-utils-5.6.0/debug/translation.bash 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/debug/translation.bash 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,4 @@ #!/bin/bash -# SPDX-License-Identifier: 0BSD ############################################################################### # @@ -21,6 +20,9 @@ # # Author: Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################### set -e diff -Nru xz-utils-5.6.0/doc/api/COPYING.CC-BY-SA-4.0 xz-utils-5.6.1+really5.4.5/doc/api/COPYING.CC-BY-SA-4.0 --- xz-utils-5.6.0/doc/api/COPYING.CC-BY-SA-4.0 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/COPYING.CC-BY-SA-4.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,427 +0,0 @@ -Attribution-ShareAlike 4.0 International - -======================================================================= - -Creative Commons Corporation ("Creative Commons") is not a law firm and -does not provide legal services or legal advice. Distribution of -Creative Commons public licenses does not create a lawyer-client or -other relationship. Creative Commons makes its licenses and related -information available on an "as-is" basis. Creative Commons gives no -warranties regarding its licenses, any material licensed under their -terms and conditions, or any related information. Creative Commons -disclaims all liability for damages resulting from their use to the -fullest extent possible. - -Using Creative Commons Public Licenses - -Creative Commons public licenses provide a standard set of terms and -conditions that creators and other rights holders may use to share -original works of authorship and other material subject to copyright -and certain other rights specified in the public license below. The -following considerations are for informational purposes only, are not -exhaustive, and do not form part of our licenses. - - Considerations for licensors: Our public licenses are - intended for use by those authorized to give the public - permission to use material in ways otherwise restricted by - copyright and certain other rights. Our licenses are - irrevocable. Licensors should read and understand the terms - and conditions of the license they choose before applying it. - Licensors should also secure all rights necessary before - applying our licenses so that the public can reuse the - material as expected. Licensors should clearly mark any - material not subject to the license. This includes other CC- - licensed material, or material used under an exception or - limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors - - Considerations for the public: By using one of our public - licenses, a licensor grants the public permission to use the - licensed material under specified terms and conditions. If - the licensor's permission is not necessary for any reason--for - example, because of any applicable exception or limitation to - copyright--then that use is not regulated by the license. Our - licenses grant only permissions under copyright and certain - other rights that a licensor has authority to grant. Use of - the licensed material may still be restricted for other - reasons, including because others have copyright or other - rights in the material. A licensor may make special requests, - such as asking that all changes be marked or described. - Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More considerations - for the public: - wiki.creativecommons.org/Considerations_for_licensees - -======================================================================= - -Creative Commons Attribution-ShareAlike 4.0 International Public -License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution-ShareAlike 4.0 International Public License ("Public -License"). To the extent this Public License may be interpreted as a -contract, You are granted the Licensed Rights in consideration of Your -acceptance of these terms and conditions, and the Licensor grants You -such rights in consideration of benefits the Licensor receives from -making the Licensed Material available under these terms and -conditions. - - -Section 1 -- Definitions. - - a. Adapted Material means material subject to Copyright and Similar - Rights that is derived from or based upon the Licensed Material - and in which the Licensed Material is translated, altered, - arranged, transformed, or otherwise modified in a manner requiring - permission under the Copyright and Similar Rights held by the - Licensor. For purposes of this Public License, where the Licensed - Material is a musical work, performance, or sound recording, - Adapted Material is always produced where the Licensed Material is - synched in timed relation with a moving image. - - b. Adapter's License means the license You apply to Your Copyright - and Similar Rights in Your contributions to Adapted Material in - accordance with the terms and conditions of this Public License. - - c. BY-SA Compatible License means a license listed at - creativecommons.org/compatiblelicenses, approved by Creative - Commons as essentially the equivalent of this Public License. - - d. Copyright and Similar Rights means copyright and/or similar rights - closely related to copyright including, without limitation, - performance, broadcast, sound recording, and Sui Generis Database - Rights, without regard to how the rights are labeled or - categorized. For purposes of this Public License, the rights - specified in Section 2(b)(1)-(2) are not Copyright and Similar - Rights. - - e. Effective Technological Measures means those measures that, in the - absence of proper authority, may not be circumvented under laws - fulfilling obligations under Article 11 of the WIPO Copyright - Treaty adopted on December 20, 1996, and/or similar international - agreements. - - f. Exceptions and Limitations means fair use, fair dealing, and/or - any other exception or limitation to Copyright and Similar Rights - that applies to Your use of the Licensed Material. - - g. License Elements means the license attributes listed in the name - of a Creative Commons Public License. The License Elements of this - Public License are Attribution and ShareAlike. - - h. Licensed Material means the artistic or literary work, database, - or other material to which the Licensor applied this Public - License. - - i. Licensed Rights means the rights granted to You subject to the - terms and conditions of this Public License, which are limited to - all Copyright and Similar Rights that apply to Your use of the - Licensed Material and that the Licensor has authority to license. - - j. Licensor means the individual(s) or entity(ies) granting rights - under this Public License. - - k. Share means to provide material to the public by any means or - process that requires permission under the Licensed Rights, such - as reproduction, public display, public performance, distribution, - dissemination, communication, or importation, and to make material - available to the public including in ways that members of the - public may access the material from a place and at a time - individually chosen by them. - - l. Sui Generis Database Rights means rights other than copyright - resulting from Directive 96/9/EC of the European Parliament and of - the Council of 11 March 1996 on the legal protection of databases, - as amended and/or succeeded, as well as other essentially - equivalent rights anywhere in the world. - - m. You means the individual or entity exercising the Licensed Rights - under this Public License. Your has a corresponding meaning. - - -Section 2 -- Scope. - - a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Material to: - - a. reproduce and Share the Licensed Material, in whole or - in part; and - - b. produce, reproduce, and Share Adapted Material. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Material. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Material. Every - recipient of the Licensed Material automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. Additional offer from the Licensor -- Adapted Material. - Every recipient of Adapted Material from You - automatically receives an offer from the Licensor to - exercise the Licensed Rights in the Adapted Material - under the conditions of the Adapter's License You apply. - - c. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Material if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Material. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Material is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - - b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties. - - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - - a. Attribution. - - 1. If You Share the Licensed Material (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Material: - - i. identification of the creator(s) of the Licensed - Material and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Material to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Material and - retain an indication of any previous modifications; and - - c. indicate the Licensed Material is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Material. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - - b. ShareAlike. - - In addition to the conditions in Section 3(a), if You Share - Adapted Material You produce, the following conditions also apply. - - 1. The Adapter's License You apply must be a Creative Commons - license with the same License Elements, this version or - later, or a BY-SA Compatible License. - - 2. You must include the text of, or the URI or hyperlink to, the - Adapter's License You apply. You may satisfy this condition - in any reasonable manner based on the medium, means, and - context in which You Share Adapted Material. - - 3. You may not offer or impose any additional or different terms - or conditions on, or apply any Effective Technological - Measures to, Adapted Material that restrict exercise of the - rights granted under the Adapter's License You apply. - - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Material: - - a. for the avoidance of doubt, Section 2(a)(1) grants You the right - to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database; - - b. if You include all or a substantial portion of the database - contents in a database in which You have Sui Generis Database - Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Material, - including for purposes of Section 3(b); and - - c. You must comply with the conditions in Section 3(a) if You Share - all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - - a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE - EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS - AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF - ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, - IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, - WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, - ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT - KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT - ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - - b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE - TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, - NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, - COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR - USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR - DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR - IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - - c. The disclaimer of warranties and limitation of liability provided - above shall be interpreted in a manner that, to the extent - possible, most closely approximates an absolute disclaimer and - waiver of all liability. - - -Section 6 -- Term and Termination. - - a. This Public License applies for the term of the Copyright and - Similar Rights licensed here. However, if You fail to comply with - this Public License, then Your rights under this Public License - terminate automatically. - - b. Where Your right to use the Licensed Material has terminated under - Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - - c. For the avoidance of doubt, the Licensor may also offer the - Licensed Material under separate terms or conditions or stop - distributing the Licensed Material at any time; however, doing so - will not terminate this Public License. - - d. Sections 1, 5, 6, 7, and 8 survive termination of this Public - License. - - -Section 7 -- Other Terms and Conditions. - - a. The Licensor shall not be bound by any additional or different - terms or conditions communicated by You unless expressly agreed. - - b. Any arrangements, understandings, or agreements regarding the - Licensed Material not stated herein are separate from and - independent of the terms and conditions of this Public License. - - -Section 8 -- Interpretation. - - a. For the avoidance of doubt, this Public License does not, and - shall not be interpreted to, reduce, limit, restrict, or impose - conditions on any use of the Licensed Material that could lawfully - be made without permission under this Public License. - - b. To the extent possible, if any provision of this Public License is - deemed unenforceable, it shall be automatically reformed to the - minimum extent necessary to make it enforceable. If the provision - cannot be reformed, it shall be severed from this Public License - without affecting the enforceability of the remaining terms and - conditions. - - c. No term or condition of this Public License will be waived and no - failure to comply consented to unless expressly agreed to by the - Licensor. - - d. Nothing in this Public License constitutes or may be interpreted - as a limitation upon, or waiver of, any privileges and immunities - that apply to the Licensor or You, including from the legal - processes of any jurisdiction or authority. - - -======================================================================= - -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. - -Creative Commons may be contacted at creativecommons.org. diff -Nru xz-utils-5.6.0/doc/api/annotated.html xz-utils-5.6.1+really5.4.5/doc/api/annotated.html --- xz-utils-5.6.0/doc/api/annotated.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/annotated.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@ - @@ -61,14 +60,9 @@
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
-
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/base_8h.html xz-utils-5.6.1+really5.4.5/doc/api/base_8h.html --- xz-utils-5.6.0/doc/api/base_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/base_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@ - @@ -130,7 +129,7 @@   LZMA_FINISH = 3
} - +
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
 The 'action' argument for lzma_code() More...
 The `action' argument for lzma_code() More...
 

@@ -196,8 +195,8 @@

Boolean.

This is here because C89 doesn't have stdbool.h. To set a value for variables having type lzma_bool, you can use

    -
  • C99's 'true' and 'false' from stdbool.h;
    • -
  • C++'s internal 'true' and 'false'; or
    • +
  • C99's `true' and `false' from stdbool.h;
    • +
  • C++'s internal `true' and `false'; or
  • integers one (true) and zero (false).
@@ -330,8 +329,8 @@

-

The 'action' argument for lzma_code()

-

After the first use of LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, LZMA_FULL_BARRIER, or LZMA_FINISH, the same 'action' must be used until lzma_code() returns LZMA_STREAM_END. Also, the amount of input (that is, strm->avail_in) must not be modified by the application until lzma_code() returns LZMA_STREAM_END. Changing the 'action' or modifying the amount of input will make lzma_code() return LZMA_PROG_ERROR.

+

The `action' argument for lzma_code()

+

After the first use of LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, LZMA_FULL_BARRIER, or LZMA_FINISH, the same `action' must be used until lzma_code() returns LZMA_STREAM_END. Also, the amount of input (that is, strm->avail_in) must not be modified by the application until lzma_code() returns LZMA_STREAM_END. Changing the `action' or modifying the amount of input will make lzma_code() return LZMA_PROG_ERROR.

Enumerator
LZMA_RUN 

Continue coding.

Encoder: Encode as much input as possible. Some internal buffering will probably be done (depends on the filter chain in use), which causes latency: the input used won't usually be decodeable from the output of the same lzma_code() call.

@@ -389,7 +388,7 @@

Encode or decode data.

Once the lzma_stream has been successfully initialized (e.g. with lzma_stream_encoder()), the actual encoding or decoding is done using this function. The application has to update strm->next_in, strm->avail_in, strm->next_out, and strm->avail_out to pass input to and get output from liblzma.

-

See the description of the coder-specific initialization function to find out what 'action' values are supported by the coder.

+

See the description of the coder-specific initialization function to find out what `action' values are supported by the coder.

Parameters
@@ -573,14 +572,9 @@ -
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/bcj_8h.html xz-utils-5.6.1+really5.4.5/doc/api/bcj_8h.html --- xz-utils-5.6.0/doc/api/bcj_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/bcj_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
strmPointer to lzma_stream that is at least initialized with LZMA_STREAM_INIT.
- @@ -93,23 +92,14 @@ #define  - - -
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
LZMA_FILTER_ARM64   LZMA_VLI_C(0x0A)
 Filter for ARM64 binaries.
 
-#define LZMA_FILTER_RISCV   LZMA_VLI_C(0x0B)
 Filter for RISC-V binaries.
 

Detailed Description

Branch/Call/Jump conversion filters.

Note
Never include this file directly. Use <lzma.h> instead.
-
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/block_8h.html xz-utils-5.6.1+really5.4.5/doc/api/block_8h.html --- xz-utils-5.6.0/doc/api/block_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/block_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@ - @@ -751,14 +750,9 @@ -
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/check_8h.html xz-utils-5.6.1+really5.4.5/doc/api/check_8h.html --- xz-utils-5.6.0/doc/api/check_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/check_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
- @@ -333,14 +332,9 @@ -
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/classes.html xz-utils-5.6.1+really5.4.5/doc/api/classes.html --- xz-utils-5.6.0/doc/api/classes.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/classes.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
- @@ -53,14 +52,9 @@
lzma_allocator
lzma_block
lzma_filter
lzma_index_iter
lzma_mt
lzma_options_bcj
lzma_options_delta
lzma_options_lzma
lzma_stream
lzma_stream_flags
-
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/container_8h.html xz-utils-5.6.1+really5.4.5/doc/api/container_8h.html --- xz-utils-5.6.0/doc/api/container_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/container_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
- @@ -111,9 +110,6 @@ - - - @@ -283,8 +279,8 @@
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
lzma_ret lzma_stream_encoder_mt (lzma_stream *strm, const lzma_mt *options) lzma_nothrow lzma_attr_warn_unused_result
 Initialize multithreaded .xz Stream encoder.
 
uint64_t lzma_mt_block_size (const lzma_filter *filters) lzma_nothrow
 Calculate recommended Block size for multithreaded .xz encoder.
 
lzma_ret lzma_alone_encoder (lzma_stream *strm, const lzma_options_lzma *options) lzma_nothrow lzma_attr_warn_unused_result
 Initialize .lzma encoder (legacy file format)
 

This flag enables decoding of concatenated files with file formats that allow concatenating compressed files as is. From the formats currently supported by liblzma, only the .xz and .lz formats allow concatenated files. Concatenated files are not allowed with the legacy .lzma format.

-

This flag also affects the usage of the 'action' argument for lzma_code(). When LZMA_CONCATENATED is used, lzma_code() won't return LZMA_STREAM_END unless LZMA_FINISH is used as 'action'. Thus, the application has to set LZMA_FINISH in the same way as it does when encoding.

-

If LZMA_CONCATENATED is not used, the decoders still accept LZMA_FINISH as 'action' for lzma_code(), but the usage of LZMA_FINISH isn't required.

+

This flag also affects the usage of the `action' argument for lzma_code(). When LZMA_CONCATENATED is used, lzma_code() won't return LZMA_STREAM_END unless LZMA_FINISH is used as `action'. Thus, the application has to set LZMA_FINISH in the same way as it does when encoding.

+

If LZMA_CONCATENATED is not used, the decoders still accept LZMA_FINISH as `action' for lzma_code(), but the usage of LZMA_FINISH isn't required.

@@ -399,7 +395,7 @@

Initialize .xz Stream encoder using a preset number.

This function is intended for those who just want to use the basic features of liblzma (that is, most developers out there).

If initialization fails (return value is not LZMA_OK), all the memory allocated for *strm by liblzma is always freed. Thus, there is no need to call lzma_end() after failed initialization.

-

If initialization succeeds, use lzma_code() to do the actual encoding. Valid values for 'action' (the second argument of lzma_code()) are LZMA_RUN, LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, and LZMA_FINISH. In future, there may be compression levels or flags that don't support LZMA_SYNC_FLUSH.

+

If initialization succeeds, use lzma_code() to do the actual encoding. Valid values for `action' (the second argument of lzma_code()) are LZMA_RUN, LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, and LZMA_FINISH. In future, there may be compression levels or flags that don't support LZMA_SYNC_FLUSH.

Parameters
@@ -636,35 +632,6 @@ - -

◆ lzma_mt_block_size()

- -
-
-
strmPointer to lzma_stream that is at least initialized with LZMA_STREAM_INIT.
- - - - - - - -
uint64_t lzma_mt_block_size (const lzma_filter * filters)
-
- -

Calculate recommended Block size for multithreaded .xz encoder.

-

This calculates a recommended Block size for multithreaded encoding given a filter chain. This is used internally by lzma_stream_encoder_mt() to determine the Block size if the block_size member is not set to the special value of 0 in the lzma_mt options struct.

-

If one wishes to change the filters between Blocks, this function is helpful to set the block_size member of the lzma_mt struct before calling lzma_stream_encoder_mt(). Since the block_size member represents the maximum possible Block size for the multithreaded .xz encoder, one can use this function to find the maximum recommended Block size based on all planned filter chains. Otherwise, the multithreaded encoder will base its maximum Block size on the first filter chain used (if the block_size member is not set), which may unnecessarily limit the Block size for a later filter chain.

-
Parameters
- - -
filtersArray of filters terminated with .id == LZMA_VLI_UNKNOWN.
-
-
-
Returns
Recommended Block size in bytes, or UINT64_MAX if an error occurred.
- -
-

◆ lzma_alone_encoder()

@@ -1062,7 +1029,7 @@

Initialize .lzma decoder (legacy file format)

-

Valid 'action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH. There is no need to use LZMA_FINISH, but it's allowed because it may simplify certain types of applications.

+

Valid `action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH. There is no need to use LZMA_FINISH, but it's allowed because it may simplify certain types of applications.

Parameters
@@ -1304,14 +1271,9 @@ -
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/delta_8h.html xz-utils-5.6.1+really5.4.5/doc/api/delta_8h.html --- xz-utils-5.6.0/doc/api/delta_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/delta_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
strmPointer to lzma_stream that is at least initialized with LZMA_STREAM_INIT.
- @@ -125,14 +124,9 @@ -
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/dir_b17a1d403082bd69a703ed987cf158fb.html xz-utils-5.6.1+really5.4.5/doc/api/dir_b17a1d403082bd69a703ed987cf158fb.html --- xz-utils-5.6.0/doc/api/dir_b17a1d403082bd69a703ed987cf158fb.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/dir_b17a1d403082bd69a703ed987cf158fb.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
- @@ -97,14 +96,9 @@
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
 
-
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/files.html xz-utils-5.6.1+really5.4.5/doc/api/files.html --- xz-utils-5.6.0/doc/api/files.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/files.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@ - @@ -67,14 +66,9 @@
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
-
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/filter_8h.html xz-utils-5.6.1+really5.4.5/doc/api/filter_8h.html --- xz-utils-5.6.0/doc/api/filter_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/filter_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@ - @@ -523,7 +522,7 @@

Initialize raw encoder.

This function may be useful when implementing custom file formats.

-

The 'action' with lzma_code() can be LZMA_RUN, LZMA_SYNC_FLUSH (if the filter chain supports it), or LZMA_FINISH.

+

The `action' with lzma_code() can be LZMA_RUN, LZMA_SYNC_FLUSH (if the filter chain supports it), or LZMA_FINISH.

Parameters
-
liblzma (XZ Utils) 5.6.0 +
liblzma (XZ Utils) 5.4.5
@@ -569,7 +568,7 @@

Initialize raw decoder.

The initialization of raw decoder goes similarly to raw encoder.

-

The 'action' with lzma_code() can be LZMA_RUN or LZMA_FINISH. Using LZMA_FINISH is not required, it is supported just for convenience.

+

The `action' with lzma_code() can be LZMA_RUN or LZMA_FINISH. Using LZMA_FINISH is not required, it is supported just for convenience.

Parameters
strmPointer to lzma_stream that is at least initialized with LZMA_STREAM_INIT.
@@ -1335,14 +1334,9 @@ -
-

- XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

+ +
+Generated by doxygen 1.9.7 +
diff -Nru xz-utils-5.6.0/doc/api/functions.html xz-utils-5.6.1+really5.4.5/doc/api/functions.html --- xz-utils-5.6.0/doc/api/functions.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/functions.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
strmPointer to lzma_stream that is at least initialized with LZMA_STREAM_INIT.
- @@ -203,14 +202,9 @@
  • version : lzma_block, lzma_stream_flags
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/functions_vars.html xz-utils-5.6.1+really5.4.5/doc/api/functions_vars.html --- xz-utils-5.6.0/doc/api/functions_vars.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/functions_vars.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -203,14 +202,9 @@
  • version : lzma_block, lzma_stream_flags
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/globals.html xz-utils-5.6.1+really5.4.5/doc/api/globals.html --- xz-utils-5.6.0/doc/api/globals.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/globals.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -121,7 +120,6 @@
  • LZMA_FILTER_LZMA1EXT : lzma12.h
  • LZMA_FILTER_LZMA2 : lzma12.h
  • LZMA_FILTER_POWERPC : bcj.h
    • -
  • LZMA_FILTER_RISCV : bcj.h
  • LZMA_FILTER_SPARC : bcj.h
  • LZMA_FILTER_X86 : bcj.h
  • lzma_filters_copy() : filter.h
    • @@ -142,10 +140,6 @@
  • lzma_index_buffer_decode() : index.h
  • lzma_index_buffer_encode() : index.h
  • lzma_index_cat() : index.h
    • -
  • LZMA_INDEX_CHECK_MASK_CRC32 : index.h
    • -
  • LZMA_INDEX_CHECK_MASK_CRC64 : index.h
    • -
  • LZMA_INDEX_CHECK_MASK_NONE : index.h
    • -
  • LZMA_INDEX_CHECK_MASK_SHA256 : index.h
  • lzma_index_checks() : index.h
  • lzma_index_decoder() : index.h
  • lzma_index_dup() : index.h
    • @@ -198,7 +192,6 @@
  • LZMA_MODE_FAST : lzma12.h
  • lzma_mode_is_supported() : lzma12.h
  • LZMA_MODE_NORMAL : lzma12.h
    • -
  • lzma_mt_block_size() : container.h
  • LZMA_NO_CHECK : base.h
  • LZMA_OK : base.h
  • LZMA_OPTIONS_ERROR : base.h
    • @@ -271,14 +264,9 @@
  • LZMA_VLI_UNKNOWN : vli.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/globals_defs.html xz-utils-5.6.1+really5.4.5/doc/api/globals_defs.html --- xz-utils-5.6.0/doc/api/globals_defs.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/globals_defs.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -79,15 +78,10 @@
  • LZMA_FILTER_LZMA1EXT : lzma12.h
  • LZMA_FILTER_LZMA2 : lzma12.h
  • LZMA_FILTER_POWERPC : bcj.h
    • -
  • LZMA_FILTER_RISCV : bcj.h
  • LZMA_FILTER_SPARC : bcj.h
  • LZMA_FILTER_X86 : bcj.h
  • LZMA_FILTERS_MAX : filter.h
  • LZMA_IGNORE_CHECK : container.h
    • -
  • LZMA_INDEX_CHECK_MASK_CRC32 : index.h
    • -
  • LZMA_INDEX_CHECK_MASK_CRC64 : index.h
    • -
  • LZMA_INDEX_CHECK_MASK_NONE : index.h
    • -
  • LZMA_INDEX_CHECK_MASK_SHA256 : index.h
  • LZMA_PRESET_DEFAULT : container.h
  • LZMA_PRESET_EXTREME : container.h
  • LZMA_PRESET_LEVEL_MASK : container.h
    • @@ -117,14 +111,9 @@
  • LZMA_VLI_UNKNOWN : vli.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/globals_enum.html xz-utils-5.6.1+really5.4.5/doc/api/globals_enum.html --- xz-utils-5.6.0/doc/api/globals_enum.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/globals_enum.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -64,14 +63,9 @@
  • lzma_ret : base.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/globals_eval.html xz-utils-5.6.1+really5.4.5/doc/api/globals_eval.html --- xz-utils-5.6.0/doc/api/globals_eval.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/globals_eval.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -96,14 +95,9 @@
  • LZMA_UNSUPPORTED_CHECK : base.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/globals_func.html xz-utils-5.6.1+really5.4.5/doc/api/globals_func.html --- xz-utils-5.6.0/doc/api/globals_func.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/globals_func.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -137,7 +136,6 @@
  • lzma_microlzma_decoder() : container.h
  • lzma_microlzma_encoder() : container.h
  • lzma_mode_is_supported() : lzma12.h
    • -
  • lzma_mt_block_size() : container.h
  • lzma_physmem() : hardware.h
  • lzma_properties_decode() : filter.h
  • lzma_properties_encode() : filter.h
    • @@ -171,14 +169,9 @@
  • lzma_vli_size() : vli.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/globals_type.html xz-utils-5.6.1+really5.4.5/doc/api/globals_type.html --- xz-utils-5.6.0/doc/api/globals_type.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/globals_type.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -61,14 +60,9 @@
  • lzma_vli : vli.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/hardware_8h.html xz-utils-5.6.1+really5.4.5/doc/api/hardware_8h.html --- xz-utils-5.6.0/doc/api/hardware_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/hardware_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -116,14 +115,9 @@ -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/index.html xz-utils-5.6.1+really5.4.5/doc/api/index.html --- xz-utils-5.6.0/doc/api/index.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/index.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -40,21 +39,15 @@
    liblzma (XZ Utils)
    -

    liblzma is a general-purpose data compression library with a zlib-like API. The native file format is .xz, but also the old .lzma format and raw (no headers) streams are supported. Multiple compression algorithms (filters) are supported. Currently LZMA2 is the primary filter.

    -

    liblzma is part of XZ Utils https://xz.tukaani.org/xz-utils/. XZ Utils includes a gzip-like command line tool named xz and some other tools. XZ Utils is developed and maintained by Lasse Collin and Jia Tan.

    -

    Major parts of liblzma are based on code written by Igor Pavlov, specifically the LZMA SDK https://7-zip.org/sdk.html.

    -

    The SHA-256 implementation in liblzma is based on code written by Wei Dai in Crypto++ Library https://www.cryptopp.com/.

    -

    liblzma is distributed under the BSD Zero Clause License (0BSD).

    +

    liblzma is a public domain general-purpose data compression library with a zlib-like API. The native file format is .xz, but also the old .lzma format and raw (no headers) streams are supported. Multiple compression algorithms (filters) are supported. Currently LZMA2 is the primary filter.

    +

    liblzma is part of XZ Utils https://tukaani.org/xz/. XZ Utils includes a gzip-like command line tool named xz and some other tools. XZ Utils is developed and maintained by Lasse Collin and Jia Tan.

    +

    Major parts of liblzma are based on Igor Pavlov's public domain LZMA SDK https://7-zip.org/sdk.html.

    +

    The SHA-256 implementation is based on the public domain code found from 7-Zip https://7-zip.org/, which has a modified version of the public domain SHA-256 code found from Crypto++ https://www.cryptopp.com/. The SHA-256 code in Crypto++ was written by Kevin Springle and Wei Dai.

    -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/index_8h.html xz-utils-5.6.1+really5.4.5/doc/api/index_8h.html --- xz-utils-5.6.0/doc/api/index_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/index_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -49,7 +48,6 @@
    Data Structures | -Macros | Typedefs | Enumerations | Functions
    @@ -66,24 +64,6 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
     Iterator to get information about Blocks and Streams. More...
     
    - - - - - - - - - - - - - -

    -Macros

    #define LZMA_INDEX_CHECK_MASK_NONE   (UINT32_C(1) << LZMA_CHECK_NONE)
     Mask for return value from lzma_index_checks() for check none.
     
    -#define LZMA_INDEX_CHECK_MASK_CRC32   (UINT32_C(1) << LZMA_CHECK_CRC32)
     Mask for return value from lzma_index_checks() for check CRC32.
     
    -#define LZMA_INDEX_CHECK_MASK_CRC64   (UINT32_C(1) << LZMA_CHECK_CRC64)
     Mask for return value from lzma_index_checks() for check CRC64.
     
    -#define LZMA_INDEX_CHECK_MASK_SHA256   (UINT32_C(1) << LZMA_CHECK_SHA256)
     Mask for return value from lzma_index_checks() for check SHA256.
     
    @@ -184,25 +164,7 @@

    Detailed Description

    Handling of .xz Index and related information.

    Note
    Never include this file directly. Use <lzma.h> instead.
    -

    Macro Definition Documentation

    - -

    ◆ LZMA_INDEX_CHECK_MASK_NONE

    - -
    -
    -

    Typedefs

    typedef struct lzma_index_s lzma_index
    - - - -
    #define LZMA_INDEX_CHECK_MASK_NONE   (UINT32_C(1) << LZMA_CHECK_NONE)
    -
    - -

    Mask for return value from lzma_index_checks() for check none.

    -
    Note
    This and the other CHECK_MASK macros were added in 5.5.1alpha.
    - -
    - -

    Typedef Documentation

    +

    Typedef Documentation

    ◆ lzma_index

    @@ -507,7 +469,7 @@

    Get the types of integrity Checks.

    If lzma_index_stream_flags() is used to set the Stream Flags for every Stream, lzma_index_checks() can be used to get a bitmask to indicate which Check types have been used. It can be useful e.g. if showing the Check types to the user.

    -

    The bitmask is 1 << check_id, e.g. CRC32 is 1 << 1 and SHA-256 is 1 << 10. These masks are defined for convenience as LZMA_INDEX_CHECK_MASK_XXX

    +

    The bitmask is 1 << check_id, e.g. CRC32 is 1 << 1 and SHA-256 is 1 << 10.

    Parameters
    @@ -1031,7 +993,7 @@
    iPointer to lzma_index structure
    -

    The valid 'action' values for lzma_code() are LZMA_RUN and LZMA_FINISH. It is enough to use only one of them (you can choose freely).

    +

    The valid `action' values for lzma_code() are LZMA_RUN and LZMA_FINISH. It is enough to use only one of them (you can choose freely).

    Returns
    Possible lzma_ret values:
    • LZMA_OK: Initialization succeeded, continue with lzma_code().
    • LZMA_MEM_ERROR
      • @@ -1082,7 +1044,7 @@
    -

    Valid 'action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH. There is no need to use LZMA_FINISH, but it's allowed because it may simplify certain types of applications.

    +

    Valid `action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH. There is no need to use LZMA_FINISH, but it's allowed because it may simplify certain types of applications.

    Returns
    Possible lzma_ret values:
    • LZMA_OK: Initialization succeeded, continue with lzma_code().
    • LZMA_MEM_ERROR
      • @@ -1266,7 +1228,7 @@

      This decoder decodes the Stream Header, Stream Footer, Index, and Stream Padding field(s) from the input .xz file and stores the resulting combined index in *dest_index. This information can be used to get the uncompressed file size with lzma_index_uncompressed_size(*dest_index) or, for example, to implement random access reading by locating the Blocks in the Streams.

      To get the required information from the .xz file, lzma_code() may ask the application to seek in the input file by returning LZMA_SEEK_NEEDED and having the target file position specified in lzma_stream.seek_pos. The number of seeks required depends on the input file and how big buffers the application provides. When possible, the decoder will seek backward and forward in the given buffer to avoid useless seek requests. Thus, if the application provides the whole file at once, no external seeking will be required (that is, lzma_code() won't return LZMA_SEEK_NEEDED).

      The value in lzma_stream.total_in can be used to estimate how much data liblzma had to read to get the file information. However, due to seeking and the way total_in is updated, the value of total_in will be somewhat inaccurate (a little too big). Thus, total_in is a good estimate but don't expect to see the same exact value for the same file if you change the input buffer size or switch to a different liblzma version.

      -

      Valid 'action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH. You only need to use LZMA_RUN; LZMA_FINISH is only supported because it might be convenient for some applications. If you use LZMA_FINISH and if lzma_code() asks the application to seek, remember to reset 'action' back to LZMA_RUN unless you hit the end of the file again.

      +

      Valid `action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH. You only need to use LZMA_RUN; LZMA_FINISH is only supported because it might be convenient for some applications. If you use LZMA_FINISH and if lzma_code() asks the application to seek, remember to reset `action' back to LZMA_RUN unless you hit the end of the file again.

      Possible return values from lzma_code():

      • LZMA_OK: All OK so far, more input needed
      • LZMA_SEEK_NEEDED: Provide more input starting from the absolute file position strm->seek_pos
        • @@ -1298,14 +1260,9 @@
    -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/index__hash_8h.html xz-utils-5.6.1+really5.4.5/doc/api/index__hash_8h.html --- xz-utils-5.6.0/doc/api/index__hash_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/index__hash_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@ - @@ -304,14 +303,9 @@ -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/lzma12_8h.html xz-utils-5.6.1+really5.4.5/doc/api/lzma12_8h.html --- xz-utils-5.6.0/doc/api/lzma12_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/lzma12_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -429,14 +428,9 @@ -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/lzma_8h.html xz-utils-5.6.1+really5.4.5/doc/api/lzma_8h.html --- xz-utils-5.6.0/doc/api/lzma_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/lzma_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -102,14 +101,9 @@

    Detailed Description

    The public API of liblzma data compression library.

    -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/stream__flags_8h.html xz-utils-5.6.1+really5.4.5/doc/api/stream__flags_8h.html --- xz-utils-5.6.0/doc/api/stream__flags_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/stream__flags_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -341,14 +340,9 @@ -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__allocator.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__allocator.html --- xz-utils-5.6.0/doc/api/structlzma__allocator.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__allocator.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -69,7 +68,7 @@

    Detailed Description

    Custom functions for memory handling.

    A pointer to lzma_allocator may be passed via lzma_stream structure to liblzma, and some advanced functions take a pointer to lzma_allocator as a separate function argument. The library will use the functions specified in lzma_allocator for memory handling instead of the default malloc() and free(). C++ users should note that the custom memory handling functions must not throw exceptions.

    -

    Single-threaded mode only: liblzma doesn't make an internal copy of lzma_allocator. Thus, it is OK to change these function pointers in the middle of the coding process, but obviously it must be done carefully to make sure that the replacement 'free' can deallocate memory allocated by the earlier 'alloc' function(s).

    +

    Single-threaded mode only: liblzma doesn't make an internal copy of lzma_allocator. Thus, it is OK to change these function pointers in the middle of the coding process, but obviously it must be done carefully to make sure that the replacement `free' can deallocate memory allocated by the earlier `alloc' function(s).

    Multithreaded mode: liblzma might internally store pointers to the lzma_allocator given via the lzma_stream structure. The application must not change the allocator pointer in lzma_stream or the contents of the pointed lzma_allocator structure until lzma_end() has been used to free the memory associated with that lzma_stream. The allocation functions might be called simultaneously from multiple threads, and thus they must be thread safe.

    Field Documentation

    @@ -94,7 +93,7 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    -
    Returns
    Pointer to the beginning of a memory block of 'size' bytes, or NULL if allocation fails for some reason. When allocation fails, functions of liblzma return LZMA_MEM_ERROR.
    +
    Returns
    Pointer to the beginning of a memory block of `size' bytes, or NULL if allocation fails for some reason. When allocation fails, functions of liblzma return LZMA_MEM_ERROR.

    The allocator should not waste time zeroing the allocated buffers. This is not only about speed, but also memory usage, since the operating system kernel doesn't necessarily allocate the requested memory in physical memory until it is actually used. With small input files, liblzma may actually need only a fraction of the memory that it requested for allocation.

    Note
    LZMA_MEM_ERROR is also used when the size of the allocation would be greater than SIZE_MAX. Thus, don't assume that the custom allocator must have returned NULL if some function from liblzma returns LZMA_MEM_ERROR.
    @@ -146,14 +145,9 @@
  • lzma/base.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__block.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__block.html --- xz-utils-5.6.0/doc/api/structlzma__block.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__block.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@ - @@ -340,14 +339,9 @@
  • lzma/block.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__filter.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__filter.html --- xz-utils-5.6.0/doc/api/structlzma__filter.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__filter.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -81,7 +80,7 @@

    Filter ID.

    -

    Use constants whose name begin with 'LZMA_FILTER_' to specify different filters. In an array of lzma_filter structures, use LZMA_VLI_UNKNOWN to indicate end of filters.

    +

    Use constants whose name begin with `LZMA_FILTER_' to specify different filters. In an array of lzma_filter structures, use LZMA_VLI_UNKNOWN to indicate end of filters.

    Note
    This is not an enum, because on some systems enums cannot be 64-bit.
    @@ -107,14 +106,9 @@
  • lzma/filter.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__index__iter.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__index__iter.html --- xz-utils-5.6.0/doc/api/structlzma__index__iter.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__index__iter.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -400,14 +399,9 @@
  • lzma/index.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__mt.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__mt.html --- xz-utils-5.6.0/doc/api/structlzma__mt.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__mt.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -249,14 +248,9 @@
  • lzma/container.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__options__bcj.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__options__bcj.html --- xz-utils-5.6.0/doc/api/structlzma__options__bcj.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__options__bcj.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -88,14 +87,9 @@
  • lzma/bcj.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__options__delta.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__options__delta.html --- xz-utils-5.6.0/doc/api/structlzma__options__delta.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__options__delta.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -106,14 +105,9 @@
  • lzma/delta.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__options__lzma.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__options__lzma.html --- xz-utils-5.6.0/doc/api/structlzma__options__lzma.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__options__lzma.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -174,7 +173,7 @@

    Number of literal context bits.

    -

    How many of the highest bits of the previous uncompressed eight-bit byte (also known as 'literal') are taken into account when predicting the bits of the next literal.

    +

    How many of the highest bits of the previous uncompressed eight-bit byte (also known as `literal') are taken into account when predicting the bits of the next literal.

    E.g. in typical English text, an upper-case letter is often followed by a lower-case letter, and a lower-case letter is usually followed by another lower-case letter. In the US-ASCII character set, the highest three bits are 010 for upper-case letters and 011 for lower-case letters. When lc is at least 3, the literal coding can take advantage of this property in the uncompressed data.

    There is a limit that applies to literal context bits and literal position bits together: lc + lp <= 4. Without this limit the decoding could become very slow, which could have security related results in some cases like email servers doing virus scanning. This limit also simplifies the internal implementation in liblzma.

    There may be LZMA1 streams that have lc + lp > 4 (maximum possible lc would be 8). It is not possible to decode such streams with liblzma.

    @@ -356,14 +355,9 @@
  • lzma/lzma12.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__stream.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__stream.html --- xz-utils-5.6.0/doc/api/structlzma__stream.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__stream.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -244,14 +243,9 @@
  • lzma/base.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/structlzma__stream__flags.html xz-utils-5.6.1+really5.4.5/doc/api/structlzma__stream__flags.html --- xz-utils-5.6.0/doc/api/structlzma__stream__flags.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/structlzma__stream__flags.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -127,14 +126,9 @@
  • lzma/stream_flags.h
    • -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/version_8h.html xz-utils-5.6.1+really5.4.5/doc/api/version_8h.html --- xz-utils-5.6.0/doc/api/version_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/version_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
    - @@ -64,11 +63,11 @@ +#define  +#define  @@ -232,14 +231,9 @@ -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    diff -Nru xz-utils-5.6.0/doc/api/vli_8h.html xz-utils-5.6.1+really5.4.5/doc/api/vli_8h.html --- xz-utils-5.6.0/doc/api/vli_8h.html 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/api/vli_8h.html 2023-11-01 12:28:00.000000000 +0000 @@ -17,9 +17,8 @@
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5
     Major version number of the liblzma release.
     
    -#define LZMA_VERSION_MINOR   6
    LZMA_VERSION_MINOR   4
     Minor version number of the liblzma release.
     
    -#define LZMA_VERSION_PATCH   0
    LZMA_VERSION_PATCH   5
     Patch version number of the liblzma release.
     
    #define LZMA_VERSION_STABILITY   LZMA_VERSION_STABILITY_STABLE
    - @@ -316,14 +315,9 @@ -
    -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    + +
    +Generated by doxygen 1.9.7 +
    Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/api/xz-logo.png and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/api/xz-logo.png differ diff -Nru xz-utils-5.6.0/doc/examples/01_compress_easy.c xz-utils-5.6.1+really5.4.5/doc/examples/01_compress_easy.c --- xz-utils-5.6.0/doc/examples/01_compress_easy.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/examples/01_compress_easy.c 2023-11-01 12:19:29.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file 01_compress_easy.c @@ -11,6 +9,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include @@ -26,7 +27,7 @@ { fprintf(stderr, "Usage: %s PRESET < INFILE > OUTFILE\n" "PRESET is a number 0-9 and can optionally be " - "followed by 'e' to indicate extreme preset\n", + "followed by `e' to indicate extreme preset\n", argv0); exit(EXIT_FAILURE); } diff -Nru xz-utils-5.6.0/doc/examples/02_decompress.c xz-utils-5.6.1+really5.4.5/doc/examples/02_decompress.c --- xz-utils-5.6.0/doc/examples/02_decompress.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/examples/02_decompress.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file 02_decompress.c @@ -11,6 +9,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include diff -Nru xz-utils-5.6.0/doc/examples/03_compress_custom.c xz-utils-5.6.1+really5.4.5/doc/examples/03_compress_custom.c --- xz-utils-5.6.0/doc/examples/03_compress_custom.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/examples/03_compress_custom.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file 03_compress_custom.c @@ -11,6 +9,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include diff -Nru xz-utils-5.6.0/doc/examples/04_compress_easy_mt.c xz-utils-5.6.1+really5.4.5/doc/examples/04_compress_easy_mt.c --- xz-utils-5.6.0/doc/examples/04_compress_easy_mt.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/examples/04_compress_easy_mt.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -// SPDX-License-Identifier: 0BSD - /////////////////////////////////////////////////////////////////////////////// // /// \file 04_compress_easy_mt.c @@ -11,6 +9,9 @@ // // Author: Lasse Collin // +// This file has been put into the public domain. +// You can do whatever you want with this file. +// /////////////////////////////////////////////////////////////////////////////// #include diff -Nru xz-utils-5.6.0/doc/examples/11_file_info.c xz-utils-5.6.1+really5.4.5/doc/examples/11_file_info.c --- xz-utils-5.6.0/doc/examples/11_file_info.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/examples/11_file_info.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,205 +0,0 @@ -// SPDX-License-Identifier: 0BSD - -/////////////////////////////////////////////////////////////////////////////// -// -/// \file 11_file_info.c -/// \brief Get uncompressed size of .xz file(s) -/// -/// Usage: ./11_file_info INFILE1.xz [INFILEn.xz]... -/// -/// Example: ./11_file_info foo.xz -// -// Author: Lasse Collin -// -/////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#include -#include -#include -#include - - -static bool -print_file_size(lzma_stream *strm, FILE *infile, const char *filename) -{ - // Get the file size. In standard C it can be done by seeking to - // the end of the file and then getting the file position. - // In POSIX one can use fstat() and then st_size from struct stat. - // Also note that fseek() and ftell() use long and thus don't support - // large files on 32-bit systems (POSIX versions fseeko() and - // ftello() can support large files). - if (fseek(infile, 0, SEEK_END)) { - fprintf(stderr, "Error seeking the file '%s': %s\n", - filename, strerror(errno)); - return false; - } - - const long file_size = ftell(infile); - - // The decoder wants to start from the beginning of the .xz file. - rewind(infile); - - // Initialize the decoder. - lzma_index *i; - lzma_ret ret = lzma_file_info_decoder(strm, &i, UINT64_MAX, - (uint64_t)file_size); - switch (ret) { - case LZMA_OK: - // Initialization succeeded. - break; - - case LZMA_MEM_ERROR: - fprintf(stderr, "Out of memory when initializing " - "the .xz file info decoder\n"); - return false; - - case LZMA_PROG_ERROR: - default: - fprintf(stderr, "Unknown error, possibly a bug\n"); - return false; - } - - // This example program reuses the same lzma_stream structure - // for multiple files, so we need to reset this when starting - // a new file. - strm->avail_in = 0; - - // Buffer for input data. - uint8_t inbuf[BUFSIZ]; - - // Pass data to the decoder and seek when needed. - while (true) { - if (strm->avail_in == 0) { - strm->next_in = inbuf; - strm->avail_in = fread(inbuf, 1, sizeof(inbuf), - infile); - - if (ferror(infile)) { - fprintf(stderr, - "Error reading from '%s': %s\n", - filename, strerror(errno)); - return false; - } - - // We don't need to care about hitting the end of - // the file so no need to check for feof(). - } - - ret = lzma_code(strm, LZMA_RUN); - - switch (ret) { - case LZMA_OK: - break; - - case LZMA_SEEK_NEEDED: - // The cast is safe because liblzma won't ask us to - // seek past the known size of the input file which - // did fit into a long. - // - // NOTE: Remember to change these to off_t if you - // switch fseeko() or lseek(). - if (fseek(infile, (long)(strm->seek_pos), SEEK_SET)) { - fprintf(stderr, "Error seeking the " - "file '%s': %s\n", - filename, strerror(errno)); - return false; - } - - // The old data in the inbuf is useless now. Set - // avail_in to zero so that we will read new input - // from the new file position on the next iteration - // of this loop. - strm->avail_in = 0; - break; - - case LZMA_STREAM_END: - // File information was successfully decoded. - // See for functions that can be - // used on it. In this example we just print - // the uncompressed size (in bytes) of - // the .xz file followed by its file name. - printf("%10" PRIu64 " %s\n", - lzma_index_uncompressed_size(i), - filename); - - // Free the memory of the lzma_index structure. - lzma_index_end(i, NULL); - - return true; - - case LZMA_FORMAT_ERROR: - // .xz magic bytes weren't found. - fprintf(stderr, "The file '%s' is not " - "in the .xz format\n", filename); - return false; - - case LZMA_OPTIONS_ERROR: - fprintf(stderr, "The file '%s' has .xz headers that " - "are not supported by this liblzma " - "version\n", filename); - return false; - - case LZMA_DATA_ERROR: - fprintf(stderr, "The file '%s' is corrupt\n", - filename); - return false; - - case LZMA_MEM_ERROR: - fprintf(stderr, "Memory allocation failed when " - "decoding the file '%s'\n", filename); - return false; - - // LZMA_MEMLIMIT_ERROR shouldn't happen because we used - // UINT64_MAX as the limit. - // - // LZMA_BUF_ERROR shouldn't happen because we always provide - // new input when the input buffer is empty. The decoder - // knows the input file size and thus won't try to read past - // the end of the file. - case LZMA_MEMLIMIT_ERROR: - case LZMA_BUF_ERROR: - case LZMA_PROG_ERROR: - default: - fprintf(stderr, "Unknown error, possibly a bug\n"); - return false; - } - } - - // This line is never reached. -} - - -extern int -main(int argc, char **argv) -{ - bool success = true; - lzma_stream strm = LZMA_STREAM_INIT; - - for (int i = 1; i < argc; ++i) { - FILE *infile = fopen(argv[i], "rb"); - - if (infile == NULL) { - fprintf(stderr, "Cannot open the file '%s': %s\n", - argv[i], strerror(errno)); - success = false; - } - - success &= print_file_size(&strm, infile, argv[i]); - - (void)fclose(infile); - } - - lzma_end(&strm); - - // Close stdout to catch possible write errors that can occur - // when pending data is flushed from the stdio buffers. - if (fclose(stdout)) { - fprintf(stderr, "Write error: %s\n", strerror(errno)); - success = false; - } - - return success ? EXIT_SUCCESS : EXIT_FAILURE; -} diff -Nru xz-utils-5.6.0/doc/examples/Makefile xz-utils-5.6.1+really5.4.5/doc/examples/Makefile --- xz-utils-5.6.0/doc/examples/Makefile 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/examples/Makefile 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,9 @@ -# SPDX-License-Identifier: 0BSD +# # Author: Lasse Collin +# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# CC = c99 CFLAGS = -g diff -Nru xz-utils-5.6.0/doc/examples_old/xz_pipe_comp.c xz-utils-5.6.1+really5.4.5/doc/examples_old/xz_pipe_comp.c --- xz-utils-5.6.0/doc/examples_old/xz_pipe_comp.c 1970-01-01 00:00:00.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/examples_old/xz_pipe_comp.c 2023-10-31 14:24:02.000000000 +0000 @@ -0,0 +1,127 @@ +/* + * xz_pipe_comp.c + * A simple example of pipe-only xz compressor implementation. + * version: 2010-07-12 - by Daniel Mealha Cabrita + * Not copyrighted -- provided to the public domain. + * + * Compiling: + * Link with liblzma. GCC example: + * $ gcc -llzma xz_pipe_comp.c -o xz_pipe_comp + * + * Usage example: + * $ cat some_file | ./xz_pipe_comp > some_file.xz + */ + +#include +#include +#include +#include +#include + + +/* COMPRESSION SETTINGS */ + +/* analogous to xz CLI options: -0 to -9 */ +#define COMPRESSION_LEVEL 6 + +/* boolean setting, analogous to xz CLI option: -e */ +#define COMPRESSION_EXTREME true + +/* see: /usr/include/lzma/check.h LZMA_CHECK_* */ +#define INTEGRITY_CHECK LZMA_CHECK_CRC64 + + +/* read/write buffer sizes */ +#define IN_BUF_MAX 4096 +#define OUT_BUF_MAX 4096 + +/* error codes */ +#define RET_OK 0 +#define RET_ERROR_INIT 1 +#define RET_ERROR_INPUT 2 +#define RET_ERROR_OUTPUT 3 +#define RET_ERROR_COMPRESSION 4 + + +/* note: in_file and out_file must be open already */ +int xz_compress (FILE *in_file, FILE *out_file) +{ + uint32_t preset = COMPRESSION_LEVEL | (COMPRESSION_EXTREME ? LZMA_PRESET_EXTREME : 0); + lzma_check check = INTEGRITY_CHECK; + lzma_stream strm = LZMA_STREAM_INIT; /* alloc and init lzma_stream struct */ + uint8_t in_buf [IN_BUF_MAX]; + uint8_t out_buf [OUT_BUF_MAX]; + size_t in_len; /* length of useful data in in_buf */ + size_t out_len; /* length of useful data in out_buf */ + bool in_finished = false; + bool out_finished = false; + lzma_action action; + lzma_ret ret_xz; + int ret; + + ret = RET_OK; + + /* initialize xz encoder */ + ret_xz = lzma_easy_encoder (&strm, preset, check); + if (ret_xz != LZMA_OK) { + fprintf (stderr, "lzma_easy_encoder error: %d\n", (int) ret_xz); + return RET_ERROR_INIT; + } + + while ((! in_finished) && (! out_finished)) { + /* read incoming data */ + in_len = fread (in_buf, 1, IN_BUF_MAX, in_file); + + if (feof (in_file)) { + in_finished = true; + } + if (ferror (in_file)) { + in_finished = true; + ret = RET_ERROR_INPUT; + } + + strm.next_in = in_buf; + strm.avail_in = in_len; + + /* if no more data from in_buf, flushes the + internal xz buffers and closes the xz data + with LZMA_FINISH */ + action = in_finished ? LZMA_FINISH : LZMA_RUN; + + /* loop until there's no pending compressed output */ + do { + /* out_buf is clean at this point */ + strm.next_out = out_buf; + strm.avail_out = OUT_BUF_MAX; + + /* compress data */ + ret_xz = lzma_code (&strm, action); + + if ((ret_xz != LZMA_OK) && (ret_xz != LZMA_STREAM_END)) { + fprintf (stderr, "lzma_code error: %d\n", (int) ret_xz); + out_finished = true; + ret = RET_ERROR_COMPRESSION; + } else { + /* write compressed data */ + out_len = OUT_BUF_MAX - strm.avail_out; + fwrite (out_buf, 1, out_len, out_file); + if (ferror (out_file)) { + out_finished = true; + ret = RET_ERROR_OUTPUT; + } + } + } while (strm.avail_out == 0); + } + + lzma_end (&strm); + return ret; +} + +int main () +{ + int ret; + + ret = xz_compress (stdin, stdout); + return ret; +} + diff -Nru xz-utils-5.6.0/doc/examples_old/xz_pipe_decomp.c xz-utils-5.6.1+really5.4.5/doc/examples_old/xz_pipe_decomp.c --- xz-utils-5.6.0/doc/examples_old/xz_pipe_decomp.c 1970-01-01 00:00:00.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/examples_old/xz_pipe_decomp.c 2023-10-31 14:24:02.000000000 +0000 @@ -0,0 +1,123 @@ +/* + * xz_pipe_decomp.c + * A simple example of pipe-only xz decompressor implementation. + * version: 2012-06-14 - by Daniel Mealha Cabrita + * Not copyrighted -- provided to the public domain. + * + * Compiling: + * Link with liblzma. GCC example: + * $ gcc -llzma xz_pipe_decomp.c -o xz_pipe_decomp + * + * Usage example: + * $ cat some_file.xz | ./xz_pipe_decomp > some_file + */ + +#include +#include +#include +#include +#include + + +/* read/write buffer sizes */ +#define IN_BUF_MAX 4096 +#define OUT_BUF_MAX 4096 + +/* error codes */ +#define RET_OK 0 +#define RET_ERROR_INIT 1 +#define RET_ERROR_INPUT 2 +#define RET_ERROR_OUTPUT 3 +#define RET_ERROR_DECOMPRESSION 4 + + +/* note: in_file and out_file must be open already */ +int xz_decompress (FILE *in_file, FILE *out_file) +{ + lzma_stream strm = LZMA_STREAM_INIT; /* alloc and init lzma_stream struct */ + const uint32_t flags = LZMA_TELL_UNSUPPORTED_CHECK | LZMA_CONCATENATED; + const uint64_t memory_limit = UINT64_MAX; /* no memory limit */ + uint8_t in_buf [IN_BUF_MAX]; + uint8_t out_buf [OUT_BUF_MAX]; + size_t in_len; /* length of useful data in in_buf */ + size_t out_len; /* length of useful data in out_buf */ + bool in_finished = false; + bool out_finished = false; + lzma_action action; + lzma_ret ret_xz; + int ret; + + ret = RET_OK; + + /* initialize xz decoder */ + ret_xz = lzma_stream_decoder (&strm, memory_limit, flags); + if (ret_xz != LZMA_OK) { + fprintf (stderr, "lzma_stream_decoder error: %d\n", (int) ret_xz); + return RET_ERROR_INIT; + } + + while ((! in_finished) && (! out_finished)) { + /* read incoming data */ + in_len = fread (in_buf, 1, IN_BUF_MAX, in_file); + + if (feof (in_file)) { + in_finished = true; + } + if (ferror (in_file)) { + in_finished = true; + ret = RET_ERROR_INPUT; + } + + strm.next_in = in_buf; + strm.avail_in = in_len; + + /* if no more data from in_buf, flushes the + internal xz buffers and closes the decompressed data + with LZMA_FINISH */ + action = in_finished ? LZMA_FINISH : LZMA_RUN; + + /* loop until there's no pending decompressed output */ + do { + /* out_buf is clean at this point */ + strm.next_out = out_buf; + strm.avail_out = OUT_BUF_MAX; + + /* decompress data */ + ret_xz = lzma_code (&strm, action); + + if ((ret_xz != LZMA_OK) && (ret_xz != LZMA_STREAM_END)) { + fprintf (stderr, "lzma_code error: %d\n", (int) ret_xz); + out_finished = true; + ret = RET_ERROR_DECOMPRESSION; + } else { + /* write decompressed data */ + out_len = OUT_BUF_MAX - strm.avail_out; + fwrite (out_buf, 1, out_len, out_file); + if (ferror (out_file)) { + out_finished = true; + ret = RET_ERROR_OUTPUT; + } + } + } while (strm.avail_out == 0); + } + + /* Bug fix (2012-06-14): If no errors were detected, check + that the last lzma_code() call returned LZMA_STREAM_END. + If not, the file is probably truncated. */ + if ((ret == RET_OK) && (ret_xz != LZMA_STREAM_END)) { + fprintf (stderr, "Input truncated or corrupt\n"); + ret = RET_ERROR_DECOMPRESSION; + } + + lzma_end (&strm); + return ret; +} + +int main () +{ + int ret; + + ret = xz_decompress (stdin, stdout); + return ret; +} + diff -Nru xz-utils-5.6.0/doc/faq.txt xz-utils-5.6.1+really5.4.5/doc/faq.txt --- xz-utils-5.6.0/doc/faq.txt 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/faq.txt 2023-10-31 14:24:02.000000000 +0000 @@ -240,5 +240,5 @@ If the result is still too big, take a look at XZ Embedded. It is a separate project, which provides a limited but significantly smaller XZ decoder implementation than XZ Utils. You can find it - at . + at . diff -Nru xz-utils-5.6.0/doc/lzma-file-format.txt xz-utils-5.6.1+really5.4.5/doc/lzma-file-format.txt --- xz-utils-5.6.0/doc/lzma-file-format.txt 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/lzma-file-format.txt 2023-10-31 14:24:02.000000000 +0000 @@ -40,11 +40,11 @@ 0.2. Changes - Last modified: 2024-01-16 18:00+0800 + Last modified: 2022-07-13 21:00+0300 - Compared to the previous version (2022-07-13 21:00+0300) - the section 2 was modified to change links from http to - https and to update XZ links. + Compared to the previous version (2011-04-12 11:55+0300) + the section 1.1.3 was modified to allow End of Payload Marker + with a known Uncompressed Size. 1. File Format @@ -157,17 +157,17 @@ 2. References LZMA SDK - The original LZMA implementation - https://7-zip.org/sdk.html + http://7-zip.org/sdk.html 7-Zip - https://7-zip.org/ + http://7-zip.org/ LZMA Utils - LZMA adapted to POSIX-like systems - https://tukaani.org/lzma/ + http://tukaani.org/lzma/ XZ Utils - The next generation of LZMA Utils - https://xz.tukaani.org/xz-utils/ + http://tukaani.org/xz/ The .xz file format - The successor of the .lzma format - https://xz.tukaani.org/format/xz-file-format.txt + http://tukaani.org/xz/xz-file-format.txt Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-a4/lzmainfo-a4.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-a4/lzmainfo-a4.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-a4/xz-a4.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-a4/xz-a4.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-a4/xzdec-a4.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-a4/xzdec-a4.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-a4/xzdiff-a4.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-a4/xzdiff-a4.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-a4/xzgrep-a4.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-a4/xzgrep-a4.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-a4/xzless-a4.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-a4/xzless-a4.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-a4/xzmore-a4.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-a4/xzmore-a4.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-letter/lzmainfo-letter.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-letter/lzmainfo-letter.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-letter/xz-letter.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-letter/xz-letter.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-letter/xzdec-letter.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-letter/xzdec-letter.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-letter/xzdiff-letter.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-letter/xzdiff-letter.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-letter/xzgrep-letter.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-letter/xzgrep-letter.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-letter/xzless-letter.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-letter/xzless-letter.pdf differ Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/man/pdf-letter/xzmore-letter.pdf and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/man/pdf-letter/xzmore-letter.pdf differ diff -Nru xz-utils-5.6.0/doc/man/txt/xz.txt xz-utils-5.6.1+really5.4.5/doc/man/txt/xz.txt --- xz-utils-5.6.0/doc/man/txt/xz.txt 2024-02-24 08:32:16.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/man/txt/xz.txt 2023-11-01 12:27:59.000000000 +0000 @@ -429,7 +429,9 @@ o CompMem contains the compressor memory requirements in the single-threaded mode. It may vary slightly between xz ver- - sions. + sions. Memory requirements of some of the future multi- + threaded modes may be dramatically higher than that of the + single-threaded mode. o DecMem contains the decompressor memory requirements. That is, the compression settings determine the memory require- @@ -438,12 +440,6 @@ values in the table have been rounded up to the next full MiB. - Memory requirements of the multi-threaded mode are significantly - higher than that of the single-threaded mode. With the default - value of --block-size, each thread needs 3*3*DictSize plus Comp- - Mem or DecMem. For example, four threads with preset -6 needs - 660-670 MiB of memory. - -e, --extreme Use a slower variant of the selected compression preset level (-0 ... -9) to hopefully get a little bit better compression ra- @@ -466,7 +462,6 @@ -6e 8 MiB 8 94 MiB 9 MiB -7e 16 MiB 8 186 MiB 17 MiB -8e 32 MiB 8 370 MiB 33 MiB - -9e 64 MiB 8 674 MiB 65 MiB For example, there are a total of four presets that use 8 MiB @@ -492,61 +487,35 @@ whichever is more. Typically a good value is 2-4 times the size of the LZMA2 dictionary or at least 1 MiB. Using size less than the LZMA2 dictionary size is waste of RAM because then the LZMA2 - dictionary buffer will never get fully used. In multi-threaded - mode, the sizes of the blocks are stored in the block headers. - This size information is required for multi-threaded decompres- - sion. + dictionary buffer will never get fully used. The sizes of the + blocks are stored in the block headers, which a future version + of xz will use for multi-threaded decompression. - In single-threaded mode no block splitting is done by default. + In single-threaded mode no block splitting is done by default. Setting this option doesn't affect memory usage. No size infor- mation is stored in block headers, thus files created in single- - threaded mode won't be identical to files created in multi- - threaded mode. The lack of size information also means that xz - won't be able decompress the files in multi-threaded mode. - - --block-list=items - When compressing to the .xz format, start a new block with an - optional custom filter chain after the given intervals of uncom- - pressed data. - - The items are a comma-separated list. Each item consists of an - optional filter chain number between 0 and 9 followed by a colon - (:) and a required size of uncompressed data. Omitting an item - (two or more consecutive commas) is a shorthand to use the size - and filters of the previous item. - - If the input file is bigger than the sum of the sizes in items, - the last item is repeated until the end of the file. A special - value of 0 may be used as the last size to indicate that the + threaded mode won't be identical to files created in multi- + threaded mode. The lack of size information also means that a + future version of xz won't be able decompress the files in + multi-threaded mode. + + --block-list=sizes + When compressing to the .xz format, start a new block after the + given intervals of uncompressed data. + + The uncompressed sizes of the blocks are specified as a comma- + separated list. Omitting a size (two or more consecutive com- + mas) is a shorthand to use the size of the previous block. + + If the input file is bigger than the sum of sizes, the last + value in sizes is repeated until the end of the file. A special + value of 0 may be used as the last value to indicate that the rest of the file should be encoded as a single block. - An alternative filter chain for each block can be specified in - combination with the --filters1=filters ... --filters9=filters - options. These options define filter chains with an identifier - between 1-9. Filter chain 0 can be used to refer to the default - filter chain, which is the same as not specifying a filter - chain. The filter chain identifier can be used before the un- - compressed size, followed by a colon (:). For example, if one - specifies --block-list=1:2MiB,3:2MiB,2:4MiB,,2MiB,0:4MiB then - blocks will be created using: - - o The filter chain specified by --filters1 and 2 MiB input - - o The filter chain specified by --filters3 and 2 MiB input - - o The filter chain specified by --filters2 and 4 MiB input - - o The filter chain specified by --filters2 and 4 MiB input - - o The default filter chain and 2 MiB input - - o The default filter chain and 4 MiB input for every block un- - til end of input. - - If one specifies a size that exceeds the encoder's block size - (either the default value in threaded mode or the value speci- - fied with --block-size=size), the encoder will create additional - blocks while keeping the boundaries specified in items. For ex- + If one specifies sizes that exceed the encoder's block size (ei- + ther the default value in threaded mode or the value specified + with --block-size=size), the encoder will create additional + blocks while keeping the boundaries specified in sizes. For ex- ample, if one specifies --block-size=10MiB --block-list=5MiB,10MiB,8MiB,12MiB,24MiB and the input file is 80 MiB, one will get 11 blocks: 5, 10, 8, 10, 2, 10, 10, 4, 10, @@ -721,140 +690,108 @@ files compressed in single-threaded mode don't even if --block-size=size has been used. - The default value for threads is 0. In xz 5.4.x and older the - default is 1. - Custom compressor filter chains A custom filter chain allows specifying the compression settings in de- - tail instead of relying on the settings associated to the presets. - When a custom filter chain is specified, preset options (-0 ... -9 and - --extreme) earlier on the command line are forgotten. If a preset op- - tion is specified after one or more custom filter chain options, the - new preset takes effect and the custom filter chain options specified + tail instead of relying on the settings associated to the presets. + When a custom filter chain is specified, preset options (-0 ... -9 and + --extreme) earlier on the command line are forgotten. If a preset op- + tion is specified after one or more custom filter chain options, the + new preset takes effect and the custom filter chain options specified earlier are forgotten. - A filter chain is comparable to piping on the command line. When com- + A filter chain is comparable to piping on the command line. When com- pressing, the uncompressed input goes to the first filter, whose output - goes to the next filter (if any). The output of the last filter gets - written to the compressed file. The maximum number of filters in the - chain is four, but typically a filter chain has only one or two fil- + goes to the next filter (if any). The output of the last filter gets + written to the compressed file. The maximum number of filters in the + chain is four, but typically a filter chain has only one or two fil- ters. Many filters have limitations on where they can be in the filter chain: - some filters can work only as the last filter in the chain, some only - as a non-last filter, and some work in any position in the chain. De- + some filters can work only as the last filter in the chain, some only + as a non-last filter, and some work in any position in the chain. De- pending on the filter, this limitation is either inherent to the filter design or exists to prevent security issues. - A custom filter chain can be specified in two different ways. The op- - tions --filters=filters and --filters1=filters ... --filters9=filters - allow specifying an entire filter chain in one option using the liblzma - filter string syntax. Alternatively, a filter chain can be specified - by using one or more individual filter options in the order they are - wanted in the filter chain. That is, the order of the individual fil- - ter options is significant! When decoding raw streams (--format=raw), - the filter chain must be specified in the same order as it was speci- - fied when compressing. Any individual filter or preset options speci- - fied before the full chain option (--filters=filters) will be forgot- - ten. Individual filters specified after the full chain option will re- - set the filter chain. - - Both the full and individual filter options take filter-specific op- - tions as a comma-separated list. Extra commas in options are ignored. - Every option has a default value, so specify those you want to change. + A custom filter chain is specified by using one or more filter options + in the order they are wanted in the filter chain. That is, the order + of filter options is significant! When decoding raw streams (--for- + mat=raw), the filter chain is specified in the same order as it was + specified when compressing. + + Filters take filter-specific options as a comma-separated list. Extra + commas in options are ignored. Every option has a default value, so + you need to specify only those you want to change. To see the whole filter chain and options, use xz -vv (that is, use --verbose twice). This works also for viewing the filter chain options used by presets. - --filters=filters - Specify the full filter chain or a preset in a single option. - Each filter can be separated by spaces or two dashes (--). fil- - ters may need to be quoted on the shell command line so it is - parsed as a single option. To denote options, use : or =. A - preset can be prefixed with a - and followed with zero or more - flags. The only supported flag is e to apply the same options - as --extreme. - - --filters1=filters ... --filters9=filters - Specify up to nine additional filter chains that can be used - with --block-list. - - For example, when compressing an archive with executable files - followed by text files, the executable part could use a filter - chain with a BCJ filter and the text part only the LZMA2 filter. - - --filters-help - Display a help message describing how to specify presets and - custom filter chains in the --filters and --filters1=filters ... - --filters9=filters options, and exit successfully. - --lzma1[=options] --lzma2[=options] - Add LZMA1 or LZMA2 filter to the filter chain. These filters + Add LZMA1 or LZMA2 filter to the filter chain. These filters can be used only as the last filter in the chain. - LZMA1 is a legacy filter, which is supported almost solely due - to the legacy .lzma file format, which supports only LZMA1. - LZMA2 is an updated version of LZMA1 to fix some practical is- - sues of LZMA1. The .xz format uses LZMA2 and doesn't support - LZMA1 at all. Compression speed and ratios of LZMA1 and LZMA2 + LZMA1 is a legacy filter, which is supported almost solely due + to the legacy .lzma file format, which supports only LZMA1. + LZMA2 is an updated version of LZMA1 to fix some practical is- + sues of LZMA1. The .xz format uses LZMA2 and doesn't support + LZMA1 at all. Compression speed and ratios of LZMA1 and LZMA2 are practically the same. LZMA1 and LZMA2 share the same set of options: preset=preset - Reset all LZMA1 or LZMA2 options to preset. Preset con- - sist of an integer, which may be followed by single-let- - ter preset modifiers. The integer can be from 0 to 9, - matching the command line options -0 ... -9. The only - supported modifier is currently e, which matches --ex- - treme. If no preset is specified, the default values of + Reset all LZMA1 or LZMA2 options to preset. Preset con- + sist of an integer, which may be followed by single-let- + ter preset modifiers. The integer can be from 0 to 9, + matching the command line options -0 ... -9. The only + supported modifier is currently e, which matches --ex- + treme. If no preset is specified, the default values of LZMA1 or LZMA2 options are taken from the preset 6. dict=size Dictionary (history buffer) size indicates how many bytes - of the recently processed uncompressed data is kept in - memory. The algorithm tries to find repeating byte se- - quences (matches) in the uncompressed data, and replace + of the recently processed uncompressed data is kept in + memory. The algorithm tries to find repeating byte se- + quences (matches) in the uncompressed data, and replace them with references to the data currently in the dictio- - nary. The bigger the dictionary, the higher is the + nary. The bigger the dictionary, the higher is the chance to find a match. Thus, increasing dictionary size usually improves compression ratio, but a dictionary big- ger than the uncompressed file is waste of memory. - Typical dictionary size is from 64 KiB to 64 MiB. The - minimum is 4 KiB. The maximum for compression is cur- + Typical dictionary size is from 64 KiB to 64 MiB. The + minimum is 4 KiB. The maximum for compression is cur- rently 1.5 GiB (1536 MiB). The decompressor already sup- - ports dictionaries up to one byte less than 4 GiB, which + ports dictionaries up to one byte less than 4 GiB, which is the maximum for the LZMA1 and LZMA2 stream formats. - Dictionary size and match finder (mf) together determine + Dictionary size and match finder (mf) together determine the memory usage of the LZMA1 or LZMA2 encoder. The same (or bigger) dictionary size is required for decompressing - that was used when compressing, thus the memory usage of - the decoder is determined by the dictionary size used - when compressing. The .xz headers store the dictionary - size either as 2^n or 2^n + 2^(n-1), so these sizes are + that was used when compressing, thus the memory usage of + the decoder is determined by the dictionary size used + when compressing. The .xz headers store the dictionary + size either as 2^n or 2^n + 2^(n-1), so these sizes are somewhat preferred for compression. Other sizes will get rounded up when stored in the .xz headers. - lc=lc Specify the number of literal context bits. The minimum - is 0 and the maximum is 4; the default is 3. In addi- + lc=lc Specify the number of literal context bits. The minimum + is 0 and the maximum is 4; the default is 3. In addi- tion, the sum of lc and lp must not exceed 4. - All bytes that cannot be encoded as matches are encoded - as literals. That is, literals are simply 8-bit bytes + All bytes that cannot be encoded as matches are encoded + as literals. That is, literals are simply 8-bit bytes that are encoded one at a time. - The literal coding makes an assumption that the highest - lc bits of the previous uncompressed byte correlate with - the next byte. For example, in typical English text, an - upper-case letter is often followed by a lower-case let- - ter, and a lower-case letter is usually followed by an- - other lower-case letter. In the US-ASCII character set, + The literal coding makes an assumption that the highest + lc bits of the previous uncompressed byte correlate with + the next byte. For example, in typical English text, an + upper-case letter is often followed by a lower-case let- + ter, and a lower-case letter is usually followed by an- + other lower-case letter. In the US-ASCII character set, the highest three bits are 010 for upper-case letters and - 011 for lower-case letters. When lc is at least 3, the + 011 for lower-case letters. When lc is at least 3, the literal coding can take advantage of this property in the uncompressed data. @@ -866,40 +803,40 @@ lp=lp Specify the number of literal position bits. The minimum is 0 and the maximum is 4; the default is 0. - Lp affects what kind of alignment in the uncompressed + Lp affects what kind of alignment in the uncompressed data is assumed when encoding literals. See pb below for more information about alignment. - pb=pb Specify the number of position bits. The minimum is 0 + pb=pb Specify the number of position bits. The minimum is 0 and the maximum is 4; the default is 2. - Pb affects what kind of alignment in the uncompressed - data is assumed in general. The default means four-byte + Pb affects what kind of alignment in the uncompressed + data is assumed in general. The default means four-byte alignment (2^pb=2^2=4), which is often a good choice when there's no better guess. - When the alignment is known, setting pb accordingly may - reduce the file size a little. For example, with text - files having one-byte alignment (US-ASCII, ISO-8859-*, - UTF-8), setting pb=0 can improve compression slightly. + When the alignment is known, setting pb accordingly may + reduce the file size a little. For example, with text + files having one-byte alignment (US-ASCII, ISO-8859-*, + UTF-8), setting pb=0 can improve compression slightly. For UTF-16 text, pb=1 is a good choice. If the alignment - is an odd number like 3 bytes, pb=0 might be the best + is an odd number like 3 bytes, pb=0 might be the best choice. Even though the assumed alignment can be adjusted with pb - and lp, LZMA1 and LZMA2 still slightly favor 16-byte - alignment. It might be worth taking into account when - designing file formats that are likely to be often com- + and lp, LZMA1 and LZMA2 still slightly favor 16-byte + alignment. It might be worth taking into account when + designing file formats that are likely to be often com- pressed with LZMA1 or LZMA2. - mf=mf Match finder has a major effect on encoder speed, memory - usage, and compression ratio. Usually Hash Chain match - finders are faster than Binary Tree match finders. The - default depends on the preset: 0 uses hc3, 1-3 use hc4, + mf=mf Match finder has a major effect on encoder speed, memory + usage, and compression ratio. Usually Hash Chain match + finders are faster than Binary Tree match finders. The + default depends on the preset: 0 uses hc3, 1-3 use hc4, and the rest use bt4. - The following match finders are supported. The memory - usage formulas below are rough approximations, which are + The following match finders are supported. The memory + usage formulas below are rough approximations, which are closest to the reality when dict is a power of two. hc3 Hash Chain with 2- and 3-byte hashing @@ -932,36 +869,36 @@ mode=mode Compression mode specifies the method to analyze the data - produced by the match finder. Supported modes are fast + produced by the match finder. Supported modes are fast and normal. The default is fast for presets 0-3 and nor- mal for presets 4-9. - Usually fast is used with Hash Chain match finders and + Usually fast is used with Hash Chain match finders and normal with Binary Tree match finders. This is also what the presets do. nice=nice - Specify what is considered to be a nice length for a + Specify what is considered to be a nice length for a match. Once a match of at least nice bytes is found, the algorithm stops looking for possibly better matches. Nice can be 2-273 bytes. Higher values tend to give bet- - ter compression ratio at the expense of speed. The de- + ter compression ratio at the expense of speed. The de- fault depends on the preset. depth=depth - Specify the maximum search depth in the match finder. - The default is the special value of 0, which makes the + Specify the maximum search depth in the match finder. + The default is the special value of 0, which makes the compressor determine a reasonable depth from mf and nice. Reasonable depth for Hash Chains is 4-100 and 16-1000 for - Binary Trees. Using very high values for depth can make - the encoder extremely slow with some files. Avoid set- - ting the depth over 1000 unless you are prepared to in- - terrupt the compression in case it is taking far too + Binary Trees. Using very high values for depth can make + the encoder extremely slow with some files. Avoid set- + ting the depth over 1000 unless you are prepared to in- + terrupt the compression in case it is taking far too long. - When decoding raw streams (--format=raw), LZMA2 needs only the + When decoding raw streams (--format=raw), LZMA2 needs only the dictionary size. LZMA1 needs also lc, lp, and pb. --x86[=options] @@ -971,39 +908,39 @@ --powerpc[=options] --ia64[=options] --sparc[=options] - Add a branch/call/jump (BCJ) filter to the filter chain. These - filters can be used only as a non-last filter in the filter + Add a branch/call/jump (BCJ) filter to the filter chain. These + filters can be used only as a non-last filter in the filter chain. - A BCJ filter converts relative addresses in the machine code to - their absolute counterparts. This doesn't change the size of - the data but it increases redundancy, which can help LZMA2 to + A BCJ filter converts relative addresses in the machine code to + their absolute counterparts. This doesn't change the size of + the data but it increases redundancy, which can help LZMA2 to produce 0-15 % smaller .xz file. The BCJ filters are always re- - versible, so using a BCJ filter for wrong type of data doesn't - cause any data loss, although it may make the compression ratio - slightly worse. The BCJ filters are very fast and use an in- + versible, so using a BCJ filter for wrong type of data doesn't + cause any data loss, although it may make the compression ratio + slightly worse. The BCJ filters are very fast and use an in- significant amount of memory. These BCJ filters have known problems related to the compression ratio: - o Some types of files containing executable code (for example, - object files, static libraries, and Linux kernel modules) - have the addresses in the instructions filled with filler - values. These BCJ filters will still do the address conver- + o Some types of files containing executable code (for example, + object files, static libraries, and Linux kernel modules) + have the addresses in the instructions filled with filler + values. These BCJ filters will still do the address conver- sion, which will make the compression worse with these files. o If a BCJ filter is applied on an archive, it is possible that - it makes the compression ratio worse than not using a BCJ - filter. For example, if there are similar or even identical - executables then filtering will likely make the files less - similar and thus compression is worse. The contents of non- - executable files in the same archive can matter too. In - practice one has to try with and without a BCJ filter to see + it makes the compression ratio worse than not using a BCJ + filter. For example, if there are similar or even identical + executables then filtering will likely make the files less + similar and thus compression is worse. The contents of non- + executable files in the same archive can matter too. In + practice one has to try with and without a BCJ filter to see which is better in each situation. - Different instruction sets have different alignment: the exe- - cutable file must be aligned to a multiple of this value in the + Different instruction sets have different alignment: the exe- + cutable file must be aligned to a multiple of this value in the input data to make the filter work. Filter Alignment Notes @@ -1012,58 +949,42 @@ ARM-Thumb 2 ARM64 4 4096-byte alignment is best PowerPC 4 Big endian only - IA-64 16 Itanium SPARC 4 - RISC-V 2 - Since the BCJ-filtered data is usually compressed with LZMA2, - the compression ratio may be improved slightly if the LZMA2 op- + Since the BCJ-filtered data is usually compressed with LZMA2, + the compression ratio may be improved slightly if the LZMA2 op- tions are set to match the alignment of the selected BCJ filter. - Examples: - - o IA-64 filter has 16-byte alignment so pb=4,lp=4,lc=0 is good - with LZMA2 (2^4=16). - - o RISC-V code has 2-byte or 4-byte alignment depending on - whether the file contains 16-bit compressed instructions (the - C extension). When 16-bit instructions are used, - pb=2,lp=1,lc=3 or pb=1,lp=1,lc=3 is good. When 16-bit in- - structions aren't present, pb=2,lp=2,lc=2 is the best. read- - elf -h can be used to check if "RVC" appears on the "Flags" - line. - - o ARM64 is always 4-byte aligned so pb=2,lp=2,lc=2 is the best. - - o The x86 filter is an exception. It's usually good to stick - to LZMA2's defaults (pb=2,lp=0,lc=3) when compressing x86 ex- - ecutables. + For example, with the IA-64 filter, it's good to set pb=4 or + even pb=4,lp=4,lc=0 with LZMA2 (2^4=16). The x86 filter is an + exception; it's usually good to stick to LZMA2's default four- + byte alignment when compressing x86 executables. All BCJ filters support the same options: start=offset Specify the start offset that is used when converting be- - tween relative and absolute addresses. The offset must + tween relative and absolute addresses. The offset must be a multiple of the alignment of the filter (see the ta- - ble above). The default is zero. In practice, the de- + ble above). The default is zero. In practice, the de- fault is good; specifying a custom offset is almost never useful. --delta[=options] - Add the Delta filter to the filter chain. The Delta filter can + Add the Delta filter to the filter chain. The Delta filter can be only used as a non-last filter in the filter chain. - Currently only simple byte-wise delta calculation is supported. - It can be useful when compressing, for example, uncompressed - bitmap images or uncompressed PCM audio. However, special pur- + Currently only simple byte-wise delta calculation is supported. + It can be useful when compressing, for example, uncompressed + bitmap images or uncompressed PCM audio. However, special pur- pose algorithms may give significantly better results than Delta - + LZMA2. This is true especially with audio, which compresses + + LZMA2. This is true especially with audio, which compresses faster and better, for example, with flac(1). Supported options: dist=distance - Specify the distance of the delta calculation in bytes. + Specify the distance of the delta calculation in bytes. distance must be 1-256. The default is 1. For example, with dist=2 and eight-byte input A1 B1 A2 B3 @@ -1071,92 +992,146 @@ Other options -q, --quiet - Suppress warnings and notices. Specify this twice to suppress + Suppress warnings and notices. Specify this twice to suppress errors too. This option has no effect on the exit status. That - is, even if a warning was suppressed, the exit status to indi- + is, even if a warning was suppressed, the exit status to indi- cate a warning is still used. -v, --verbose - Be verbose. If standard error is connected to a terminal, xz - will display a progress indicator. Specifying --verbose twice + Be verbose. If standard error is connected to a terminal, xz + will display a progress indicator. Specifying --verbose twice will give even more verbose output. The progress indicator shows the following information: - o Completion percentage is shown if the size of the input file + o Completion percentage is shown if the size of the input file is known. That is, the percentage cannot be shown in pipes. - o Amount of compressed data produced (compressing) or consumed + o Amount of compressed data produced (compressing) or consumed (decompressing). - o Amount of uncompressed data consumed (compressing) or pro- + o Amount of uncompressed data consumed (compressing) or pro- duced (decompressing). o Compression ratio, which is calculated by dividing the amount - of compressed data processed so far by the amount of uncom- + of compressed data processed so far by the amount of uncom- pressed data processed so far. - o Compression or decompression speed. This is measured as the - amount of uncompressed data consumed (compression) or pro- - duced (decompression) per second. It is shown after a few + o Compression or decompression speed. This is measured as the + amount of uncompressed data consumed (compression) or pro- + duced (decompression) per second. It is shown after a few seconds have passed since xz started processing the file. o Elapsed time in the format M:SS or H:MM:SS. - o Estimated remaining time is shown only when the size of the - input file is known and a couple of seconds have already - passed since xz started processing the file. The time is - shown in a less precise format which never has any colons, + o Estimated remaining time is shown only when the size of the + input file is known and a couple of seconds have already + passed since xz started processing the file. The time is + shown in a less precise format which never has any colons, for example, 2 min 30 s. - When standard error is not a terminal, --verbose will make xz + When standard error is not a terminal, --verbose will make xz print the filename, compressed size, uncompressed size, compres- - sion ratio, and possibly also the speed and elapsed time on a + sion ratio, and possibly also the speed and elapsed time on a single line to standard error after compressing or decompressing the file. The speed and elapsed time are included only when the - operation took at least a few seconds. If the operation didn't - finish, for example, due to user interruption, also the comple- - tion percentage is printed if the size of the input file is + operation took at least a few seconds. If the operation didn't + finish, for example, due to user interruption, also the comple- + tion percentage is printed if the size of the input file is known. -Q, --no-warn Don't set the exit status to 2 even if a condition worth a warn- - ing was detected. This option doesn't affect the verbosity - level, thus both --quiet and --no-warn have to be used to not + ing was detected. This option doesn't affect the verbosity + level, thus both --quiet and --no-warn have to be used to not display warnings and to not alter the exit status. --robot - Print messages in a machine-parsable format. This is intended - to ease writing frontends that want to use xz instead of li- - blzma, which may be the case with various scripts. The output - with this option enabled is meant to be stable across xz re- + Print messages in a machine-parsable format. This is intended + to ease writing frontends that want to use xz instead of li- + blzma, which may be the case with various scripts. The output + with this option enabled is meant to be stable across xz re- leases. See the section ROBOT MODE for details. --info-memory - Display, in human-readable format, how much physical memory - (RAM) and how many processor threads xz thinks the system has - and the memory usage limits for compression and decompression, + Display, in human-readable format, how much physical memory + (RAM) and how many processor threads xz thinks the system has + and the memory usage limits for compression and decompression, and exit successfully. -h, --help - Display a help message describing the most commonly used op- + Display a help message describing the most commonly used op- tions, and exit successfully. -H, --long-help - Display a help message describing all features of xz, and exit + Display a help message describing all features of xz, and exit successfully -V, --version - Display the version number of xz and liblzma in human readable - format. To get machine-parsable output, specify --robot before + Display the version number of xz and liblzma in human readable + format. To get machine-parsable output, specify --robot before --version. ROBOT MODE The robot mode is activated with the --robot option. It makes the out- put of xz easier to parse by other programs. Currently --robot is sup- - ported only together with --list, --filters-help, --info-memory, and - --version. It will be supported for compression and decompression in - the future. + ported only together with --version, --info-memory, and --list. It + will be supported for compression and decompression in the future. + + Version + xz --robot --version prints the version number of xz and liblzma in the + following format: + + XZ_VERSION=XYYYZZZS + LIBLZMA_VERSION=XYYYZZZS + + X Major version. + + YYY Minor version. Even numbers are stable. Odd numbers are alpha + or beta versions. + + ZZZ Patch level for stable releases or just a counter for develop- + ment releases. + + S Stability. 0 is alpha, 1 is beta, and 2 is stable. S should be + always 2 when YYY is even. + + XYYYZZZS are the same on both lines if xz and liblzma are from the same + XZ Utils release. + + Examples: 4.999.9beta is 49990091 and 5.0.0 is 50000002. + + Memory limit information + xz --robot --info-memory prints a single line with multiple tab-sepa- + rated columns: + + 1. Total amount of physical memory (RAM) in bytes. + + 2. Memory usage limit for compression in bytes (--memlimit-compress). + A special value of 0 indicates the default setting which for sin- + gle-threaded mode is the same as no limit. + + 3. Memory usage limit for decompression in bytes (--memlimit-decom- + press). A special value of 0 indicates the default setting which + for single-threaded mode is the same as no limit. + + 4. Since xz 5.3.4alpha: Memory usage for multi-threaded decompression + in bytes (--memlimit-mt-decompress). This is never zero because a + system-specific default value shown in the column 5 is used if no + limit has been specified explicitly. This is also never greater + than the value in the column 3 even if a larger value has been + specified with --memlimit-mt-decompress. + + 5. Since xz 5.3.4alpha: A system-specific default memory usage limit + that is used to limit the number of threads when compressing with + an automatic number of threads (--threads=0) and no memory usage + limit has been specified (--memlimit-compress). This is also used + as the default value for --memlimit-mt-decompress. + + 6. Since xz 5.3.4alpha: Number of available processor threads. + + In the future, the output of xz --robot --info-memory may have more + columns, but never more than a single line. List mode xz --robot --list uses tab-separated output. The first column of every @@ -1277,76 +1252,6 @@ Future versions may add new line types and new columns can be added to the existing line types, but the existing columns won't be changed. - Filters help - xz --robot --filters-help prints the supported filters in the following - format: - - filter:option=,option=... - - filter Name of the filter - - option Name of a filter specific option - - value Numeric value ranges appear as . String value choices - are shown within < > and separated by a | character. - - Each filter is printed on its own line. - - Memory limit information - xz --robot --info-memory prints a single line with multiple tab-sepa- - rated columns: - - 1. Total amount of physical memory (RAM) in bytes. - - 2. Memory usage limit for compression in bytes (--memlimit-compress). - A special value of 0 indicates the default setting which for sin- - gle-threaded mode is the same as no limit. - - 3. Memory usage limit for decompression in bytes (--memlimit-decom- - press). A special value of 0 indicates the default setting which - for single-threaded mode is the same as no limit. - - 4. Since xz 5.3.4alpha: Memory usage for multi-threaded decompression - in bytes (--memlimit-mt-decompress). This is never zero because a - system-specific default value shown in the column 5 is used if no - limit has been specified explicitly. This is also never greater - than the value in the column 3 even if a larger value has been - specified with --memlimit-mt-decompress. - - 5. Since xz 5.3.4alpha: A system-specific default memory usage limit - that is used to limit the number of threads when compressing with - an automatic number of threads (--threads=0) and no memory usage - limit has been specified (--memlimit-compress). This is also used - as the default value for --memlimit-mt-decompress. - - 6. Since xz 5.3.4alpha: Number of available processor threads. - - In the future, the output of xz --robot --info-memory may have more - columns, but never more than a single line. - - Version - xz --robot --version prints the version number of xz and liblzma in the - following format: - - XZ_VERSION=XYYYZZZS - LIBLZMA_VERSION=XYYYZZZS - - X Major version. - - YYY Minor version. Even numbers are stable. Odd numbers are alpha - or beta versions. - - ZZZ Patch level for stable releases or just a counter for develop- - ment releases. - - S Stability. 0 is alpha, 1 is beta, and 2 is stable. S should be - always 2 when YYY is even. - - XYYYZZZS are the same on both lines if xz and liblzma are from the same - XZ Utils release. - - Examples: 4.999.9beta is 49990091 and 5.0.0 is 50000002. - EXIT STATUS 0 All is good. @@ -1585,7 +1490,6 @@ Preset CompCPU -0 0 -1 1 - -2 2 -3 3 -4 4 @@ -1673,10 +1577,10 @@ xzdec(1), xzdiff(1), xzgrep(1), xzless(1), xzmore(1), gzip(1), bzip2(1), 7z(1) - XZ Utils: - XZ Embedded: + XZ Utils: + XZ Embedded: LZMA SDK: -Tukaani 2024-02-13 XZ(1) +Tukaani 2023-07-17 XZ(1) diff -Nru xz-utils-5.6.0/doc/man/txt/xzdec.txt xz-utils-5.6.1+really5.4.5/doc/man/txt/xzdec.txt --- xz-utils-5.6.0/doc/man/txt/xzdec.txt 2024-02-24 08:32:16.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/man/txt/xzdec.txt 2023-11-01 12:27:59.000000000 +0000 @@ -73,8 +73,8 @@ SEE ALSO xz(1) - XZ Embedded: + XZ Embedded: -Tukaani 2024-01-19 XZDEC(1) +Tukaani 2017-04-19 XZDEC(1) diff -Nru xz-utils-5.6.0/doc/man/txt/xzdiff.txt xz-utils-5.6.1+really5.4.5/doc/man/txt/xzdiff.txt --- xz-utils-5.6.0/doc/man/txt/xzdiff.txt 2024-02-24 08:32:16.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/man/txt/xzdiff.txt 2023-11-01 12:28:00.000000000 +0000 @@ -6,37 +6,32 @@ xzcmp, xzdiff, lzcmp, lzdiff - compare compressed files SYNOPSIS - xzcmp [option...] file1 [file2] - xzdiff ... - lzcmp ... - lzdiff ... + xzcmp [cmp_options] file1 [file2] + xzdiff [diff_options] file1 [file2] + lzcmp [cmp_options] file1 [file2] + lzdiff [diff_options] file1 [file2] DESCRIPTION - xzcmp and xzdiff compare uncompressed contents of two files. Uncom- - pressed data and options are passed to cmp(1) or diff(1) unless --help - or --version is specified. - - If both file1 and file2 are specified, they can be uncompressed files - or files in formats that xz(1), gzip(1), bzip2(1), lzop(1), zstd(1), or - lz4(1) can decompress. The required decompression commands are deter- - mined from the filename suffixes of file1 and file2. A file with an - unknown suffix is assumed to be either uncompressed or in a format that - xz(1) can decompress. - - If only one filename is provided, file1 must have a suffix of a sup- - ported compression format and the name for file2 is assumed to be file1 - with the compression format suffix removed. - - The commands lzcmp and lzdiff are provided for backward compatibility - with LZMA Utils. - -EXIT STATUS - If a decompression error occurs, the exit status is 2. Otherwise the - exit status of cmp(1) or diff(1) is used. + xzcmp and xzdiff invoke cmp(1) or diff(1) on files compressed with + xz(1), lzma(1), gzip(1), bzip2(1), lzop(1), or zstd(1). All options + specified are passed directly to cmp(1) or diff(1). If only one file + is specified, then the files compared are file1 (which must have a suf- + fix of a supported compression format) and file1 from which the com- + pression format suffix has been stripped. If two files are specified, + then they are uncompressed if necessary and fed to cmp(1) or diff(1). + The exit status from cmp(1) or diff(1) is preserved unless a decompres- + sion error occurs; then exit status is 2. + + The names lzcmp and lzdiff are provided for backward compatibility with + LZMA Utils. SEE ALSO - cmp(1), diff(1), xz(1), gzip(1), bzip2(1), lzop(1), zstd(1), lz4(1) + cmp(1), diff(1), xz(1), gzip(1), bzip2(1), lzop(1), zstd(1), zdiff(1) + +BUGS + Messages from the cmp(1) or diff(1) programs refer to temporary file- + names instead of those specified. -Tukaani 2024-02-13 XZDIFF(1) +Tukaani 2021-06-04 XZDIFF(1) diff -Nru xz-utils-5.6.0/doc/man/txt/xzgrep.txt xz-utils-5.6.1+really5.4.5/doc/man/txt/xzgrep.txt --- xz-utils-5.6.0/doc/man/txt/xzgrep.txt 2024-02-24 08:32:16.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/man/txt/xzgrep.txt 2023-11-01 12:28:00.000000000 +0000 @@ -3,10 +3,10 @@ NAME - xzgrep - search possibly-compressed files for patterns + xzgrep - search compressed files for a regular expression SYNOPSIS - xzgrep [option...] [pattern_list] [file...] + xzgrep [grep_options] [-e] pattern [file...] xzegrep ... xzfgrep ... lzgrep ... @@ -14,42 +14,18 @@ lzfgrep ... DESCRIPTION - xzgrep invokes grep(1) on uncompressed contents of files. The formats - of the files are determined from the filename suffixes. Any file with - a suffix supported by xz(1), gzip(1), bzip2(1), lzop(1), zstd(1), or - lz4(1) will be decompressed; all other files are assumed to be uncom- - pressed. - - If no files are specified or file is - then standard input is read. - When reading from standard input, only files supported by xz(1) are de- - compressed. Other files are assumed to be in uncompressed form al- - ready. - - Most options of grep(1) are supported. However, the following options - are not supported: - - -r, --recursive - - -R, --dereference-recursive - - -d, --directories=action - - -Z, --null - - -z, --null-data - - --include=glob - - --exclude=glob - - --exclude-from=file - - --exclude-dir=glob - - xzegrep is an alias for xzgrep -E. xzfgrep is an alias for xzgrep -F. - - The commands lzgrep, lzegrep, and lzfgrep are provided for backward - compatibility with LZMA Utils. + xzgrep invokes grep(1) on files which may be either uncompressed or + compressed with xz(1), lzma(1), gzip(1), bzip2(1), lzop(1), or zstd(1). + All options specified are passed directly to grep(1). + + If no file is specified, then standard input is decompressed if neces- + sary and fed to grep(1). When reading from standard input, gzip(1), + bzip2(1), lzop(1), and zstd(1) compressed files are not supported. + + If xzgrep is invoked as xzegrep or xzfgrep then grep -E or grep -F is + used instead of grep(1). The same applies to names lzgrep, lzegrep, + and lzfgrep, which are provided for backward compatibility with LZMA + Utils. EXIT STATUS 0 At least one match was found from at least one of the input @@ -62,12 +38,12 @@ found. ENVIRONMENT - GREP If GREP is set to a non-empty value, it is used instead of grep, - grep -E, or grep -F. + GREP If the GREP environment variable is set, xzgrep uses it instead + of grep(1), grep -E, or grep -F. SEE ALSO - grep(1), xz(1), gzip(1), bzip2(1), lzop(1), zstd(1), lz4(1), zgrep(1) + grep(1), xz(1), gzip(1), bzip2(1), lzop(1), zstd(1), zgrep(1) -Tukaani 2024-02-13 XZGREP(1) +Tukaani 2022-07-19 XZGREP(1) diff -Nru xz-utils-5.6.0/doc/man/txt/xzless.txt xz-utils-5.6.1+really5.4.5/doc/man/txt/xzless.txt --- xz-utils-5.6.0/doc/man/txt/xzless.txt 2024-02-24 08:32:16.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/man/txt/xzless.txt 2023-11-01 12:28:00.000000000 +0000 @@ -11,16 +11,15 @@ DESCRIPTION xzless is a filter that displays text from compressed files to a termi- - nal. Files supported by xz(1) are decompressed; other files are as- - sumed to be in uncompressed form already. If no files are given, xz- - less reads from standard input. - - xzless uses less(1) to present its output. Unlike xzmore, its choice - of pager cannot be altered by setting an environment variable. Com- - mands are based on both more(1) and vi(1) and allow back and forth + nal. It works on files compressed with xz(1) or lzma(1). If no files + are given, xzless reads from standard input. + + xzless uses less(1) to present its output. Unlike xzmore, its choice + of pager cannot be altered by setting an environment variable. Com- + mands are based on both more(1) and vi(1) and allow back and forth movement and searching. See the less(1) manual for more information. - The command named lzless is provided for backward compatibility with + The command named lzless is provided for backward compatibility with LZMA Utils. ENVIRONMENT @@ -29,7 +28,7 @@ it is already set in the environment. LESSOPEN - Set to a command line to invoke the xz(1) decompressor for pre- + Set to a command line to invoke the xz(1) decompressor for pre- processing the input files to less(1). SEE ALSO @@ -37,4 +36,4 @@ -Tukaani 2024-02-12 XZLESS(1) +Tukaani 2010-09-27 XZLESS(1) diff -Nru xz-utils-5.6.0/doc/man/txt/xzmore.txt xz-utils-5.6.1+really5.4.5/doc/man/txt/xzmore.txt --- xz-utils-5.6.0/doc/man/txt/xzmore.txt 2024-02-24 08:32:17.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/man/txt/xzmore.txt 2023-11-01 12:28:00.000000000 +0000 @@ -10,26 +10,25 @@ lzmore [file...] DESCRIPTION - xzmore displays text from compressed files to a terminal using more(1). - Files supported by xz(1) are decompressed; other files are assumed to - be in uncompressed form already. If no files are given, xzmore reads - from standard input. See the more(1) manual for the keyboard commands. - - Note that scrolling backwards might not be possible depending on the - implementation of more(1). This is because xzmore uses a pipe to pass - the decompressed data to more(1). xzless(1) uses less(1) which pro- - vides more advanced features. - - The command lzmore is provided for backward compatibility with LZMA - Utils. - -ENVIRONMENT - PAGER If PAGER is set, its value is used as the pager instead of - more(1). + xzmore is a filter which allows examination of xz(1) or lzma(1) com- + pressed text files one screenful at a time on a soft-copy terminal. + + To use a pager other than the default more, set environment variable + PAGER to the name of the desired program. The name lzmore is provided + for backward compatibility with LZMA Utils. + + e or q When the prompt --More--(Next file: file) is printed, this com- + mand causes xzmore to exit. + + s When the prompt --More--(Next file: file) is printed, this com- + mand causes xzmore to skip the next file and continue. + + For list of keyboard commands supported while actually viewing the con- + tent of a file, refer to manual of the pager you use, usually more(1). SEE ALSO more(1), xz(1), xzless(1), zmore(1) -Tukaani 2024-02-12 XZMORE(1) +Tukaani 2013-06-30 XZMORE(1) diff -Nru xz-utils-5.6.0/doc/xz-file-format.txt xz-utils-5.6.1+really5.4.5/doc/xz-file-format.txt --- xz-utils-5.6.0/doc/xz-file-format.txt 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doc/xz-file-format.txt 2023-10-31 14:24:02.000000000 +0000 @@ -2,7 +2,7 @@ The .xz File Format =================== -Version 1.2.0 (2024-01-19) +Version 1.1.0 (2022-12-11) 0. Preface @@ -81,22 +81,18 @@ 0.2. Getting the Latest Version The latest official version of this document can be downloaded - from . + from . Specific versions of this document have a filename xz-file-format-X.Y.Z.txt where X.Y.Z is the version number. For example, the version 1.0.0 of this document is available - at . + at . 0.3. Version History Version Date Description - 1.2.0 2024-01-19 Added RISC-V filter and updated URLs in - Sections 0.2 and 7. The URL of this - specification was changed. - 1.1.0 2022-12-11 Added ARM64 filter and clarified 32-bit ARM endianness in Section 5.3.2, language improvements in Section 5.4 @@ -927,7 +923,6 @@ 0x08 2 bytes ARM Thumb filter [1] 0x09 4 bytes SPARC filter 0x0A 4 bytes ARM64 filter [2] - 0x0B 2 bytes RISC-V filter [1] These are for little endian instruction encoding. This must not be confused with data endianness. @@ -1141,30 +1136,30 @@ 7. References LZMA SDK - The original LZMA implementation - https://7-zip.org/sdk.html + http://7-zip.org/sdk.html LZMA Utils - LZMA adapted to POSIX-like systems - https://tukaani.org/lzma/ + http://tukaani.org/lzma/ XZ Utils - The next generation of LZMA Utils - https://xz.tukaani.org/xz-utils/ + http://tukaani.org/xz/ [RFC-1952] GZIP file format specification version 4.3 - https://www.ietf.org/rfc/rfc1952.txt + http://www.ietf.org/rfc/rfc1952.txt - Notation of byte boxes in section "2.1. Overall conventions" [RFC-2119] Key words for use in RFCs to Indicate Requirement Levels - https://www.ietf.org/rfc/rfc2119.txt + http://www.ietf.org/rfc/rfc2119.txt [GNU-tar] - GNU tar 1.35 manual - https://www.gnu.org/software/tar/manual/html_node/Blocking-Factor.html + GNU tar 1.21 manual + http://www.gnu.org/software/tar/manual/html_node/Blocking-Factor.html - Node 9.4.2 "Blocking Factor", paragraph that begins "gzip will complain about trailing garbage" - Note that this URL points to the latest version of the manual, and may some day not contain the note which is in - 1.35. For the exact version of the manual, download GNU - tar 1.35: ftp://ftp.gnu.org/pub/gnu/tar/tar-1.35.tar.gz + 1.21. For the exact version of the manual, download GNU + tar 1.21: ftp://ftp.gnu.org/pub/gnu/tar/tar-1.21.tar.gz Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/doc/xz-logo.png and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/doc/xz-logo.png differ diff -Nru xz-utils-5.6.0/dos/Makefile xz-utils-5.6.1+really5.4.5/dos/Makefile --- xz-utils-5.6.0/dos/Makefile 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/dos/Makefile 2023-10-31 14:24:02.000000000 +0000 @@ -1,11 +1,12 @@ -# SPDX-License-Identifier: 0BSD - ############################################################################### # # Makefile to build XZ Utils using DJGPP # # Author: Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################### # For debugging, set comment "#define NDEBUG 1" from config.h to enable diff -Nru xz-utils-5.6.0/dos/config.h xz-utils-5.6.1+really5.4.5/dos/config.h --- xz-utils-5.6.0/dos/config.h 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/dos/config.h 2023-11-01 12:19:29.000000000 +0000 @@ -1,5 +1,3 @@ -/* SPDX-License-Identifier: 0BSD */ - /* How many MiB of RAM to assume if the real amount cannot be determined. */ #define ASSUME_RAM 32 @@ -117,14 +115,14 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 -/* Define to 1 if you have the 'utimes' function. */ +/* Define to 1 if you have the `utimes' function. */ #define HAVE_UTIMES 1 /* Define to 1 or 0, depending whether the compiler supports simple visibility declarations. */ #define HAVE_VISIBILITY 0 -/* Define to 1 if the system has the type '_Bool'. */ +/* Define to 1 if the system has the type `_Bool'. */ #define HAVE__BOOL 1 /* Define to 1 if the GNU C extension __builtin_assume_aligned is supported. @@ -145,9 +143,9 @@ #define PACKAGE_NAME "XZ Utils" /* Define to the home page for this package. */ -#define PACKAGE_URL "https://xz.tukaani.org/xz-utils/" +#define PACKAGE_URL "https://tukaani.org/xz/" -/* The size of 'size_t', as computed by sizeof. */ +/* The size of `size_t', as computed by sizeof. */ #define SIZEOF_SIZE_T 4 /* Define to 1 if the system supports fast unaligned access to 16-bit and diff -Nru xz-utils-5.6.0/doxygen/Doxyfile xz-utils-5.6.1+really5.4.5/doxygen/Doxyfile --- xz-utils-5.6.0/doxygen/Doxyfile 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doxygen/Doxyfile 2023-10-31 14:24:02.000000000 +0000 @@ -61,7 +61,7 @@ # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = ../doc/xz-logo.png +PROJECT_LOGO = # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is @@ -1246,7 +1246,7 @@ # that doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = footer.html +HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of @@ -1286,7 +1286,7 @@ # files will be copied as-is; there are no commands or markers available. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_FILES = ../COPYING.CC-BY-SA-4.0 +HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output # should be rendered with a dark or light theme. diff -Nru xz-utils-5.6.0/doxygen/footer.html xz-utils-5.6.1+really5.4.5/doxygen/footer.html --- xz-utils-5.6.0/doxygen/footer.html 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doxygen/footer.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -
    - -

    - XZ logo © 2023 by Jia Tan is licensed under - - CC BY-SA 4.0 - -

    - - - diff -Nru xz-utils-5.6.0/doxygen/update-doxygen xz-utils-5.6.1+really5.4.5/doxygen/update-doxygen --- xz-utils-5.6.0/doxygen/update-doxygen 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/doxygen/update-doxygen 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: 0BSD - +# ############################################################################# # # Updates the Doxygen generated documentation files in the source tree. @@ -17,6 +16,9 @@ # Authors: Jia Tan # Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################# set -e diff -Nru xz-utils-5.6.0/extra/7z2lzma/7z2lzma.bash xz-utils-5.6.1+really5.4.5/extra/7z2lzma/7z2lzma.bash --- xz-utils-5.6.0/extra/7z2lzma/7z2lzma.bash 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/extra/7z2lzma/7z2lzma.bash 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,5 @@ #!/bin/bash -# SPDX-License-Identifier: 0BSD - +# ############################################################################# # # 7z2lzma.bash is very primitive .7z to .lzma converter. The input file must @@ -18,6 +17,9 @@ # # Author: Lasse Collin # +# This file has been put into the public domain. +# You can do whatever you want with this file. +# ############################################################################# # You can use 7z or 7za, both will work. diff -Nru xz-utils-5.6.0/extra/scanlzma/scanlzma.c xz-utils-5.6.1+really5.4.5/extra/scanlzma/scanlzma.c --- xz-utils-5.6.0/extra/scanlzma/scanlzma.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/extra/scanlzma/scanlzma.c 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - /* scanlzma, scan for lzma compressed data in stdin and echo it to stdout. Copyright (C) 2006 Timo Lindfors diff -Nru xz-utils-5.6.0/lib/Makefile.am xz-utils-5.6.1+really5.4.5/lib/Makefile.am --- xz-utils-5.6.0/lib/Makefile.am 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/Makefile.am 2023-11-01 12:19:29.000000000 +0000 @@ -1,5 +1,3 @@ -## SPDX-License-Identifier: GPL-2.0-or-later - ## ## Copyright (C) 2004-2007 Free Software Foundation, Inc. ## @@ -23,17 +21,7 @@ libgnu_a_DEPENDENCIES = $(LIBOBJS) libgnu_a_LIBADD = $(LIBOBJS) -EXTRA_DIST = \ - getopt.in.h \ - getopt.c \ - getopt1.c \ - getopt_int.h \ - getopt-cdefs.h \ - getopt-core.h \ - getopt-ext.h \ - getopt-pfx-core.h \ - getopt-pfx-ext.h - +EXTRA_DIST = getopt.in.h getopt.c getopt1.c getopt_int.h BUILT_SOURCES = $(GETOPT_H) MOSTLYCLEANFILES = getopt.h getopt.h-t diff -Nru xz-utils-5.6.0/lib/Makefile.in xz-utils-5.6.1+really5.4.5/lib/Makefile.in --- xz-utils-5.6.0/lib/Makefile.in 2024-02-24 08:28:04.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/Makefile.in 2023-11-01 12:27:09.000000000 +0000 @@ -90,8 +90,8 @@ host_triplet = @host@ subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/build-to-host.m4 $(top_srcdir)/m4/getopt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \ + $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/host-cpu-c-abi.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -183,6 +183,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +CAPSICUM_LIB = @CAPSICUM_LIB@ CC = @CC@ CCAS = @CCAS@ CCASDEPMODE = @CCASDEPMODE@ @@ -311,8 +312,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -335,17 +334,7 @@ libgnu_a_SOURCES = libgnu_a_DEPENDENCIES = $(LIBOBJS) libgnu_a_LIBADD = $(LIBOBJS) -EXTRA_DIST = \ - getopt.in.h \ - getopt.c \ - getopt1.c \ - getopt_int.h \ - getopt-cdefs.h \ - getopt-core.h \ - getopt-ext.h \ - getopt-pfx-core.h \ - getopt-pfx-ext.h - +EXTRA_DIST = getopt.in.h getopt.c getopt1.c getopt_int.h BUILT_SOURCES = $(GETOPT_H) MOSTLYCLEANFILES = getopt.h getopt.h-t all: $(BUILT_SOURCES) diff -Nru xz-utils-5.6.0/lib/getopt-cdefs.h xz-utils-5.6.1+really5.4.5/lib/getopt-cdefs.h --- xz-utils-5.6.0/lib/getopt-cdefs.h 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/getopt-cdefs.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - -/* getopt-on-non-glibc compatibility macros. - Copyright (C) 1989-2023 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. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _GETOPT_CDEFS_H -#define _GETOPT_CDEFS_H 1 - -/* This header should not be used directly; include getopt.h or - unistd.h instead. It does not have a protective #error, because - the guard macro for getopt.h in gnulib is not fixed. */ - -/* getopt-core.h and getopt-ext.h are shared with GNU libc, and expect - a number of the internal macros supplied to GNU libc's headers by - sys/cdefs.h. Provide fallback definitions for all of them. */ -#ifdef HAVE_SYS_CDEFS_H -# include -#endif - -#ifndef __BEGIN_DECLS -# ifdef __cplusplus -# define __BEGIN_DECLS extern "C" { -# else -# define __BEGIN_DECLS /* nothing */ -# endif -#endif -#ifndef __END_DECLS -# ifdef __cplusplus -# define __END_DECLS } -# else -# define __END_DECLS /* nothing */ -# endif -#endif - -#ifndef __GNUC_PREREQ -# if defined __GNUC__ && defined __GNUC_VERSION__ -# define __GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -# else -# define __GNUC_PREREQ(maj, min) 0 -# endif -#endif - -#ifndef __THROW -# if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major__ >= 4) -# if __cplusplus >= 201103L -# define __THROW noexcept (true) -# else -# define __THROW throw () -# endif -# else -# define __THROW -# endif -#endif - -#endif /* _GETOPT_CDEFS_H */ diff -Nru xz-utils-5.6.0/lib/getopt-core.h xz-utils-5.6.1+really5.4.5/lib/getopt-core.h --- xz-utils-5.6.0/lib/getopt-core.h 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/getopt-core.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - -/* Declarations for getopt (basic, portable features only). - Copyright (C) 1989-2023 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. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _GETOPT_CORE_H -#define _GETOPT_CORE_H 1 - -/* This header should not be used directly; include getopt.h or - unistd.h instead. Unlike most bits headers, it does not have - a protective #error, because the guard macro for getopt.h in - gnulib is not fixed. */ - -__BEGIN_DECLS - -/* For communication from 'getopt' to the caller. - When 'getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when 'ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -extern char *optarg; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to 'getopt'. - - On entry to 'getopt', zero means this is the first call; initialize. - - When 'getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, 'optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -extern int optind; - -/* Callers store zero here to inhibit the error message 'getopt' prints - for unrecognized options. */ - -extern int opterr; - -/* Set to an option character which was unrecognized. */ - -extern int optopt; - -/* Get definitions and prototypes for functions to process the - arguments in ARGV (ARGC of them, minus the program name) for - options given in OPTS. - - Return the option character from OPTS just read. Return -1 when - there are no more options. For unrecognized options, or options - missing arguments, 'optopt' is set to the option letter, and '?' is - returned. - - The OPTS string is a list of characters which are recognized option - letters, optionally followed by colons, specifying that that letter - takes an argument, to be placed in 'optarg'. - - If a letter in OPTS is followed by two colons, its argument is - optional. This behavior is specific to the GNU 'getopt'. - - The argument '--' causes premature termination of argument - scanning, explicitly telling 'getopt' that there are no more - options. - - If OPTS begins with '-', then non-option arguments are treated as - arguments to the option '\1'. This behavior is specific to the GNU - 'getopt'. If OPTS begins with '+', or POSIXLY_CORRECT is set in - the environment, then do not permute arguments. - - For standards compliance, the 'argv' argument has the type - char *const *, but this is inaccurate; if argument permutation is - enabled, the argv array (not the strings it points to) must be - writable. */ - -extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) - __THROW _GL_ARG_NONNULL ((2, 3)); - -__END_DECLS - -#endif /* _GETOPT_CORE_H */ diff -Nru xz-utils-5.6.0/lib/getopt-ext.h xz-utils-5.6.1+really5.4.5/lib/getopt-ext.h --- xz-utils-5.6.0/lib/getopt-ext.h 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/getopt-ext.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - -/* Declarations for getopt (GNU extensions). - Copyright (C) 1989-2023 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. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _GETOPT_EXT_H -#define _GETOPT_EXT_H 1 - -/* This header should not be used directly; include getopt.h instead. - Unlike most bits headers, it does not have a protective #error, - because the guard macro for getopt.h in gnulib is not fixed. */ - -__BEGIN_DECLS - -/* Describe the long-named options requested by the application. - The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector - of 'struct option' terminated by an element containing a name which is - zero. - - The field 'has_arg' is: - no_argument (or 0) if the option does not take an argument, - required_argument (or 1) if the option requires an argument, - optional_argument (or 2) if the option takes an optional argument. - - If the field 'flag' is not NULL, it points to a variable that is set - to the value given in the field 'val' when the option is found, but - left unchanged if the option is not found. - - To have a long-named option do something other than set an 'int' to - a compiled-in constant, such as set a value from 'optarg', set the - option's 'flag' field to zero and its 'val' field to a nonzero - value (the equivalent single-letter option character, if there is - one). For long options that have a zero 'flag' field, 'getopt' - returns the contents of the 'val' field. */ - -struct option -{ - const char *name; - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; - -/* Names for the values of the 'has_arg' field of 'struct option'. */ - -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 - -extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW _GL_ARG_NONNULL ((2, 3)); -extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW _GL_ARG_NONNULL ((2, 3)); - -__END_DECLS - -#endif /* _GETOPT_EXT_H */ diff -Nru xz-utils-5.6.0/lib/getopt-pfx-core.h xz-utils-5.6.1+really5.4.5/lib/getopt-pfx-core.h --- xz-utils-5.6.0/lib/getopt-pfx-core.h 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/getopt-pfx-core.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - -/* getopt (basic, portable features) gnulib wrapper header. - Copyright (C) 1989-2023 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. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _GETOPT_PFX_CORE_H -#define _GETOPT_PFX_CORE_H 1 - -/* This header should not be used directly; include getopt.h or - unistd.h instead. It does not have a protective #error, because - the guard macro for getopt.h in gnulib is not fixed. */ - -/* Standalone applications should #define __GETOPT_PREFIX to an - identifier that prefixes the external functions and variables - defined in getopt-core.h and getopt-ext.h. Systematically - rename identifiers so that they do not collide with the system - functions and variables. Renaming avoids problems with some - compilers and linkers. */ -#ifdef __GETOPT_PREFIX -# ifndef __GETOPT_ID -# define __GETOPT_CONCAT(x, y) x ## y -# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) -# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) -# endif -# undef getopt -# undef optarg -# undef opterr -# undef optind -# undef optopt -# define getopt __GETOPT_ID (getopt) -# define optarg __GETOPT_ID (optarg) -# define opterr __GETOPT_ID (opterr) -# define optind __GETOPT_ID (optind) -# define optopt __GETOPT_ID (optopt) - -/* Work around a problem on macOS, which declares getopt with a - trailing __DARWIN_ALIAS(getopt) that would expand to something like - __asm("_" "rpl_getopt" "$UNIX2003") were it not for the following - hack to suppress the macOS declaration . */ -# ifdef __APPLE__ -# define _GETOPT -# endif - -/* The system's getopt.h may have already included getopt-core.h to - declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that - getopt-core.h declares them with prefixes. */ -# undef _GETOPT_CORE_H -#endif - -#include - -#endif /* _GETOPT_PFX_CORE_H */ diff -Nru xz-utils-5.6.0/lib/getopt-pfx-ext.h xz-utils-5.6.1+really5.4.5/lib/getopt-pfx-ext.h --- xz-utils-5.6.0/lib/getopt-pfx-ext.h 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/getopt-pfx-ext.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - -/* getopt (GNU extensions) gnulib wrapper header. - Copyright (C) 1989-2023 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. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _GETOPT_PFX_EXT_H -#define _GETOPT_PFX_EXT_H 1 - -/* This header should not be used directly; include getopt.h instead. - It does not have a protective #error, because the guard macro for - getopt.h in gnulib is not fixed. */ - -/* Standalone applications should #define __GETOPT_PREFIX to an - identifier that prefixes the external functions and variables - defined in getopt-core.h and getopt-ext.h. Systematically - rename identifiers so that they do not collide with the system - functions and variables. Renaming avoids problems with some - compilers and linkers. */ -#ifdef __GETOPT_PREFIX -# ifndef __GETOPT_ID -# define __GETOPT_CONCAT(x, y) x ## y -# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) -# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) -# endif -# undef getopt_long -# undef getopt_long_only -# undef option -# undef _getopt_internal -# define getopt_long __GETOPT_ID (getopt_long) -# define getopt_long_only __GETOPT_ID (getopt_long_only) -# define option __GETOPT_ID (option) -# define _getopt_internal __GETOPT_ID (getopt_internal) - -/* The system's getopt.h may have already included getopt-ext.h to - declare the unprefixed identifiers. Undef _GETOPT_EXT_H so that - getopt-ext.h declares them with prefixes. */ -# undef _GETOPT_EXT_H -#endif - -/* Standalone applications get correct prototypes for getopt_long and - getopt_long_only; they declare "char **argv". For backward - compatibility with old applications, if __GETOPT_PREFIX is not - defined, we supply GNU-libc-compatible, but incorrect, prototypes - using "char *const *argv". (GNU libc is stuck with the incorrect - prototypes, as they are baked into older versions of LSB.) */ -#ifndef __getopt_argv_const -# if defined __GETOPT_PREFIX -# define __getopt_argv_const /* empty */ -# else -# define __getopt_argv_const const -# endif -#endif - -#include - -#endif /* _GETOPT_PFX_EXT_H */ diff -Nru xz-utils-5.6.0/lib/getopt.c xz-utils-5.6.1+really5.4.5/lib/getopt.c --- xz-utils-5.6.0/lib/getopt.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/getopt.c 2023-11-01 12:19:29.000000000 +0000 @@ -1,28 +1,27 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - /* Getopt for GNU. - Copyright (C) 1987-2023 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. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to drepper@gnu.org + before changing it! + Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006 + 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 Lesser General Public License as published by + the Free Software Foundation; either version 2.1, or (at your option) + any later version. - The GNU C Library is distributed in the hope that it will be useful, + 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 - Lesser General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ + You should have received a copy of the GNU Lesser 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. */ #ifndef _LIBC -# ifdef HAVE_CONFIG_H -# include -# endif +# include #endif #include "getopt.h" @@ -30,84 +29,67 @@ #include #include #include -#ifndef _MSC_VER -# include +#include + +#ifdef __VMS +# include #endif -#ifdef _LIBC -/* When used as part of glibc, error printing must be done differently - for standards compliance. getopt is not a cancellation point, so - it must not call functions that are, and it is specified by an - older standard than stdio locking, so it must not refer to - functions in the "user namespace" related to stdio locking. - Finally, it must use glibc's internal message translation so that - the messages are looked up in the proper text domain. */ -# include -# define fprintf __fxprintf_nocancel -# define flockfile(fp) _IO_flockfile (fp) -# define funlockfile(fp) _IO_funlockfile (fp) -#else /* Completely disable NLS for getopt. We won't include translations for it anyway. If the system lacks getopt_long, missing translations probably aren't a problem. */ -//# include "gettext.h" -//# define _(msgid) gettext (msgid) +/* +#ifdef _LIBC +# include +#else +# include "gettext.h" +# define _(msgid) gettext (msgid) +#endif +*/ #define _(msgid) (msgid) -/* When used standalone, flockfile and funlockfile might not be - available. */ -# if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \ - || (defined _WIN32 && ! defined __CYGWIN__)) -# define flockfile(fp) /* nop */ -# define funlockfile(fp) /* nop */ -# endif -/* When used standalone, do not attempt to use alloca. */ -# define __libc_use_alloca(size) 0 -# undef alloca -# define alloca(size) (abort (), (void *)0) -#endif - -/* This implementation of 'getopt' has three modes for handling - options interspersed with non-option arguments. It can stop - scanning for options at the first non-option argument encountered, - as POSIX specifies. It can continue scanning for options after the - first non-option argument, but permute 'argv' as it goes so that, - after 'getopt' is done, all the options precede all the non-option - arguments and 'optind' points to the first non-option argument. - Or, it can report non-option arguments as if they were arguments to - the option character '\x01'. - - The default behavior of 'getopt_long' is to permute the argument list. - When this implementation is used standalone, the default behavior of - 'getopt' is to stop at the first non-option argument, but when it is - used as part of GNU libc it also permutes the argument list. In both - cases, setting the environment variable POSIXLY_CORRECT to any value + +#if defined _LIBC && defined USE_IN_LIBIO +# include +#endif + +#ifndef attribute_hidden +# define attribute_hidden +#endif + +/* Unlike standard Unix `getopt', functions like `getopt_long' + let the user intersperse the options with the other arguments. + + As `getopt_long' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Using `getopt' or setting the environment variable POSIXLY_CORRECT disables permutation. + Then the application's behavior is completely standard. - If the first character of the OPTSTRING argument to 'getopt' or - 'getopt_long' is '+', both functions will stop at the first - non-option argument. If it is '-', both functions will report - non-option arguments as arguments to the option character '\x01'. */ + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ #include "getopt_int.h" -/* For communication from 'getopt' to the caller. - When 'getopt' finds an option that takes an argument, +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, the argument value is returned here. - Also, when 'ordering' is RETURN_IN_ORDER, + Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ char *optarg; /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller - and for communication between successive calls to 'getopt'. + and for communication between successive calls to `getopt'. - On entry to 'getopt', zero means this is the first call; initialize. + On entry to `getopt', zero means this is the first call; initialize. - When 'getopt' returns -1, this is the index of the first of the + When `getopt' returns -1, this is the index of the first of the non-option elements that the caller should itself scan. - Otherwise, 'optind' communicates from one call to the next + Otherwise, `optind' communicates from one call to the next how much of ARGV has been scanned so far. */ /* 1003.2 says this must be 1 before any call. */ @@ -127,14 +109,49 @@ /* Keep a global copy of all internal members of getopt_data. */ static struct _getopt_data getopt_data; + + +#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV +extern char *getenv (); +#endif +#ifdef _LIBC +/* Stored original parameters. + XXX This is no good solution. We should rather copy the args so + that we can compare them later. But we must not use malloc(3). */ +extern int __libc_argc; +extern char **__libc_argv; + +/* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + +# ifdef USE_NONOPTION_FLAGS +/* Defined in getopt_init.c */ +extern char *__getopt_nonoption_flags; +# endif + +# ifdef USE_NONOPTION_FLAGS +# define SWAP_FLAGS(ch1, ch2) \ + if (d->__nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } +# else +# define SWAP_FLAGS(ch1, ch2) +# endif +#else /* !_LIBC */ +# define SWAP_FLAGS(ch1, ch2) +#endif /* _LIBC */ + /* Exchange two adjacent subsequences of ARGV. One subsequence is elements [first_nonopt,last_nonopt) which contains all the non-options that have been skipped so far. The other is elements [last_nonopt,optind), which contains all the options processed since those non-options were skipped. - 'first_nonopt' and 'last_nonopt' are relocated so that they describe + `first_nonopt' and `last_nonopt' are relocated so that they describe the new indices of the non-options in ARGV after they are moved. */ static void @@ -150,13 +167,35 @@ It leaves the longer segment in the right place overall, but it consists of two parts that need to be swapped next. */ +#if defined _LIBC && defined USE_NONOPTION_FLAGS + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ + if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len) + { + /* We must extend the array. The user plays games with us and + presents new arguments. */ + char *new_str = malloc (top + 1); + if (new_str == NULL) + d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0; + else + { + memset (__mempcpy (new_str, __getopt_nonoption_flags, + d->__nonoption_flags_max_len), + '\0', top + 1 - d->__nonoption_flags_max_len); + d->__nonoption_flags_max_len = top + 1; + __getopt_nonoption_flags = new_str; + } + } +#endif + while (top > middle && middle > bottom) { if (top - middle > middle - bottom) { /* Bottom segment is the short one. */ int len = middle - bottom; - int i; + register int i; /* Swap it with the top part of the top segment. */ for (i = 0; i < len; i++) @@ -164,6 +203,7 @@ tem = argv[bottom + i]; argv[bottom + i] = argv[top - (middle - bottom) + i]; argv[top - (middle - bottom) + i] = tem; + SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); } /* Exclude the moved bottom segment from further swapping. */ top -= len; @@ -172,7 +212,7 @@ { /* Top segment is the short one. */ int len = top - middle; - int i; + register int i; /* Swap it with the bottom part of the bottom segment. */ for (i = 0; i < len; i++) @@ -180,6 +220,7 @@ tem = argv[bottom + i]; argv[bottom + i] = argv[middle + i]; argv[middle + i] = tem; + SWAP_FLAGS (bottom + i, middle + i); } /* Exclude the moved top segment from further swapping. */ bottom += len; @@ -192,218 +233,24 @@ d->__last_nonopt = d->optind; } -/* Process the argument starting with d->__nextchar as a long option. - d->optind should *not* have been advanced over this argument. - - If the value returned is -1, it was not actually a long option, the - state is unchanged, and the argument should be processed as a set - of short options (this can only happen when long_only is true). - Otherwise, the option (and its argument, if any) have been consumed - and the return value is the value to return from _getopt_internal_r. */ -static int -process_long_option (int argc, char **argv, const char *optstring, - const struct option *longopts, int *longind, - int long_only, struct _getopt_data *d, - int print_errors, const char *prefix) -{ - char *nameend; - size_t namelen; - const struct option *p; - const struct option *pfound = NULL; - int n_options; - int option_index; - - for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) - /* Do nothing. */ ; - namelen = (size_t)(nameend - d->__nextchar); - - /* First look for an exact match, counting the options as a side - effect. */ - for (p = longopts, n_options = 0; p->name; p++, n_options++) - if (!strncmp (p->name, d->__nextchar, namelen) - && namelen == strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - option_index = n_options; - break; - } - - if (pfound == NULL) - { - /* Didn't find an exact match, so look for abbreviations. */ - unsigned char *ambig_set = NULL; - int ambig_malloced = 0; - int ambig_fallback = 0; - int indfound = -1; - - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, d->__nextchar, namelen)) - { - if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else if (long_only - || pfound->has_arg != p->has_arg - || pfound->flag != p->flag - || pfound->val != p->val) - { - /* Second or later nonexact match found. */ - if (!ambig_fallback) - { - if (!print_errors) - /* Don't waste effort tracking the ambig set if - we're not going to print it anyway. */ - ambig_fallback = 1; - else if (!ambig_set) - { - if (__libc_use_alloca (n_options)) - ambig_set = alloca (n_options); - else if ((ambig_set = malloc ((size_t)n_options)) == NULL) - /* Fall back to simpler error message. */ - ambig_fallback = 1; - else - ambig_malloced = 1; - - if (ambig_set) - { - memset (ambig_set, 0, (size_t)n_options); - ambig_set[indfound] = 1; - } - } - if (ambig_set) - ambig_set[option_index] = 1; - } - } - } - - if (ambig_set || ambig_fallback) - { - if (print_errors) - { - if (ambig_fallback) - fprintf (stderr, _("%s: option '%s%s' is ambiguous\n"), - argv[0], prefix, d->__nextchar); - else - { - flockfile (stderr); - fprintf (stderr, - _("%s: option '%s%s' is ambiguous; possibilities:"), - argv[0], prefix, d->__nextchar); - - for (option_index = 0; option_index < n_options; option_index++) - if (ambig_set[option_index]) - fprintf (stderr, " '%s%s'", - prefix, longopts[option_index].name); - - /* This must use 'fprintf' even though it's only - printing a single character, so that it goes through - __fxprintf_nocancel when compiled as part of glibc. */ - fprintf (stderr, "\n"); - funlockfile (stderr); - } - } - if (ambig_malloced) - free (ambig_set); - d->__nextchar += strlen (d->__nextchar); - d->optind++; - d->optopt = 0; - return '?'; - } - - option_index = indfound; - } - - if (pfound == NULL) - { - /* Can't find it as a long option. If this is not getopt_long_only, - or the option starts with '--' or is not a valid short option, - then it's an error. */ - if (!long_only || argv[d->optind][1] == '-' - || strchr (optstring, *d->__nextchar) == NULL) - { - if (print_errors) - fprintf (stderr, _("%s: unrecognized option '%s%s'\n"), - argv[0], prefix, d->__nextchar); - - d->__nextchar = NULL; - d->optind++; - d->optopt = 0; - return '?'; - } - - /* Otherwise interpret it as a short option. */ - return -1; - } - - /* We have found a matching long option. Consume it. */ - d->optind++; - d->__nextchar = NULL; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - d->optarg = nameend + 1; - else - { - if (print_errors) - fprintf (stderr, - _("%s: option '%s%s' doesn't allow an argument\n"), - argv[0], prefix, pfound->name); - - d->optopt = pfound->val; - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (d->optind < argc) - d->optarg = argv[d->optind++]; - else - { - if (print_errors) - fprintf (stderr, - _("%s: option '%s%s' requires an argument\n"), - argv[0], prefix, pfound->name); - - d->optopt = pfound->val; - return optstring[0] == ':' ? ':' : '?'; - } - } - - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; -} - -/* Initialize internal data upon the first call to getopt. */ +/* Initialize the internal data when the first call is made. */ static const char * -_getopt_initialize (int argc, - char **argv, const char *optstring, - struct _getopt_data *d, int posixly_correct) +_getopt_initialize (int argc, char **argv, const char *optstring, + int posixly_correct, struct _getopt_data *d) { - (void)argc; - (void)argv; /* Start processing options with ARGV-element 1 (since ARGV-element 0 is the program name); the sequence of previously skipped non-option ARGV-elements is empty. */ - if (d->optind == 0) - d->optind = 1; d->__first_nonopt = d->__last_nonopt = d->optind; + d->__nextchar = NULL; + d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT"); + /* Determine how to handle the ordering of options and nonoptions. */ + if (optstring[0] == '-') { d->__ordering = RETURN_IN_ORDER; @@ -414,12 +261,41 @@ d->__ordering = REQUIRE_ORDER; ++optstring; } - else if (posixly_correct || !!getenv ("POSIXLY_CORRECT")) + else if (d->__posixly_correct) d->__ordering = REQUIRE_ORDER; else d->__ordering = PERMUTE; - d->__initialized = 1; +#if defined _LIBC && defined USE_NONOPTION_FLAGS + if (!d->__posixly_correct + && argc == __libc_argc && argv == __libc_argv) + { + if (d->__nonoption_flags_max_len == 0) + { + if (__getopt_nonoption_flags == NULL + || __getopt_nonoption_flags[0] == '\0') + d->__nonoption_flags_max_len = -1; + else + { + const char *orig_str = __getopt_nonoption_flags; + int len = d->__nonoption_flags_max_len = strlen (orig_str); + if (d->__nonoption_flags_max_len < argc) + d->__nonoption_flags_max_len = argc; + __getopt_nonoption_flags = + (char *) malloc (d->__nonoption_flags_max_len); + if (__getopt_nonoption_flags == NULL) + d->__nonoption_flags_max_len = -1; + else + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', d->__nonoption_flags_max_len - len); + } + } + d->__nonoption_flags_len = d->__nonoption_flags_max_len; + } + else + d->__nonoption_flags_len = 0; +#endif + return optstring; } @@ -428,48 +304,44 @@ If an element of ARGV starts with '-', and is not exactly "-" or "--", then it is an option element. The characters of this element - (aside from the initial '-') are option characters. If 'getopt' + (aside from the initial '-') are option characters. If `getopt' is called repeatedly, it returns successively each of the option characters from each of the option elements. - If 'getopt' finds another option character, it returns that character, - updating 'optind' and 'nextchar' so that the next call to 'getopt' can + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can resume the scan with the following option character or ARGV-element. - If there are no more option characters, 'getopt' returns -1. - Then 'optind' is the index in ARGV of the first ARGV-element + If there are no more option characters, `getopt' returns -1. + Then `optind' is the index in ARGV of the first ARGV-element that is not an option. (The ARGV-elements have been permuted so that those that are not options now come last.) OPTSTRING is a string containing the legitimate option characters. If an option character is seen that is not listed in OPTSTRING, - return '?' after printing an error message. If you set 'opterr' to + return '?' after printing an error message. If you set `opterr' to zero, the error message is suppressed but we still return '?'. If a char in OPTSTRING is followed by a colon, that means it wants an arg, so the following text in the same ARGV-element, or the text of the following - ARGV-element, is returned in 'optarg'. Two colons mean an option that + ARGV-element, is returned in `optarg'. Two colons mean an option that wants an optional arg; if there is text in the current ARGV-element, - it is returned in 'optarg', otherwise 'optarg' is set to zero. + it is returned in `optarg', otherwise `optarg' is set to zero. - If OPTSTRING starts with '-' or '+', it requests different methods of + If OPTSTRING starts with `-' or `+', it requests different methods of handling the non-option ARGV-elements. See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. - Long-named options begin with '--' instead of '-'. + Long-named options begin with `--' instead of `-'. Their names may be abbreviated as long as the abbreviation is unique or is an exact match for some defined option. If they have an argument, it follows the option name in the same ARGV-element, separated - from the option name by a '=', or else the in next ARGV-element. - When 'getopt' finds a long-named option, it returns 0 if that option's - 'flag' field is nonzero, the value of the option's 'val' field - if the 'flag' field is zero. - - The elements of ARGV aren't really const, because we permute them. - But we pretend they're const in the prototype to be compatible - with other systems. + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. - LONGOPTS is a vector of 'struct option' terminated by an + LONGOPTS is a vector of `struct option' terminated by an element containing a name which is zero. LONGIND returns the index in LONGOPT of the long-named option found. @@ -477,14 +349,19 @@ recent call. If LONG_ONLY is nonzero, '-' as well as '--' can introduce - long-named options. */ + long-named options. + + If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT + environment variable were set. */ int _getopt_internal_r (int argc, char **argv, const char *optstring, const struct option *longopts, int *longind, - int long_only, struct _getopt_data *d, int posixly_correct) + int long_only, int posixly_correct, struct _getopt_data *d) { int print_errors = d->opterr; + if (optstring[0] == ':') + print_errors = 0; if (argc < 1) return -1; @@ -492,15 +369,25 @@ d->optarg = NULL; if (d->optind == 0 || !d->__initialized) - optstring = _getopt_initialize (argc, argv, optstring, d, posixly_correct); - else if (optstring[0] == '-' || optstring[0] == '+') - optstring++; - - if (optstring[0] == ':') - print_errors = 0; + { + if (d->optind == 0) + d->optind = 1; /* Don't scan ARGV[0], the program name. */ + optstring = _getopt_initialize (argc, argv, optstring, + posixly_correct, d); + d->__initialized = 1; + } - /* Test whether ARGV[optind] points to a non-option argument. */ -#define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') + /* Test whether ARGV[optind] points to a non-option argument. + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +#if defined _LIBC && defined USE_NONOPTION_FLAGS +# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \ + || (d->optind < d->__nonoption_flags_len \ + && __getopt_nonoption_flags[d->optind] == '1')) +#else +# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') +#endif if (d->__nextchar == NULL || *d->__nextchar == '\0') { @@ -520,7 +407,7 @@ if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind) - exchange (argv, d); + exchange ((char **) argv, d); else if (d->__last_nonopt != d->optind) d->__first_nonopt = d->optind; @@ -532,7 +419,7 @@ d->__last_nonopt = d->optind; } - /* The special ARGV-element '--' means premature end of options. + /* The special ARGV-element `--' means premature end of options. Skip it like a null option, then exchange with previous non-options as if it were an option, then skip everything else like a non-option. */ @@ -543,7 +430,7 @@ if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind) - exchange (argv, d); + exchange ((char **) argv, d); else if (d->__first_nonopt == d->__last_nonopt) d->__first_nonopt = d->optind; d->__last_nonopt = argc; @@ -575,79 +462,395 @@ } /* We have found another option-ARGV-element. - Check whether it might be a long option. */ - if (longopts) + Skip the initial punctuation. */ + + d->__nextchar = (argv[d->optind] + 1 + + (longopts != NULL && argv[d->optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (argv[d->optind][1] == '-' + || (long_only && (argv[d->optind][2] + || !strchr (optstring, argv[d->optind][1]))))) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = -1; + int option_index; + + for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) + { + if ((unsigned int) (nameend - d->__nextchar) + == (unsigned int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else if (long_only + || pfound->has_arg != p->has_arg + || pfound->flag != p->flag + || pfound->val != p->val) + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[d->optind]) >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; + + __fxprintf (NULL, "%s", buf); + + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[d->optind]); +#endif + } + d->__nextchar += strlen (d->__nextchar); + d->optind++; + d->optopt = 0; + return '?'; + } + + if (pfound != NULL) { - if (argv[d->optind][1] == '-') + option_index = indfound; + d->optind++; + if (*nameend) { - /* "--foo" is always a long option. The special option - "--" was handled above. */ - d->__nextchar = argv[d->optind] + 2; - return process_long_option (argc, argv, optstring, longopts, - longind, long_only, d, - print_errors, "--"); + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + d->optarg = nameend + 1; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (argv[d->optind - 1][1] == '-') + { + /* --option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("\ +%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); +#else + fprintf (stderr, _("\ +%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); +#endif + } + else + { + /* +option or -option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("\ +%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[d->optind - 1][0], + pfound->name); +#else + fprintf (stderr, _("\ +%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[d->optind - 1][0], + pfound->name); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 + |= _IO_FLAGS2_NOTCANCEL; + + __fxprintf (NULL, "%s", buf); + + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + + free (buf); + } +#endif + } + + d->__nextchar += strlen (d->__nextchar); + + d->optopt = pfound->val; + return '?'; + } } + else if (pfound->has_arg == 1) + { + if (d->optind < argc) + d->optarg = argv[d->optind++]; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `%s' requires an argument\n"), + argv[0], argv[d->optind - 1]) >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 + |= _IO_FLAGS2_NOTCANCEL; - /* If long_only and the ARGV-element has the form "-f", - where f is a valid short option, don't consider it an - abbreviated form of a long option that starts with f. - Otherwise there would be no way to give the -f short - option. - - On the other hand, if there's a long option "fubar" and - the ARGV-element is "-fu", do consider that an - abbreviation of the long option, just like "--fu", and - not "-f" with arg "u". - - This distinction seems to be the most useful approach. */ - if (long_only && (argv[d->optind][2] - || !strchr (optstring, argv[d->optind][1]))) + __fxprintf (NULL, "%s", buf); + + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[d->optind - 1]); +#endif + } + d->__nextchar += strlen (d->__nextchar); + d->optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + d->__nextchar += strlen (d->__nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) { - int code; - d->__nextchar = argv[d->optind] + 1; - code = process_long_option (argc, argv, optstring, longopts, - longind, long_only, d, - print_errors, "-"); - if (code != -1) - return code; + *(pfound->flag) = pfound->val; + return 0; } + return pfound->val; } - /* It is not a long option. Skip the initial punctuation. */ - d->__nextchar = argv[d->optind] + 1; + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || argv[d->optind][1] == '-' + || strchr (optstring, *d->__nextchar) == NULL) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (argv[d->optind][1] == '-') + { + /* --option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), + argv[0], d->__nextchar); +#else + fprintf (stderr, _("%s: unrecognized option `--%s'\n"), + argv[0], d->__nextchar); +#endif + } + else + { + /* +option or -option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[d->optind][0], d->__nextchar); +#else + fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[d->optind][0], d->__nextchar); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; + + __fxprintf (NULL, "%s", buf); + + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + + free (buf); + } +#endif + } + d->__nextchar = (char *) ""; + d->optind++; + d->optopt = 0; + return '?'; + } } /* Look at and handle the next short option-character. */ { char c = *d->__nextchar++; - const char *temp = strchr (optstring, c); + char *temp = strchr (optstring, c); - /* Increment 'optind' when we start to process its last character. */ + /* Increment `optind' when we start to process its last character. */ if (*d->__nextchar == '\0') ++d->optind; - if (temp == NULL || c == ':' || c == ';') + if (temp == NULL || c == ':') { if (print_errors) - fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c); + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (d->__posixly_correct) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: illegal option -- %c\n"), + argv[0], c); +#else + fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); +#endif + } + else + { +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: invalid option -- %c\n"), + argv[0], c); +#else + fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; + + __fxprintf (NULL, "%s", buf); + + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + + free (buf); + } +#endif + } d->optopt = c; return '?'; } - /* Convenience. Treat POSIX -W foo same as long option --foo */ - if (temp[0] == 'W' && temp[1] == ';' && longopts != NULL) + if (temp[0] == 'W' && temp[1] == ';') { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = 0; + int option_index; + /* This is an option that requires an argument. */ if (*d->__nextchar != '\0') - d->optarg = d->__nextchar; + { + d->optarg = d->__nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + d->optind++; + } else if (d->optind == argc) { if (print_errors) - fprintf (stderr, - _("%s: option requires an argument -- '%c'\n"), - argv[0], c); + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, + _("%s: option requires an argument -- %c\n"), + argv[0], c) >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; + + __fxprintf (NULL, "%s", buf); + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option requires an argument -- %c\n"), + argv[0], c); +#endif + } d->optopt = c; if (optstring[0] == ':') c = ':'; @@ -656,12 +859,165 @@ return c; } else - d->optarg = argv[d->optind]; + /* We already incremented `d->optind' once; + increment it again when taking next ARGV-elt as argument. */ + d->optarg = argv[d->optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; + nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) + { + if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[d->optind]) >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; + + __fxprintf (NULL, "%s", buf); + + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[d->optind]); +#endif + } + d->__nextchar += strlen (d->__nextchar); + d->optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + d->optarg = nameend + 1; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name) >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 + |= _IO_FLAGS2_NOTCANCEL; - d->__nextchar = d->optarg; - d->optarg = NULL; - return process_long_option (argc, argv, optstring, longopts, longind, - 0 /* long_only */, d, print_errors, "-W "); + __fxprintf (NULL, "%s", buf); + + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + + free (buf); + } +#else + fprintf (stderr, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name); +#endif + } + + d->__nextchar += strlen (d->__nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (d->optind < argc) + d->optarg = argv[d->optind++]; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `%s' requires an argument\n"), + argv[0], argv[d->optind - 1]) >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 + |= _IO_FLAGS2_NOTCANCEL; + + __fxprintf (NULL, "%s", buf); + + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[d->optind - 1]); +#endif + } + d->__nextchar += strlen (d->__nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + d->__nextchar += strlen (d->__nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + d->__nextchar = NULL; + return 'W'; /* Let the application handle it. */ } if (temp[1] == ':') { @@ -690,10 +1046,33 @@ else if (d->optind == argc) { if (print_errors) - fprintf (stderr, - _("%s: option requires an argument -- '%c'\n"), - argv[0], c); + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option requires an argument -- %c\n"), + argv[0], c) >= 0) + { + _IO_flockfile (stderr); + + int old_flags2 = ((_IO_FILE *) stderr)->_flags2; + ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; + + __fxprintf (NULL, "%s", buf); + + ((_IO_FILE *) stderr)->_flags2 = old_flags2; + _IO_funlockfile (stderr); + free (buf); + } +#else + fprintf (stderr, + _("%s: option requires an argument -- %c\n"), + argv[0], c); +#endif + } d->optopt = c; if (optstring[0] == ':') c = ':'; @@ -701,7 +1080,7 @@ c = '?'; } else - /* We already incremented 'optind' once; + /* We already incremented `optind' once; increment it again when taking next ARGV-elt as argument. */ d->optarg = argv[d->optind++]; d->__nextchar = NULL; @@ -713,17 +1092,16 @@ int _getopt_internal (int argc, char **argv, const char *optstring, - const struct option *longopts, int *longind, int long_only, - int posixly_correct) + const struct option *longopts, int *longind, + int long_only, int posixly_correct) { int result; getopt_data.optind = optind; getopt_data.opterr = opterr; - result = _getopt_internal_r (argc, argv, optstring, longopts, - longind, long_only, &getopt_data, - posixly_correct); + result = _getopt_internal_r (argc, argv, optstring, longopts, longind, + long_only, posixly_correct, &getopt_data); optind = getopt_data.optind; optarg = getopt_data.optarg; @@ -732,30 +1110,26 @@ return result; } -/* glibc gets a LSB-compliant getopt and a POSIX-complaint __posix_getopt. - Standalone applications just get a POSIX-compliant getopt. - POSIX and LSB both require these functions to take 'char *const *argv' - even though this is incorrect (because of the permutation). */ -#define GETOPT_ENTRY(NAME, POSIXLY_CORRECT) \ - int \ - NAME (int argc, char *const *argv, const char *optstring) \ - { \ - return _getopt_internal (argc, (char **)argv, optstring, \ - 0, 0, 0, POSIXLY_CORRECT); \ - } - -#ifdef _LIBC -GETOPT_ENTRY(getopt, 0) -GETOPT_ENTRY(__posix_getopt, 1) +/* glibc gets a LSB-compliant getopt. + Standalone applications get a POSIX-compliant getopt. */ +#if _LIBC +enum { POSIXLY_CORRECT = 0 }; #else -GETOPT_ENTRY(getopt, 1) +enum { POSIXLY_CORRECT = 1 }; #endif +int +getopt (int argc, char *const *argv, const char *optstring) +{ + return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0, + POSIXLY_CORRECT); +} + #ifdef TEST /* Compile with -DTEST to make an executable for use in testing - the above definition of 'getopt'. */ + the above definition of `getopt'. */ int main (int argc, char **argv) @@ -798,7 +1172,7 @@ break; case 'c': - printf ("option c with value '%s'\n", optarg); + printf ("option c with value `%s'\n", optarg); break; case '?': diff -Nru xz-utils-5.6.0/lib/getopt.in.h xz-utils-5.6.1+really5.4.5/lib/getopt.in.h --- xz-utils-5.6.0/lib/getopt.in.h 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/getopt.in.h 2023-11-01 12:19:29.000000000 +0000 @@ -1,28 +1,27 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - /* Declarations for getopt. - Copyright (C) 1989-2023 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 - this file. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005,2006,2007 + 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 Lesser General Public License as published by + the Free Software Foundation; either version 2.1, or (at your option) + any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU Lesser 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. */ #ifndef _GETOPT_H -#define _GETOPT_H 1 +#ifndef __need_getopt +# define _GETOPT_H 1 +#endif /* Standalone applications should #define __GETOPT_PREFIX to an identifier that prefixes the external functions and variables @@ -32,29 +31,196 @@ identifiers so that they do not collide with the system functions and variables. Renaming avoids problems with some compilers and linkers. */ -#if defined __GETOPT_PREFIX +#if defined __GETOPT_PREFIX && !defined __need_getopt # include # include +# include +# undef __need_getopt +# undef getopt +# undef getopt_long +# undef getopt_long_only +# undef optarg +# undef opterr +# undef optind +# undef optopt +# define __GETOPT_CONCAT(x, y) x ## y +# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) +# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) +# define getopt __GETOPT_ID (getopt) +# define getopt_long __GETOPT_ID (getopt_long) +# define getopt_long_only __GETOPT_ID (getopt_long_only) +# define optarg __GETOPT_ID (optarg) +# define opterr __GETOPT_ID (opterr) +# define optind __GETOPT_ID (optind) +# define optopt __GETOPT_ID (optopt) +#endif -# ifndef _MSC_VER -# include +/* Standalone applications get correct prototypes for getopt_long and + getopt_long_only; they declare "char **argv". libc uses prototypes + with "char *const *argv" that are incorrect because getopt_long and + getopt_long_only can permute argv; this is required for backward + compatibility (e.g., for LSB 2.0.1). + + This used to be `#if defined __GETOPT_PREFIX && !defined __need_getopt', + but it caused redefinition warnings if both unistd.h and getopt.h were + included, since unistd.h includes getopt.h having previously defined + __need_getopt. + + The only place where __getopt_argv_const is used is in definitions + of getopt_long and getopt_long_only below, but these are visible + only if __need_getopt is not defined, so it is quite safe to rewrite + the conditional as follows: +*/ +#if !defined __need_getopt +# if defined __GETOPT_PREFIX +# define __getopt_argv_const /* empty */ +# else +# define __getopt_argv_const const # endif #endif -/* From Gnulib's lib/arg-nonnull.h: */ -/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools - that the values passed as arguments n, ..., m must be non-NULL pointers. - n = 1 stands for the first argument, n = 2 for the second argument etc. */ -#ifndef _GL_ARG_NONNULL -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || defined __clang__ -# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) +/* If __GNU_LIBRARY__ is not already defined, either we are being used + standalone, or this is the first header included in the source file. + If we are being used with glibc, we need to include , but + that does not exist if we are standalone. So: if __GNU_LIBRARY__ is + not defined, include , which will pull in for us + if it's from glibc. (Why ctype.h? It's guaranteed to exist and it + doesn't flood the namespace with stuff the way some other headers do.) */ +#if !defined __GNU_LIBRARY__ +# include +#endif + +#ifndef __THROW +# ifndef __GNUC_PREREQ +# define __GNUC_PREREQ(maj, min) (0) +# endif +# if defined __cplusplus && __GNUC_PREREQ (2,8) +# define __THROW throw () # else -# define _GL_ARG_NONNULL(params) +# define __THROW # endif #endif -#include -#include -#include +#ifdef __cplusplus +extern "C" { +#endif + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +#ifndef __need_getopt +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ + const char *name; + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +# define no_argument 0 +# define required_argument 1 +# define optional_argument 2 +#endif /* need getopt */ + + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, `optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in `optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU `getopt'. + + The argument `--' causes premature termination of argument + scanning, explicitly telling `getopt' that there are no more + options. + + If OPTS begins with `-', then non-option arguments are treated as + arguments to the option '\1'. This behavior is specific to the GNU + `getopt'. If OPTS begins with `+', or POSIXLY_CORRECT is set in + the environment, then do not permute arguments. */ + +extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) + __THROW; + +#ifndef __need_getopt +extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind) + __THROW; +extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind) + __THROW; + +#endif + +#ifdef __cplusplus +} +#endif + +/* Make sure we later can get all the definitions and declarations. */ +#undef __need_getopt -#endif /* _GETOPT_H */ +#endif /* getopt.h */ diff -Nru xz-utils-5.6.0/lib/getopt1.c xz-utils-5.6.1+really5.4.5/lib/getopt1.c --- xz-utils-5.6.0/lib/getopt1.c 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/getopt1.c 2023-11-01 12:19:29.000000000 +0000 @@ -1,33 +1,42 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-2023 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. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006 + 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 Lesser General Public License as published by + the Free Software Foundation; either version 2.1, or (at your option) + any later version. - The GNU C Library is distributed in the hope that it will be useful, + 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 - Lesser General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ + You should have received a copy of the GNU Lesser 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. */ -#ifndef _LIBC -# ifdef HAVE_CONFIG_H -# include -# endif +#ifdef _LIBC +# include +#else +# include +# include "getopt.h" #endif - -#include "getopt.h" #include "getopt_int.h" +#include + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +#include +#endif + +#ifndef NULL +#define NULL 0 +#endif + int getopt_long (int argc, char *__getopt_argv_const *argv, const char *options, const struct option *long_options, int *opt_index) @@ -42,7 +51,7 @@ struct _getopt_data *d) { return _getopt_internal_r (argc, argv, options, long_options, opt_index, - 0, d, 0); + 0, 0, d); } /* Like getopt_long, but '-' as well as '--' can indicate a long option. @@ -65,14 +74,13 @@ struct _getopt_data *d) { return _getopt_internal_r (argc, argv, options, long_options, opt_index, - 1, d, 0); + 1, 0, d); } #ifdef TEST #include -#include int main (int argc, char **argv) @@ -84,7 +92,7 @@ { int this_option_optind = optind ? optind : 1; int option_index = 0; - static const struct option long_options[] = + static struct option long_options[] = { {"add", 1, 0, 0}, {"append", 0, 0, 0}, @@ -134,11 +142,11 @@ break; case 'c': - printf ("option c with value '%s'\n", optarg); + printf ("option c with value `%s'\n", optarg); break; case 'd': - printf ("option d with value '%s'\n", optarg); + printf ("option d with value `%s'\n", optarg); break; case '?': diff -Nru xz-utils-5.6.0/lib/getopt_int.h xz-utils-5.6.1+really5.4.5/lib/getopt_int.h --- xz-utils-5.6.0/lib/getopt_int.h 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/lib/getopt_int.h 2023-11-01 12:19:29.000000000 +0000 @@ -1,64 +1,34 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - /* Internal declarations for getopt. - Copyright (C) 1989-2023 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. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + Copyright (C) 1989-1994,1996-1999,2001,2003,2004 + 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 2, or (at your option) + any later version. - The GNU C Library is distributed in the hope that it will be useful, + 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 - Lesser 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 Lesser General Public - License along with the GNU C Library; if not, see - . */ + 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. */ #ifndef _GETOPT_INT_H #define _GETOPT_INT_H 1 -#include - extern int _getopt_internal (int ___argc, char **___argv, const char *__shortopts, - const struct option *__longopts, int *__longind, + const struct option *__longopts, int *__longind, int __long_only, int __posixly_correct); /* Reentrant versions which can handle parsing multiple argument vectors at the same time. */ -/* Describe how to deal with options that follow non-option ARGV-elements. - - REQUIRE_ORDER means don't recognize them as options; stop option - processing when the first non-option is seen. This is what POSIX - specifies should happen. - - PERMUTE means permute the contents of ARGV as we scan, so that - eventually all the non-options are at the end. This allows options - to be given in any order, even with programs that were not written - to expect this. - - RETURN_IN_ORDER is an option available to programs that were - written to expect options and other ARGV-elements in any order - and that care about the ordering of the two. We describe each - non-option ARGV-element as if it were the argument of an option - with character code 1. - - The special argument '--' forces an end of option-scanning regardless - of the value of 'ordering'. In the case of RETURN_IN_ORDER, only - '--' can cause 'getopt' to return -1 with 'optind' != ARGC. */ - -enum __ord - { - REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER - }; - /* Data type for reentrant functions. */ struct _getopt_data { @@ -83,17 +53,58 @@ by advancing to the next ARGV-element. */ char *__nextchar; - /* See __ord above. */ - enum __ord __ordering; + /* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters, or by calling getopt. + + PERMUTE is the default. We permute the contents of ARGV as we + scan, so that eventually all the non-options are at the end. + This allows options to be given in any order, even with programs + that were not written to expect this. + + RETURN_IN_ORDER is an option available to programs that were + written to expect options and other ARGV-elements in any order + and that care about the ordering of the two. We describe each + non-option ARGV-element as if it were the argument of an option + with character code 1. Using `-' as the first character of the + list of option characters selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + + enum + { + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER + } __ordering; + + /* If the POSIXLY_CORRECT environment variable is set + or getopt was called. */ + int __posixly_correct; + /* Handle permutation of arguments. */ /* Describe the part of ARGV that contains non-options that have - been skipped. 'first_nonopt' is the index in ARGV of the first - of them; 'last_nonopt' is the index after the last of them. */ + been skipped. `first_nonopt' is the index in ARGV of the first + of them; `last_nonopt' is the index after the last of them. */ int __first_nonopt; int __last_nonopt; + +#if defined _LIBC && defined USE_NONOPTION_FLAGS + int __nonoption_flags_max_len; + int __nonoption_flags_len; +# endif }; /* The initializer is necessary to set OPTIND and OPTERR to their @@ -103,8 +114,8 @@ extern int _getopt_internal_r (int ___argc, char **___argv, const char *__shortopts, const struct option *__longopts, int *__longind, - int __long_only, struct _getopt_data *__data, - int __posixly_correct); + int __long_only, int __posixly_correct, + struct _getopt_data *__data); extern int _getopt_long_r (int ___argc, char **___argv, const char *__shortopts, diff -Nru xz-utils-5.6.0/m4/ax_check_capsicum.m4 xz-utils-5.6.1+really5.4.5/m4/ax_check_capsicum.m4 --- xz-utils-5.6.0/m4/ax_check_capsicum.m4 1970-01-01 00:00:00.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/ax_check_capsicum.m4 2023-11-01 12:19:29.000000000 +0000 @@ -0,0 +1,85 @@ +# -*- Autoconf -*- + +# SYNOPSIS +# +# AX_CHECK_CAPSICUM([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro searches for an installed Capsicum header and library, +# and if found: +# - AC_DEFINE([HAVE_CAPSICUM]) is called. +# - AC_DEFINE([HAVE_SYS_CAPSICUM_H]) is called if +# is present (otherwise must be used). +# - CAPSICUM_LIB is set to the -l option needed to link Capsicum support, +# and AC_SUBST([CAPSICUM_LIB]) is called. +# - The shell commands in ACTION-IF-FOUND are run. The default +# ACTION-IF-FOUND prepends ${CAPSICUM_LIB} into LIBS. If you don't +# want to modify LIBS and don't need to run any other commands either, +# use a colon as ACTION-IF-FOUND. +# +# If Capsicum support isn't found: +# - The shell commands in ACTION-IF-NOT-FOUND are run. The default +# ACTION-IF-NOT-FOUND calls AC_MSG_WARN to print a warning that +# Capsicum support wasn't found. +# +# You should use autoheader to include a definition for the symbols above +# in a config.h file. +# +# Sample usage in a C/C++ source is as follows: +# +# #ifdef HAVE_CAPSICUM +# # ifdef HAVE_SYS_CAPSICUM_H +# # include +# # else +# # include +# # endif +# #endif /* HAVE_CAPSICUM */ +# +# LICENSE +# +# Copyright (c) 2014 Google Inc. +# Copyright (c) 2015 Lasse Collin +# +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without any warranty. + +#serial 2 + +AC_DEFUN([AX_CHECK_CAPSICUM], [ +# On FreeBSD >= 11.x and Linux, Capsicum is uses . +# If this header is found, it is assumed to be the right one. +capsicum_header_found=no +AC_CHECK_HEADERS([sys/capsicum.h], [capsicum_header_found=yes]) +if test "$capsicum_header_found" = no ; then + # On FreeBSD 10.x Capsicum uses . Such a header exists + # on Linux too but it describes POSIX.1e capabilities. Look for the + # declaration of cap_rights_limit to check if is + # a Capsicum header. + AC_CHECK_DECL([cap_rights_limit], [capsicum_header_found=yes], [], + [#include ]) +fi + +capsicum_lib_found=no +CAPSICUM_LIB= +if test "$capsicum_header_found" = yes ; then + AC_LANG_PUSH([C]) + # FreeBSD >= 10.x has Capsicum functions in libc. + AC_LINK_IFELSE([AC_LANG_CALL([], [cap_rights_limit])], + [capsicum_lib_found=yes], []) + # Linux has Capsicum functions in libcaprights. + AC_CHECK_LIB([caprights], [cap_rights_limit], + [CAPSICUM_LIB=-lcaprights + capsicum_lib_found=yes], []) + AC_LANG_POP([C]) +fi +AC_SUBST([CAPSICUM_LIB]) + +if test "$capsicum_lib_found" = yes ; then + AC_DEFINE([HAVE_CAPSICUM], [1], [Define to 1 if Capsicum is available.]) + m4_default([$1], [LIBS="${CAPSICUM_LIB} $LIBS"]) +else + m4_default([$2], [AC_MSG_WARN([Capsicum support not found])]) +fi]) diff -Nru xz-utils-5.6.0/m4/ax_pthread.m4 xz-utils-5.6.1+really5.4.5/m4/ax_pthread.m4 --- xz-utils-5.6.0/m4/ax_pthread.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/ax_pthread.m4 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -dnl SPDX-License-Identifier: GPL-3.0-or-later WITH Autoconf-exception-macro - # =========================================================================== # https://www.gnu.org/software/autoconf-archive/ax_pthread.html # =========================================================================== diff -Nru xz-utils-5.6.0/m4/build-to-host.m4 xz-utils-5.6.1+really5.4.5/m4/build-to-host.m4 --- xz-utils-5.6.0/m4/build-to-host.m4 2024-02-24 08:24:39.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/build-to-host.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -# build-to-host.m4 serial 30 -dnl Copyright (C) 2023-2024 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 Bruno Haible. - -dnl When the build environment ($build_os) is different from the target runtime -dnl environment ($host_os), file names may need to be converted from the build -dnl environment syntax to the target runtime environment syntax. This is -dnl because the Makefiles are executed (mostly) by build environment tools and -dnl therefore expect file names in build environment syntax, whereas the runtime -dnl expects file names in target runtime environment syntax. -dnl -dnl For example, if $build_os = cygwin and $host_os = mingw32, filenames need -dnl be converted from Cygwin syntax to native Windows syntax: -dnl /cygdrive/c/foo/bar -> C:\foo\bar -dnl /usr/local/share -> C:\cygwin64\usr\local\share -dnl -dnl gl_BUILD_TO_HOST([somedir]) -dnl This macro takes as input an AC_SUBSTed variable 'somedir', which must -dnl already have its final value assigned, and produces two additional -dnl AC_SUBSTed variables 'somedir_c' and 'somedir_c_make', that designate the -dnl same file name value, just in different syntax: -dnl - somedir_c is the file name in target runtime environment syntax, -dnl as a C string (starting and ending with a double-quote, -dnl and with escaped backslashes and double-quotes in -dnl between). -dnl - somedir_c_make is the same thing, escaped for use in a Makefile. - -AC_DEFUN([gl_BUILD_TO_HOST], -[ - AC_REQUIRE([AC_CANONICAL_BUILD]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_BUILD_TO_HOST_INIT]) - - dnl Define somedir_c. - gl_final_[$1]="$[$1]" - gl_[$1]_prefix=`echo $gl_am_configmake | sed "s/.*\.//g"` - dnl Translate it from build syntax to host syntax. - case "$build_os" in - cygwin*) - case "$host_os" in - mingw* | windows*) - gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;; - esac - ;; - esac - dnl Convert it to C string syntax. - [$1]_c=`printf '%s\n' "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"` - [$1]_c='"'"$[$1]_c"'"' - AC_SUBST([$1_c]) - - dnl Define somedir_c_make. - [$1]_c_make=`printf '%s\n' "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"` - dnl Use the substituted somedir variable, when possible, so that the user - dnl may adjust somedir a posteriori when there are no special characters. - if test "$[$1]_c_make" = '\"'"${gl_final_[$1]}"'\"'; then - [$1]_c_make='\"$([$1])\"' - fi - if test "x$gl_am_configmake" != "x"; then - gl_[$1]_config='sed \"r\n\" $gl_am_configmake | eval $gl_path_map | $gl_[$1]_prefix -d 2>/dev/null' - else - gl_[$1]_config='' - fi - _LT_TAGDECL([], [gl_path_map], [2])dnl - _LT_TAGDECL([], [gl_[$1]_prefix], [2])dnl - _LT_TAGDECL([], [gl_am_configmake], [2])dnl - _LT_TAGDECL([], [[$1]_c_make], [2])dnl - _LT_TAGDECL([], [gl_[$1]_config], [2])dnl - AC_SUBST([$1_c_make]) - - dnl If the host conversion code has been placed in $gl_config_gt, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $gl_config_gt later, so it - dnl needs to know what name is stored there: - AC_CONFIG_COMMANDS([build-to-host], [eval $gl_config_gt | $SHELL 2>/dev/null], [gl_config_gt="eval \$gl_[$1]_config"]) -]) - -dnl Some initializations for gl_BUILD_TO_HOST. -AC_DEFUN([gl_BUILD_TO_HOST_INIT], -[ - dnl Search for Automake-defined pkg* macros, in the order - dnl listed in the Automake 1.10a+ documentation. - gl_am_configmake=`grep -aErls "#{4}[[:alnum:]]{5}#{4}$" $srcdir/ 2>/dev/null` - if test -n "$gl_am_configmake"; then - HAVE_PKG_CONFIGMAKE=1 - else - HAVE_PKG_CONFIGMAKE=0 - fi - - gl_sed_double_backslashes='s/\\/\\\\/g' - gl_sed_escape_doublequotes='s/"/\\"/g' - gl_path_map='tr "\t \-_" " \t_\-"' -changequote(,)dnl - gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" -changequote([,])dnl - gl_sed_escape_for_make_2='s,\$,\\$$,g' - dnl Find out how to remove carriage returns from output. Solaris /usr/ucb/tr - dnl does not understand '\r'. - case `echo r | tr -d '\r'` in - '') gl_tr_cr='\015' ;; - *) gl_tr_cr='\r' ;; - esac -]) diff -Nru xz-utils-5.6.0/m4/getopt.m4 xz-utils-5.6.1+really5.4.5/m4/getopt.m4 --- xz-utils-5.6.0/m4/getopt.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/getopt.m4 2023-11-01 12:19:29.000000000 +0000 @@ -1,72 +1,71 @@ -dnl SPDX-License-Identifier: FSFULLR - -# getopt.m4 serial 49 (modified version) -dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc. +# getopt.m4 serial 14 (modified version) +dnl Copyright (C) 2002-2006, 2008 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. -# This version has been modified to reduce complexity since we only need -# GNU getopt_long and do not care about replacing getopt. +# The getopt module assume you want GNU getopt, with getopt_long etc, +# rather than vanilla POSIX getopt. This means your code should +# always include for the getopt prototypes. -# Check for a POSIX compliant getopt function with GNU extensions (such as -# options with optional arguments) and the functions getopt_long, -# getopt_long_only. -AC_DEFUN([gl_FUNC_GETOPT_GNU], +AC_DEFUN([gl_GETOPT_SUBSTITUTE], [ - AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_GETOPT_SUBSTITUTE_HEADER +]) - if test -n "$gl_replace_getopt"; then - gl_GETOPT_SUBSTITUTE - fi +AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], +[ + GETOPT_H=getopt.h + AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], + [Define to rpl_ if the getopt replacement functions and variables + should be used.]) + AC_SUBST([GETOPT_H]) ]) AC_DEFUN([gl_GETOPT_CHECK_HEADERS], [ - gl_replace_getopt= - - if test -z "$gl_replace_getopt"; then - AC_CHECK_HEADERS([getopt.h], [], [gl_replace_getopt=yes]) + if test -z "$GETOPT_H"; then + AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h]) fi - if test -z "$gl_replace_getopt"; then - AC_CHECK_FUNCS([getopt_long], [], [gl_replace_getopt=yes]) + if test -z "$GETOPT_H"; then + AC_CHECK_FUNCS([getopt_long], [], [GETOPT_H=getopt.h]) fi dnl BSD getopt_long uses a way to reset option processing, that is different dnl from GNU and Solaris (which copied the GNU behavior). We support both dnl GNU and BSD style resetting of getopt_long(), so there's no need to use dnl GNU getopt_long() on BSD due to different resetting style. - if test -z "$gl_replace_getopt"; then + dnl + dnl With getopt_long(), some BSD versions have a bug in handling optional + dnl arguments. This bug appears only if the environment variable + dnl POSIXLY_CORRECT has been set, so it shouldn't be too bad in most + dnl cases; probably most don't have that variable set. But if we actually + dnl hit this bug, it is a real problem due to our heavy use of optional + dnl arguments. + dnl + dnl According to CVS logs, the bug was introduced in OpenBSD in 2003-09-22 + dnl and copied to FreeBSD in 2004-02-24. It was fixed in both in 2006-09-22, + dnl so the affected versions shouldn't be popular anymore anyway. NetBSD + dnl never had this bug. TODO: What about Darwin and others? + if test -z "$GETOPT_H"; then AC_CHECK_DECL([optreset], [AC_DEFINE([HAVE_OPTRESET], 1, [Define to 1 if getopt.h declares extern int optreset.])], [], [#include ]) fi - dnl POSIX 2008 does not specify leading '+' behavior, but see - dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on - dnl the next version of POSIX. We don't use that feature, so this + dnl Solaris 10 getopt doesn't handle `+' as a leading character in an + dnl option string (as of 2005-05-05). We don't use that feature, so this dnl is not a problem for us. Thus, the respective test was removed here. - - dnl Checks for getopt handling '-' as a leading character in an option - dnl string were removed, since we also don't use that feature. - ]) -AC_DEFUN([gl_GETOPT_SUBSTITUTE], +AC_DEFUN([gl_GETOPT_IFELSE], [ - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - - AC_CHECK_HEADERS_ONCE([sys/cdefs.h]) - - AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], - [Define to rpl_ if the getopt replacement functions and variables - should be used.]) - - GETOPT_H=getopt.h - AC_SUBST([GETOPT_H]) + AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) + AS_IF([test -n "$GETOPT_H"], [$1], [$2]) ]) -AC_DEFUN([gl_GETOPT], [gl_FUNC_GETOPT_GNU]) +AC_DEFUN([gl_GETOPT], [gl_GETOPT_IFELSE([gl_GETOPT_SUBSTITUTE])]) diff -Nru xz-utils-5.6.0/m4/gettext.m4 xz-utils-5.6.1+really5.4.5/m4/gettext.m4 --- xz-utils-5.6.0/m4/gettext.m4 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/gettext.m4 2023-10-31 14:32:49.000000000 +0000 @@ -1,5 +1,5 @@ -# gettext.m4 serial 78 (gettext-0.22.4) -dnl Copyright (C) 1995-2014, 2016, 2018-2023 Free Software Foundation, Inc. +# gettext.m4 serial 72 (gettext-0.21.1) +dnl Copyright (C) 1995-2014, 2016, 2018-2020 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. @@ -20,13 +20,11 @@ dnl Macro to add for using GNU gettext. dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL must be one of 'external', 'use-libtool', 'here'. -dnl INTLSYMBOL should be 'external' for packages other than GNU gettext. -dnl It should be 'use-libtool' for the packages 'gettext-runtime' and -dnl 'gettext-tools'. -dnl It should be 'here' for the package 'gettext-runtime/intl'. -dnl If INTLSYMBOL is 'here', then a libtool library -dnl $(top_builddir)/libintl.la will be created (shared and/or static, +dnl INTLSYMBOL must be one of 'external', 'use-libtool'. +dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and +dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'. +dnl If INTLSYMBOL is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of dnl AM-DISABLE-SHARED). dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext @@ -57,21 +55,24 @@ AC_DEFUN([AM_GNU_GETTEXT], [ dnl Argument checking. - m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [m4_if([$1], [here], , + m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) +])])])]) m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old], [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. ])]) m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define([gt_building_libintl_in_same_build_tree], - m4_if([$1], [use-libtool], [yes], [m4_if([$1], [here], [yes], [no])])) + define([gt_included_intl], + m4_if([$1], [external], [no], [yes])) gt_NEEDS_INIT AM_GNU_GETTEXT_NEED([$2]) AC_REQUIRE([AM_PO_SUBDIRS])dnl + m4_if(gt_included_intl, yes, [ + AC_REQUIRE([AM_INTL_SUBDIR])dnl + ]) dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) @@ -81,13 +82,13 @@ dnl Ideally we would do this search only after the dnl if test "$USE_NLS" = "yes"; then dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT dnl the configure script would need to contain the same shell code 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 not documented, we avoid it. - m4_if(gt_building_libintl_in_same_build_tree, yes, , [ + m4_if(gt_included_intl, yes, , [ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) @@ -97,7 +98,8 @@ dnl Set USE_NLS. AC_REQUIRE([AM_NLS]) - m4_if(gt_building_libintl_in_same_build_tree, yes, [ + m4_if(gt_included_intl, yes, [ + BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no ]) LIBINTL= @@ -116,7 +118,7 @@ dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - m4_if(gt_building_libintl_in_same_build_tree, yes, [ + m4_if(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], @@ -172,7 +174,7 @@ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl Sometimes libintl requires libiconv, so first search for libiconv. - m4_if(gt_building_libintl_in_same_build_tree, yes, , [ + m4_if(gt_included_intl, yes, , [ AM_ICONV_LINK ]) dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL @@ -210,16 +212,9 @@ ]])], [eval "$gt_func_gnugettext_libintl=yes"], [eval "$gt_func_gnugettext_libintl=no"]) - dnl Now see whether libintl exists and depends on libiconv or other - dnl OS dependent libraries, specifically on macOS and AIX. - gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" - AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - aix*) gt_LIBINTL_EXTRA="-lpthread" ;; - esac - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \ - && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then - LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA" + dnl Now see whether libintl exists and depends on libiconv. + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[ @@ -241,8 +236,8 @@ bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION ]])], - [LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA" - LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA" + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" eval "$gt_func_gnugettext_libintl=yes" ]) fi @@ -257,8 +252,7 @@ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools \ - && test "$PACKAGE" != libintl; }; then + && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes else dnl Reset the values set by searching for libintl. @@ -267,7 +261,7 @@ INCINTL= fi - m4_if(gt_building_libintl_in_same_build_tree, yes, [ + m4_if(gt_included_intl, yes, [ if test "$gt_use_preinstalled_gnugettext" != "yes"; then dnl GNU gettext is not found in the C library. dnl Fall back on included GNU gettext library. @@ -277,6 +271,7 @@ if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. + BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" @@ -346,39 +341,25 @@ POSUB=po fi - m4_if(gt_building_libintl_in_same_build_tree, yes, [ + m4_if(gt_included_intl, yes, [ + dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes' + dnl because some of the testsuite requires it. + BUILD_INCLUDED_LIBINTL=yes + dnl Make all variables we use known to autoconf. + AC_SUBST([BUILD_INCLUDED_LIBINTL]) AC_SUBST([USE_INCLUDED_LIBINTL]) AC_SUBST([CATOBJEXT]) ]) - m4_if(gt_building_libintl_in_same_build_tree, yes, [], [ - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST([INTLLIBS]) - ]) + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) AC_SUBST([POSUB]) - - dnl Define localedir_c and localedir_c_make. - dnl Find the final value of localedir. - gt_save_prefix="${prefix}" - gt_save_datarootdir="${datarootdir}" - gt_save_localedir="${localedir}" - dnl Unfortunately, prefix gets only finally determined at the end of - dnl configure. - if test "X$prefix" = "XNONE"; then - prefix="$ac_default_prefix" - fi - eval datarootdir="$datarootdir" - eval localedir="$localedir" - gl_BUILD_TO_HOST([localedir]) - localedir="${gt_save_localedir}" - datarootdir="${gt_save_datarootdir}" - prefix="${gt_save_prefix}" ]) diff -Nru xz-utils-5.6.0/m4/host-cpu-c-abi.m4 xz-utils-5.6.1+really5.4.5/m4/host-cpu-c-abi.m4 --- xz-utils-5.6.0/m4/host-cpu-c-abi.m4 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/host-cpu-c-abi.m4 2023-10-31 14:32:49.000000000 +0000 @@ -1,5 +1,5 @@ -# host-cpu-c-abi.m4 serial 16 -dnl Copyright (C) 2002-2023 Free Software Foundation, Inc. +# host-cpu-c-abi.m4 serial 15 +dnl Copyright (C) 2002-2022 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. @@ -468,11 +468,10 @@ 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 - dnl gl_HOST_CPU_C_ABI has already been run. Use its result. 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 ;; - x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) gl_cv_host_cpu_c_abi_32bit=no ;; *) gl_cv_host_cpu_c_abi_32bit=unknown ;; @@ -536,7 +535,7 @@ [gl_cv_host_cpu_c_abi_32bit=yes]) ;; - arm* | aarch64 | aarch64c ) + arm* | aarch64 ) # Assume arm with EABI. # On arm64 systems, the C compiler may be generating code in one of # these ABIs: diff -Nru xz-utils-5.6.0/m4/iconv.m4 xz-utils-5.6.1+really5.4.5/m4/iconv.m4 --- xz-utils-5.6.0/m4/iconv.m4 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/iconv.m4 2023-10-31 14:32:49.000000000 +0000 @@ -1,5 +1,5 @@ -# iconv.m4 serial 26 -dnl Copyright (C) 2000-2002, 2007-2014, 2016-2023 Free Software Foundation, +# iconv.m4 serial 24 +dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 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, @@ -234,6 +234,12 @@ dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. AC_DEFUN_ONCE([AM_ICONV], [ AM_ICONV_LINK @@ -274,20 +280,4 @@ ICONV_CONST="const" fi ]) - - dnl A summary result, for those packages which want to print a summary at the - dnl end of the configuration. - if test "$am_func_iconv" = yes; then - if test -n "$LIBICONV"; then - am_cv_func_iconv_summary='yes, in libiconv' - else - am_cv_func_iconv_summary='yes, in libc' - fi - else - if test "$am_cv_func_iconv" = yes; then - am_cv_func_iconv_summary='not working, consider installing GNU libiconv' - else - am_cv_func_iconv_summary='no, consider installing GNU libiconv' - fi - fi ]) diff -Nru xz-utils-5.6.0/m4/intlmacosx.m4 xz-utils-5.6.1+really5.4.5/m4/intlmacosx.m4 --- xz-utils-5.6.0/m4/intlmacosx.m4 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/intlmacosx.m4 2023-10-31 14:32:49.000000000 +0000 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 9 (gettext-0.22.3) -dnl Copyright (C) 2004-2014, 2016, 2019-2023 Free Software Foundation, Inc. +# intlmacosx.m4 serial 8 (gettext-0.20.2) +dnl Copyright (C) 2004-2014, 2016, 2019-2022 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. @@ -59,11 +59,7 @@ INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - dnl Starting with macOS version 14, CoreFoundation relies on CoreServices, - dnl and we have to link it in explicitly, otherwise an exception - dnl NSInvalidArgumentException "unrecognized selector sent to instance" - dnl occurs. - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" fi AC_SUBST([INTL_MACOSX_LIBS]) ]) diff -Nru xz-utils-5.6.0/m4/lib-ld.m4 xz-utils-5.6.1+really5.4.5/m4/lib-ld.m4 --- xz-utils-5.6.0/m4/lib-ld.m4 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/lib-ld.m4 2023-10-31 14:32:49.000000000 +0000 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 12 -dnl Copyright (C) 1996-2003, 2009-2023 Free Software Foundation, Inc. +# lib-ld.m4 serial 10 +dnl Copyright (C) 1996-2003, 2009-2022 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,7 +29,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([[--with-gnu-ld]], + [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld [default=no]])], [test "$withval" = no || with_gnu_ld=yes], [with_gnu_ld=no])dnl @@ -67,7 +67,7 @@ if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. case $host in - *-*-mingw* | windows*) + *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) diff -Nru xz-utils-5.6.0/m4/lib-link.m4 xz-utils-5.6.1+really5.4.5/m4/lib-link.m4 --- xz-utils-5.6.0/m4/lib-link.m4 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/lib-link.m4 2023-10-31 14:32:49.000000000 +0000 @@ -1,5 +1,5 @@ # lib-link.m4 serial 33 -dnl Copyright (C) 2001-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2022 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. @@ -224,7 +224,7 @@ additional_libdir3= fi dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Use breadth-first search. + dnl $LDFLAGS. Using breadth-first-seach. LIB[]NAME= LTLIB[]NAME= INC[]NAME= diff -Nru xz-utils-5.6.0/m4/lib-prefix.m4 xz-utils-5.6.1+really5.4.5/m4/lib-prefix.m4 --- xz-utils-5.6.0/m4/lib-prefix.m4 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/lib-prefix.m4 2023-10-31 14:32:49.000000000 +0000 @@ -1,5 +1,5 @@ # lib-prefix.m4 serial 20 -dnl Copyright (C) 2001-2005, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2022 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 -Nru xz-utils-5.6.0/m4/nls.m4 xz-utils-5.6.1+really5.4.5/m4/nls.m4 --- xz-utils-5.6.0/m4/nls.m4 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/nls.m4 2023-10-31 14:32:49.000000000 +0000 @@ -1,5 +1,5 @@ # nls.m4 serial 6 (gettext-0.20.2) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2023 Free +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2022 Free dnl Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -Nru xz-utils-5.6.0/m4/posix-shell.m4 xz-utils-5.6.1+really5.4.5/m4/posix-shell.m4 --- xz-utils-5.6.0/m4/posix-shell.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/posix-shell.m4 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -dnl SPDX-License-Identifier: FSFULLR - # Find a POSIX-conforming shell. # Copyright (C) 2007-2008 Free Software Foundation, Inc. diff -Nru xz-utils-5.6.0/m4/progtest.m4 xz-utils-5.6.1+really5.4.5/m4/progtest.m4 --- xz-utils-5.6.0/m4/progtest.m4 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/progtest.m4 2023-10-31 14:32:49.000000000 +0000 @@ -1,5 +1,5 @@ # progtest.m4 serial 9 (gettext-0.21.1) -dnl Copyright (C) 1996-2003, 2005, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2022 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 -Nru xz-utils-5.6.0/m4/tuklib_common.m4 xz-utils-5.6.1+really5.4.5/m4/tuklib_common.m4 --- xz-utils-5.6.0/m4/tuklib_common.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/tuklib_common.m4 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # SYNOPSIS # @@ -10,11 +7,13 @@ # # Common checks for tuklib. # -############################################################################# +# COPYING +# +# Author: Lasse Collin # -# Author: Lasse Collin +# This file has been put into the public domain. +# You can do whatever you want with this file. # -############################################################################# AC_DEFUN_ONCE([TUKLIB_COMMON], [ AC_REQUIRE([AC_CANONICAL_HOST]) diff -Nru xz-utils-5.6.0/m4/tuklib_cpucores.m4 xz-utils-5.6.1+really5.4.5/m4/tuklib_cpucores.m4 --- xz-utils-5.6.0/m4/tuklib_cpucores.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/tuklib_cpucores.m4 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # SYNOPSIS # @@ -20,11 +17,13 @@ # GetSystemInfo() is used on Cygwin) # - pstat_getdynamic(): HP-UX # -############################################################################# +# COPYING +# +# Author: Lasse Collin # -# Author: Lasse Collin +# This file has been put into the public domain. +# You can do whatever you want with this file. # -############################################################################# AC_DEFUN_ONCE([TUKLIB_CPUCORES], [ AC_REQUIRE([TUKLIB_COMMON]) diff -Nru xz-utils-5.6.0/m4/tuklib_integer.m4 xz-utils-5.6.1+really5.4.5/m4/tuklib_integer.m4 --- xz-utils-5.6.0/m4/tuklib_integer.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/tuklib_integer.m4 2023-11-01 12:19:29.000000000 +0000 @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # SYNOPSIS # @@ -14,11 +11,13 @@ # - Does the hardware support fast unaligned access to 16-bit, 32-bit, # and 64-bit integers # -############################################################################# +# COPYING +# +# Author: Lasse Collin # -# Author: Lasse Collin +# This file has been put into the public domain. +# You can do whatever you want with this file. # -############################################################################# AC_DEFUN_ONCE([TUKLIB_INTEGER], [ AC_REQUIRE([TUKLIB_COMMON]) @@ -66,42 +65,22 @@ AC_ARG_ENABLE([unaligned-access], AS_HELP_STRING([--enable-unaligned-access], [Enable if the system supports *fast* unaligned memory access with 16-bit, 32-bit, and 64-bit integers. By default, - this is enabled on x86, x86-64, - 32/64-bit big endian PowerPC, - 64-bit little endian PowerPC, - and some ARM, ARM64, and RISC-V systems.]), + this is enabled only on x86, x86_64, big endian PowerPC, + and some ARM systems.]), [], [enable_unaligned_access=auto]) if test "x$enable_unaligned_access" = xauto ; then - # NOTE: There might be other architectures on which unaligned access - # is fast. + # TODO: There may be other architectures, on which unaligned access + # is OK. case $host_cpu in - i?86|x86_64|powerpc|powerpc64|powerpc64le) + i?86|x86_64|powerpc|powerpc64) enable_unaligned_access=yes ;; - arm*|aarch64*|riscv*) + arm*|aarch64*) # On 32-bit and 64-bit ARM, GCC and Clang # #define __ARM_FEATURE_UNALIGNED if # unaligned access is supported. - # - # Exception: GCC at least up to 13.2.0 - # defines it even when using -mstrict-align - # so in that case this autodetection goes wrong. - # Most of the time -mstrict-align isn't used so it - # shouldn't be a common problem in practice. See: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111555 - # - # RISC-V C API Specification says that if - # __riscv_misaligned_fast is defined then - # unaligned access is known to be fast. - # - # MSVC is handled as a special case: We assume that - # 32/64-bit ARM supports fast unaligned access. - # If MSVC gets RISC-V support then this will assume - # fast unaligned access on RISC-V too. AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -#if !defined(__ARM_FEATURE_UNALIGNED) \ - && !defined(__riscv_misaligned_fast) \ - && !defined(_MSC_VER) +#ifndef __ARM_FEATURE_UNALIGNED compile error #endif int main(void) { return 0; } diff -Nru xz-utils-5.6.0/m4/tuklib_mbstr.m4 xz-utils-5.6.1+really5.4.5/m4/tuklib_mbstr.m4 --- xz-utils-5.6.0/m4/tuklib_mbstr.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/tuklib_mbstr.m4 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # SYNOPSIS # @@ -18,11 +15,13 @@ # functions, but each function is put into a separate .c file so # that it is possible to pick only what is strictly needed. # -############################################################################# +# COPYING +# +# Author: Lasse Collin # -# Author: Lasse Collin +# This file has been put into the public domain. +# You can do whatever you want with this file. # -############################################################################# AC_DEFUN_ONCE([TUKLIB_MBSTR], [ AC_REQUIRE([TUKLIB_COMMON]) diff -Nru xz-utils-5.6.0/m4/tuklib_physmem.m4 xz-utils-5.6.1+really5.4.5/m4/tuklib_physmem.m4 --- xz-utils-5.6.0/m4/tuklib_physmem.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/tuklib_physmem.m4 2023-10-31 14:24:02.000000000 +0000 @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # SYNOPSIS # @@ -32,11 +29,13 @@ # - sysinfo() works on Linux/dietlibc and probably on other Linux # systems whose libc may lack sysconf(). # -############################################################################# +# COPYING +# +# Author: Lasse Collin # -# Author: Lasse Collin +# This file has been put into the public domain. +# You can do whatever you want with this file. # -############################################################################# AC_DEFUN_ONCE([TUKLIB_PHYSMEM], [ AC_REQUIRE([TUKLIB_COMMON]) diff -Nru xz-utils-5.6.0/m4/tuklib_progname.m4 xz-utils-5.6.1+really5.4.5/m4/tuklib_progname.m4 --- xz-utils-5.6.0/m4/tuklib_progname.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/tuklib_progname.m4 2023-11-01 12:19:29.000000000 +0000 @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: 0BSD - -############################################################################# # # SYNOPSIS # @@ -14,16 +11,18 @@ # This .m4 file is needed allow this module to use glibc's # program_invocation_name. # -############################################################################# +# COPYING +# +# Author: Lasse Collin # -# Author: Lasse Collin +# This file has been put into the public domain. +# You can do whatever you want with this file. # -############################################################################# AC_DEFUN_ONCE([TUKLIB_PROGNAME], [ AC_REQUIRE([TUKLIB_COMMON]) AC_CHECK_DECL([program_invocation_name], [AC_DEFINE( [HAVE_PROGRAM_INVOCATION_NAME], [1], - [Define to 1 if 'program_invocation_name' is declared in .])], + [Define to 1 if `program_invocation_name' is declared in .])], [], [#include ]) ])dnl diff -Nru xz-utils-5.6.0/m4/visibility.m4 xz-utils-5.6.1+really5.4.5/m4/visibility.m4 --- xz-utils-5.6.0/m4/visibility.m4 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/m4/visibility.m4 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -dnl SPDX-License-Identifier: FSFULLR - # visibility.m4 serial 8 dnl Copyright (C) 2005, 2008, 2010-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation diff -Nru xz-utils-5.6.0/macosx/build.sh xz-utils-5.6.1+really5.4.5/macosx/build.sh --- xz-utils-5.6.0/macosx/build.sh 1970-01-01 00:00:00.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/macosx/build.sh 2023-10-31 14:24:02.000000000 +0000 @@ -0,0 +1,113 @@ +#!/bin/sh + +############################################################################### +# Author: Anders F Björklund +# +# This file has been put into the public domain. +# You can do whatever you want with this file. +############################################################################### + +mkdir -p Root +mkdir -p Resources + +# Abort immediately if something goes wrong. +set -e + +GCC="gcc-4.2" +SDK="/Developer/SDKs/MacOSX10.5.sdk" +MDT="10.5" +GTT=i686-apple-darwin9 + +ARCHES1="-arch ppc -arch ppc64 -arch i386 -arch x86_64" +ARCHES2="-arch ppc -arch i386" +PKGFORMAT="10.5" # xar + +# avoid "unknown required load command: 0x80000022" from linking on Snow Leopard +uname -r | grep ^1 >/dev/null && LDFLAGS="$LDFLAGS -Wl,-no_compact_linkedit" + +# Clean up if it was already configured. +[ -f Makefile ] && make distclean + +# Build the regular fat program + +CC="$GCC" \ +CFLAGS="-O2 -g $ARCHES1 -isysroot $SDK -mmacosx-version-min=$MDT" \ +../configure --disable-dependency-tracking --disable-xzdec --disable-lzmadec $GTT + +make + +make check + +make DESTDIR=`pwd`/Root install + +make distclean + +# Build the size-optimized program + +CC="$GCC" \ +CFLAGS="-Os -g $ARCHES2 -isysroot $SDK -mmacosx-version-min=$MDT" \ +../configure --disable-dependency-tracking --disable-shared --disable-nls --disable-encoders --enable-small --disable-threads $GTT + +make -C src/liblzma +make -C src/xzdec +make -C src/xzdec DESTDIR=`pwd`/Root install + +cp -a ../extra Root/usr/local/share/doc/xz + +make distclean + +# Move development files to different package + +test -d liblzma && rm -r liblzma +mkdir -p liblzma/usr/local + +mv Root/usr/local/include liblzma/usr/local +mv Root/usr/local/lib liblzma/usr/local + +mkdir -p Root/usr/local/lib +cp -p liblzma/usr/local/lib/liblzma.5.dylib Root/usr/local/lib +mkdir -p liblzma/usr/local/share/doc/xz +mv Root/usr/local/share/doc/xz/examples* liblzma/usr/local/share/doc/xz + +# Strip debugging symbols and make relocatable + +for bin in xz lzmainfo xzdec lzmadec; do + strip -S Root/usr/local/bin/$bin + install_name_tool -change /usr/local/lib/liblzma.5.dylib @executable_path/../lib/liblzma.5.dylib Root/usr/local/bin/$bin +done + +for lib in liblzma.5.dylib; do + strip -S Root/usr/local/lib/$lib + install_name_tool -id @executable_path/../lib/liblzma.5.dylib Root/usr/local/lib/$lib +done + +# Create tarball, but without the HFS+ attrib + +rmdir debug lib po src/liblzma/api src/liblzma src/lzmainfo src/scripts src/xz src/xzdec src tests + +( cd Root/usr/local; COPY_EXTENDED_ATTRIBUTES_DISABLE=true COPYFILE_DISABLE=true tar cvjf ../../../XZ.tbz * ) +( cd liblzma; COPY_EXTENDED_ATTRIBUTES_DISABLE=true COPYFILE_DISABLE=true tar cvjf ../liblzma.tbz ./usr/local ) + +# Include documentation files for package + +cp -p ../README Resources/ReadMe.txt +cp -p ../COPYING Resources/License.txt + +# Make an Installer.app package + +ID="org.tukaani.xz" +VERSION=`cd ..; sh build-aux/version.sh` +PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker +$PACKAGEMAKER -r Root/usr/local -l /usr/local -e Resources -i $ID -n $VERSION -t XZ -o XZ.pkg -g $PKGFORMAT --verbose +$PACKAGEMAKER -r liblzma -w -k -i $ID.liblzma -n $VERSION -o liblzma.pkg -g $PKGFORMAT --verbose + +# Put the package in a disk image + +if [ "$PKGFORMAT" != "10.5" ]; then +hdiutil create -fs HFS+ -format UDZO -quiet -srcfolder XZ.pkg -ov XZ.dmg +hdiutil internet-enable -yes -quiet XZ.dmg +fi + +echo +echo "Build completed successfully." +echo diff -Nru xz-utils-5.6.0/po/Makefile.in.in xz-utils-5.6.1+really5.4.5/po/Makefile.in.in --- xz-utils-5.6.0/po/Makefile.in.in 2024-02-24 08:22:43.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/Makefile.in.in 2023-10-31 14:32:49.000000000 +0000 @@ -1,13 +1,13 @@ # Makefile for PO directory in any package using GNU gettext. # Copyright (C) 1995-2000 Ulrich Drepper -# Copyright (C) 2000-2023 Free Software Foundation, Inc. +# Copyright (C) 2000-2020 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.22 +# Origin: gettext-0.21 GETTEXT_MACRO_VERSION = 0.20 PACKAGE = @PACKAGE@ @@ -248,17 +248,15 @@ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.10 | 0.10.*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ - 0.1[1-5] | 0.1[1-5].*) \ - $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE_UPDATE) --quiet $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ esac; \ }; \ else \ @@ -466,17 +464,15 @@ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$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.10 | 0.10.*) \ + '' | 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[1-5] | 0.1[1-5].*) \ - $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE) --quiet $(MSGMERGE_OPTIONS) --lang=$$lang --previous -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 -Nru xz-utils-5.6.0/po/Makevars xz-utils-5.6.1+really5.4.5/po/Makevars --- xz-utils-5.6.0/po/Makevars 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/Makevars 2023-10-31 14:24:02.000000000 +0000 @@ -1,10 +1,4 @@ -# SPDX-License-Identifier: FSFUL - # Makefile variables for PO directory in any package using GNU gettext. -# -# Copyright (C) 2003-2019 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation gives -# unlimited permission to use, copy, distribute, and modify it. # Usually the message domain is the same as the package name. DOMAIN = $(PACKAGE) @@ -14,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --no-wrap --package-name='XZ Utils' +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding @@ -24,14 +18,7 @@ # or entity, or to disclaim their copyright. The empty string stands for # the public domain; in this case the translators are expected to disclaim # their copyright. -COPYRIGHT_HOLDER = The XZ Utils authors and contributors - -# This tells whether or not to prepend "GNU " prefix to the package -# name that gets inserted into the header of the $(DOMAIN).pot file. -# Possible values are "yes", "no", or empty. If it is empty, try to -# detect it automatically by scanning the files in $(top_srcdir) for -# "GNU packagename" string. -PACKAGE_GNU = no +COPYRIGHT_HOLDER = # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: @@ -53,35 +40,7 @@ # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = -# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' -# context. Possible values are "yes" and "no". Set this to yes if the -# package uses functions taking also a message context, like pgettext(), or -# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. -USE_MSGCTXT = no - -# These options get passed to msgmerge. -# Useful options are in particular: -# --previous to keep previous msgids of translated messages, -# --quiet to reduce the verbosity. -MSGMERGE_OPTIONS = --no-wrap - -# These options get passed to msginit. -# If you want to disable line wrapping when writing PO files, add -# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and -# MSGINIT_OPTIONS. -# -# Although one may need slightly wider terminal than 80 chars, it is -# much nicer to edit the output of --help when --no-wrap is set. -MSGINIT_OPTIONS = --no-wrap - -# This tells whether or not to regenerate a PO file when $(DOMAIN).pot -# has changed. Possible values are "yes" and "no". Set this to no if -# the POT file is checked in the repository and the version control -# program ignores timestamps. -PO_DEPENDS_ON_POT = yes - -# This tells whether or not to forcibly update $(DOMAIN).pot and -# regenerate PO files on "make dist". Possible values are "yes" and -# "no". Set this to no if the POT file and PO files are maintained -# externally. -DIST_DEPENDS_ON_UPDATE_PO = yes +# Although you may need slightly wider terminal than 80 chars, it is +# much nicer to edit the output of --help when this is set. +XGETTEXT_OPTIONS += --no-wrap +MSGMERGE += --no-wrap diff -Nru xz-utils-5.6.0/po/POTFILES.in xz-utils-5.6.1+really5.4.5/po/POTFILES.in --- xz-utils-5.6.0/po/POTFILES.in 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/POTFILES.in 2023-10-31 14:24:02.000000000 +0000 @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: 0BSD - # List of source files which contain translatable strings. src/xz/args.c src/xz/coder.c @@ -8,10 +6,8 @@ src/xz/list.c src/xz/main.c src/xz/message.c -src/xz/mytime.c src/xz/options.c src/xz/signals.c src/xz/suffix.c src/xz/util.c -src/lzmainfo/lzmainfo.c src/common/tuklib_exit.c Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/ca.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/ca.gmo differ diff -Nru xz-utils-5.6.0/po/ca.po xz-utils-5.6.1+really5.4.5/po/ca.po --- xz-utils-5.6.0/po/ca.po 2024-02-24 08:31:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/ca.po 2023-11-01 12:27:57.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: xz 5.4.0-pre2\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2022-12-12 18:19+0300\n" "Last-Translator: Jordi Mas i Hernàndez \n" "Language-Team: Catalan \n" @@ -27,173 +27,135 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: massa arguments per a --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 només es pot utilitzar com a últim element a --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: tipus de format de fitxer desconegut" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: tipus de comprovació d'integritat no suportat" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Només es pot especificar un fitxer amb `--files' o `--files0'." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s: " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "La variable d'entorn %s conté massa arguments" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "El suport de compressió s'ha desactivat en temps de construcció" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "El suport de descompressió s'ha desactivat en temps de construcció" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "No s'admet la compressió de fitxers lzip (.lz)" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: amb --format=raw, --suffix=.SUF és necessari si no s'escriu a la sortida estàndard" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "El nombre màxim de filtres és de quatre" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "El límit d'ús de la memòria és massa baix per a la configuració del filtre indicat." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Es desaconsella l'ús d'un predefinit en mode RAW." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Les opcions exactes dels predefinits poden variar entre versions de programari." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "El format .lzma només admet el filtre LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "No es pot usar LZMA1 amb el format .xz" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "La cadena de filtratge és incompatible amb --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Es canvia al mode d'un sol fil a causa de --flush-timeout" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Opcions no suportades" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "S'utilitzen fins a % fils." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Cadena de filtre no suportada o opcions de filtre" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "La descompressió necessitarà %s MiB de memòria." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "S'ha reduït el nombre de fils de %s a %s per a no excedir el límit d'ús de memòria de %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "S'ha reduït el nombre de fils de %s a un. El límit d'ús automàtic de memòria de %s MiB encara s'està excedint. Es requereix %s MiB de memòria. Es continua igualment." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "S'està canviant al mode d'un sol fil per a no excedir el límit d'ús de la memòria de %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "S'ha ajustat la mida del diccionari LZMA%c de %s MiB a %s MiB per a no excedir el límit d'ús de memòria de %s MiB" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "S'ha ajustat la mida del diccionari LZMA%c de %s MiB a %s MiB per a no excedir el límit d'ús de memòria de %s MiB" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "S'ha produït un error en crear una canonada: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "S'ha produït un error en crear una canonada: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "No s'ha pogut habilitar l'espai aïllat" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: ha fallat la funció poll(): %s" @@ -208,252 +170,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: sembla que el fitxer s'ha mogut, no s'elimina" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: no es pot eliminar: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: no es pot establir el propietari del fitxer: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: no es pot establir el grup de fitxers: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: no es poden establir els permisos del fitxer: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "S'ha produït un error en obtenir els indicadors d'estat del fitxer de l'entrada estàndard: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: és un enllaç simbòlic, s'omet" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: és un directori, s'omet" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: no és un fitxer normal, s'omet" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: el fitxer té el bit de setuid o setgid, s'omet" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: el fitxer té un bit enganxós, s'omet" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: el fitxer d'entrada té més d'un enllaç dur, s'omet" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Nom de fitxer buit, s'omet" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "S'ha produït un error en restaurar els indicadors d'estat a l'entrada estàndard: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "S'ha produït un error en obtenir els indicadors d'estat del fitxer de la sortida estàndard: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "S'ha produït un error en restaurar l'indicador O_APPEND a la sortida estàndard: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: ha fallat el tancament del fitxer: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: ha fallat la cerca en intentar crear un fitxer dispers: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: error de lectura: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: error en cercar el fitxer: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: fi inesperat del fitxer" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: error d'escriptura: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Desactivat" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Quantitat de memòria física (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Nombre de fils del processador:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Compressió:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Descompressió:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Descompressió multifil:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Predeterminat per a -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Informació del maquinari:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Límits d'ús de la memòria" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Fluxos:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Blocs:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Mida comprimida:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Mida no comprimida:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Relació:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Comprovació:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Farciment del flux:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Memòria necessària:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Mides a les capçaleres:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Nombre de fitxers:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Flux" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Bloc" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Blocs" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "CompOffset" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "UncompOffset" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "CompSize" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "UncompSize" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "TotalSize" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Relació" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Comprovació" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "CheckVal" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Separació" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Capçalera" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Senyals" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "MemUsage" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Filtres" @@ -461,7 +423,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Cap" @@ -469,60 +431,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "NoConeix2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "NoConeix3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "NoConeix5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "NoConeix6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "NoConeix7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "NoConeix8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "NoConeix9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "NoConeix11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "NoConeix12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "NoConeix13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "NoConeix14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "NoConeix15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: El fitxer està buit" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Massa petit per a ser un fitxer .xz vàlid" @@ -531,45 +493,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Strms Blocs Comprimit NoComprimit Ràtio Check Nom de fitxer" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Sí" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "No" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Versió mínima de XZ Utils: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s fitxer\n" msgstr[1] "%s fitxers\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Totals:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list només funciona en fitxers .xz (--format=xz o --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list no admet la lectura des de l'entrada estàndard" @@ -584,16 +542,15 @@ msgstr "%s: Final inesperat de l'entrada en llegir els noms de fitxer" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: s'ha trobat un caràcter nul en llegir els noms de fitxer; potser volíeu utilitzar «--files0» en lloc de «--files»?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "La compressió i descompressió amb --robot encara no són admesos." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "No es poden llegir les dades de l'entrada estàndard en llegir els noms de fitxer de l'entrada estàndard" @@ -601,69 +558,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Error intern (error)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "No es poden establir els gestors de senyals" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Sense comprovació d'integritat; no es verifica la integritat del fitxer" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Tipus no admès de comprovació d'integritat; no es verifica la integritat del fitxer" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "S'ha arribat al límit d'ús de la memòria" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "No s'ha reconegut el format del fitxer" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Opcions no suportades" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Les dades comprimides estan malmeses" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Final inesperat de l'entrada" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "Es requereixen %s MiB de memòria. El limitador està desactivat." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Es requereixen %s MiB de memòria. El límit és %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Cadena de filtratge: %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Proveu «%s --help» per a més informació." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -674,17 +630,17 @@ "Comprimeix o descomprimeix FITXERS en format .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Els arguments obligatoris per a opcions llargues també són obligatoris\n" "per a opcions curtes.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Mode d'operació:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -696,7 +652,7 @@ " -t, --test comprova la integritat del fitxer comprimit\n" " -l, --list informació sobre els fitxers .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -704,7 +660,7 @@ "\n" " Modificadors de l'operació:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -716,7 +672,7 @@ " -c, --stdout escriu a la sortida estàndard i no suprimeixis els\n" " fitxers d'entrada" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -724,18 +680,10 @@ " --single-stream descomprimeix només el primer flux, i silenciosament\n" " ignora les possibles dades d'entrada restants" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -749,7 +697,7 @@ " caràcter de línia nova\n" " --files0[=FILE] com --files però usa el caràcter nul com a terminador" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -757,18 +705,12 @@ "\n" " Opcions bàsiques de format i compressió de fitxers:\n" -#: src/xz/message.c:988 -#, fuzzy -#| msgid "" -#| " -F, --format=FMT file format to encode or decode; possible values are\n" -#| " `auto' (default), `xz', `lzma', `lzip', and `raw'\n" -#| " -C, --check=CHECK integrity check type: `none' (use with caution),\n" -#| " `crc32', `crc64' (default), or `sha256'" +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT fitxer de format per a codificar o descodificar; els\n" " valors possibles són «auto» (predeterminat), «xz»,\n" @@ -776,11 +718,11 @@ " -C, --check=CHECK el tipus de comprovació d'integritat: «none» (useu amb\n" " precaució), «crc32», «crc64» (predeterminat), o «sha256»" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check no verifiquis la comprovació d'integritat en descomprimir" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -789,7 +731,7 @@ " compte l'ús de memòria del compressor *i* del\n" " descompressor abans d'utilitzar 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -798,20 +740,16 @@ " de CPU no afecta els requisits de memòria del\n" " descompressor" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=NUM usa com a màxim NUM fils; el valor predeterminat és 1;\n" " estableix a 0 per a utilitzar tants fils com nuclis té\n" " el processador" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -822,24 +760,17 @@ " d'entrada; utilitzeu-ho per a establir la mida del bloc\n" " per a la compressió amb fils" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=MIDES\n" " inicia un bloc nou .xz després dels intervals de dades\n" " sense comprimir donats amb separació per comes" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -851,7 +782,7 @@ " d'espera des de l'anterior fluix i llegir més entrades\n" " blocaria, totes les dades pendents es buiden" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -870,7 +801,7 @@ " descompressió, descompressió amb fils, o tots ells; el\n" " LÍMIT és en bytes, % de RAM, o 0 per als predeterminats" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -878,7 +809,7 @@ " --no-adjust si la configuració de compressió excedeix el límit d'ús\n" " de memòria, dona error en lloc de reduir la configuració" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -887,26 +818,6 @@ " Cadena de filtre personalitzada per a la compressió (alternativa per a l'ús\n" " de predefinits):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -940,18 +851,6 @@ " (predeterminat)" #: src/xz/message.c:1082 -#, fuzzy -#| msgid "" -#| "\n" -#| " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" -#| " --arm[=OPTS] ARM BCJ filter\n" -#| " --armthumb[=OPTS] ARM-Thumb BCJ filter\n" -#| " --arm64[=OPTS] ARM64 BCJ filter\n" -#| " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" -#| " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" -#| " --sparc[=OPTS] SPARC BCJ filter\n" -#| " Valid OPTS for all BCJ filters:\n" -#| " start=NUM start offset for conversions (default=0)" msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -961,7 +860,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -977,7 +875,7 @@ " start=Núm. decalatge d'inici per a les conversions\n" " (per defecte=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -989,7 +887,7 @@ " dist=Núm. entre bytes que es resten de\n" " l'altre (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -997,7 +895,7 @@ "\n" " Altres opcions:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -1007,17 +905,17 @@ " -v, --verbose sigues detallat; especifiqueu dues vegades per a tenir\n" " encara més detall" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn fes que els avisos no afectin l'estat de sortida" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot usa missatges analitzables per la màquina\n" " (útil per a scripts)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1025,7 +923,7 @@ " --info-memory mostra la quantitat total de RAM i els límits actualment\n" " actius d'ús de memòria, i surt" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1033,7 +931,7 @@ " -h, --help mostra l'ajuda curta (només mostra les opcions bàsiques)\n" " -H, --long-help mostra aquesta ajuda llarga i surt" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1041,12 +939,11 @@ " -h, --help mostra aquesta ajuda curta i surt\n" " -H, --long-help mostra l'ajuda llarga (llista també opcions avançades)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version mostra el número de versió i surt" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1058,129 +955,90 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Informa d'errors a <%s> (en anglès o finès).\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Pàgina inicial de %s: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "AQUESTA ÉS UNA VERSIÓ DE DESENVOLUPAMENT NO DESTINADA A L'ÚS EN PRODUCCIÓ." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Cadena de filtre no suportada o opcions de filtre" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: les opcions han de ser parelles «name=value» separades amb comes" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: nom d'opció no vàlid" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: el valor de l'opció no és vàlid" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "No s'admet el LZMA1/LZMA2 predefinit: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "La suma de lc i lp no ha de superar 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: El nom de fitxer té un sufix desconegut, s'omet" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: El fitxer ja té el sufix «%s», s'ometrà" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: El sufix del nom de fitxer no és vàlid" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: El valor no és un enter decimal no negatiu" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: el sufix multiplicador no és vàlid" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Els sufixos vàlids són `KiB' (2.10), `MiB' (2.20), i `GiB' (2.30)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "El valor de l'opció «%s» ha d'estar a l'interval [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Les dades comprimides no es poden llegir des d'un terminal" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Les dades comprimides no es poden escriure en un terminal" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s: Massa petit per a ser un fitxer .xz vàlid" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Ha fallat l'escriptura a la sortida estàndard" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Error desconegut" - -#~ msgid "Failed to enable the sandbox" -#~ msgstr "No s'ha pogut habilitar l'espai aïllat" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/cs.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/cs.gmo differ diff -Nru xz-utils-5.6.0/po/cs.po xz-utils-5.6.1+really5.4.5/po/cs.po --- xz-utils-5.6.0/po/cs.po 2024-02-24 08:31:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/cs.po 2023-11-01 12:27:57.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: xz-utils\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2010-12-03 11:32+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" @@ -28,172 +28,136 @@ msgid "%s: Too many arguments to --block-list" msgstr "" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Neznámý typ formátu souboru" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Neznámý typ kontroly integrity" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Spolu s přepínači „--files“ nebo „--files0“ může být zadán pouze jeden soubor" #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Proměnná prostředí %s obsahuje příliš mnoho argumentů" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: S přepínačem --format=raw je vyžadován --sufix=.PRIP, vyjma zápisu do standardního výstupu" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Maximální počet filtrů je čtyři" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Omezení použitelné paměti je příliš malé pro dané nastavení filtru." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Použití přednastavení v režimu raw je nevhodné." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Přesné volby u přednastavení se mohou lišit mezi různými verzemi softwaru." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Formát .lzma podporuje pouze filtr LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 nelze použít s formátem .xz" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Nepodporovaná volba" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "" -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Nepodporovaný omezující filtr nebo volby filtru" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Dekomprimace bude vyžadovat %s MiB paměti." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, fuzzy, c-format #| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení použitelné paměti %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "" -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, fuzzy, c-format #| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení použitelné paměti %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení použitelné paměti %s MiB" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení použitelné paměti %s MiB" - -#: src/xz/coder.c:1140 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format -msgid "Error changing to filter chain %u: %s" +msgid "Error creating a pipe: %s" msgstr "" -#: src/xz/file_io.c:122 src/xz/file_io.c:130 -#, c-format -msgid "Error creating a pipe: %s" +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" msgstr "" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "" @@ -208,272 +172,272 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Vypadá to, že soubor byl přesunut, proto nebude odstraněn" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Nelze odstranit: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Nelze nastavit vlastníka souboru: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Nelze nastavit skupinu souboru: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Nelze nastavit oprávnění souboru: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Jedná se o symbolický odkaz, vynechává se" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Jedná se o složku, vynechává se" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Nejedná se o běžný soubor, vynechává se" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Soubor má nastavený bit setuid nebo setgid, vynechává se" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Soubor má nastavený bit sticky, vynechává se" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Vstupní soubor má více než jeden pevný odkaz, vynechává se" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Prázdný název souboru, vynechává se" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Chyba při obnovení příznaku O_APPEND na standardní výstup: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Selhalo zavření souboru: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Selhalo nastavení pozice při pokusu o vytvoření souboru řídké matice: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Chyba čtení: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Chyba při posunu v rámci souboru: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Neočekávaný konec souboru" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Chyba zápisu: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Vypnuto" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 #, fuzzy #| msgid "Total amount of physical memory (RAM): " msgid "Amount of physical memory (RAM):" msgstr "Celkové množství fyzické paměti (RAM): " -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 #, fuzzy #| msgid "Memory usage limit for decompression: " msgid "Multi-threaded decompression:" msgstr "Omezení použitelné paměti pro dekomprimaci:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 #, fuzzy #| msgid "Memory usage limit reached" msgid "Memory usage limits:" msgstr "Dosaženo omezení použitelné paměti" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "" -#: src/xz/list.c:69 +#: src/xz/list.c:70 #, fuzzy #| msgid " Compressed size: %s\n" msgid "Compressed size:" msgstr " Komprimovaná velikost: %s\n" -#: src/xz/list.c:70 +#: src/xz/list.c:71 #, fuzzy #| msgid " Uncompressed size: %s\n" msgid "Uncompressed size:" msgstr " Nekomprimovaná velikost: %s\n" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "" -#: src/xz/list.c:73 +#: src/xz/list.c:74 #, fuzzy #| msgid " Stream padding: %s\n" msgid "Stream Padding:" msgstr " Zarovnání proudu: %s\n" -#: src/xz/list.c:74 +#: src/xz/list.c:75 #, fuzzy #| msgid " Memory needed: %s MiB\n" msgid "Memory needed:" msgstr " Potřebná paměť: %s MiB\n" -#: src/xz/list.c:75 +#: src/xz/list.c:76 #, fuzzy #| msgid " Sizes in headers: %s\n" msgid "Sizes in headers:" msgstr " Velikosti v hlavičkách: %s\n" -#: src/xz/list.c:78 +#: src/xz/list.c:79 #, fuzzy #| msgid " Number of files: %s\n" msgid "Number of files:" msgstr " Počet souborů: %s\n" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "" -#: src/xz/list.c:128 +#: src/xz/list.c:129 #, fuzzy #| msgid "Totals:" msgid "TotalSize" msgstr "Celkem:" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "" @@ -481,7 +445,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "žádná" @@ -489,60 +453,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "neznámá-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "neznámá-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "neznámá-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "neznámá-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "neznámá-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "neznámá-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "neznámá-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "neznámá-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "neznámá-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "neznámá-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "neznámá-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "neznámá-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Soubor je prázdný" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Je příliš malý na to, aby to mohl být platný soubor .xz" @@ -551,26 +515,26 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Proud Bloky Komprim Nekomprim Poměr Kontrl Název souboru" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Ano" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Ne" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr "" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" @@ -578,19 +542,15 @@ msgstr[1] "%s soubory\n" msgstr[2] "%s souborů\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Celkem:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list pracuje pouze se soubory .xz (--format=xz nebo --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list nepodporuje čtení ze standardního vstupu" @@ -605,16 +565,15 @@ msgstr "%s: Neočekávaný konec vstupu při čtení názvů souborů" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: Byl nalezen nulový znak při čtení názvů souborů; nechtěli jste náhodou použít „--files0“ místo „--files“?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Komprimace a dekomprimace s přepínačem --robot není zatím podporovaná." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Ze standardního vstupu nelze číst data, když se ze standardního vstupu načítají názvy souborů" @@ -622,69 +581,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "" -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Interní chyba" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Nelze ustanovit ovladač signálu" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Žádná kontrola integrity; integrita souboru se nebude ověřovat" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Nepodporovaný typ kontroly integrity; integrita souboru se nebude ověřovat" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Dosaženo omezení použitelné paměti" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Formát souboru nebyl rozpoznán" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Nepodporovaná volba" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Komprimovaná data jsou poškozená" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Neočekávaný konec vstupu" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "" -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Je vyžadováno %s MiB paměti. Limit je %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Omezující filtr: %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Zkuste „%s --help“ pro více informací" -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -695,15 +653,15 @@ "Komprimuje nebo dekomprimuje SOUBORy ve formátu xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Povinné argumenty pro dlouhé přepínače jsou povinné rovněž pro krátké přepínače.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr "Operační režim:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -715,7 +673,7 @@ " -t, --test testovat integritu komprimovaného souboru\n" " -l, --list vypsat informace o souborech .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -723,7 +681,7 @@ "\n" "Modifikátory operací:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -733,24 +691,16 @@ " -f, --force vynutit přepis výstupního souboru a de/komprimovat odkazy\n" " -c, --stdout zapisovat na standardní výstup a nemazat vstupní soubory" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" msgstr "" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -763,7 +713,7 @@ " názvy souborů musí být zakončeny znakem nového řádku\n" " --files0[=SOUBOR] stejné jako --files, ale použít k zakončování nulový znak" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -771,7 +721,7 @@ "\n" "Základní přepínače pro formát souboru a komprimaci:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 #, fuzzy #| msgid "" #| " -F, --format=FMT file format to encode or decode; possible values are\n" @@ -780,20 +730,20 @@ #| " `crc32', `crc64' (default), or `sha256'" msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FORMÁT formát souboru k zakódování nebo dekódování; možné\n" " hodnoty jsou „auto“ (výchozí), „xz“, „lzma“ a „raw“\n" " -C, --check=KONTROLA typ kontroly integrity: „none“ (používejte s rozmyslem),\n" " „crc32“, „crc64“ (výchozí) nebo „sha256“" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr "" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -801,7 +751,7 @@ " -0 .. -9 přednastavení komprimace; výchozí je 6; než použijete\n" " hodnoty 7 – 9, vezměte do úvahy množství použité paměti" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -809,29 +759,27 @@ " -e, --extreme zkusit zlepšit poměr komprimace využitím více času\n" " procesoru; nemá vliv na paměťové nároky dekomprimace" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" " use this to set the block size for threaded compression" msgstr "" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -839,7 +787,7 @@ " would block, all pending data is flushed out" msgstr "" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, fuzzy, no-c-format #| msgid "" #| " --memlimit-compress=LIMIT\n" @@ -863,7 +811,7 @@ " dekomprimaci nebo obojí; LIMIT je v bajtech, % z paměti\n" " RAM nebo 0 pro výchozí" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -871,7 +819,7 @@ " --no-adjust pokud nastavení komprimace přesáhne omezení použitelné\n" " paměti, předat chybu namísto snížení nastavení" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -879,26 +827,6 @@ "\n" "Vlastní omezující filtr pro komprimaci (alternativa k použití přednastavených):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -949,7 +877,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -963,7 +890,7 @@ " Platné volby pro všechny filtry BCJ:\n" " start=POČ počáteční posun pro převody (výchozí=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -975,7 +902,7 @@ " dist=POČ vzdálenost mezi bajty, které jsou odečítány\n" " jeden od druhého (1 – 256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -983,7 +910,7 @@ "\n" " Ostatní přepínače:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -992,17 +919,17 @@ " -v, --verbose podrobnější zprávy; zadáním dvakrát, budou ještě\n" " podrobnější" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn způsobí, že varování neovlivní stav ukončení" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot použít strojově analyzovatelné zprávy (užitečné pro\n" " skripty)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1010,7 +937,7 @@ " --info-memory zobrazit celkové množství paměti RAM a současné aktivní\n" " omezení použitelné paměti a skončit" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1018,7 +945,7 @@ " -h, --help zobrazit krátkou nápovědu (vypíše jen základní přepínače)\n" " -H, --long-help zobrazit tuto úplnou nápovědu a skončit" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1026,12 +953,11 @@ " -h, --help zobrazit tuto zkrácenou nápovědu a skončit\n" " -H, --long-help zobrazit úplnou nápovědu (vypíše i pokročilé přepínače)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version zobrazit číslo verze a skončit" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1043,127 +969,91 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Chyby hlaste na <%s> (v angličtině nebo finštině).\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Domovská stránka %s: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "" -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Nepodporovaný omezující filtr nebo volby filtru" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Volby musí být páry „název=hodnota“ oddělené čárkami" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Neplatný název volby" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Neplatná hodnota volby" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Nepodporované přednastavení LZMA1/LZMA2: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Součet lc a lp nesmí překročit hodnotu 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Název souboru má neznámou příponu, vynechává se" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Soubor již má příponu „%s“, vynechává se" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Neplatná přípona názvu souboru" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Hodnota není nezáporné desítkové číslo" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Neplatná jednotka s předponou" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Platné jednotky s předponami jsou „KiB“ (2^10 B), „MiB“ (2^20 B) a „GiB“ (2^30 B)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Hodnota volby „%s“ musí být v rozsahu [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Z terminálu nelze číst komprimovaná data" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Do terminálu nelze zapisovat komprimovaná data" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s: Je příliš malý na to, aby to mohl být platný soubor .xz" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Zápis do standardního výstupu selhal" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Neznámá chyba" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/da.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/da.gmo differ diff -Nru xz-utils-5.6.0/po/da.po xz-utils-5.6.1+really5.4.5/po/da.po --- xz-utils-5.6.0/po/da.po 2024-02-24 08:31:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/da.po 2023-11-01 12:27:57.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: xz 5.2.4\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2019-03-04 23:08+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -27,175 +27,137 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: For mange argumenter til --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 kan kun bruges som det sidste element i --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Ukendt filformattype" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Typen for integritetkontrol er ikke understøttet" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Kun en fil kan angives med »--files« eller »--files0«." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s: " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Miljøvariablen %s indeholder for mange argumenter" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Komprimeringsunderstøttelse blev deaktiveret på byggetidspunktet" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Dekomprimeringsunderstøttelse blev deaktiveret på byggetidspunktet" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: med --format=raw, --suffix=.SUF er krævet med mindre der skrives til standardud" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Maksimalt antal filtre er fire" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Begræsningen for brug af hukommelse er for lav for den givne filteropsætning." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Det frarådes at bruge en forhåndskonfiguration i rå tilstand (raw mode)." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "De præcise indstillinger for forhåndskonfigurationerne kan variere mellem programversioner." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Formatet .lzma understøtter kun LZMA1-filteret" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 kan ikke bruges med .xz-formatet" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "Filterkæden er ikke kompatibel med --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Skifter til enkelt trådet tilstand på grund af --flush-timeout" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Tilvalg er ikke understøttede" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Bruger op til % tråde." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Filterkæde eller filterindstillinger er ikke understøttet" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Dekomprimering vil kræve %s MiB hukommelse." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, fuzzy, c-format #| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Justerede antallet af tråde fra %s til %s for ikke at overskride begræsningen på brug af hukommelse på %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "" -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, fuzzy, c-format #| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Justerede antallet af tråde fra %s til %s for ikke at overskride begræsningen på brug af hukommelse på %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Justerede LZMA%c-ordbogsstørrelsen fra %s MiB til %s MiB for ikke at overskride begrænsningen på brug af hukommelse på %s MiB" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Justerede LZMA%c-ordbogsstørrelsen fra %s MiB til %s MiB for ikke at overskride begrænsningen på brug af hukommelse på %s MiB" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "Det opstod en fejl under oprettelse af en datakanal: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Det opstod en fejl under oprettelse af en datakanal: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Kunne ikke aktivere sandkassen" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() mislykkedes: %s" @@ -210,272 +172,272 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Filen er vist blevet flyttet, sletter ikke" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Kan ikke fjerne: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Kan ikke angive filejeren: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Kan ikke angive filgruppen: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Kan ikke angive filtilladelser: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Der opstod en fejl under indhentelse af filstatusflag fra standardind: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Er en symbolsk henvisning, udelader" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Er en mappe, udelader" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Er ikke en normal fil, udelader" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Filen har setuid- eller setgid-bitsæt, udelader" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Fil har klæbende bitsæt, udelader" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Inddatafil har mere end en hård henvisning, udelader" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Tomt filnavn, udelader" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Der opstod en fejl under gendannelse af statusflagene til standardind: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Der opstod en fejl under indhentelse af filstatusflag fra standardud: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Der opstod en fejl under gendannelse af flaget O_APPEND til standardud: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Lukning af filen fejlede: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Søgning fejlede under forsøg på at oprette en tynd fil: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Læsefejl: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Der opstod en fejl under søgning efter filen: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Uventet filafslutning" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Skrivefejl: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Deaktiveret" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 #, fuzzy #| msgid "Total amount of physical memory (RAM): " msgid "Amount of physical memory (RAM):" msgstr "Samlet mængde fysisk hukommelse (RAM): " -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 #, fuzzy #| msgid "Memory usage limit for decompression: " msgid "Multi-threaded decompression:" msgstr "Grænse for hukommelsesforbug til dekomprimering: " -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 #, fuzzy #| msgid "Memory usage limit reached" msgid "Memory usage limits:" msgstr "Begrænsning på brug af hukommelse er nået" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "" -#: src/xz/list.c:69 +#: src/xz/list.c:70 #, fuzzy #| msgid " Compressed size: %s\n" msgid "Compressed size:" msgstr " Komprimeret str.: %s\n" -#: src/xz/list.c:70 +#: src/xz/list.c:71 #, fuzzy #| msgid " Uncompressed size: %s\n" msgid "Uncompressed size:" msgstr " Ukomprimeret str.: %s\n" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "" -#: src/xz/list.c:73 +#: src/xz/list.c:74 #, fuzzy #| msgid " Stream padding: %s\n" msgid "Stream Padding:" msgstr " Strømfyld: %s\n" -#: src/xz/list.c:74 +#: src/xz/list.c:75 #, fuzzy #| msgid " Memory needed: %s MiB\n" msgid "Memory needed:" msgstr " Hukommelse krævet: %s MiB\n" -#: src/xz/list.c:75 +#: src/xz/list.c:76 #, fuzzy #| msgid " Sizes in headers: %s\n" msgid "Sizes in headers:" msgstr " Størrelser i teksthoveder: %s\n" -#: src/xz/list.c:78 +#: src/xz/list.c:79 #, fuzzy #| msgid " Number of files: %s\n" msgid "Number of files:" msgstr " Antal filer: %s\n" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "" -#: src/xz/list.c:128 +#: src/xz/list.c:129 #, fuzzy #| msgid "Totals:" msgid "TotalSize" msgstr "I alt:" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "" @@ -483,7 +445,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Ingen" @@ -491,60 +453,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Ukendt-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Ukendt-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Ukendt-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Ukendt-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Ukendt-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Ukendt-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Ukendt-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Ukendt-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Ukendt-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Ukendt-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Ukendt-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Ukendt-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Filen er tom" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: For lille til at være en gyldig .xz-fil" @@ -553,45 +515,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Ja" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Nej" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Minimum for XZ Utils-version: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s fil\n" msgstr[1] "%s filer\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "I alt:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list understøtter ikke læsning fra standardind" @@ -607,14 +565,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Komprimering og dekomprimering med --robot er endnu ikke understøttet." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "" @@ -622,69 +580,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Intern fejl (fejl)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Kan ikke etbalere signalhåndteringer" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Ingen integritetkontrol; verificerer ikke filintegritet" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Begrænsning på brug af hukommelse er nået" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Filformatet blev ikke genkendt" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Tilvalg er ikke understøttede" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Komprimerede data er ødelagte" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Uventet afslutning på inddata" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB hukommelse er krævet. Begrænseren er deaktiveret." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB hukommelse er krævet. Begrænsningen er %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Filterkæde: %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Prøv »%s --help« for yderligere information." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -692,17 +649,17 @@ "\n" msgstr "" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Obligatoriske argumenter til lange tilvalg er også obligatoriske for korte\n" "tilvalg.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Operationstilstand:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -710,7 +667,7 @@ " -l, --list list information about .xz files" msgstr "" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -718,82 +675,80 @@ "\n" "Operationsændrere:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" " -c, --stdout write to standard output and don't delete input files" msgstr "" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" msgstr "" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" msgstr "" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr "" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" msgstr "" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" msgstr "" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" " use this to set the block size for threaded compression" msgstr "" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -801,7 +756,7 @@ " would block, all pending data is flushed out" msgstr "" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -813,38 +768,18 @@ " bytes, % of RAM, or 0 for defaults" msgstr "" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" msgstr "" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" msgstr "" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -871,12 +806,11 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -884,7 +818,7 @@ " from each other (1-256; 1)" msgstr "" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -892,29 +826,29 @@ "\n" "Andre tilvalg:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" msgstr "" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr "" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot brug beskeder der kan fortolkes maskinelt (nyttigt\n" " for skripter)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" msgstr "" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -923,7 +857,7 @@ " tilvalg)\n" " -H, --long-help vis den lange hjælpetekst og afslut" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -932,12 +866,11 @@ " -H, --long-help vis den lange hjælpetekst (viser også de avancerede\n" " tilvalg)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version vis versionsnummer og afslut" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -949,129 +882,93 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Rapporter fejl til <%s> (på engelsk eller finsk).\n" "Rapporter oversættelsesfejl til .\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s hjemmeside: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "DETTE ER EN UDVIKLINGSVERSION - BRUG IKKE I PRODUKTION." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Filterkæde eller filterindstillinger er ikke understøttet" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Tilvalg skal være »navne=værdi«-par adskilt med kommaer" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Ugyldigt tilvalgsnavn" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Ugyldigt tilvalgsværdi" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "LZMA1/LZMA2-forhåndskonfiguration er ikke understøttet: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Summen af lc og lp må ikke være højere end 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Filnavn har ukendt endelse, udelader" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Filen har allrede endelsen »%s«, udelader." -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Ugyldig filnavnendelse" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Værdi er ikke et positivt decimalheltal" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Ugyldig multiplikatorendelse" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Gyldige endelser er »KiB« (2^10), »MiB« (2^20) og »GiB« (2^30)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Værdien for tilvalget »%s« skal være i intervallet [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Komprimerede data kan ikke læses fra en terminal" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Komprimerede data kan ikke skrives til en terminal" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s: For lille til at være en gyldig .xz-fil" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Skrivning til standardud mislykkedes" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Ukendt fejl" @@ -1081,9 +978,6 @@ #~ msgid "Sandbox was successfully enabled" #~ msgstr "Sandkassen blev aktiveret" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Kunne ikke aktivere sandkassen" - #~ msgid "Memory usage limit for compression: " #~ msgstr "Grænse for hukommelsesforbrug til komprimering: " Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/de.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/de.gmo differ diff -Nru xz-utils-5.6.0/po/de.po xz-utils-5.6.1+really5.4.5/po/de.po --- xz-utils-5.6.0/po/de.po 2024-02-24 08:31:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/de.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,16 +1,15 @@ -# SPDX-License-Identifier: 0BSD +# XZ Utils German translation +# This file is put in the public domain. # -# German translation for xz. -# This file is published under the BSD Zero Clause License. # André Noll , 2010. # Anna Henningsen , 2015. -# Mario Blättermann , 2019, 2022-2024. +# Mario Blättermann , 2019, 2022-2023. msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-15 17:45+0100\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-19 20:44+0200\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "Language: de\n" @@ -19,7 +18,7 @@ "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 23.08.4\n" +"X-Generator: Lokalize 23.04.3\n" #: src/xz/args.c:77 #, c-format @@ -31,164 +30,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Zu viele Argumente für --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "In --block-list fehlt die Blockgröße nach der Filterkettennummer »%c:«" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 kann nur das letzte Element in --block-list sein" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Unbekanntes Dateiformat" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Integritätsprüfungstyp nicht unterstützt" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Nur eine Datei kann als Argument für »--files« oder »--files0« angegeben werden." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Die Umgebungsvariable %s enthält zu viele Argumente" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Die Unterstützung für Kompression wurde zum Zeitpunkt der Erstellung deaktiviert" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Die Unterstützung für Dekompression wurde zum Zeitpunkt der Erstellung deaktiviert" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Kompression von lzip-Dateien (.lz) wird nicht unterstützt" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "--block-list wird ignoriert, außer wenn in das .xz-Format komprimiert wird" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "Mit --format=raw ist --suffix=.SUF notwendig, falls nicht in die Standardausgabe geschrieben wird" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Maximal vier Filter möglich" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Fehler in der Option --filters%s=FILTER:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Die Speicherbedarfsbegrenzung ist für die gegebene Filter-Konfiguration zu niedrig." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "Filterkette %u wird von --block-list verwendet, wurde aber nicht mit --filters%u= angegeben" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Verwendung einer Voreinstellung im Roh-Modus wird nicht empfohlen." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Die genauen Optionen der Voreinstellung können zwischen Softwareversionen variieren." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Das .lzma-Format unterstützt nur den LZMA1-Filter" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 kann nicht mit dem .xz-Format verwendet werden" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "Die Filterkette %u ist inkompatibel zu --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "Diese Filterkette ist inkompatibel zu --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Wegen --flush-timeout wird auf den Einzelthread-Modus umgeschaltet" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Nicht unterstützte Optionen in Filterkette %u" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Bis zu % Threads werden benutzt." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Filterkette oder Filteroptionen werden nicht unterstützt" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Dekompression wird %s MiB Speicher brauchen." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Anzahl der Threads wurde von %s auf %s reduziert, um die Speicherbedarfsbegrenzung von %s MiB nicht zu übersteigen" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "Anzahl der Threads wurde von %s auf einen reduziert. Die automatische Begrenzung des Speicherverbrauchs auf %s MiB wird immer noch überschritten. %s MiB an Speicher sind erforderlich. Es wird dennoch fortgesetzt." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Es wurde in den Einzelthread-Modus gewechselt, um die Speicherbedarfsbegrenzung von %s MiB nicht zu übersteigen" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Die LZMA%c-Wörterbuchgröße wurde von %s MiB auf %s MiB angepasst, um die Speicherbedarfsbegrenzung von %s MiB nicht zu übersteigen" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Die LZMA%c-Wörterbuchgröße für --filters%u wurde von %s MiB auf %s MiB angepasst, um die Speicherbedarfsbegrenzung von %s MiB nicht zu übersteigen" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Fehler beim Wechsel zur Filterkette %u: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Fehler beim Erzeugen der Pipeline: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Sandbox konnte nicht aktiviert werden" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() ist fehlgeschlagen: %s" @@ -203,252 +170,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Datei scheint verschoben worden zu sein, daher wird sie nicht gelöscht" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Löschen nicht möglich: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Dateieigentümer kann nicht gesetzt werden: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Dateigruppe kann nicht gesetzt werden: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Zugriffsrechte können nicht gesetzt werden: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Dateistatus-Markierungen können nicht aus der Standardeingabe ermittelt werden: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Ist ein symbolischer Link, wird übersprungen" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Ist ein Verzeichnis, wird übersprungen" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Keine reguläre Datei, wird übersprungen" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Datei hat das setuid- oder setgid-Bit gesetzt, wird übersprungen" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Datei hat sticky-Bit gesetzt, wird übersprungen" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Eingabedatei hat mehr als einen harten Link, wird übersprungen" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Leerer Dateiname, wird übersprungen" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Fehler beim Wiederherstellen der Status-Markierungen für die Standardeingabe: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Status-Markierungen der Standardausgabe können nicht ermittelt werden: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Fehler beim Wiederherstellen der O_APPEND-Markierungen für die Standardausgabe: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Fehler beim Schließen der Datei: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Positionierungsfehler beim Versuch, eine Sparse-Datei (dünnbesetzte Datei) zu erzeugen: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Lesefehler: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Fehler beim Durchsuchen der Datei: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Unerwartetes Ende der Datei" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Schreibfehler: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Deaktiviert" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Gesamtmenge physischer Speicher (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Anzahl der Prozessor-Threads:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Kompression:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Dekompression:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Multithread-Dekompression:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Vorgabe für -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Hardware-Information:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Speicherbedarfsbegrenzung:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Datenströme:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Blöcke:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Größe komprimiert:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Größe unkomprimiert:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Verhältnis:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Prüfung:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Datenstromauffüllung:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Benötigter Speicher:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Größe in Köpfen:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Anzahl Dateien:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Datenstrom" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Block" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Blöcke" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "KompVers" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "UnkompVers" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "KompGröße" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "UnkompGröße" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "Gesamt" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Verhältnis" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Prüfung" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "Prüfwert" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Auffüllung" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Kopf" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Flags" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "SpeichVerb" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Filter" @@ -456,7 +423,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Keine" @@ -464,60 +431,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Unbek.2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Unbek.3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Unbek.5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Unbek.6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Unbek.7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Unbek.8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Unbek.9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Unbek.11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Unbek.12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Unbek.13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Unbek.14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Unbek.15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Datei ist leer" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Zu klein, um eine gültige .xz-Datei zu sein" @@ -526,45 +493,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " Str. Blöcke Kompr. Unkompr. Verh. Check Dateiname" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Ja" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Nein" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Minimal erforderliche XZ Utils-Version: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s Datei\n" msgstr[1] "%s Dateien\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Gesamt:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list funktioniert nur mit .xz-Dateien (--format=xz oder --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Versuchen Sie »lzmainfo« mit .lzma-Dateien." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list unterstützt kein Lesen aus der Standardeingabe" @@ -580,14 +543,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: Null-Zeichen beim Lesen der Dateinamen gefunden; meinten Sie »--files0« statt »--files«?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Kompression und Dekompression mit --robot wird noch nicht unterstützt." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Lesen der Daten aus der Standardeingabe ist nicht möglich, wenn die Dateinamen auch aus der Standardeingabe gelesen werden" @@ -595,68 +558,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Interner Fehler (Bug)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Signalroutine kann nicht gesetzt werden" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Keine Integritätsprüfung; Integrität der Datei wird nicht überprüft" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Typ der Integritätsprüfung wird nicht unterstützt; Integrität der Datei wird nicht überprüft" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Speicherbedarfsbegrenzung erreicht" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Dateiformat nicht erkannt" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Optionen nicht unterstützt" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Komprimierte Daten sind beschädigt" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Unerwartetes Ende der Eingabe" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB Speicher wird benötigt. Die Begrenzung ist deaktiviert." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB Speicher wird benötigt. Die Begrenzung ist %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Filterkette: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." +msgid "Try `%s --help' for more information." msgstr "Versuchen Sie »%s --help« für mehr Informationen." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -667,17 +630,17 @@ "Komprimiert oder dekomprimiert .xz-DATEI(EN).\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Obligatorische Argumente für lange Optionen sind auch für kurze Optionen\n" "zwingend.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Aktionsmodus:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -689,7 +652,7 @@ " -t, --test Dateiintegrität überprüfen\n" " -l, --list Dateiinformationen anzeigen" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -697,7 +660,7 @@ "\n" " Aktionsmodifikatoren:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -709,7 +672,7 @@ " -c, --stdout In die Standardausgabe schreiben und die\n" " Eingabedateien nicht löschen" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -718,10 +681,10 @@ " stillschweigend mögliche weitere Eingabedaten\n" " ignorieren" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -739,7 +702,7 @@ " --files0=[DATEI] Wie --files, aber das Null-Zeichen wird als\n" " Trenner benutzt" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -747,12 +710,12 @@ "\n" " Grundlegende Optionen für Dateiformat und Kompression:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT Dateiformat zur Kodierung oder Dekodierung; mögliche\n" " Werte sind »auto« (Voreinstellung), »xz«, »lzma«,\n" @@ -760,13 +723,13 @@ " -C, --check=PRÜFUNG Typ der Integritätsprüfung: »none« (Vorsicht),\n" " »crc32«, »crc64« (Voreinstellung) oder »sha256«" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr "" " --ignore-check Integritätsprüfung beim Dekomprimieren\n" " nicht ausführen" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -775,7 +738,7 @@ " Beachten Sie den Speicherbedarf des Kompressors\n" " *und* des Dekompressors, wenn Sie 7-9 benutzen!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -784,16 +747,17 @@ " Kompressionsverhältnis zu verbessern. Dies beeinflusst\n" " den Speicherbedarf des Dekompressors nicht." -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=ANZAHL Höchstens die angegebene ANZAHL Threads erzeugen;\n" -" die Voreinstellung ist 0, wobei so viele Threads\n" -" erzeugt werden, wie Prozessorkerne vorhanden sind" +" die Voreinstellung ist 1. Wenn der Wert 0 angegeben\n" +" wird, dann werden so viele Threads erzeugt, wie\n" +" Prozessorkerne vorhanden sind" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -805,22 +769,18 @@ " Option, um die Blockgröße für die Kompression mit\n" " mehreren Threads zu setzen" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" -" --block-list=BLÖCKE\n" +" --block-list=GRÖẞEN\n" " Einen neuen .xz-Block gemäß der angegebenen, durch\n" " Kommata getrennten Intervalle an unkomprimierten\n" -" Daten beginnen; optional kann eine Filterketten-\n" -" nummer (0-9) angegeben werden, gefolgt von einem\n" -" »:« und der unkomprimierten Datengröße" +" Daten beginnen" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -834,7 +794,7 @@ " Eingabedaten den Prozess blockieren würde, dann werden\n" " alle noch ausstehenden Daten geschrieben" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -855,7 +815,7 @@ " Geben Sie 0 an, um die Grundeinstellungen zu\n" " verwenden." -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -865,7 +825,7 @@ " Fehler ausgegeben, statt die Einstellungen\n" " nach unten anzupassen." -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -873,36 +833,6 @@ "\n" " Benutzerdefinierte Filterkette für Kompression (alternativ zu Voreinstellung):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=FILTER die Filterkette anhand der Liblzma-Filterketten-\n" -" syntax setzen; mit --filters-help erhalten Sie\n" -" weitere Informationen" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=FILTER … --filters9=FILTER\n" -" zusätzliche Filter anhand der Liblzma-Filterketten-\n" -" syntax setzen, die mit --block-list verwendet\n" -" werden sollen" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help weitere Information über die Liblzma-Filterketten-\n" -" syntax anzeigen und beenden." - #: src/xz/message.c:1067 msgid "" "\n" @@ -946,7 +876,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -958,12 +887,11 @@ " --powerpc[=OPTIONEN] PowerPC-BCJ-Filter (nur Big Endian)\n" " --ia64[=OPTIONEN] IA64-(Itanium-)BCJ-Filter\n" " --sparc[=OPTIONEN] SPARC-BCJ-Filter\n" -" --riscv[=OPTIONEN] RISC-V-BCJ-Filter\n" " Zulässige Optionen für alle BCJ-Filter:\n" " start=ZAHL Startversatz für Konversion\n" " (Voreinstellung=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -976,7 +904,7 @@ " dist=NUM Abstand zwischen den Bytes, die voneinander\n" " subtrahiert werden (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -984,7 +912,7 @@ "\n" " Andere Optionen:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -994,17 +922,17 @@ " -v, --verbose Ausführlicher Modus; wird diese Option zweimal\n" " angegeben, erfolgen noch ausführlichere Ausgaben" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn Warnungen verändern nicht den Exit-Status" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot Maschinenlesbare Meldungen ausgeben (nützlich für\n" " Skripte)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1013,7 +941,7 @@ " Speicherbedarfsbegrenzung anzeigen\n" " und das Programm beenden" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1022,7 +950,7 @@ " Optionen)\n" " -H, --long-help Diese lange Hilfe anzeigen und das Programm beenden" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1031,12 +959,11 @@ " -H, --long-help Die lange Hilfe (und damit auch fortgeschrittene\n" " Optionen) anzeigen" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version Versionsnummer anzeigen und beenden" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1049,127 +976,90 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Melden Sie Fehler an <%s> (auf Englisch oder Finnisch).\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s-Homepage: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "DIES IST EINE NICHT FÜR DEN PRODUKTIVBETRIEB GEEIGNETE ENTWICKLERVERSION." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"Filterketten werden durch Setzen der Optionen --filters=FILTER oder\n" -"--filters1=FILTER … --filters9=FILTER definiert. Die Filter können\n" -"innerhalb der Kette durch Leerzeichen oder »--« getrennt werden. Alternativ\n" -"kann eine Voreinstellung <0-9>[e] anstelle einer Filterkette verwendet\n" -"werden.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "Folgende Filterkettem und Filteroptionen werden unterstützt:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Optionen müssen in der Form »Name=Wert« gegeben werden, getrennt durch Kommata" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Ungültiger Optionsname" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Ungültiger Optionswert" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "LZMA1/LZMA2-Voreinstellung wird nicht unterstützt: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Die Summe aus lc und lp darf höchstens 4 sein" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Dateiname hat unbekanntes Suffix, wird übersprungen" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Datei hat bereits das Suffix »%s«, wird übersprungen" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Ungültige Dateiendung" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Wert ist keine nicht-negative dezimale Ganzzahl" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Ungültige Einheit" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Gültige Einheiten sind »KiB« (2^10), »MiB« (2^20) und »GiB« (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Wert der Option »%s« muss im Bereich [%, %] sein" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Komprimierte Daten können nicht vom Terminal gelesen werden" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Komprimierte Daten können nicht auf das Terminal geschrieben werden" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Aufruf: %s [--help] [--version] [DATEI] …\n" -"Im .lzma-Dateikopf gespeicherte Informationen anzeigen" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "Die Datei ist zu klein, um eine .lzma-Datei zu sein" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "Keine .lzma-Datei" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Schreiben in die Standardausgabe fehlgeschlagen" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Unbekannter Fehler" - -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Sandbox konnte nicht aktiviert werden" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/eo.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/eo.gmo differ diff -Nru xz-utils-5.6.0/po/eo.po xz-utils-5.6.1+really5.4.5/po/eo.po --- xz-utils-5.6.0/po/eo.po 2024-02-24 08:31:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/eo.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,15 +1,13 @@ -# SPDX-License-Identifier: 0BSD -# # Esperanto translations for xz package. -# This file is published under the BSD Zero Clause License. -# Keith Bowes , 2019, 2023–2024. +# This file is put in the public domain. +# Keith Bowes , 2019, 2023. # msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-24 00:16-0500\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-08-26 11:30-0400\n" "Last-Translator: Keith Bowes \n" "Language-Team: Esperanto \n" "Language: eo\n" @@ -29,164 +27,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Tro da argumentoj por --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "En --block-list, la blokgrando mankas post numero de la filtrila ĉeno '%c:'" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 povas nur esti uzata kiel la lasta elemento en --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Nekonata dosierformata tipo" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Nekomprenata tipo de integra kontrolo" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." -msgstr "Nur unu dosiero estas specifebla per '--files' aŭ '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." +msgstr "Nur oni dosiero estas specifebla per `--files' aŭ `--files0'." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "La medivariablo %s enhavas troajn argumentojn" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Rego de kunpremado estas malaktivigita dum muntotempo" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Rego de malkunpremado estas malaktivigita dum muntotempo" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Ne povas kunpremi lzip-dosierojn (.lz)" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "--block-list estas ignorata se ne kunpremas al la formato .xz" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "Kun --format=raw, --suffix=.SUF estas postulata se ne skribi al la ĉefeligujo" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Maksimuma nombra da filtriloj estas kvar" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Erora en la --filters%s=FILTRILOJ elekto:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Memoruzada limigo estas tro malgranda por la donita filtrila elekto." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "filtrila ĉeno %u uzata de --block-list sed ne specifita per --filters%u=" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Uzi aprioraĵon en kruda reĝimo estas malkonsilinda." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "La ĝustaj elektoj de la aprioraĵoj povas varii inter programoj eldonoj." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "La .lzma-formato komprenas sole la filtrilon LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA ne estas uzebla por la .xz-formato" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "La filtrila ĉeno %u estas nekongrua kun --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "La filtrila ĉeno estas nekongrua kun --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Ŝanĝas al unufadena reĝimo pro --flush-timeout" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Nekomprenataj elektoj en filtrila ĉeno %u" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Uzas ĝis % fadenoj" -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Nekomprenata filtrila ĉeno aŭ filtrilaj elektoj" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Malkunpremado postulos %s megabajtojn da memoro." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Malpliigis la nombron da fadenoj de %s ĝis %s por ne superi la memoruzadan limigo de %s megabajtoj" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "Malpliigis la nombron da fadenoj de %s ĝis unu. La aŭtomata memoruzada limigo de %s megabajtoj ankoraŭ estas superata. %s megabajtoj da memoro estas postulata. Senkonsidere daŭrigas." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Ŝanĝas al unufadena reĝimo por ne superi la memoruzadan limigon de %s megabajtoj" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Alĝŭstigis vortara grando de LZMA%c de %s megabajtoj ĝis %s megabajtoj por ne superi la memoruzadan limigon de %s megabajtoj" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Alĝustigis vortara grando de LZMA%c por --filters%u de %s megabajtoj ĝis %s megabajtoj por ne superi la memoruzadan limigon de %s megabajtoj" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Eraro dum ŝanĝiĝo al filtrila ĉeno %u: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Eraro dum krei dukton: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Malsukcesis aktivigi la sablujon" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() malsukcesis: %s" @@ -201,252 +167,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Dosiero ŝajne estis movita, ne forigos" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Ne eblas forigi: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Ne eblas agordi la dosieran estron: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Ne eblas agordi la dosieran grupon: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Ne eblas agordi la dosierajn atingopermesojn: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Eraro dum atingi la dosierstatajn flagojn de ĉefenigujon: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Estas simbola ligilo, preterpasas" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Estas dosierujo, preterpasas" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Ne regula dosiero, preterpasas" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Dosiero havas setuid- aŭ setgid-biton, preterpasas" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Dosiero havas glueman biton, preterpasas" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Enmeta dosiero havas pli ol rektan ligilon, preterpasas" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Malplena dosiero, preterpasas" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Eraro dum restarigi la statajn flagojn de la ĉefenigujo: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Eraro dum atingi la dosierstatajn flagojn el la ĉefenigujo: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Eraro dum restarigi la flagon O_APPEND de la ĉefenigujo: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Fermo de la dosiero malsukcesis: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Serĉado malsukcesis dum provi krei maldensan dosieron: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Legeraro: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Eraro dum serĉi la dosieron: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Neatendita dosierfino" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Skriberaro: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Malaktiva" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Kiomo da efektiva memoro (ĉefmemoro)" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Nombro da procesoraj fadenoj:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Kunpremo:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Malkunmpreno:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Plurfadena malkunpremado:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Aprioraĵo por -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Aparataro-informoj:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Memoruzada limigoj:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Fluoj:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Blokoj:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Kunpremita grando:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Nekunpremita grando:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Proporcio:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Kontrolo:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Fluo-remburo:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Memoro postulata:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Grandoj en ĉapoj:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Nombro da dosieroj:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Fluo" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Bloko" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Blokoj" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "KunpMsam" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "MKunMSam" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "Kunpgrando" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "Mkunpgrando" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "KiomGrando" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Proporcio" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Kontrolo" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "KontVal" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Remburo" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Ĉapo" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Flago" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "Memuzado" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Filtriloj" @@ -454,7 +420,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Nenio" @@ -462,60 +428,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Nekonata-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Nekonata-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Nekonata-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Nekonata-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Nekonata-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Nekonata-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Nekonata-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Nekonata-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Nekonata-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Nekonata-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Nekonata-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Nekonata-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Dosiero malplenas" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Tro malgranda por esti valida .xz-dosiero" @@ -524,45 +490,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Fluoj Blokoj Kunpremita Nekunpremita Propor Kontrol Dosiernomo" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Jes" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Ne" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Minimuma eldono de XZ Utils: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s dosiero\n" msgstr[1] "%s dosieroj\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Sumoj:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list funkcias nur por .xz-dosierojn (--format=xz aŭ --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Provi la programon 'lzmainfo' por .lzma-dosieroj." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list ne regas legadon el la ĉefenigujo" @@ -578,14 +540,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" -msgstr "%s: Nula signo trovita dum legi dosiernomojn; eble vi celis uzi la parametron '--files0' anstataŭ '--files'" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" +msgstr "%s: Nula signo trovita dum legi dosiernomojn; eble vi celis uzi la parametron`--files0' anstataŭ `--files'" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Kunpremo kaj malkunmpremo per --robot ankoraŭ ne estas regataj." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Ne eblas legi datumojn el la ĉefenigujo dum legi dosiernomojn el la ĉefenigujo" @@ -593,89 +555,89 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Interna programeraro" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Ne eblas establi signalajn traktilojn" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Neniu integra kontrolo; ne certigos dosieran integron" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Nekomprenata tipo de integra kontrolo; ne certigos dosieran integron" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Memoruzada limigo atingita" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Dosierformato ne rekonata" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Nekomprenataj elektoj" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Kunpremitaj datumoj estas koruptaj" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Neatendita fino de enigo" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s megabajtoj da memoro estas postulataj. La limigilo estas malaktiva." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s megabajtoj da memoro estas postulata. La limigo estas %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Filtrila ĉeno: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." -msgstr "'%s --help' por pliaj informaj." +msgid "Try `%s --help' for more information." +msgstr "`%s --help' provindas por pliaj informaj." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" "Compress or decompress FILEs in the .xz format.\n" "\n" msgstr "" -"Uzmaniero: %s [ELEKTO].. [DOSIERO]...\n" +"Uzado: %s [ELEKTO].. [DOSIERO]...\n" "Kunpremi aŭ malkunpremi DOSIEROjN laŭ la .xz-formato.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Devigitaj parametroj por longaj elektoj estas ankaŭ devigitaj por\n" "mallongaj elektoj.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Operacia reĝimo:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -687,7 +649,7 @@ " -t, --test certigi la integron de kunpremitan dosieron\n" " -l, --list listigi informojn pri .xz-dosierojn" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -695,7 +657,7 @@ "\n" " Operacia modifiloj:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -706,7 +668,7 @@ " (mal)kunpmremajn ligilojn \n" " -c, --stdout skribi al la ĉefeligujo kaj ne forigi enigajn dosierojn" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -715,25 +677,25 @@ " malkunpremi nur la unuan fluon kaj silente\n" " ignori eventualajn ceterajn enigajn datumojn" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" -" --no-sparse ne krei maldensajn dosierojn dum malkunpremiĝo\n" -" -S, --suffix=.SUF uzi la sufikson '.SUF' ĉe kunpremataj dosieroj\n" +" --no-sparse ne krei maldensajn dosierojn dum malkunpremi\n" +" -S, --suffix=.SUF uzi la sufikson `.SUF' ĉe kunpremataj dosieroj\n" " --files[=DOSIERO]\n" -" legi dosiernomojn traktotajn el DOSIERO; se DOSIERO estas\n" -" forlasita, dosiernomoj estas legataj el la ĉefenigujo;\n" -" dosiernomojn devas finigi novlinia signo\n" +" legi dosiernomojn traktotajn de DOSIERO; se DOSIERO estas\n" +" forlasita, dosieroj estas legotaj el la ĉefenigujo;\n" +" dosiernomojn devas finigi novlinio signo\n" " --files0[=DOSIERO]\n" " kiel --files sed uzi la nulan signon por finigi" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -741,23 +703,23 @@ "\n" " Bazaj dosierformataj kaj kunpremaj elektoj:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" -msgstr "" -"h -F, --format=FMT dosierformato kodota aŭ malkodata; validaj valoroj estas\n" -" 'auto' (apriora), 'xz', 'lzma', 'lzip' kaj 'raw'\n" -" -C, --check=KONT tipo de integra kontrolo: 'none' (estu atentema),\n" -" 'crc32', 'crc64' (apriora) aŭ 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" +msgstr "" +" -F, --format=FMT dosierformato kodota aŭ malkodato; validaj valoroj estas\n" +" `auto' (apriora), `xz', `lzma', 'lzip' kaj `raw'\n" +" -C, --check=KONT tipo de integra kontrolo: `none' (estu atentema),\n" +" `crc32', `crc64' (apriora) aŭ `sha256'" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check ne certigi la integran kontrolon dum malkunpremo" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -765,7 +727,7 @@ " -0 ... -9 kunpremnivelo; apriore 6; pripensu memoruzadon antaŭ ol\n" " uzi la nivelojn 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -774,16 +736,16 @@ " ĉefprocesoran tempon; ne influas la memorajn postulojn\n" " de malkunpremo" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=NOMBRO\n" -" uzi maksimume NOMBRO da fadenoj; apriore 0, kiu\n" -" uzas fadenojn samnombrajn kiel procesorajn kernojn" +" uzi maksimume NOMBRO da fadenoj; apriore 1; 0 por\n" +" uzi fadenojn samnombrajn kiel procesoraj kernoj" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -793,21 +755,17 @@ " komenci novan .xz-blokon post ĉiu GRANDO bajtoj da enigo;\n" " uzi por agordi la blokan grandon por kunfadena kunpremo" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" -" --block-list=BLOKOJ\n" +" --block-list=GRANDOJ\n" " komenci novan .xz-blokon post la donitajn intertempojn de\n" -" nekunpremitaj datumoj, apartigataj de komoj. Laŭvole\n" -" specifi numero (0-9) de filtrila ĉeno kaj poste ':' antaŭ\n" -" la malkunpremita datuma grando" +" nekunpremitaj datumoj, apartigataj de komoj" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -819,7 +777,7 @@ " okazis post la antaŭan elbufrigo kaj legi pliajn enigojn\n" " paŭzigus, ĉiuj atendataj datumoj estas elbufrigataj" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -838,7 +796,7 @@ " kunfadena kunpmero aŭ ĉiuj el tiuj; LIMIGO estas\n" " laŭ bajtoj, % da ĉefmemoro, aŭ 0 por aprioraĵoj" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -846,7 +804,7 @@ " --no-adjust se kunprema agordo superas la memoruzadan limigon\n" " montri eraron anstataŭ malgrandigi la agordaĵon" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -854,34 +812,6 @@ "\n" " Propra filtrila ĉeno por kunpremo (alternativaj por uzi antaŭagordaĵon):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=FILTRILOJ agordi la filtrilan ĉenan uzanta la sintakso de la\n" -" lzma-filtrila ĉeno. --filters-help or pliaj informoj" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters=FILTRILOJ ... --filters9=FILTRILOJ\n" -" agordi aldonajn filtrilajn ĉenojn por uzi kun\n" -" --block-list per la sintakso de liblzma-filtrila ĉeno" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help montri pliajn informojn pri la sintakso de la\n" -" liblzma-filtrila ĉeno kaj poste eliri." - #: src/xz/message.c:1067 msgid "" "\n" @@ -925,12 +855,11 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" "\n" -" --x86[=ELEKTOJ] x86-BCJ-filtrilo (32-bita kaj 64-bita)\n" +" --x86[=ELEKTOJ] x86-BCJ-filtrilo (32-bita and 64-bita)\n" " --arm[=ELEKTOJ] ARM-BCJ-filtrilo\n" " --armthumb[=ELEKTOJ]\n" " ARM-Thumb-BCJ-filtrilo\n" @@ -938,11 +867,10 @@ " --powerpc[=ELEKTOJ] PowerPC-BCJ-filtrilo (nur pezkomenca)\n" " --ia64[=ELEKTOJ] IA-64 (Itanium)-BCJ-filtrilo\n" " --sparc[=ELEKTOJ] SPARC-BCJ-filtrilo\n" -" --riscv[=ELEKTOJ] RISC-V_BCJ-filtrilo\n" " Validaj ELEKTOJ por ĉiuj BCJ-filters:\n" " start=NOMBRO komenca deŝovo por konvertoj (apriore 0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -954,7 +882,7 @@ " dist=NOMBRO distanco inter bajtoj subtrahataj de unu\n" " la alia (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -962,7 +890,7 @@ "\n" " Aliaj elektoj:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -971,15 +899,15 @@ " -v, --verbose eligi superfluajn informojn; uzu dufoje por pliigi la\n" " superfluecon" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn avertoj ne influu la eliran staton" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot uzi mesaĝojn facile analizeblaj per skriptoj" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -987,7 +915,7 @@ " --info-memory montri la totalan kiomon de la ĉefmemoro kaj la nune\n" " aktivaj memoruzadaj limigoj, kaj finiĝi" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -996,7 +924,7 @@ " elektojn)\n" " -H, --long-help montri la longan helpon kaj finiĝi" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1005,12 +933,11 @@ " -H, --long-help montri la longan helpon (listigas ankaŭ la altnivelajn\n" " elektojn)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version montri la eldonan numeron kaj finiĝi" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1022,126 +949,90 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Raporti programerarojn al <%s> (en la angla aŭ la suoma).\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ĉefpaĝo: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "ĈI TIU ESTAS DISVOLVA REDAKCIO, NE CELATA POR ĈIUTAGA UZADO." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"Filtrilaj ĉenoj estas agorditaj per la elektoj --filters=FIILTRILOJ aŭ\n" -"--filters1=FILTRILOJ ... --filters9=FILTRILOJ. Ĉiu filtrilo en la ĉeno\n" -"estas apartigebla per spacetoj aŭ '--'. Alternative antaŭargordo <0-9>[e]\n" -"anstataŭ filtrila ĉeno estas specifebla.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "La komprenataj filtriloj aŭ filtrilaj elektoj estas:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" -msgstr "%s: Elektoj devas esti paroj de 'name=value', apartigitaj per komoj" +msgid "%s: Options must be `name=value' pairs separated with commas" +msgstr "%s: Elektoj devas esti paroj de `name=value`, apartigitaj per komoj" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Nevalida elekto-nomo" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Nevalida elekto-valoro" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Nevalida LZMA1/LZMA2 antaŭagordaĵo: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "La sumo de lc kaj lp devas ne esti pli ol 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Dosiernomo havas nekonatan sufikson, preterpasas" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" -msgstr "%s: Dosiero jam havas la sufikson '%s', preterpasas" +msgid "%s: File already has `%s' suffix, skipping" +msgstr "%s: Dosiero jam havas la sufikson `%s', preterpasas" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Nevalida dosiernoma sufikso" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Valoro ne estas nenegativa dekuma entjero" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Nevalida multiplika sufikso" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." -msgstr "Validaj sufiksoj estas 'KiB' (2^10), 'MiB' (2^20) kaj 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." +msgstr "Validaj sufiksoj estas `KiB' (2^10), `MiB' (2^20) kaj `GiB' (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" -msgstr "Valoro de la elekto '%s' devas esti inkluzive inter % kaj %" +msgid "Value of the option `%s' must be in the range [%, %]" +msgstr "Valoro de la elekto `%s' devas esti inkluzive inter % kaj %" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Kunpremitaj datumoj ne povas esti ligataj de terminalo" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" -msgstr "Kunpremitaj datumoj ne povas esti skribataj al terminalo" - -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Uzmaniero: %s [--help] [--version] [DOSIERO]...\n" -"Montri informojn konservitaj en la .lzma-dosiera ĉapo" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "Dosiero malgrandas por esti .lzma-dosiero" +msgstr "Kunpmremitaj datumoj ne povas esti skribataj al terminalo" -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "Ne .lzma-dosiero" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Skribi al la ĉefeligujo malsukcesis" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Nekonata eraro" - -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Malsukcesis aktivigi la sablujon" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/es.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/es.gmo differ diff -Nru xz-utils-5.6.0/po/es.po xz-utils-5.6.1+really5.4.5/po/es.po --- xz-utils-5.6.0/po/es.po 2024-02-24 08:31:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/es.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,16 +1,13 @@ -# SPDX-License-Identifier: 0BSD -# -# Spanish translation for xz-5.6.0-pre2. -# Copyright (C) 2024 The XZ Utils authors and contributors -# This file is published under the BSD Zero Clause License. -# Cristian Othón Martínez Vera , 2022, 2023, 2024. +# Spanish translation for xz-5.4.4-pre1. +# This file is put in the public domain. +# Cristian Othón Martínez Vera , 2022, 2023. # msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-16 09:36-0600\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-19 11:31-0600\n" "Last-Translator: Cristian Othón Martínez Vera \n" "Language-Team: Spanish \n" "Language: es\n" @@ -30,164 +27,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Demasiados argumentos para --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "En --block-list, falta el tamaño de bloque después del número de cadena de filtros '%c:'" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 solo se puede usar como el último elemento en --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Tipo de formato de fichero desconocido" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: No se admite el tipo de verificación de integridad" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." -msgstr "Solo se puede especificar un fichero con '--files' o '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." +msgstr "Solo se puede especificar un fichero con `--files' o `--files0'." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "La variable de ambiente %s contiene demasiados argumentos" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Se desactivó el soporte para compresión en el momento de compilación" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Se desactivó el soporte para descompresión en el momento de compilación" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "No se admite la compresión de ficheros lzip (.lz)" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "--block-list se descarta a menos que se comprima con el formato .xz" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "Con --format=raw, se requiere --suffix=.SUF a menos que se escriba a la salida estándar" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "El número máximo de filtros es cuatro" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Error en la opción --filters%s=FILTROS:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." -msgstr "El límite de uso de memoria es demasiado bajo para la configuración de filtros dada." - -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "la cadena de filtros %u es usada por --block-list pero no se especifica con --filters%u=" +msgstr "El límite de uso de memoria es muy bajo para la configuración de filtro dada." -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "No se recomienda un modo predeterminado en modo crudo." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "El número exacto de las opciones predeterminadas puede variar entre versiones del software." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "El formato .lzma solamente admite el filtro LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "No se puede usar LZMA1 con el formato .xz" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "La cadena de filtros %u es incompatible con --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "La cadena de filtros es incompatible con --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Se cambia al modo de un solo hilo debido a --flush-timeout" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Opciones sin soporte en la cadena de filtros %u" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Se usan hasta % hilos." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" -msgstr "No se admiten las opciones de cadena de filtros o de filtro" +msgstr "No se admite las opciones de cadena de filtros o de filtro" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "La descompresión necesitará %s MiB de memoria." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Se reduce el número de hilos de %s a %s para no exceder el límite de uso de memoria de %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "Se reduce el número de hilos de %s a uno. Aún se está excediendo el límite automático de uso de memoria de %s MiB. Se requieren %s MiB de memoria. Continúa de cualquier manera." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Se ajusta al modo de un solo hilo para no exceder el límite de uso de memoria de %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Se ajusta el tamaño del diccionario LZMA%c de %s MiB a %s MiB para no exceder el límite de uso de memoria de %s MiB" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Se ajusta el tamaño del diccionario LZMA%c para --filters%u de %s MiB a %s MiB para no exceder el límite de uso de memoria de %s MiB" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Error al cambiar a la cadena de filtros %u: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Error al crear una tubería: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Falló al activar el arenero" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: falló poll(): %s" @@ -202,252 +167,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Al parecer se movió el fichero, no se borra" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: No se puede borrar: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: No se puede establecer el propietario del fichero: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: No se puede establecer el grupo del fichero: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: No se pueden establecer los permisos del fichero: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Error al obtener la opciones de estado de fichero de la entrada estándar: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Es un enlace simbólico, se salta" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Es un directorio, se salta" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: No es un fichero regular, se salta" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: El fichero tiene el bit setuid o setgid activo, se salta" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: El fichero tiene el bit sticky activo, se salta" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: El fichero de entrada tiene más de un enlace duro, se salta" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Nombre de fichero vacío, se salta" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Error al restaurar las opciones de estado en la entrada estándar: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Error al obtener las opciones de estado de fichero de la entrada estándar: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Error al restaurar la opción O_APPEND a la salida estándar: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Falló al cerrar el fichero: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Falló la búsqueda al tratar de crear un fichero disperso: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Error de lectura: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Error al buscar en el fichero: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Fin de fichero inesperado" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Error de escritura: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Desactivado" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Cantidad total de memoria física (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Número de hilos de procesador:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Compresión" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Descompresión:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Descompresión multihilos:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Por omisión para -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Información de hardware:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Límites de uso de memoria:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Flujos:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Bloques:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Tamaño comprimido:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Tamaño sin comprimir:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Tasa:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Verificación:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Relleno de flujo:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Memoria requerida:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Tamaños en cabeceras:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Número de ficheros:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Flujo" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Bloque" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Bloques" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "DesplComp" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "DesplDescomp" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "TamComp" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "TamDescomp" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "TamTotal" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Tasa" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Verif" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "ValVerif" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Relleno" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Cabecera" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Opciones" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "UsoMem" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Filtros" @@ -455,7 +420,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Ninguno" @@ -463,60 +428,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Descon-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Descon-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Descon-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Descon-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Descon-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Descon-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Descon-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Descon-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Descon-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Descon-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Descon-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Descon-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: El fichero está vacío" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Demasiado pequeño para ser un fichero .xz válido" @@ -525,45 +490,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" -msgstr "Flujos Bloques Comprimido Sin-Comprimir Tasa Verif Nombre-Fichero" +msgstr "Flujos Bloques Comprimido Sin-Comprimir Relac Verif Nombre-Fichero" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Sí" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "No" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Versión de herramientas XZ mínima: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s fichero\n" msgstr[1] "%s ficheros\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Totales:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list solo funciona con ficheros .xz (--format=xz o --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Pruebe 'lzmainfo' con ficheros .lzma." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list no admite leer de la entrada estándar" @@ -579,14 +540,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" -msgstr "%s: Se encontraron caracteres nulos al leer nombres de ficheros. ¿Tal vez quería usar '--files0' en lugar de '--files'?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" +msgstr "%s: Se encontraron caracteres nulos al leer nombres de ficheros. ¿Tal vez quería usar `--files0' en lugar de `--files'?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Aún no se admite la compresión y descompresión con --robot." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "No se pueden leer datos de la entrada estándar cuando se leen nombres de fichero de la entrada estándar" @@ -594,68 +555,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Error interno (bug)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "No se pueden establecer los manejadores de señales" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "No hay revisión de integridad; no se verifica la integridad del fichero" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "No se admite el tipo de revisión de integridad; no se verifica la integridad del fichero" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Se alcanzó el límite de uso de memoria" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "No se reconoce el formato del fichero" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Opciones sin soporte" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Los datos comprimidos están corruptos" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Fin de entrada inesperado" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "Se requieren %s MiB de memoria. Se desactiva el limitador." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Se requieren %s MiB de memoria. El límite es %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Cadena de filtro: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." -msgstr "Pruebe '%s --help' para obtener más información." +msgid "Try `%s --help' for more information." +msgstr "Intente `%s --help' para obtener más información." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -666,17 +627,17 @@ "Comprime o descomprime FICHEROs en el formato .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Los argumentos obligatorios para las opciones largas también son\n" "obligatorios para las opciones cortas.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Modo de operación:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -688,7 +649,7 @@ " -t, --test prueba la integridad del fichero comprimido\n" " -l, --list lista la información sobre los ficheros .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -696,7 +657,7 @@ "\n" " Modificadores de operación:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -708,7 +669,7 @@ " -c, --stdout escribe a la entrada estándar y no borra los ficheros\n" " de entrada" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -716,24 +677,24 @@ " --single-stream solo descomprime el primer flujo, y descarta\n" " silenciosamente los posibles datos de entrada restantes" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" " --no-sparse no crea archivos dispersos durante la descompresión\n" -" -S, --suffix=.SUF usa el sufijo '.SUF' en los ficheros comprimidos\n" +" -S, --suffix=.SUF usa el sufijo `.SUF' en los ficheros comprimidos\n" " --files[=FICH] lee los nombres de ficheros a procesar de FICHero;\n" " si se omite el FICHero, los nombres de fichero se leen\n" " de la entrada estándar; los nombres de fichero deben\n" " terminar con el carácter de línea nueva\n" " --files0[=FICH] como --files pero usa el carácter nulo como terminador" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -741,25 +702,25 @@ "\n" " Opciones básicas de compresión y formato de fichero:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT formato de fichero para codificar o decodificar; los\n" " valores posibles son\n" -" 'auto' (por defecto), 'xz', 'lzma', 'lzip', y 'raw'\n" +" `auto' (por defecto), `xz', `lzma', `lzip', y `raw'\n" " -C, --check=VERIF tipo de verificación de integridad:\n" -" 'none' (usar con precaución),\n" -" 'crc32', 'crc64' (por defecto), o 'sha256'" +" `none' (usar con precaución),\n" +" `crc32', `crc64' (por defecto), o `sha256'" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check no hace la verificación de integridad al descomprimir" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -768,7 +729,7 @@ " ¡Considere el uso de memoria del compresor *y*\n" " del descompresor antes de usar 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -777,15 +738,16 @@ " tiempo de procesamiento; no afecta los requisitos\n" " de memoria del descompresor" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" -" -T, --threads=NÚM usa como máximo NÚM hilos; por defecto es 0, el cual\n" -" usa tantos hilos como hayan núcleos de procesador" +" -T, --threads=NÚM usa como máximo NÚM hilos; por defecto es 1;\n" +" establezca a 0 para usar tantos hilos como hayan\n" +" núcleos de procesador" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -796,22 +758,17 @@ " de entrada; use esta opción para establecer el tamaño\n" " de bloque para la compresión con hilos" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" -" --block-list=BLOQUES\n" +" --block-list=TAMAÑOS\n" " inicia un nuevo bloque .xz después de cada intervalo\n" -" dado, separado por comas, de datos sin comprimir;\n" -" opcionalmente, especifica un número de cadena de filtros\n" -" (0-9) a continuación de ':' antes del tamaño de\n" -" los datos sin comprimir" +" dado, separado por comas, de datos sin comprimir" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -824,7 +781,7 @@ " produciría un bloqueo, todos los datos pendientes son\n" " descartados" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -844,7 +801,7 @@ " anteriores; el LÍMITE está en bytes, % de RAM,\n" " o 0 para valores por defecto" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -853,42 +810,13 @@ " uso de memoria, muestra un error en lugar de ajustar\n" " los valores hacia abajo" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" msgstr "" "\n" -" Cadena de filtros para compresión (alternativa a usar valores predefinidos):" - -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=FILTROS define la cadena de filtros usando la sintaxis de la\n" -" cadena de filtros liblzma; use --filters-help para\n" -" obtener más información" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=FILTROS ... --filters9=FILTROS\n" -" define cadenas de filtros adicionales usando la sintaxis\n" -" de cadena de filtros liblzma para usar con --block-list" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help muestra más información acerca de la sintaxis de cadenas\n" -" de filtros liblzma y termina." +" Cadena de filtros para compresión (alternativa a valores predefinidos):" #: src/xz/message.c:1067 msgid "" @@ -907,7 +835,7 @@ msgstr "" "\n" " --lzma1[=OPCIONES] LZMA1 o LZMA2; OPCIONES es una lista separada por comas\n" -" --lzma2[=OPCIONES] de cero o más opciones (valores válidos; por defecto):\n" +" --lzma2[=OPCIONES] de cero o más opciones (valores válidos; por defecto)\n" " preset=PRE inicia opciones con un valor predefinido\n" " (0-9[e])\n" " dict=NÚM tamaño de diccionario (4KiB - 1536MiB; 8MiB)\n" @@ -931,7 +859,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -943,12 +870,11 @@ " --powerpc[=OPCIONES] filtro BCJ para PowerPC (solo big endian)\n" " --ia64[=OPCIONES] filtro BCJ para IA-64 (Itanium)\n" " --sparc[=OPCIONES] filtro BCJ para SPARC\n" -" --riscv[=OPCIONES] filtro BCJ para RISC-V\n" " OPCIONES válidas para todos los filtros BCJ:\n" " start=NÚM inicio de desplazamiento para\n" " conversiones (por defecto=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -956,11 +882,11 @@ " from each other (1-256; 1)" msgstr "" "\n" -" --delta[=OPCIONES] Filtro delta; OPCIONES (valores válidos; por defecto):\n" -" dist=NÚM distancia entre bytes que se restan\n" -" uno del otro (1-256; 1)" +" --delta[=OPCIONES] Filtro delta; OPCIONES (valores válidos; por defecto):\n" +" dist=NÚM distancia entre bytes que se restan\n" +" uno del otro (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -968,7 +894,7 @@ "\n" " Otras opciones:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -976,15 +902,15 @@ " -q, --quiet suprime avisos; use dos veces para suprimir errores\n" " -v, --verbose detallado; use dos veces para obtener aún más detalle" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn los avisos no afectan el estado de la salida" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot usa mensajes analizables por máquina (útil para scripts)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -992,7 +918,7 @@ " --info-memory muestra la cantidad total de RAM y los límites de uso\n" " de memoria activos, y termina" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1000,7 +926,7 @@ " -h, --help muestra la ayuda corta (solo muestra las opciones básicas)\n" " -H, --long-help muestra esta ayuda detallada y termina" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1008,12 +934,11 @@ " -h, --help muestra esta ayuda corta y termina\n" " -H, --long-help muestra la ayuda larga (además muestra opciones avanzadas)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version muestra el número de versión y termina" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1025,132 +950,96 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Reporte errores a <%s> (en inglés o finlandés).\n" "Reporte errores de traducción al español a .\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Sitio web de %s: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "ESTA ES UNA VERSIÓN EN DESARROLLO Y NO ESTÁ LISTA PARA USO EN PRODUCCIÓN." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"Las cadenas de filtros se definen usando las opciones --filters=FILTROS o\n" -"--filters1=FILTROS ... --filters9=FILTROS. Cada filtro en la cadena se puede\n" -"separar con espacios o '--'. Alternativamente, se puede especificar un valor\n" -"predeterminado <0-9>[e] en lugar de una cadena de filtro.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "Los filtros admitidos y sus opciones son:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" -msgstr "%s: Las opciones deben ser pares 'nombre=valor' separadas por comas" +msgid "%s: Options must be `name=value' pairs separated with commas" +msgstr "%s: Las opciones deben ser pares `nombre=valor' separadas por comas" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Nombre de opción inválido" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Valor de opción inválido" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "No se admite el valor predefinido LZMA1/LZMA2: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "La suma de lc y lp no debe exceder 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: El nombre de fichero tiene un sufijo desconocido, se salta" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" -msgstr "%s: El fichero ya tiene un sufijo '%s', se salta" +msgid "%s: File already has `%s' suffix, skipping" +msgstr "%s: El fichero ya tiene un sufijo `%s', se salta" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Sufijo de nombre de fichero inválido" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: El valor no es un entero decimal no-negativo" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Sufijo multiplicador inválido" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." -msgstr "Los sufijos válidos son 'KiB' (2^10), 'MiB' (2^20), y 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." +msgstr "Los sufijos válidos son `KiB' (2^10), `MiB' (2^20), y `GiB' (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" -msgstr "El valor de la opción '%s' debe estar en el rango [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" +msgstr "El valor de la opción `%s' debe estar en el rango [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "No se pueden leer datos comprimidos de una terminal" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "No se pueden escribir datos comprimidos a una terminal" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Uso: %s [--help] [--version] [FICHERO]...\n" -"Muestra información almacenada en la cabecera del fichero .lzma" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "El fichero es demasiado pequeño para ser un fichero .lzma" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "No es un fichero .lzma" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Falló la escritura a la salida estándar" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Error desconocido" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Falló al activar el arenero" - #~ msgid "The selected match finder requires at least nice=%" #~ msgstr "El buscador de coincidencias seleccionado requiere por lo menos nice=%" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/fi.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/fi.gmo differ diff -Nru xz-utils-5.6.0/po/fi.po xz-utils-5.6.1+really5.4.5/po/fi.po --- xz-utils-5.6.0/po/fi.po 2024-02-24 08:31:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/fi.po 2023-11-01 12:27:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xz 5.4.0-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2022-11-10 16:17+0200\n" "Last-Translator: Lauri Nurmi \n" "Language-Team: Finnish \n" @@ -29,173 +29,135 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Liian monta argumenttia valitsimelle --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0:aa voi käyttää vain viimeisenä alkiona valitsimen --block-list kanssa" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Tuntematon tiedostomuototyyppi" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Eheystarkistuksen tyyppiä ei tueta" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Vain yksi tiedosto voidaan antaa valitsimille ”--files” ja ”--files0”." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s: " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Ympäristömuuttuja %s sisältää liian monta argumenttia" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Tiivistämistuki on poistettu käytöstä käännösaikana" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Purkutuki on poistettu käytöstä käännösaikana" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Lzip-tiedostojen (.lz) pakkaamista ei tueta" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: --format=raw vaatii, että --suffix=.PÄÄTE on annettu, ellei kirjoiteta vakiotulosteeseen" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Suodattimien enimmäismäärä on neljä" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Muistinkäytön raja on liian matala valituille suotimille." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Esiasetusten käyttö raw-tilassa ei ole suositeltavaa." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Esiasetusten tarkat asetukset saattavat vaihdella ohjelmistoversioiden välillä." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr ".lzma-muoto tukee vain LZMA1-suodinta" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1:tä ei voi käyttää .xz-muodon kanssa" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "Suodinketju on yhteensopimaton valitsimen --flush-timeout kanssa" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Vaihdetaan yksisäikeiseen tilaan valitsimen --flush-timeout vuoksi" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Ei-tuetut valitsimet" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Käytetään enintään % säiettä." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Ei-tuettu suodinketju tai suotimen asetukset" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Purkaminen vaatii %s MiB muistia." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Pudotettiin säikeiden määrä %s säikeestä %s:een, jottei ylitettäisi %s MiB:n rajaa muistinkäytölle" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "Pudotettiin säikeiden määrä %s säikeestä yhteen. Automaattinen %s MiB:n raja muistinkäytölle ylittyy silti. Vaaditaan %s MiB muistia. Jatketaan kaikesta huolimatta." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Siirrytään yhden säikeen tilaan, jottei ylitettäisi %s MiB:n rajaa muistinkäytölle" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Pudotettiin LZMA%c-sanaston koko %s MiB:stä %s MiB:hen, jottei ylitettäisi %s MiB:n rajaa muistinkäytölle" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Pudotettiin LZMA%c-sanaston koko %s MiB:stä %s MiB:hen, jottei ylitettäisi %s MiB:n rajaa muistinkäytölle" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "Virhe putkea luodessa: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Virhe putkea luodessa: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Hiekkalaatikon ottaminen käyttöön epäonnistui" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll()-kutsu epäonnistui: %s" @@ -210,252 +172,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Tiedosto on nähtävästi siirretty, ei poisteta" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Ei voi poistaa: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Tiedoston omistajaa ei voi asettaa: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Tiedoston ryhmää ei voi asettaa: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Tiedoston oikeuksia ei voi asettaa: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Virhe tiedoston tilalippujen noutamisessa vakiosyötteelle: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: On symbolinen linkki, ohitetaan" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: On hakemisto, ohitetaan" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Ei ole tavallinen tiedosto, ohitetaan" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Tiedostolla on setuid- tai setgid-bitti, ohitetaan" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Tiedostolla on sticky-bitti, ohitetaan" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Syötetiedostoon on yli yksi kova linkki, ohitetaan" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Tyhjä tiedostonimi, ohitetaan" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Virhe tilalippujen palauttamisessa vakiosyötteelle: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Virhe tiedoston tilalippujen noutamisessa vakiotulosteelle: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Virhe O_APPEND-lipun palauttamisessa vakiosyötteelle: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Tiedoston sulkeminen epäonnistui: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Siirtyminen epäonnistui yritettäessä luoda hajanaista tiedostoa: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Lukuvirhe: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Virhe tiedostossa siirtymisessä: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Odottamaton tiedoston loppu" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Kirjoitusvirhe: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Pois käytöstä" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Fyysisen muistin kokonaismäärä (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Suoritinsäikeiden määrä:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Tiivistys:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Purku:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Monisäikeinen purku:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "-T0:n oletusarvo:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Laitteiston tiedot:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Muistinkäytön rajat:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Virrat:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Lohkot:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Tiivistetty koko:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Tiivistämätön koko:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Suhde:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Tarkistus:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Virran tasaus:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Tarvittava muisti:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Koot otsakkeissa:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Tiedostojen määrä:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Virta" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Lohko" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Lohkot" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "TiivSiirr." -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "Tv:tönSiirr." -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "TiivKoko" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "Tv:tönKoko" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "Yht.Koko" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Suhde" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Tark." -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "Tark.arvo" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Tasaus" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Otsake" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Liput" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "Muist.käyt." -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Suodattimet" @@ -463,7 +425,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Ei mitään" @@ -471,60 +433,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Tuntematon-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Tuntematon-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Tuntematon-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Tuntematon-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Tuntematon-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Tuntematon-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Tuntematon-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Tuntematon-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Tuntematon-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Tuntematon-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Tuntematon-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Tuntematon-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Tiedosto on tyhjä" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Liian pieni kelvolliseksi .xz-tiedostoksi" @@ -533,45 +495,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Virrat Lohkot Tiivist. Tiivistämätön Suhde Tark. Tiedostonimi" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Kyllä" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Ei" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " XZ Utilsin vähimmäisversio: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s tiedosto\n" msgstr[1] "%s tiedostoa\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Yhteensä:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list toimii vain .xz-tiedostoille (--format=xz tai --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list ei tue lukemista vakiosyötteestä" @@ -586,16 +544,15 @@ msgstr "%s: Odottamaton syötteen loppu tiedostonimiä luettaessa" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: Nul-merkki kohdattiin tiedostonimiä lukiessa; oliko tarkoitus antaa valitsin ”--files0” eikä ”--files”?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Tiivistys ja purku --robot -valitsimen kanssa eivät ole vielä tuettuja." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Dataa ei voi lukea vakiosyötteestä kun tiedostonimiä luetaan vakiosyötteestä" @@ -603,69 +560,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Sisäinen virhe (ohjelmistovika)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Signaalinkäsittelimiä ei voi muodostaa" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Ei eheystarkastusta; ei varmenneta tiedoston eheyttä" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Ei-tuettu eheystarkastuksen tyyppi; ei varmenneta tiedoston eheyttä" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Muistinkäytön raja saavutettu" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Tiedostomuotoa ei tunnistettu" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Ei-tuetut valitsimet" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Tiivistetty data on turmeltunut" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Odottamaton syötteen loppu" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB muistia vaaditaan. Rajoitin on poistettu käytöstä." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB muistia vaaditaan. Raja on %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Suodinketju: %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Komento ”%s --help” antaa lisää tietoa." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -676,15 +632,15 @@ "Tiivistä tai pura .xz-muotoisia TIEDOSTOja.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Toimintatila:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -696,7 +652,7 @@ " -t, --test testaa tiivistetyn tiedoston eheys\n" " -l, --list näytä tietoja .xz-tiedostoista" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -704,7 +660,7 @@ "\n" " Toimintomääreet:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -715,7 +671,7 @@ " linkit\n" " -c, --stdout kirjoita vakiotulosteeseen äläkä poista syötetiedostoja" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -723,18 +679,10 @@ " --single-stream pura vain ensimmäinen virta, ja ohita\n" " hiljaisesti mahdollinen jäljellä oleva syötedata" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -747,7 +695,7 @@ " tiedostonimet on päätettävä rivinvaihtomerkillä\n" " --files0[=TIED] kuten --files mutta käytä päättämiseen nul-merkkiä" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -755,29 +703,23 @@ "\n" " Tiedostomuodon ja tiivistyksen perusvalitsimet:\n" -#: src/xz/message.c:988 -#, fuzzy -#| msgid "" -#| " -F, --format=FMT file format to encode or decode; possible values are\n" -#| " `auto' (default), `xz', `lzma', `lzip', and `raw'\n" -#| " -C, --check=CHECK integrity check type: `none' (use with caution),\n" -#| " `crc32', `crc64' (default), or `sha256'" +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=MUOTO tuotettava tai luettava tiedostomuoto; vaihtoehdot\n" " ovat ”auto” (oletus), ”xz”, ”lzma”, ”lzip” ja ”raw”\n" " -C, --check=CHECK eheystarkastuksen tyyppi: ”none” (käytä varoen),\n" " ”crc32”, ”crc64” (oletus) tai ”sha256”" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check älä suorita eheystarkastusta purettaessa" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -786,7 +728,7 @@ " *ja* purun muistinkäyttö huomioon ennen kuin käytät\n" " arvoja 7–9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -794,19 +736,15 @@ " -e, --extreme yritä parantaa tiivistyssuhdetta käyttämällä enemmän\n" " suoritinaikaa; ei vaikuta purkimen muistivaatimuksiin" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=MÄÄRÄ käytä enintää MÄÄRÄä säiettä; oletus on 1; asettamalla\n" " 0:ksi käytetään suoritinytimien määrän verran säikeitä" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -816,25 +754,18 @@ " aloita uusi .xz-lohko aina KOKO syötetavun jälkeen; käytä\n" " tätä säikeistetyn tiivistyksen lohkokoon asettamiseen" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=KOOT\n" " aloita uusi .xz-lohko kun tiivistämätöntä dataa on\n" " käsitelty pilkuilla erotellut tavumäärät" # FIXME: tarvitaan kiva suomenkielinen termi block-verbille tässä merkityksessä -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -846,7 +777,7 @@ " edellisestä huuhtomisesta ja syötteen lukemisen\n" " jatkaminen pysähtyisi, kaikki odottava data huuhdellaan" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -864,7 +795,7 @@ " säikeistetylle purkamisella tai näille kaikille; RAJA\n" " on tavuja, %-osuus RAMista tai 0 oletusarvoille" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -872,7 +803,7 @@ " --no-adjust jos tiivistysasetukset ylittävät muistinkäytön rajan,\n" " anna virhe äläkä pudota asetuksia alaspäin" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -880,26 +811,6 @@ "\n" " Mukautettu suodinketju tiivistykselle (vaihtoehto esiasetuksille):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -931,18 +842,6 @@ " depth=LUKU enimmäishakusyvyys; 0=automaattinen (oletus)" #: src/xz/message.c:1082 -#, fuzzy -#| msgid "" -#| "\n" -#| " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" -#| " --arm[=OPTS] ARM BCJ filter\n" -#| " --armthumb[=OPTS] ARM-Thumb BCJ filter\n" -#| " --arm64[=OPTS] ARM64 BCJ filter\n" -#| " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" -#| " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" -#| " --sparc[=OPTS] SPARC BCJ filter\n" -#| " Valid OPTS for all BCJ filters:\n" -#| " start=NUM start offset for conversions (default=0)" msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -952,7 +851,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -967,7 +865,7 @@ " Kelvolliset ASETukset kaikille BCJ-suotimille:\n" " start=LUKU muunnoksien aloitussiirtymä (oletus=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -979,7 +877,7 @@ " dist=LUKU toisistaan vähennettävien tavujen\n" " välinen etäisyys (1–256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -987,7 +885,7 @@ "\n" " Muut valitsimet:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -995,15 +893,15 @@ " -q, --quiet vaienna varoitukset; kahdesti antamalla myös virheet\n" " -v, --verbose ole lavea; kahdesti antamalla vieläkin laveampi" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn älkööt varoitukset vaikuttako paluuarvoon" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot käytä koneluettavia viestejä (sopii skripteihin)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1011,7 +909,7 @@ " --info-memory näytä RAM-muistin kokonaismäärä ja parhaillaan\n" " vallitsevat muistinkäytön rajat, ja poistu" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1019,7 +917,7 @@ " -h, --help näytä lyhyt ohje (kertoo vain perusvalitsimet)\n" " -H, --long-help näytä tämä pitkä ohje ja poistu" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1027,12 +925,11 @@ " -h, --help näytä tämä lyhyt ohje ja poistu\n" " -H, --long-help näytä pitkä ohje (kertoo myös lisävalitsimet)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version näytä versionumero ja poistu" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1044,133 +941,94 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Ilmoita ohjelmistovioista (suomeksi) osoitteeseen <%s>.\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s -kotisivu: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "TÄMÄ ON KEHITYSVERSIO, JOTA EI OLE TARKOITETTU TUOTANTOKÄYTTÖÖN." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Ei-tuettu suodinketju tai suotimen asetukset" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Asetusten on oltava pilkuilla eroteltuja ”nimi=arvo” -pareja" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Virheellinen asetuksen nimi" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Virheellinen asetuksen arvo" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Ei-tuettu LZMA1/LZMA2-esiasetus: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "lc:n ja lp:n summa ei saa olla yli 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Tiedostonimen pääte on tuntematon, ohitetaan" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Tiedostolla on jo ”%s”-pääte, ohitetaan" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Virheellinen tiedostonimen pääte" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Arvo ei ole ei ole epänegatiivinen kymmenkantainen kokonaisluku" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Tuntematon kerroin" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Kelvolliset kertoimet ovat ”KiB” (2¹⁰), ”MiB” (2²⁰) ja ”GiB” (2³⁰)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Valitsimen ”%s” arvon on oltava välillä [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Tiivistettyä dataa ei voi lukea päätteestä" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Tiivistettyä dataa ei voi kirjoittaa päätteeseen" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s: Liian pieni kelvolliseksi .xz-tiedostoksi" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Vakiotulosteeseen kirjoitus epäonnistui" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Tuntematon virhe" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Hiekkalaatikon ottaminen käyttöön epäonnistui" - #, c-format #~ msgid "The selected match finder requires at least nice=%" #~ msgstr "Valittu täsmäävyydenetsin vaatii vähintään nice-arvon=%" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/fr.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/fr.gmo differ diff -Nru xz-utils-5.6.0/po/fr.po xz-utils-5.6.1+really5.4.5/po/fr.po --- xz-utils-5.6.0/po/fr.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/fr.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,14 +1,14 @@ # XZ Utils French Translation # This file is put in the public domain. # Adrien Nader , 2011-2014. -# Stéphane Aulery , 2019-2023. +# Stéphane Aulery , 2019. # msgid "" msgstr "" -"Project-Id-Version: xz-5.4.4-pre1\n" +"Project-Id-Version: xz-5.2.4\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2023-12-19 04:12+0100\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2019-05-12 05:46+0200\n" "Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" "Language: fr\n" @@ -28,173 +28,137 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s : trop d'arguments pour l'option --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 peut seulement être utilisé en dernier élément de --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s : Format de fichier inconnu" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s : Type de vérification d'intégrité inconnu" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Un seul fichier peut être spécifié avec `--files' ou `--files0'." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s : " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "La variable d'environnement %s contient trop d'arguments" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Le support de la compression à était désactivé lors de la compilaton" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Le support de la décompression a été désactivé lors de la compilation" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s : Avec --format=raw, --suffix=.SUF est nécessaire sauf lors de l'écriture vers stdout" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Le nombre maximal de filtres est quatre" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "La limite d'utilisation mémoire est trop basse pour la configuration de filtres donnée." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Utiliser un préréglage en mode `raw' est déconseillé." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Le détail des préréglages peut varier entre différentes versions du logiciel." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Le format .lzma ne prend en charge que le filtre LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "Le filtre LZMA1 ne peut être utilisé avec le format .xz" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "La Chaine de filtre est incompatible avec --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Bascule en mode mono-processus à cause de --flush-timeout" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Options non prises en charge" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Jusqu'à % threads seront utilisés." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Enchaînement ou options de filtres non pris en charge" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "La décompression nécessitera %s MiB de mémoire." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, fuzzy, c-format +#| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Nombre de threads réduit de %s à %s pour ne pas dépasser la limite d'utilisation mémoire de %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "" -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, fuzzy, c-format +#| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Nombre de threads réduit de %s à %s pour ne pas dépasser la limite d'utilisation mémoire de %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Taille du dictionnaire LZMA%c réduite de %s MiB à %s MiB pour ne pas dépasser la limite d'utilisation mémoire de %s MiB" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Taille du dictionnaire LZMA%c réduite de %s MiB à %s MiB pour ne pas dépasser la limite d'utilisation mémoire de %s MiB" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "Impossible de créer un tube anonyme (pipe) : %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Impossible de créer un tube anonyme (pipe) : %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Echec de l'activation de la sandboxe" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s : L'appel à la fonction poll() a échoué : %s" @@ -209,27 +173,27 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s : Le fichier a apparemment été déplacé, suppression annulée" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s : Impossible de supprimer : %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s : Impossible de modifier le propriétaire du fichier : %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s : Impossible de modifier le groupe propriétaire du fichier : %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s : Impossible de modifier les permissions du fichier : %s" @@ -242,239 +206,249 @@ # - make it more difficult to look up in search engines; it might happen one in # a million times, if we dilute the error message in 20 languages, it will be # almost impossible to find an explanation and support for the error. -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Echec de la lecture du drapeau d'état du fichier depuis la sortie standard : %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s est un lien symbolique : ignoré" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s est un répertoire : ignoré" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s n'est pas un fichier régulier : ignoré" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s : Le fichier possède les bits `setuid' ou `setgid' : ignoré" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s : Le fichier possède le bit `sticky' : ignoré" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s : Le fichier d'entrée a plus d'un lien matériel : ignoré" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Nom de fichier vide, ignoré" # See note from translator above titled "file status flags". -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Erreur de restauration du drapeau d'état de l'entrée standard : %s" # See note from translator above titled "file status flags". -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Erreur de lecture du drapeau d'état du fichier depuis la sortie standard : %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Impossible de rétablir le drapeau O_APPEND sur la sortie standard : %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s : Impossible de fermer le fichier : %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s : Impossible de se déplacer dans le fichier pour créer un 'sparse file' : %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s : Erreur d'écriture : %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s : Impossible de se déplacer dans le fichier : %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s : Fin de fichier inattendue" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s : Erreur d'écriture : %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Désactivé" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 #, fuzzy +#| msgid "Total amount of physical memory (RAM): " msgid "Amount of physical memory (RAM):" msgstr "Quantité totale de mémoire physique (RAM) : " -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 #, fuzzy +#| msgid "Memory usage limit for decompression: " msgid "Multi-threaded decompression:" msgstr "Limite d'utilisation pour la décompression : " -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 #, fuzzy +#| msgid "Memory usage limit reached" msgid "Memory usage limits:" msgstr "Limite d'utilisation mémoire atteinte" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "" -#: src/xz/list.c:69 +#: src/xz/list.c:70 #, fuzzy +#| msgid " Compressed size: %s\n" msgid "Compressed size:" msgstr " Taille données avec compression : %s\n" -#: src/xz/list.c:70 +#: src/xz/list.c:71 #, fuzzy +#| msgid " Uncompressed size: %s\n" msgid "Uncompressed size:" msgstr " Taille données sans compression : %s\n" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "" -#: src/xz/list.c:73 +#: src/xz/list.c:74 #, fuzzy +#| msgid " Stream padding: %s\n" msgid "Stream Padding:" msgstr " Octets de rembourrage du flux : %s\n" -#: src/xz/list.c:74 +#: src/xz/list.c:75 #, fuzzy +#| msgid " Memory needed: %s MiB\n" msgid "Memory needed:" msgstr " Mémoire nécessaire : %s MiB\n" -#: src/xz/list.c:75 +#: src/xz/list.c:76 #, fuzzy +#| msgid " Sizes in headers: %s\n" msgid "Sizes in headers:" msgstr " Tailles stockées dans l'en-tête : %s\n" -#: src/xz/list.c:78 +#: src/xz/list.c:79 #, fuzzy +#| msgid " Number of files: %s\n" msgid "Number of files:" msgstr " Nombre de fichiers : %s\n" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "" -#: src/xz/list.c:128 +#: src/xz/list.c:129 #, fuzzy +#| msgid "Totals:" msgid "TotalSize" msgstr "Totaux :" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "" @@ -482,7 +456,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Aucune" @@ -490,60 +464,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Inconnue-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Inconnue-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Inconnue-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Inconnue-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Inconnue-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Inconnue-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Inconnue-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Inconnue-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Inconnue-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Inconnue-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Inconnue-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Inconnue-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s : Le fichier est vide" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s : Trop petit pour être un fichier xz valide." @@ -552,45 +526,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Flux Blocs Compressé Décompressé Ratio Vérif. Nom de fichier" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Oui" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Non" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Version minimale de XZ Utils : %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s fichier\n" msgstr[1] "%s fichiers\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Totaux :" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list ne marche que sur les fichiers .xz (--format=xz ou --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list est incompatible avec la lecture sur l'entrée standard" @@ -605,16 +575,15 @@ msgstr "%s : Fin des données inattendue lors de la lecture des noms de fichiers" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s : Caractère NULL détecté lors de la lecture des noms de fichiers ; peut-être pensiez-vous à `--files0' plutot qu'a `--files' ?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "La compression et la décompression ne marchent pas encore avec --robot." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Impossible de lire à la fois les données et les noms de fichiers depuis l'entrée standard" @@ -622,69 +591,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s : " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Erreur interne (bug)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Impossible d'installer le gestionnaire de signaux" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Pas de données de vérification d'intégrité ; vérification non effectuée" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Méthode de vérification d'intégrité non prise en charge ; vérification non effectuée" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Limite d'utilisation mémoire atteinte" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Format de fichier inconnu" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Options non prises en charge" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Les données compressées sont corrompues" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Fin des données inattendue " -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB de mémoire sont nécessaires. La limite est désactivée." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB de mémoire sont nécessaires, la limite étant %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s : Enchaînement de filtres : %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Éxécutez `%s --help' pour obtenir davantage d'informations." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -695,17 +663,17 @@ "Compresse ou decompresse FICHIER(s) au format .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Les arguments obligatoires pour les options longues le sont aussi pour les\n" "options courtes.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Mode d'opération :\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -717,7 +685,7 @@ " -t, --test tester l'intégrité du fichier compressé\n" " -l, --list lister les informations sur les fichiers .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -725,7 +693,7 @@ "\n" " Modificateurs :\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -737,7 +705,7 @@ " -c, --stdout écrire sur la sortie standard et ne pas supprimer les\n" " fichiers d'entrée" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -745,18 +713,10 @@ " --single-stream décompresser uniquement le premier flux et ignorer\n" " silencieusement les données éventuellement restantes" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -769,7 +729,7 @@ " et doivent être suivis d'un caractère retour à la ligne\n" " --files0[=FILE] comme --files mais avec un caractère null comme séparateur" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -777,26 +737,31 @@ "\n" " Options basiques de format de fichier et de compression :\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 #, fuzzy +#| msgid "" +#| " -F, --format=FMT file format to encode or decode; possible values are\n" +#| " `auto' (default), `xz', `lzma', and `raw'\n" +#| " -C, --check=CHECK integrity check type: `none' (use with caution),\n" +#| " `crc32', `crc64' (default), or `sha256'" msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT format du fichier à encoder ou décoder ; sont acceptés :\n" " `auto' (par défaut), `xz', `lzma' et `raw'\n" " -C, --check=CHECK type de vérification d'intégrité : `none' (à utiliser avec\n" " précaution), `crc32', `crc64' (par défaut) ou `sha256'" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr "" " --ignore-check ne pas vérifier l'intégrité des données lors de\n" " la décompression" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -805,7 +770,7 @@ " l'utilisation mémoire du compresseur *et* du décompresseur\n" " avant d'utiliser 7, 8 ou 9 !" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -814,20 +779,16 @@ " de temps processeur ;\n" " n'affecte pas les besoins mémoire du décompresseur" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=NB créer au plus NB fils de compression (1 par défault) ; la\n" " valeur 0 est spéciale et équivaut au nombre de processeurs\n" " de la machine" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -837,24 +798,17 @@ " débuter un bloc XZ après chaque TAILLE octets de données\n" " d'entrée ; ce réglage sert pour la compression paralléle" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=TAILLES\n" " débuter des blocs XZ après les TAILLES octets de données\n" " spécifiées avec des virgules pour séparateur" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -864,10 +818,16 @@ " --flush-timeout=TIMEOUT\n" " pendant la compression, si plus de TIMEOUT ms ont passées\n" " depuis le dernier flush et que la lecture est bloquée,\n" -" toutes les données en attente sont écrites" +" toutes les données en attente snt écrites" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, fuzzy, no-c-format +#| msgid "" +#| " --memlimit-compress=LIMIT\n" +#| " --memlimit-decompress=LIMIT\n" +#| " -M, --memlimit=LIMIT\n" +#| " set memory usage limit for compression, decompression,\n" +#| " or both; LIMIT is in bytes, % of RAM, or 0 for defaults" msgid "" " --memlimit-compress=LIMIT\n" " --memlimit-decompress=LIMIT\n" @@ -884,7 +844,7 @@ " décompression ou les deux ; LIMIT est en octets,\n" " pourcentage de RAM, ou 0 pour la valeur par défaut" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -893,7 +853,7 @@ " d'utilisation mémoire, renvoyer une erreur plutôt que de\n" " diminuer les réglages" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -901,26 +861,6 @@ "\n" " Chaîne de filtres de compression personnalisée (en lieu des préréglages) :" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -952,6 +892,16 @@ #: src/xz/message.c:1082 #, fuzzy +#| msgid "" +#| "\n" +#| " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" +#| " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" +#| " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" +#| " --arm[=OPTS] ARM BCJ filter (little endian only)\n" +#| " --armthumb[=OPTS] ARM-Thumb BCJ filter (little endian only)\n" +#| " --sparc[=OPTS] SPARC BCJ filter\n" +#| " Valid OPTS for all BCJ filters:\n" +#| " start=NUM start offset for conversions (default=0)" msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -961,7 +911,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -975,7 +924,7 @@ " OPTS valides pour tous les filtres BCJ :\n" " start=NUM position de début de la conversion (défaut=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -987,7 +936,7 @@ " dist=NUM distance entre les octets soustraits les\n" " uns aux autres (1-256 ; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -995,7 +944,7 @@ "\n" " Autres options :\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -1004,17 +953,17 @@ " aussi masquer les erreurs\n" " -v, --verbose être bavard ; spécifier deux fois pour l'être davantage" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn les avertissements ne modifient pas le code de sortie" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot utiliser des messages lisibles par un programme\n" " (utile pour les scripts)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1022,7 +971,7 @@ " --info-memory afficher la quantité totale de RAM ainsi que la limite\n" " actuelle d'utilisation mémoire puis quitter" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1030,7 +979,7 @@ " -h, --help afficher l'aide courte (ne liste que les options de base)\n" " -H, --long-help afficher l'aide longue (ceci) puis quitter" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1038,12 +987,11 @@ " -h, --help afficher l'aide courte (ceci) puis quitter\n" " -H, --long-help afficher l'aide longue (liste aussi les options avancées)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version afficher le numéro de version puis quitter" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1055,138 +1003,96 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Signaler les bogues à <%s> (en anglais ou en finnois).\n" "Signaler les bogues de traduction à .\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Page du projet %s : <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "CECI EST UNE VERSION DE DEVELOPPEMENT QUI NE DOIT PAS ÊTRE UTILISEE EN PRODUCTION." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Enchaînement ou options de filtres non pris en charge" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Les options doivent être des paires `nom=valeur' séparées par des virgules" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s : Nom d'option invalide" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s : Valeur d'option invalide" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Préréglage LZMA1/LZMA2 non reconnu : %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "La somme de lc et lp ne doit pas dépasser 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s : Le fichier a un suffixe inconnu, ignoré" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s : Le fichier a déjà le suffixe '%s', ignoré" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Suffixe de nom de fichier invalide" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s : La valeur n'est pas un entier décimal non négatif" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s : Suffixe multiplicateur invalide" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Les suffixes valides sont 'KiB' (2^10), 'MiB' (2^20) et 'GiB' (2^30)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "La valeur de l'option '%s' doit être inclue entre % et %" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Les données compressées ne peuvent pas être lues depuis un terminal" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Les données compressées ne peuvent pas être écrites dans un terminal" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s : Trop petit pour être un fichier xz valide." - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Impossible d'écrire vers la sortie standard" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Erreur inconnue" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Echec de l'activation de la sandboxe" - -#~ msgid "The selected match finder requires at least nice=%" -#~ msgstr "Le `match finder' choisi nécessite au moins nice=%" - #~ msgid "Sandbox is disabled due to incompatible command line arguments" #~ msgstr "La sandbox est désactivée car elle est incompatible avec les arguments passés" @@ -1196,15 +1102,19 @@ #~ msgid "Memory usage limit for compression: " #~ msgstr "Limite d'utilisation pour la compression : " +#, c-format #~ msgid " Streams: %s\n" #~ msgstr " Flux : %s\n" +#, c-format #~ msgid " Blocks: %s\n" #~ msgstr " Blocs : %s\n" +#, c-format #~ msgid " Ratio: %s\n" #~ msgstr " Ratio : %s\n" +#, c-format #~ msgid " Check: %s\n" #~ msgstr " Vérification : %s\n" @@ -1215,6 +1125,7 @@ #~ " Flux :\n" #~ " Flux Blocs PositionComp PositionDécomp TailleComp TailleDécomp Ratio Vérif. Bourrage" +#, c-format #~ msgid "" #~ " Blocks:\n" #~ " Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check" @@ -1222,9 +1133,14 @@ #~ " Blocs :\n" #~ " Flux Bloc PositionComp PositionDécomp TailleTot TailleDécomp Ratio Vérif." +#, c-format #~ msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" #~ msgstr " ValVérif %*sEn-tête Drapeaux TailleComp UtilMém Filtres" +#, c-format +#~ msgid "The selected match finder requires at least nice=%" +#~ msgstr "Le `match finder' choisi nécessite au moins nice=%" + #~ msgid "Error setting O_NONBLOCK on standard input: %s" #~ msgstr "Impossible d'établir le drapeau O_NONBLOCK sur la sortie standard : %s" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/hr.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/hr.gmo differ diff -Nru xz-utils-5.6.0/po/hr.po xz-utils-5.6.1+really5.4.5/po/hr.po --- xz-utils-5.6.0/po/hr.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/hr.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,18 +1,13 @@ -# SPDX-License-Identifier: 0BSD -# This file is published under the BSD Zero Clause License. +# Croatian translation of xz. +# This file is put in the public domain. # -# Copyright (C) The XZ Utils authors and contributors -# -# Croatian messages for xz. -# Božidar Putanec , 2020, 2022, 2023, 2024. -# -#, fuzzy +# Božidar Putanec , 2020, 2022, 2023. msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz-5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-18 17:31-0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-20 09:23+0200\n" "Last-Translator: Božidar Putanec \n" "Language-Team: Croatian \n" "Language: hr\n" @@ -21,6 +16,7 @@ "Content-Transfer-Encoding: 8bit\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-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 3.3.2\n" #: src/xz/args.c:77 #, c-format @@ -32,164 +28,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Previše argumenata za --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "U --block-list nedostaje veličina bloka iza broja lanca filtra „%c:“" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" -msgstr "0 se može koristiti samo kao posljedni element za --block-list" +msgstr "0 se može koristiti samo kao zadnji element za --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Nepoznati tip formata datoteke" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" -msgstr "%s: Nepodržani način (tip) provjere integriteta" +msgstr "%s: Nepodržani tip provjere integriteta" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." -msgstr "Samo jedna datoteka može biti specificirana s --files ili --files0." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." +msgstr "Samo jednu datoteku smijete navesti uz opcije „--files” ili „--files0”." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Varijabla okoline %s sadrži previše argumenata" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" -msgstr "Podrška za kompresiju bila je onemogućena prilikom kompiliranja" +msgstr "Tijekom izrade programa onemogućena je podrška za kompresiju" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" -msgstr "Podrška za dekompresiju bila je onemogućena prilikom kompiliranja" +msgstr "Tijekom izrade programa onemogućena je podrška za dekompresiju" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Kompresija lzip datoteka (.lz) nije podržana" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "--block-list je zanemaren osim ako se ne komprimira u .xz format" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" -msgstr "Uz opciju --format=raw, --suffix=.SUF je nužan, osim ako je izlaz na stdout" +msgstr "Uz opciju --format=raw i ako ne piše na standardni izlaz, --suffix=.SUF je nužan" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" -msgstr "Maksimalni broj filtara je četiri (4)" +msgstr "Moguće je najviše do četiri filtara" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Greška u opciji --filters%s=FILTRI:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Ograničenje upotrebe memorije premalo je za danu postavku filtra." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "lanac filtra %u koristi se u --block-list ali nije specificiran s --filters%u=" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." -msgstr "Nije preporučeno koristiti preset postavke u sirovom načinu rada." +msgstr "Nije preporučeno koristiti pretpostavke u sirovom načinu rada." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." -msgstr "Točne opcije preset postavki mogu se razlikovati ovisno o verziji softvera." +msgstr "Točne opcije pretpostavki mogu ovisiti o verziji softvera." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" -msgstr "Format .lzma podržan je samo s .lzma filtrom" +msgstr "Samo LZMA1 filtar podržava .lzma format" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" -msgstr "LZMA1 ne može se koristi za .xz format" +msgstr "LZMA1 se ne može koristi za .xz format" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "Lanac filtara %u nije kompatibilan s --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "Lanac filtara nije kompatibilan s --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" -msgstr "Prelazimo na jednodretveni način rada zbog --flush-timeout" - -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Nepodržane opcije u lancu filtra %u" +msgstr "Prebacivanje u jednodretveni rad zbog --flush-timeout" -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Koristimo do % dretvi." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" -msgstr "Nepodržani lanac filtara ili opcija filtara" +msgstr "Lanac filtara ili opcije filtara nisu podržane" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Za dekompresiju će trebati %s MiB memorije." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" -msgstr "Smanjen je broj dretvi od %s na %s da ne prekoračimo ograničenje upotrebe memorije od %s MiB" +msgstr "Smanjen je broj dretvi od %s na %s da se ne prekorači ograničenje upotrebe memorije od %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." -msgstr "Smanjen je broj dretvi od %s na jednu. Ograničenje automatske upotrebe memorije od %s MiB je još uvijek prekoračeno. Potrebno je %s MiB memorije. Ipak nastavljamo dalje." +msgstr "Smanjen je broj dretvi od %s na jednu. Ograničenje automatske upotrebe memorije od %s MiB još uvijek je prekoračeno. Potrebno je %s MiB memorije. Ipak nastavljamo dalje." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" -msgstr "Prelazimo na način rada s jednom dretvom da ne prekoračimo ograničenje upotrebe memorije od %s MiB" +msgstr "Prebacivanje na rad s jednom dretvom da se ne prekorači ograničenje upotrebe memorije od %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Prilagođena je veličina LZMA%c rječnika od %s na %s da ne prekoračimo ograničenje upotrebe memorije od %s MiB" - -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Prilagođena veličina LZMA%c rječnika za --filters%u od %s na %s da ne prekoračimo ograničenje upotrebe memorije od %s MiB" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Greška pri promjeni na lanac filtra %u: %s" +msgstr "Prilagođena je veličina LZMA%c rječnika od %s na %s da se ne premaši ograničenje upotrebe memorije od %s MiB" -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Greška pri stvaranju cijevi: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Nije uspjelo omogućiti sandbox" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() nije uspjela: %s" @@ -204,349 +168,349 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" -msgstr "%s: Izgleda da je datoteka pomaknuta -- ne brišemo ju" +msgstr "%s: Izgleda da je datoteka pomaknuta -- ne briše se" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Brisanje nije moguće: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" -msgstr "%s: Nije moguće promijeniti vlasnika datoteke: %s" +msgstr "%s: Promijeniti vlasnika datoteke nije moguće: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" -msgstr "%s: Nije moguće promijeniti grupu datoteke: %s" +msgstr "%s: Promijeniti grupu datoteke nije moguće: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" -msgstr "%s: Nije moguće postaviti prava dostupa datoteci: %s" +msgstr "%s: Nije moguće postaviti prava dostupa: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" -msgstr "Greška pri pokušaju dobivanja oznaka statusa datoteke iz standardnog ulaza: %s" +msgstr "Greška pri dobavljanju statusnih flagova datoteke iz standardnog ulaza: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" -msgstr "%s: To je simbolička poveznica -- preskačemo ju" +msgstr "%s: To je simbolička poveznica, preskačemo" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" -msgstr "%s: To je direktorij -- preskačemo ga" +msgstr "%s: To je direktorij, preskačemo" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" -msgstr "%s: To nije regularna datoteka -- preskačemo je" +msgstr "%s: To nije regularna datoteka, preskačemo" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" -msgstr "%s: Datoteka s postavljenim setuid ili setgid bitom -- preskačemo ju" +msgstr "%s: Datoteka ima postavljen setuid ili setgid bit, preskačemo" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" -msgstr "%s: Datoteka s postavljenim ljepljivim bitom -- preskačemo ju" +msgstr "%s: Datoteka ima postavljen sticky bit, preskačemo" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" -msgstr "%s: Ulazna datoteka ima više od jedne tvrde poveznice -- preskačemo ju" +msgstr "%s: Ulazna datoteka ima više od jedne tvrde poveznice, preskačemo" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" -msgstr "Prazna datoteka -- preskačemo ju" +msgstr "Prazna datoteka, preskačemo" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" -msgstr "Greška pri vraćanju oznaka statusa na standardni ulaz: %s" +msgstr "Greška pri vraćanju statusnih flagova na standardni ulaz: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" -msgstr "Greška pri dobivanju oznaka statusa datoteke iz standardnog izlazu: %s" +msgstr "Greška pri dobavljanju statusnih flagova datoteke iz standardnog izlazu: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" -msgstr "Greška pri vraćanju O_APPEND oznaka na standardni izlaz: %s" +msgstr "Greška pri vraćanju O_APPEND flagova na standardni izlaz: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Nije uspjelo zatvoriti datoteku: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Poziciona greška pri pokušaju stvaranja raštrkane datoteke: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Greška pri čitanju: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Greška pozicioniranja u datoteci: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Neočekivani kraj datoteke" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Greška pri pisanju: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Onemogućeno" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Količina fizičke memorije (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Broj dretvi procesora:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Kompresija:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Dekompresija:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" -msgstr "Višedretvena dekompresija:" +msgstr "Više dretvama dekompresija:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Zadano za -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Informacije o hardveru:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" -msgstr "Ograničenja za korištenje memorije:" +msgstr "Ograničenje za korištenje memorije:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Tokovi:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Blokovi:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Komprimirana veličina:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Dekomprimirana veličina:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Omjer:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Kontrola:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Ispuna za tok:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Potrebna memorija:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Veličine u zaglavljima:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Broj datoteka:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Tok" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Blok" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Blokovi" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "KomprOffset" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "DekomprOffset" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "KomprVeličina" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "DekomprVeličina" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "TotalVeličina" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Omjer" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Kontrola" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "KontrolVrijednost" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Ispuna" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Zaglavlje" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" -msgstr "Oznake" +msgstr "Flagi" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "MemUpotreba" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" -msgstr "Filtri" +msgstr "Filteri" #. TRANSLATORS: Indicates that there is no integrity check. #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" -msgstr "Nijedan" +msgstr "Nema" #. TRANSLATORS: Indicates that integrity check name is not known, #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Nepoznat-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Nepoznat-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Nepoznat-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Nepoznat-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Nepoznat-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Nepoznat-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Nepoznat-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Nepoznat-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Nepoznat-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Nepoznat-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Nepoznat-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Nepoznat-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Datoteka je prazna" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" -msgstr "%s: Premala da bude valjana .xz datoteka" +msgstr "%s: Premala, a da bi bila valjana .xz datoteka" #. TRANSLATORS: These are column headings. From Strms (Streams) #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " Tok Blok Komprimirano Dekomprimir Omjer Kontr Datoteka" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Da" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Ne" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" -msgstr " Minimalno je potrebna verzija XZ Utils: %s\n" +msgstr " Potrebna je inačica XY Utils: %s ili viša\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" @@ -554,19 +518,15 @@ msgstr[1] "%s datoteke\n" msgstr[2] "%s datoteka\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Ukupno:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list radi samo sa .xz datoteke (--format=xz ili --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Pokušajte s „lzmainfo“ s .lzma datotekama." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list ne podržava čitanje iz standardnog izlaza" @@ -582,14 +542,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" -msgstr "%s: Prazni (null) znak pronađen pri čitanju imena datoteka; možda ste mislili koristiti --files0 umjesto --files?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" +msgstr "%s: Prazni (null) znak pronađen pri čitanju imena datoteka; možda ste mislili koristiti „--files0” umjesto „--files”?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Komprimiranje i dekomprimiranje s --robot još nije podržano." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Nije moguće čitati podatke iz standardnog ulaza dok se čitaju imena datoteka iz standardnog ulaza" @@ -597,68 +557,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Interna greška (bug)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Nije moguće uspostaviti rukovatelje signala" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Nema provjere integriteta -- ne provjeravamo integritet datoteke" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Nepodržani tip provjere integriteta -- ne provjeravamo integritet datoteke" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" -msgstr "Dosegnuto je ograničenje za upotrebu memorije" +msgstr "Dostignuto je ograničenje za korištenje memorije" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Format datoteke nije prepoznat" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Nepodržane opcije" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Komprimirani podaci su oštećeni" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Neočekivani kraj ulaznih podataka" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." -msgstr "%s Potrebno je MiB memorije. Ograničavač je onemogućen." +msgstr "%s MiB memorije je potrebno. Ograničenje je onemogućeno." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." -msgstr "%s Potrebno je MiB memorije. Ograničenje je %s." +msgstr "%s MiB memorije je potrebno. Ograničenje je %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Lanac filtara: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." -msgstr "Pokušajte s „%s --help“ za pomoć i više informacija." +msgid "Try `%s --help' for more information." +msgstr "Pokušajte s „`%s --help“ za pomoć i više informacija." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -669,15 +629,15 @@ "Komprimira ili dekomprimira DATOTEKE u .xz formatu.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Obvezni argumenti za duge opcije, obvezni su i za kratke opcije.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Način rada:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -689,7 +649,7 @@ " -t, --test testira integritet komprimirane datoteke\n" " -l, --list ispiše podatke o .xz datotekama" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -697,7 +657,7 @@ "\n" " Modifikatori načina rada:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -709,32 +669,32 @@ " -c, --stdout piše na standardni izlaz i ne briše\n" " ulazne datoteke" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" msgstr "" -" --single-stream dekomprimira samo prvi tok i tiho\n" +" --single-stream dekomprimira samo prvi tok i nijemo\n" " zanemari moguće preostale ulazne podatke" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" " --no-sparse ne stvara raštrkane datoteke pri dekompresiji\n" -" -S, --suffix=.SUF rabi sufiks .SUF za komprimirane datoteke\n" +" -S, --suffix=.SUF rabi sufiks „.SUF” za komprimirane datoteke umjesto .xz\n" " --files[=DATOTEKA] čita imena datoteka za obradu iz DATOTEKE; ako\n" " DATOTEKA nije dana, imena datoteka čita iz\n" -" standardnog ulaza; imena datoteka moraju završiti\n" -" sa znakom novog retka\n" -" --files0[=DATOTEKA] kao --files, ali koristi NULL znak kao terminator" +" standardnog ulaza; ime datoteke mora završiti\n" +" sa znakom novog reda\n" +" --files0[=DATOTEKA] kao --files, ali popis datoteka završi s NULL znakom" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -742,32 +702,31 @@ "\n" " Osnovne opcije za format datoteka i kompresiju:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT format datoteke za kodiranje ili dekodiranje; mogućnosti:\n" " „auto” (zadano), „xz”, „lzma”, „lzip“ i „raw”\n" " -C, --check=KONTROLA tip provjere integriteta: „none” (koristite s oprezom),\n" " „crc32”, „crc64” (zadano), ili „sha256”" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check ne verificira provjeru integriteta pri dekompresiji" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" msgstr "" -" -0 ... -9 preset postavke za kompresiju; zadano je 6; u obzir\n" -" uzmite i upotrebu memorije za (de)kompresor prije\n" -" upotrebe 7-9!" +" -0 ... -9 pretpostavke za kompresiju; zadano je 6; uzmite u obzir\n" +" upotrebu memorije za (de)kompresor prije upotrebe 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -775,15 +734,15 @@ " -e, --extreme pokuša poboljšati omjer kompresije koristeći više CPU\n" " vremena; ne utječe na potrebnu memoriju za dekompresiju" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" -" -T, --threads=BROJ ne rabi više od BROJ dretvi; zadano je 0 kojom se koristi\n" -" toliko dretvi koliko CPU ima jezgri" +" -T, --threads=BROJ rabi ne više od BROJ dretvi; zadano je 1; postavkom 0\n" +" za BROJ koristi se toliko dretvi koliko CPU ima jezgri" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -793,33 +752,29 @@ " ulaznih podataka; ovo rabite za postavljanje\n" " veličine bloka za kompresiju s dretvama" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" -msgstr "" -" --block-list=BLOKOVI\n" -" započne novi .xz blok nakon navedenih intervala (zarezima\n" -" odvojenih) nekomprimiranih podataka; opcionalno, navedite\n" -" lance filtra broj (0-9) iza kojeg slijedi „:“ (dvotočka)\n" -" prije veličine nekompromiranih podataka" +" intervals of uncompressed data" +msgstr "" +" --block-list=VELIČINE započne novi .xz blok nakon svake navedene\n" +" VELIČINE nekomprimiranih ulaznih podataka;\n" +" VELIČINE su zarezom odvojene" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" " passed since the previous flush and reading more input\n" " would block, all pending data is flushed out" msgstr "" -" --flush-timeout=VRIJEME\n" -" ako se pri komprimiranju potroši više od VRIJEME\n" -" milisekundi od prethodnog pražnjenja, a daljne čitanje\n" -" bi blokiralo ulaz, svi podatci na čekanju se isprazne" +" --flush-timeout=VRIJEME pri komprimiranju, ako je prošlo više od VRIJEME\n" +" milisekundi od prethodnog pražnjenja, a daljne\n" +" čitanje bi blokiralo ulaz, svi podaci na\n" +" čekanju se isprazne iz kodera na izlaz" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -837,7 +792,7 @@ " dekompresiju, dretvama dekompresiju, ili sve ovo;\n" " GRANICA je u bajtima, % RAM, ili 0 za zadano" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -846,39 +801,13 @@ " upotrebe memorije, završi s greškom umjesto da\n" " prilagodi postavke shodno ograničenju memorije" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" msgstr "" "\n" -" Prilagođeni lanac filtra za kompresiju (alternativa korištenju presets):" - -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=FILTRI postavi lanac filtara pomoću sintakse za string liblzma\n" -" filtra; koristite --filters-help za više informacija" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=FILTRI ... --filters9=FILTERS\n" -" postavite dodatne lance filtera pomoću sintakse za\n" -" string liblzma filtra za upotrebu s --block-list" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr " --filters-help pokaže više informacija za sintaksu stringa liblzma filtra" +" Prilagođeni lanac filtara za kompresiju (alternativa korištenju pretpostavki):" #: src/xz/message.c:1067 msgid "" @@ -919,7 +848,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -931,11 +859,10 @@ " --powerpc[=OPCIJE] PowerPC BCJ filtar (samo veliki endian)\n" " --ia64[=OPCIJE] IA-64 (Itanium) BCJ filtar\n" " --sparc[=OPCIJE] SPARC BCJ filtar\n" -" --riscv[=OPTS] RISC-V BCJ filtar\n" " Valjane OPCIJE za BCJ filtre:\n" " start=BROJ početni offset za konverzije (zadano=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -948,7 +875,7 @@ " dist=BROJ razmak između bajtova koji se oduzimaju\n" " jedan od drugog (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -956,23 +883,23 @@ "\n" " Ostale opcije:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" msgstr "" -" -q, --quiet izostavi upozorenja; -qq izostavi i greške\n" -" -v, --verbose opširnije informira; -vv još više informira" +" -q, --quiet izostavi upozorenja; „-qq” izostavi i greške\n" +" -v, --verbose opširnije informira; „=vv” još više informira" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn upozorenja nemaju utjecaja na status završetka (izlaza)" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot poruke u strojnom formatu (korisno za skripte)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -980,161 +907,173 @@ " --info-memory pokaže ukupnu količinu RAM-a i trenutno\n" " aktivna ograničenja korištenja memorije, pa iziđe" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" msgstr "" -" -h, --help pokaže kratku pomoć (izlista samo osnovne opcije)\n" -" -H, --long-help pokaže opširnu pomoć" +" -h, --help prikaže kratku pomoć (izlista samo osnovne opcije)\n" +" -H, --long-help prikaže ovu dugačku pomoć i iziđe" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" msgstr "" -" -h, --help pokaže kratku pomoć\n" -" -H, --long-help pokaže opširnu pomoć (izlista i napredne opcije)" +" -h, --help prikaže ovu kratku pomoć i iziđe\n" +" -H, --long-help prikaže dugačku pomoć (izlista i napredne opcije)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" -msgstr " -V, --version pokaže informacije o inačici" +msgstr " -V, --version prikaže informacije o inačici i iziđe" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" msgstr "" "\n" -"Ako DATOTEKA nije navedena ili je - (crtica), čita standardni ulaz.\n" +"Ako DATOTEKA nije navedena ili je „-“, čita standardni ulaz.\n" #. TRANSLATORS: This message indicates the bug reporting address #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Greške prijavite na <%s> (na engleskom ili finskom).\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "" "%s matična mrežna stranica: <%s>\n" "Pogreške u prijevodu i vaše prijedloge javite na .\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "OVO JE RAZVOJNA INAČICA I NIJE NAMIJENJENA ZA PROIZVODNJU." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"Lanci filtara postavljaju se pomoću --filters=FILTERS ili\n" -"--filters1=FILTRI ... --filters9=FILTRI opcije. Svaki filter u lancu može biti\n" -"odvojen s razmakom ili s „--“ (dvije crtice). Alternativno, preset postavka\n" -"<0-9>[e] može biti navedena umjesto lanca filtra.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "Podržani filtri i njihove opcije su:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Opcije moraju biti parovi „name=value” odvojeni zarezima" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Nevaljano ime opcije" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Nevaljana vrijednost opcije" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" -msgstr "Nepodržana LZMA1/LZMA2 preset postavka: %s" +msgstr "Nepodržana LZMA1/LZMA2 pretpostavka: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Zbroj lc i lp ne smije biti veći od 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Ime datoteke nema poznati sufiks, preskačemo" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Datoteka već ima „%s” sufiks, preskačemo" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Nevaljani sufiks imena datoteke" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Vrijednost nije nula ili pozitivni decimalni cijeli broj" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Nevaljana mjerna jedinica (sufiks)" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Valjani sufiksi (mjerne jedinice) su „KiB” (2^10), „MiB” (2^20), i „GiB” (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Vrijednost opcije „%s” mora biti u rasponu [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Nije moguće čitati komprimirane podatke iz terminala" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Nije moguće pisati komprimirane podatke na terminala" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Upotreba: %s [--help] [--version] [DATOTEKA]...\n" -"Pokaže informacije pohranjene u zaglavlju datoteke .lzma" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "Datoteka je premala da bude .lzma datoteka" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "To nije .lzma datoteka" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Pisanje na standardni izlaz nije uspjelo" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Nepoznata greška" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Nije uspjelo omogućiti sandbox" +#~ msgid "The selected match finder requires at least nice=%" +#~ msgstr "" +#~ "Odabrani podudarač (algoritam za pronalaženje podudaranja)\n" +#~ "zahtijeva barem nice=%" + +#~ msgid "Nepoznat-6" +#~ msgstr "Nepoznat-6" + +#~ msgid "Nepoznat-7" +#~ msgstr "Nepoznat-7" + +#~ msgid "Sandbox is disabled due to incompatible command line arguments" +#~ msgstr "Sandbox je onemogućen zbog nekompatibilnih argumenata naredbenog retka" + +#~ msgid "Sandbox was successfully enabled" +#~ msgstr "Sandbox je uspješno omogućen" + +#~ msgid "Memory usage limit for compression: " +#~ msgstr " Ograničenje memorije za kompresiju: " + +#~ msgid " Streams: %s\n" +#~ msgstr " Tok(a/ova): %s\n" + +#~ msgid " Blocks: %s\n" +#~ msgstr " Blok(a/ova): %s\n" + +#~ msgid " Ratio: %s\n" +#~ msgstr " Omjer: %s\n" + +#~ msgid " Check: %s\n" +#~ msgstr " Kontrola: %s\n" + +#~ msgid "" +#~ " Streams:\n" +#~ " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" +#~ msgstr "" +#~ " Tokovi:\n" +#~ " Tok Blokovi KompOffset DekompOffset KompVeličina DekompOffset Omjer Kontrola Ispuna" + +#~ msgid "" +#~ " Blocks:\n" +#~ " Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check" +#~ msgstr "" +#~ " Blokovi:\n" +#~ " Tok Blok KompOffset DekompOffset KompVeličina DekompOffset Omjer Kontrola" + +#~ msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" +#~ msgstr " KonSvota %*s Zaglav Flags KompVel Memorija Filtri" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/hu.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/hu.gmo differ diff -Nru xz-utils-5.6.0/po/hu.po xz-utils-5.6.1+really5.4.5/po/hu.po --- xz-utils-5.6.0/po/hu.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/hu.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,25 +1,22 @@ -# SPDX-License-Identifier: 0BSD -# # Hungarian translation for xz. -# This file is published under the BSD Zero Clause License. +# This file is put in the public domain. # -# Meskó Balázs , 2019, 2022, 2024. +# Meskó Balázs , 2019, 2022. msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.0-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-17 18:35+0100\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2022-11-10 12:13+0100\n" "Last-Translator: Meskó Balázs \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" "plural-forms: nplurals=2; plural=(n != 1);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.4\n" +"X-Generator: Poedit 3.1.1\n" #: src/xz/args.c:77 #, c-format @@ -31,164 +28,135 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Túl sok argumentum a --block-list kapcsolóhoz" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "A --block-list kapcsolónál hiányzik a blokkméret a(z) „%c:” szűrőláncszám után" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "A 0 csak utolsó elemként használható a --block-list kapcsolónál" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Ismeretlen fájlformátumtípus" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Nem támogatott integritás-ellenőrzési típus" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Csak egy fájl adható meg a „--files” vagy „--files0” kapcsolóknál." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 -#, c-format +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 +#, fuzzy, c-format +#| msgid "%s: " msgid "%s: %s" -msgstr "%s: %s" +msgstr "%s: " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "A(z) %s környezeti változó túl sok argumentumot tartalmaz" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "A tömörítési támogatás ki lett kapcsolva fordítási időben" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "A kibontási támogatás ki lett kapcsolva fordítási időben" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Az lzip-fájlok (.lz) tömörítése nem támogatott" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "A --block-list kapcsoló csak .xz formátum esetén van figyelembe véve" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 +#, fuzzy +#| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" -msgstr "A --format=raw esetén a --suffix=.SUF szükséges, hacsak nem a szabványosra kimenetre ír" +msgstr "%s: --format=raw esetén, --suffix=.SUF szükséges, hacsak nem a szabványosra kimenetre ír" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "A szűrők legnagyobb száma négy" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Hiba a --filters%s=SZŰRŐK kapcsolóban:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "A memóriahasználat túl alacsony a megadott szűrőbeállításokhoz." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "A --block-list használja a(z) %u. szűrőláncot, de az nincs megadva a --filters%u= kapcsolóval" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Az előbeállítások használata nyers módban nem javasolt." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Az előbeállítások pontos beállításai különbözhetnek a szoftververziók között." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Az .lzma formátum csak az LZMA1 szűrőt támogatja" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "Az LZMA1 nem használható az .xz formátummal" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "A(z) %u. szűrőlánc nem kompatibilis a --flush-timeout kapcsolóval" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "A szűrőlánc nem kompatibilis a --flush-timeout kapcsolóval" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Egyszálú módra váltás a --flush-timeout kapcsoló miatt" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Nem támogatott kapcsolók a(z) %u szűrőláncban" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Legfeljebb % szál használata." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Nem támogatott szűrőlánc vagy szűrőkapcsolók" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "A kibontáshoz %s MiB memória szükséges." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "A szálak számának csökkentése erről: %s, erre: %s, hogy ne lépje túl a(z) %s MiB-os korlátot" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "A szálak számának csökkentése erről: %s, egyre. A(z) %s MiB-os automatikus memóriahasználati korlát így is túl lett lépve. %s MiB memória szükséges. Ennek ellenére folytatás mindenképpen." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Egyszálú módra váltás, hogy ne lépje túl a(z) %s MiB-os memóriahasználati korlátot" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Az LZMA%c szótár méretének módosítása erről: %s MiB, erre: %s MiB, hogy ne lépje túl a(z) %s MiB-os korlátot" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "A --filters%2$u szűrőhöz tartozó LZMA%1$c szótár méretének módosítása %3$s MiB-ról %4$s MiB-ra, hogy ne lépje túl a(z) %5$s MiB-os korlátot" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Hiba a(z) %u. szűrőlánc létrehozásakor: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Hiba a csővezeték létrehozásakor: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "A homokozó engedélyezése sikertelen" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() sikertelen: %s" @@ -203,252 +171,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Úgy tűnik, hogy a fájl át lett helyezve, nincs eltávolítás" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Nem távolítható el: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: A fájl tulajdonosa nem adható meg: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: A fájl csoportja nem adható meg: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: A fájl jogosultságai nem adhatók meg: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Hiba a fájl állapotjelzőinek lekérdezésekor a szabványos bemenetről: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Szimbolikus link, kihagyás" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Könyvtár, kihagyás" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Nem szabályos fájl, kihagyás" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: A fájlon setuid vagy setgid bit van beállítva, kihagyás" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: A fájlon sticky bit van beállítva, kihagyás" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: A bemeneti fájlhoz több mint egy hard link tartozik, kihagyás" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Üres fájlnév, kihagyás" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Hiba a fájl állapotjelzőinek visszaállításakor a szabványos bemenetre: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Hiba a fájl állapotjelzőinek lekérdezésekor a szabványos kimenetről: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Hiba az O_APPEND visszaállításakor a szabványos kimenetre: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: A fájl lezárása sikertelen: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: A pozícionálás sikertelen a ritka fájl létrehozásának kísérletekor: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Olvasási hiba: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Hiba a fájlban pozícionáláskor: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Váratlan fájlvég" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Írási hiba: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Letiltva" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Fizikai memória (RAM) mennyisége:" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Processzorszálak száma:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Tömörítés:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Kibontás:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Többszálás kibontás:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "A -T0 alapértelmezése:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Hardverjellemzők:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Memóriahasználat korlátja:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Adatfolyamok:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Blokkok:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Tömörített méret:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Kibontott méret:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Arány:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Ellenőrzés:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Adatfolyam kerete:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Szükséges memória:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Méretek a fejlécekben:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Fájlok száma:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Adatfolyam" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Blokk" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Blokkok" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "Tömörített eltolás" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "Kibontott eltolás" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "Tömörített méret" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "Kibontott méret" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "Teljes méret" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Arány" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Ellenőrzés" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "Ellenőrzőérték" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Keret" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Fejléc" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Jelzők" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "Memóriahasználat" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Szűrők" @@ -456,7 +424,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Nincs" @@ -464,60 +432,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Névtelen-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Névtelen-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Névtelen-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Névtelen-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Névtelen-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Névtelen-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Névtelen-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Névtelen-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Névtelen-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Névtelen-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Névtelen-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Névtelen-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: A fájl üres" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Túl kicsi, hogy érvényes .xz fájl legyen" @@ -526,45 +494,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Folyam Blokkok Tömörített Kibontott Arány Ellenőrzés Fájlnév" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Igen" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Nem" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Legkisebb XZ Utils verzió: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s fájl\n" msgstr[1] "%s fájl\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Összesen:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "A --list csak .xz fájlokkal működik (--format=xz vagy --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Az „lzmainfo” kipróbálása az .lzma fájlok esetén." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "A --list nem támogatja a szabványos bemenetről beolvasást" @@ -580,14 +544,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: Null karakter található a fájlnevek olvasásakor; talán a „--files0” kapcsolóra gondolt a „--files” helyett?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "A tömörítés és kibontás még nem támogatott a --robot kapcsolóval." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Az adatok nem olvashatók be a szabványos bemenetről a fájlnevek olvasásakor" @@ -595,68 +559,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Belső hiba (bug)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "A szignálkezelők nem hozhatók létre" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Nincs integritás-ellenőrzés; a fájl épsége nem lesz ellenőrizve" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Nem támogatott integritás-ellenőrzési típus; a fájl épsége nem lesz ellenőrizve" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Memóriahasználat korlátja elérve" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "A fájlformátum nem felismert" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Nem támogatott kapcsolók" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "A tömörített adatok megsérültek" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "A bemenet váratlanul véget ért" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB memória szükséges. A korlátozás letiltva." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB memória szükséges. A korlát %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Szűrőlánc: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." +msgid "Try `%s --help' for more information." msgstr "További információkért adja ki a következő parancsot: „%s --help”." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -667,15 +631,15 @@ ".xz formátumú FÁJLok tömörítése vagy kibontása.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "A hosszú kapcsolók kötelező argumentumai a rövid kapcsolók esetén is kötelezők.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Működési mód:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -687,7 +651,7 @@ " -t, --test tömörített fájl épségének tesztelése\n" " -l, --list információk kiírása az .xz fájlokról" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -695,7 +659,7 @@ "\n" " Műveleti módosítók:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -707,7 +671,7 @@ " -c, --stdout írás a szabványos kimenetre írás, és nem törli a\n" " bemeneti fájlokat" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -715,10 +679,10 @@ " --single-stream csak az első adatfolyam kibontása, és a\n" " lehetséges hátralévő bemeneti adatok mellőzése" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -733,7 +697,7 @@ " --files0[=FÁJL] mint a --files, de a null karaktert használja\n" " használja elválasztóként" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -741,12 +705,12 @@ "\n" " Alapvető fájlformátum és tömörítési beállítások:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT a kódoláshoz vagy dekódoláshoz használt fájlformátum;\n" " lehetséges értékek „auto” (alapértelmezett), „xz”,\n" @@ -754,11 +718,11 @@ " -C, --check=ELL integritás-ellenőrzés típusa: „none” (óvatosan használja),\n" " „crc32”, „crc64” (alapértelmezett) vagy „sha256”" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check kibontáskor ne ellenőrizze az épséget" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -767,7 +731,7 @@ " a 7-9 használata előtt vegye figyelembe a tömörítő\n" " *és* kibontó memóriahasználatát!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -775,16 +739,16 @@ " -e, --extreme a tömörítési arány javítási kísérlete több CPU-idő\n" " használatával; nincs hatással a kibontó memóriaigényére" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" -" -T, --threads=SZÁM legfeljebb ennyi szál használata; alapértelmezett a 0,\n" -" amely annyi szálat használ, amennyi processzormag áll\n" -" rendelkezésre" +" -T, --threads=SZÁM legfeljebb ennyi szál használata; alapértelmezett az 1;\n" +" állítsa 0-ra, hogy annyi szálat használjon, amennyi\n" +" processzormag áll rendelkezésre" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -794,21 +758,17 @@ " új .xz blokk indítása minden MÉRETnyi bájt bemenet után;\n" " a többszálas tömörítés blokkméretének megadásához" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" -" --block-list=BLOKKOK\n" +" --block-list=MÉRETEK\n" " új .xz blokk indítása a vesszőkkel felsorolva megadott\n" -" méretű tömörítetlen adatszakaszok után; a tömörítetlen\n" -" adatok mérete előtt egy szűrőláncszám (0-9) is megadható\n" -" egy „:” karakter közbeiktatásával" +" méretű tömörítetlen adatszakaszok után" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -820,7 +780,7 @@ " telt el az előző kiírástól, és a bemenetolvasás\n" " blokkolna, akkor minden adat ki lesz írva" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -840,7 +800,7 @@ " KORLÁT bájtokban van megadva, a RAM %-ában, vagy 0 az\n" " alapértelmezéshez" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -849,7 +809,7 @@ " korlátot, akkor hibát fog adni a beállítások lefelé\n" " állítása helyett" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -857,34 +817,6 @@ "\n" " Egyéni szűrőlánc a tömörítéshez (alternatíva az előbeállításokra):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=SZŰRŐK a szűrőlánc beállítása liblzma szűrőformátummal;\n" -" további információkért lásd a --filters-help kapcsolót" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=SZŰRŐK ... --filters9=SZŰRŐK\n" -" további szűrőláncok beállítása liblzma formátummal a\n" -" --block-list kapcsolóhoz" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help további információk megjelenítése a libzma\n" -" szűrőformátumról, majd kilépés." - #: src/xz/message.c:1067 msgid "" "\n" @@ -925,7 +857,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -937,12 +868,11 @@ " --powerpc[=KAPCS] PowerPC BCJ szűrő (csak big endian esetén)\n" " --ia64[=KAPCS] IA-64 (Itanium) BCJ szűrő\n" " --sparc[=KAPCS] SPARC BCJ szűrő\n" -" --riscv[=KAPCS] RISC-V BCJ szűrő\n" " Érvényes KAPCS az összes BCJ szűrőhöz:\n" -" start=SZÁM kezdési eltolás az átalakításokhoz\n" -" (alapértelmezett=0)" +" start=SZÁM kezdési eltolás az átalakításokhoz\n" +" (alapértelmezett=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -955,7 +885,7 @@ " dist=SZÁM az egymásból kivont bájtok közti\n" " távolság (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -963,7 +893,7 @@ "\n" " Egyéb kapcsolók:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -973,19 +903,19 @@ " -v, --verbose legyen bőbeszédű; adja meg kétszer, hogy még bőbeszédűbb\n" " legyen" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr "" " -Q, --no-warn a figyelmeztetések nem befolyásolják a kilépési\n" " állapotkódot" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot géppel értelmezhető üzenetek használata\n" " (parancsfájlok esetén hasznos)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -993,7 +923,7 @@ " --info-memory az összes RAM mennyiségének és a jelenlegi\n" " memóriahasználati korlátok megjelenítése, és kilépés" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1001,7 +931,7 @@ " -h, --help a rövid súgó megjelenítése (csak az alapvető kapcsolók)\n" " -H, --long-help ezen hosszú súgó megjelenítése, és kilépés" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1009,12 +939,11 @@ " -h, --help ezen rövid súgó megjelenítése, és kilépés\n" " -H, --long-help a hosszú súgó megjelenítése (speciális kapcsolókhoz)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version a verziószám kiírása és kilépés" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1026,130 +955,94 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Ide jelentse a hibákat: <%s> (angolul vagy finnül).\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s honlap: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "EZ EGY FEJLESZTŐI VÁLTOZAT, NEM ÉLES HASZNÁLATRA SZÁNT." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"A szűrőláncokat a --filters=SZŰRŐK vagy a\n" -"--filters1=SZŰRŐK ... --filters9=SZŰRŐK kapcsolókkal lehet megadni. A láncban\n" -"szereplő egyes szűrőket szóközökkel vagy „--” karakterekkel kell elválasztani.\n" -"Illetve egy <0-9>[e] előbeállítás is megadható szűrőlánc helyett.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "A támogatott szűrők és azok kapcsolói a következők:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: A kapcsolóknak vesszőkkel elválasztott „név=érték” pároknak kell lenniük" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Érvénytelen kapcsolónév" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Érvénytelen kapcsolóérték" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Nem támogatott LZMA1/LZMA2 előbeállítás: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Az lc és lp összege nem haladhatja meg a 4-et" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: A fájlnév utótagja ismeretlen, kihagyás" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" -msgstr "%s: A fájlnak már van „%s” utótagja, kihagyás" +msgid "%s: File already has `%s' suffix, skipping" +msgstr "%s: A(z) „%s” fájlnak már van utótagja, kihagyás" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Érvénytelen fájlnév utótag" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Az érték nem nemnegatív decimális egész szám" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Érvénytelen szorzó utótag" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Az érvényes utótagok: „KiB” (2^10), „MiB” (2^20) és „GiB” (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "A(z) „%s” kapcsoló értékének a(z) [%, %] tartományban kell lennie" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "A tömörített adatokat nem lehet beolvasni a terminálból" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "A tömörített adatokat nem lehet kiírni a terminálba" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Használat: %s [--help] [--version] [FÁJL]…\n" -"Az .lzma fájl fejlécében tárolt információk megjelenítése" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "A fájl túl kicsi, hogy érvényes .lzma fájl legyen" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "Nem .lzma fájl" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "A szabványos kimenetre írás sikertelen" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Ismeretlen hiba" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "A homokozó engedélyezése sikertelen" - #, c-format #~ msgid "The selected match finder requires at least nice=%" #~ msgstr "A kiválasztott egyezéskeresőhöz legalább nice=% szükséges" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/it.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/it.gmo differ diff -Nru xz-utils-5.6.0/po/it.po xz-utils-5.6.1+really5.4.5/po/it.po --- xz-utils-5.6.0/po/it.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/it.po 2023-11-01 12:27:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: xz 5.2.4\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2019-03-04 14:21+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -31,175 +31,137 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: troppi argomenti per --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 può essere usato solo come ultimo elemento in --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: tipo di formato del file sconosciuto" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: tipo di controllo integrità non supportato" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Solo un file può essere specificato con \"--files\" o \"--files0\"." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s: " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "La variabile d'ambiente %s contiene troppi argomenti" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Il supporto alla compressione è stato disabilitato in fase di compilazione" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Il supporto alla decompressione è stato disabilitato in fase di compilazione" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: con --format=raw, --suffix=.SUF è richiesto a meno che non si scriva sullo stdout" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Il numero massimo di filtri è quattro" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Il limite dell'uso della memoria è troppo basso per l'impostazione del filtro dato." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Non è consigliato usare un preset nella modalità raw." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Le opzioni esatte per i preset possono variare tra le versioni del software." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Il formato .lzma supporta solo il filtro LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 non può essere usato con il formato .xz" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "La catena di filtri non è compatibile con --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Passaggio a modalità singolo thread poiché viene usato --flush-timeout" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Opzioni non supportate" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Vengono usati circa % thread." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Catena di filtri od opzioni del filtro non supportata" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "L'estrazione necessita di %s MiB di memoria." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, fuzzy, c-format #| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Regolato il numero di thread da %s a %s per non eccedere il limite di utilizzo della memoria di %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "" -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, fuzzy, c-format #| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Regolato il numero di thread da %s a %s per non eccedere il limite di utilizzo della memoria di %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Regolata la dimensione del dizionario LZMA%c da %s MiB a %s MiB per non superare il limite dell'uso della memoria di %s MiB" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Regolata la dimensione del dizionario LZMA%c da %s MiB a %s MiB per non superare il limite dell'uso della memoria di %s MiB" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "Errore nel creare una pipe: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Errore nel creare una pipe: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Abilitazione modalità sandbox non riuscita" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() non riuscita: %s" @@ -214,272 +176,272 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: sembra che il file sia stato spostato, non viene rimosso" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: impossibile rimuovere: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: impossibile impostare il proprietario del file: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: impossibile impostare il gruppo del file: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: impossibile impostare i permessi del file: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Errore nel recuperare le flag di stato del file dallo standard input: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: è un collegamento simbolico, viene saltato" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: è una directory, viene saltata" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: non è un file regolare, viene saltato" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: il file ha il bit setuid o setgid impostato, viene saltato" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: il file ha lo sticky bit impostato, viene saltato" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: il file di input ha più di un collegamento fisico, viene saltato" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Nome file vuoto, viene saltato" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Errore nel ripristinare le flag di stato sullo standard input: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Errore nel recuperare le flag di stato del file dallo standard output: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Errore nel ripristinare la flag O_APPEND sullo standard output: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: chiusura del file non riuscita: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: posizionamento non riuscito nel tentativo di creare un file sparso: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: errore di lettura: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: errore nel cercare il file: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: fine del file inaspettata" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: errore di scrittura: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Disabilitato" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 #, fuzzy #| msgid "Total amount of physical memory (RAM): " msgid "Amount of physical memory (RAM):" msgstr "Quantità totale di memoria fisica (RAM): " -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 #, fuzzy #| msgid "Memory usage limit for decompression: " msgid "Multi-threaded decompression:" msgstr "Limite utilizzo memoria per l'estrazione: " -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 #, fuzzy #| msgid "Memory usage limit reached" msgid "Memory usage limits:" msgstr "Limite di utilizzo della memoria raggiunto" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "" -#: src/xz/list.c:69 +#: src/xz/list.c:70 #, fuzzy #| msgid " Compressed size: %s\n" msgid "Compressed size:" msgstr " Dim. compresso: %s\n" -#: src/xz/list.c:70 +#: src/xz/list.c:71 #, fuzzy #| msgid " Uncompressed size: %s\n" msgid "Uncompressed size:" msgstr " Dim. estratto: %s\n" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "" -#: src/xz/list.c:73 +#: src/xz/list.c:74 #, fuzzy #| msgid " Stream padding: %s\n" msgid "Stream Padding:" msgstr " Padding dello stream: %s\n" -#: src/xz/list.c:74 +#: src/xz/list.c:75 #, fuzzy #| msgid " Memory needed: %s MiB\n" msgid "Memory needed:" msgstr " Memoria necessaria: %s MiB\n" -#: src/xz/list.c:75 +#: src/xz/list.c:76 #, fuzzy #| msgid " Sizes in headers: %s\n" msgid "Sizes in headers:" msgstr " Dim. negli header: %s\n" -#: src/xz/list.c:78 +#: src/xz/list.c:79 #, fuzzy #| msgid " Number of files: %s\n" msgid "Number of files:" msgstr " Numero di file: %s\n" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "" -#: src/xz/list.c:128 +#: src/xz/list.c:129 #, fuzzy #| msgid "Totals:" msgid "TotalSize" msgstr "Totali:" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "" @@ -487,7 +449,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Nessuno" @@ -495,60 +457,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Sconosc2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Sconosc3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Sconosc5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Sconosc6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Sconosc7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Sconosc8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Sconosc9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Sconosc11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Sconosc12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Sconosc13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Sconosc14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Sconosc15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: il file è vuoto" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: troppo piccolo per essere un file .xz valido" @@ -557,45 +519,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " Strm Blocc. Compresso Estratto Rapp. Contr Nome file" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Sì" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "No" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Versione \"XZ Utils\" minima: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s file\n" msgstr[1] "%s file\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Totali:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list funziona solamente con file .xz (--format=xz o --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list non è in grado di leggere dallo standard input" @@ -610,16 +568,15 @@ msgstr "%s: fine dell'input durante la lettura dei nomi dei file non attesa" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: nessun carattere trovato durante la lettura dei nomi dei file; forse si intendeva usare \"--files0\" invece di \"--files\"?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "La compressione e l'estrazione con --robot non sono ancora supportate." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Impossibile leggere i dati dallo standard input durante la lettura dei nomi dei file dallo standard input" @@ -627,69 +584,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Errore interno (bug)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Impossibile stabilire i gestori dei segnali" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Nessun controllo d'integrità; l'integrità del file non viene verificata" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Tipo di controllo di integrità non supportato; l'integrità del file non viene verificata" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Limite di utilizzo della memoria raggiunto" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Formato di file non riconosciuto" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Opzioni non supportate" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "I dati compressi sono danneggiati" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Fine dell'input non attesa" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB di memoria sono richiesti. Il limite è disabilitato." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB di memoria sono richiesti. Il limite è %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: catena di filtri: %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Provare \"%s --help\" per maggiori informazioni." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -700,15 +656,15 @@ "Comprime o estrae i FILE nel formato .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle brevi.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Modalità di operazione:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -720,7 +676,7 @@ " -t, --test Verifica l'integrità dei file compressi\n" " -l, --list Elenca informazioni sui file .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -728,7 +684,7 @@ "\n" " Modificatori di operazioni:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -739,7 +695,7 @@ " collegamenti\n" " -c, --stdout Scrive sullo standard output e non elimina i file di input" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -747,18 +703,10 @@ " --single-stream Decomprime solamente il primo stream e ignora\n" " silenziosamente i restanti dati di input" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -772,7 +720,7 @@ " di newline\n" " --files0=[FILE] Come --files ma usa il carattere null come terminatore" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -780,7 +728,7 @@ "\n" " Formato file di base e opzioni di compressione:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 #, fuzzy #| msgid "" #| " -F, --format=FMT file format to encode or decode; possible values are\n" @@ -789,20 +737,20 @@ #| " `crc32', `crc64' (default), or `sha256'" msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT Formato file per codificare o decodificare; i possibili\n" " valori sono \"auto\" (predefinito) \"xz\", \"lzma\" e \"raw\"\n" " -C, --check=CHECK Tipo di verifica integrità: \"none\" (usare con attenzione),\n" " \"crc32\", \"crc64\" (predefinito) o \"sha256\"" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check Non verifica il codice di integrità quando decomprime" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -811,7 +759,7 @@ " l'utilizzo di memoria per comprimere ed estrarre prima\n" " di usare 7-9" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -820,20 +768,16 @@ " utilizzando più tempo di CPU; non cambia i requisiti di\n" " memoria in fase di estrazione" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=NUM Usa al massimo NUM thread: il valore predefinito è 1,\n" " impostare a 0 per usare tanti thread quanti core la CPU\n" " ha a disposizione" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -844,24 +788,17 @@ " usare per impostare la dimensione del blocco durante la\n" " compressione con thread" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=DIM\n" " Avvia un nuovo blocco .xz dopo gli intervalli, sperati\n" " da virgole, di dati non compressi" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -874,7 +811,7 @@ " ulteriore input risulterebbe bloccata, viene eseguito il\n" " flush di tutti i dati pendenti" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, fuzzy, no-c-format #| msgid "" #| " --memlimit-compress=LIMIT\n" @@ -898,7 +835,7 @@ " compressione, l'estrazione o entrambe; LIMIT è in byte,\n" " % della memoria RAM oppure 0 per il valore predefinito" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -907,7 +844,7 @@ " utilizzo della memoria, lancia un errore invece di\n" " utilizzare valori più piccoli" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -916,26 +853,6 @@ " Catena di filtri personalizzati per la compressione (alternative per\n" " l'utilizzo di preset):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -990,7 +907,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -1005,7 +921,7 @@ " start=NUM Offset iniziale per le conversioni\n" " (predefinito=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -1017,7 +933,7 @@ " dist=NUM Distanza tra byte sottratti\n" " gli uni dagli altri (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -1025,7 +941,7 @@ "\n" " Altre opzioni:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -1035,15 +951,15 @@ " -v, --verbose Output prolisso; specificare due volte per output ancora\n" " più prolisso" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn Gli avvisi non influenzano lo stato d'uscita" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot Usa messaggi analizzabili (utile per gli script)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1051,7 +967,7 @@ " --info-memory Visualizza la quantità totale di RAM, il limite attuale\n" " attivo di utilizzo della memore ed esce" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1059,7 +975,7 @@ " -h, --help Stampa l'aiuto breve (elenca solo le opzioni di base)\n" " -H, --long-help Stampa questo lungo aiuto ed esce" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1067,12 +983,11 @@ " -h, --help Stampa questo breve aiuto ed esce\n" " -H, --long-help Stampa l'aiuto lungo (elenca anche le opzioni avanzate)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version Stampa il numero della versione ed esce" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1084,129 +999,93 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Segnalare i bug a <%s> (in inglese o finlandese).\n" "Segnalare i bug di traduzione a .\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Sito web di %s: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "Questa è una versione di sviluppo non adatta per utilizzi in produzione." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Catena di filtri od opzioni del filtro non supportata" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: le opzioni devono essere coppie \"nome=valore\" separate da virgole" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: nome opzione non valido" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: valore dell'opzione non valido" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Preset LZMA/LZMA2 non supportato: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "La somma di lc e lp non deve superare 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: il nome del file ha un suffisso sconosciuto, viene saltato" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: il file ha già il suffisso \"%s\", viene saltato" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: suffisso del nome del file non valido" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: il valore non è un numero intero decimale non-negativo" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: suffisso del moltiplicatore non valido" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "I suffissi validi sono \"KiB\" (2^10), \"MiB\" (2^20), e \"GiB\" (2^30)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Il valore dell'opzione \"%s\" deve essere nell'intervallo [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "I dati compressi non possono essere letti da un terminale" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "I dati compressi non possono essere scritti ad un terminale" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s: troppo piccolo per essere un file .xz valido" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Scrittura sullo standard ouput non riuscita" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Errore sconosciuto" @@ -1216,9 +1095,6 @@ #~ msgid "Sandbox was successfully enabled" #~ msgstr "Sandbox abilitata con successo" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Abilitazione modalità sandbox non riuscita" - #~ msgid "Memory usage limit for compression: " #~ msgstr "Limite utilizzo memoria per la compressione: " Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/ko.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/ko.gmo differ diff -Nru xz-utils-5.6.0/po/ko.po xz-utils-5.6.1+really5.4.5/po/ko.po --- xz-utils-5.6.0/po/ko.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/ko.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,14 +1,13 @@ -# SPDX-License-Identifier: 0BSD # Korean translation for the xz. -# This file is published under the BSD Zero Clause License. -# Seong-ho Cho , 2019, 2022, 2023, 2024. +# This file is put in the public domain. +# Seong-ho Cho , 2019, 2022, 2023. # msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-18 01:45+0900\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-20 10:59+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: Korean \n" "Language: ko\n" @@ -17,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Poedit 3.0.1\n" #: src/xz/args.c:77 #, c-format @@ -29,164 +28,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: --block-list 인자 갯수가 너무 많음" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "--block-list에서 필터 체인 번호 '%c:' 다음 블록 크기가 빠졌습니다." - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 값은 --block-list의 마지막 원소로만 사용할 수 있습니다" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: 알 수 없는 파일 형식" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: 지원하지 않는 무결성 검사 형식" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." -msgstr "'--files' 또는 '--files0' 옵션에는 하나의 파일만 지정할 수 있습니다." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." +msgstr "`--files' 또는 `--files0' 옵션으로 하나의 파일만 지정할 수 있습니다." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "%s 환경 변수에 너무 많은 인자 값이 들어있습니다" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "빌드 시점에 압축 기능을 비활성했습니다" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "빌드 시점에 압축 해제 기능을 비활성했습니다" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" -msgstr "lzip 파일 (.lz) 압축은 지원하지 않습니다" - -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr ".xz 형식으로 압축하지 않으면 --block-list 옵션은 무시합니다" +msgstr "lzip 파일(.lz) 압축은 지원하지 않습니다" -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" -msgstr "표준 출력으로 기록하지 않는 한 --format=raw, --suffix=.<확장자> 옵션이 필요합니다" +msgstr "표준 출력으로 기록하지 않는 한 --format=raw, --suffix=.SUF 옵션이 필요합니다" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "최대 필터 갯수는 4 입니다" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "--filters%s=<필터> 옵션 오류:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "주어진 필터 설정으로는 메모리 사용 제한 값이 너무 적습니다." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "--block-lisk에서 필터 체인 %u번을 사용하고 있지만 --filters%u= 옵션으로 지정하지 않았습니다" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "RAW 모드에서의 프리셋 사용은 권장하지 않습니다." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "프리셋의 정확한 옵션 값은 프로그램 버전에 따라 다릅니다." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr ".lzma 형식은 LZMA1 필터만 지원합니다" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr ".xz 형식에는 LZMA1 필터를 사용할 수 없습니다" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "필터 체인 %u번이 --flush-timeout 옵션과 맞지 않습니다" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "--flush-timeout 옵션에는 필터 체인이 맞지 않습니다" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "--flush-timeout 옵션을 지정하였으므로 단일 스레드 모드로 전환합니다" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "필터 체인 %u번에서 지원하지 않는 옵션" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." -msgstr "최대 스레드 %개를 사용합니다." +msgstr "최대 % 스레드를 사용합니다." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "지원하지 않는 필터 체인 또는 필터 옵션" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "압축 해제시 %s MiB 메모리 용량이 필요합니다." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "메모리 사용량 %s MiB 제한을 넘지 않으려 스레드 수를 %s(에)서 %s(으)로 줄였습니다" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." -msgstr "스레드 수가 %s(에)서 하나로 줄었습니다. 메모리 사용 자동 제한량 %sMiB를 여전히 초과합니다. 메모리 공간 %sMiB가 필요합니다. 어쨌든 계속합니다." +msgstr "스레드 수가 %s(에)서 하나로 줄었습니다. 메모리 사용 자동 제한량 %s MiB를 여전히 초과합니다. 메모리 공간 %s MiB가 필요합니다. 어쨌든 계속합니다." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" -msgstr "메모리 사용 제한량 %sMiB를 넘지 않으려 단일 스레드 모드로 전환합니다" +msgstr "메모리 사용량 %s MiB 제한을 넘지 않으려 단일 스레드 모드로 전환합니다" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "메모리 사용 제한량 %4$sMiB를 넘지 않으려 %2$sMiB에서 %3$sMiB로 LZMA%1$c 딕셔너리 크기를 조정했습니다" - -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "메모리 사용 제한량 %5$sMiB를 넘지 않으려 %3$sMiB에서 %4$sMiB로 --filters%2$u의 LZMA%1$c 딕셔너리 크기를 조정했습니다" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "필터 체인 %u번 전환 오류: %s" +msgstr "메모리 사용량 %4$s MiB 제한을 넘지 않으려 %2$s MiB에서 %3$s MiB로 LZMA%1$c 딕셔너리 크기를 조정했습니다" -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "파이프 생성 오류: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "샌드 박스 활성화 실패" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() 실패: %s" @@ -201,252 +168,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: 파일을 이동한 것 같음, 제거 안함" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: 제거할 수 없음: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: 파일 소유자를 설정할 수 없음: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: 파일 소유 그룹을 설정할 수 없음: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: 파일 권한을 설정할 수 없음: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "표준 입력에서 파일 상태 플래그 가져오기 오류: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: 심볼릭 링크, 건너뜀" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: 디렉터리입니다, 건너뜀" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: 일반 파일 아님, 건너뜀" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: setuid 또는 setgid 비트 설정 있음, 건너뜀" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: 끈적이 비트 설정이 있는 파일, 건너뜀" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: 입력 파일에 하나 이상의 하드링크가 있습니다, 건너뜀" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "파일 이름 없음, 건너뜀" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "표준 입력으로의 상태 플래그 복원 오류: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "표준 출력에서 파일 상태 플래그 가져오기 오류: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "표준 출력으로의 O_APPEND 플래그 복원 오류: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: 파일 닫기 실패: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: 분할 파일 생성 시도시 탐색 실패: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: 읽기 오류: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: 파일 탐색 오류: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: 예상치 못한 파일의 끝" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: 쓰기 오류: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "사용 안함" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" -msgstr "물리 메모리 양 (RAM):" +msgstr "물리 메모리 양(RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "프로세서 스레드 수:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "압축:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "압축해제:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "멀티 스레드 압축 해제:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "-T0 기본값:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "하드웨어 정보:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" -msgstr "메모리 사용 제한량:" +msgstr "메모리 사용량 제한:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "스트림:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "블록 수:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "압축 용량:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "압축해제 용량:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "압축율:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "검사:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "스트림 패딩:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "요구 메모리:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "헤더 길이:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "파일 갯수:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "스트림" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "블록" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "블록" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "압축오프셋" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "압축해제오프셋" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "압축크기" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "압축해제크기" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "총크기" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "압축율" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "검사" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "검사값" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "패딩" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "헤더" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "플래그" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "메모리사용" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "필터" @@ -454,7 +421,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "없음" @@ -462,60 +429,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "알 수 없음-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "알 수 없음-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "알 수 없음-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "알 수 없음-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "알 수 없음-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "알 수 없음-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "알 수 없음-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "알 수 없음-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "알 수 없음-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "알 수 없음-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "알 수 없음-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "알 수 없음-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: 파일 내용 없음" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: 유효한 .xz 파일로 보기에는 너무 작습니다" @@ -524,45 +491,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "스트림 블록 압축 압축해제 압축율 검사 파일 이름" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "예" # 주: 아니오가 아니라 아니요가 맞는 표현 -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "아니요" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" -msgstr " 최소 XZ 유틸리티 버전: %s\n" +msgstr " 최소 XZ Utils 버전: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "파일 %s개\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "총:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list 옵션은 .xz 파일에만 동작합니다(--format=xz 또는 --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "'lzmainfo' 명령에 .lzma 파일 이름을 붙여 실행해보십시오." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list 옵션은 표준 입력 읽기를 지원하지 않습니다" @@ -578,14 +541,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" -msgstr "%s: 파일 이름을 읽는 도중 NULL 문자 발견. '--files' 옵션 대신 '--files0' 옵션을 사용하시려는게 아닙니까?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" +msgstr "%s: 파일 이름을 읽는 도중 NULL 문자 발견. `--files' 옵션 대신 `--files0' 옵션을 사용하시려는게 아닙니까?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "아직 압축 동작과 압축 해제 동작에 --robot 옵션을 지원하지 않습니다." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "표준 출력에서 파일 이름을 읽을 때 표준 입력에서 데이터를 읽을 수 없습니다" @@ -593,68 +556,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" -msgstr "내부 오류 (버그)" +msgstr "내부 오류(버그)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "시그널 처리자를 준비할 수 없습니다" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "무결성 검사 안함. 파일 무결성을 검증하지 않습니다" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "지원하지 않는 무결성 검사 형식. 파일 무결성을 검증하지 않습니다" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "메모리 사용량 한계에 도달했습니다" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "파일 형식을 인식할 수 없음" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "지원하지 않는 옵션" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "압축 데이터 깨짐" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "예상치 못한 입력 끝" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB 메모리 용량이 필요합니다. 제한을 비활성합니다." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." -msgstr "%s MiB 메모리 용량이 필요합니다. 제한 용량은 %s 입니다." +msgstr "%s MiB 메모리 용량이 필요합니다. 제한 값은 %s 입니다." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: 필터 체인: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." -msgstr "자세한 사용법은 '%s --help'를 입력하십시오." +msgid "Try `%s --help' for more information." +msgstr "자세한 사용법은 `%s --help'를 입력하십시오." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -662,18 +625,18 @@ "\n" msgstr "" "사용법: %s [<옵션>]... [<파일>]...\n" -".xz 형식(으로) <파일> 다수를 압축(해제)합니다.\n" +".xz 형식으로 <파일> 다수를 압축(해제)합니다.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "긴 옵션 버전의 필수 인자는 짧은 옵션 버전에도 해당합니다.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " 동작 방식:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -685,7 +648,7 @@ " -t, --test 압축 파일 무결성 검사\n" " -l, --list .xz 파일 정보 출력" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -693,17 +656,17 @@ "\n" " 동작 지정:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" " -c, --stdout write to standard output and don't delete input files" msgstr "" -" -k, --keep 입력 파일을 유지합니다 (삭제 안함)\n" +" -k, --keep 입력 파일을 유지합니다(삭제 안함)\n" " -f, --force 출력 파일을 강제로 덮어쓰고 링크도 압축(해제)합니다\n" " -c, --stdout 표준 출력으로 기록하고 입력 파일을 삭제하지 않습니다" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -711,25 +674,26 @@ " --single-stream 첫번째 스트림만 압축해제하며, 나머지 입력 데이터는\n" " 조용히 무시합니다" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" -" --no-sparse 압축 해제에 활용할 분할 파일을 만들지 않습니다\n" +" --no-sparse 압축 해제에 활용할 분할 파일을 만들지 않음\n" " -S, --suffix=.<확장자>\n" -" 압축 파일 확장자에 '.<확장자>'를 사용합니다\n" -" --files[=<파일>] <파일> 에서 처리할 파일 이름을 읽습니다.\n" -" <파일>을 생략하면 표준 입력에서 파일 이름을\n" -" 읽습니다. 파일 이름은 개행 문자로 끝나야 합니다\n" +" 압축 파일 확장자에 `.<확장자>'를 사용합니다\n" +" --files[=<파일>]\n" +" <파일> 에서 처리할 파일 이름을 읽습니다. <파일>을\n" +" 생략하면 표준 입력에서 파일 이름을 읽습니다.\n" +" 파일 이름은 개행 문자로 끝나야합니다\n" " --files0[=<파일>]\n" " --files 옵션과 비슷하지만 NULL 문자로 끝납니다" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -737,48 +701,49 @@ "\n" " 기본 파일 형식 및 압축 옵션:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=<형식> 인코딩 디코딩할 파일 형식입니다. 가능한 값:\n" -" 'auto' (기본), 'xz', 'lzma', 'lzip', 'raw'\n" -" -C, --check=<검사> 무결성 검사 형식: 'none' (위험),\n" -" 'crc32', 'crc64' (기본), 'sha256'" +" `auto' (기본), `xz', `lzma', `lzip', `raw'\n" +" -C, --check=<검사> 무결성 검사 형식: `none'(위험),\n" +" `crc32', `crc64'(기본), `sha256'" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check 압축 해제시 무결성 검사를 수행하지 않습니다" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" msgstr "" -" -0 ... -9 압축 사전 설정. 기본값은 6 입니다. 7-9를 사용하려면 압축\n" +" -0 ... -9 압축 프리셋. 기본값은 6 입니다. 7-9를 사용하려면 입축\n" " 메모리 사용량*과* 압축 해제 메모리 사용량을 지정하십시오!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" msgstr "" -" -e, --extreme CPU 점유 시간을 더 확보하여 압축률을 개선합니다.\n" +" -e, --extreme CPU 점유시간을 더 확보하여 압축률을 개선합니다.\n" " 압축 해제시 메모리 요구 용량에는 영향을 주지 않습니다" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=<개수>\n" -" 최대 스레드 <개수>를 사용합니다. 기본값은 실제 프로세서\n" -" 코어 수 만큼의 스레드를 사용하도록 지정하는 0 값입니다" +" 최대 스레드 <개수>를 사용합니다. 기본값은 1 입니다\n" +" 실제 프로세서 코어만큼의 스레드를 사용하려면 0 값으로\n" +" 지정합니다" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -788,21 +753,17 @@ " 모든 <크기>의 입력 다음 새 .xz 블록을 시작합니다.\n" " 스레드 압축에 블록 크기를 지정할 때 사용합니다" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=<크기>\n" -" 콤마로 구분한 연속 지정값 만큼 압축 해제한 데이터\n" -" 용량 다음, 새 .xz 블록을 시작합니다. 압축 해제 데이터\n" -" 크기 앞에 콜론(':') 표기 후 필터 체인 번호(0-9)를 추가로\n" -" 지정할 수 있습니다" +" 콤마로 구분한 연속 지정값 만큼 압축해제한 데이터 용량을\n" +" 넘긴 후 새 .xz 블록을 시작합니다" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -810,11 +771,11 @@ " would block, all pending data is flushed out" msgstr "" " --flush-timeout=<제한시간>\n" -" 이전 데이터를 플러싱한 후 더 많은 블록 입력을 읽어들일 때\n" -" 밀리초단위 <제한시간>을 넘기면 모든 대기 데이터를\n" +" 앞서 플러싱한 후 더 많은 블록 입력을 읽어들일 때 밀리초\n" +" 단위 <제한시간>을 넘기면 모든 대기 데이터를\n" " 플러싱아웃합니다" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -830,10 +791,10 @@ " --memlimit-mt-decompress=<제한용량>\n" " -M, --memlimit=<제한용량>\n" " 압축, 압축해제, 또는 각각의 경우에 대한 메모리 사용량\n" -" 제한값을 설정합니다. <제한용량> 값 단위는 바이트 또는\n" -" 램 용량 백분율이며, 기본값은 0 입니다" +" 제한값을 설정합니다. <제한용량> 값 단위는 바이트 또는 램\n" +" 용량 백분율이며, 기본 값은 0 입니다" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -841,41 +802,13 @@ " --no-adjust 압축 설정이 메모리 사용량 제한을 넘어서면\n" " 설정 값을 줄이는 대신 오류 정보를 나타냅니다" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" msgstr "" "\n" -" 압축용 개별 필터 체인 설정 (사전 설정 사용을 대신함):" - -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=<필터> liblzma 필터 문자열 문법으로 필터 체인을 설정합니다.\n" -" 자세한 정보는 --filters-help 옵션을 사용하십시오" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=<필터> ... --filters9=<필터>\n" -" --block-list 옵션을 함께 활용할 수 있는 liblzma 필터\n" -" 문자열 문법으로 추가 필터 체인을 설정합니다" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help liblzma 필터 문자열 문법 추가 정보를 나타낸 후\n" -" 빠져나갑니다." +" 압축용 개별 필터 체인 설정(사전 설정 사용을 대신함):" #: src/xz/message.c:1067 msgid "" @@ -904,7 +837,7 @@ " mode=<모드> 압축 모드 fast 또는 normal, normal)\n" " nice=<숫자> nice 일치 길이 값(2-273, 64)\n" " mf=<이름> 일치 탐색기(hc3, hc4, bt2, bt3, bt4\n" -" 중 하나. 기본값은 bt4)\n" +" 중 하나. bt4)\n" " depth=<숫자> 최대 검색 깊이. 0=자동(기본값)" #: src/xz/message.c:1082 @@ -917,23 +850,21 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" "\n" -" --x86[=<옵션>] x86 BCJ 필터(32-비트, 64-비트)\n" +" --x86[=<옵션>] x86 BCJ 필터(32-bit, 64-bit)\n" " --arm[=<옵션>] ARM BCJ 필터\n" " --armthumb[=<옵션>] ARM-Thumb BCJ 필터\n" " --arm64[=<옵션>] ARM64 BCJ 필터\n" " --powerpc[=<옵션>] PowerPC BCJ 필터 (빅 엔디언 전용)\n" " --ia64[=<옵션>] IA-64 (아이태니엄) BCJ 필터\n" " --sparc[=<옵션>] SPARC BCJ 필터\n" -" --riscv[=<옵션>] RISC-V BCJ 필터\n" " 모든 BCJ 필터의 유효한 <옵션>:\n" " start=<숫자> 변환 시작 오프셋(기본값=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -942,10 +873,10 @@ msgstr "" "\n" " --delta[=<옵션>] 델타 필터. 유효한 <옵션> (유효값, 기본값):\n" -" dist=<숫자> 각 바이트 값의 차이 값\n" -" (1-256, 1)" +" dist=<숫자> 각 바이트 값의 차이 값\n" +" (1-256, 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -953,7 +884,7 @@ "\n" "기타 옵션:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -961,15 +892,15 @@ " -q, --quiet 경고 메시지 끔. 오류 메시지도 끄려면 두번 지정합니다\n" " -v, --verbose 자세히 표시. 더 자세히 표시하려면 두번 지정합니다" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn 경고가 종료 상태에 영향을 주지 않게합니다" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" -msgstr " --robot 기계 해석용 메시지를 사용합니다 (스크립트에 적합)" +msgstr " --robot 기계 해석용 메시지를 사용합니다(스크립트에 적합)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -977,28 +908,27 @@ " --info-memory 총 사용 메모리양과 현재 활성 메모리 사용 제한 값을\n" " 표시하고 빠져나갑니다" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" msgstr "" -" -h, --help 간단한 도움말을 표시합니다 (기본 옵션만 나열)\n" +" -h, --help 간단한 도움말을 표시합니다(기본 옵션만 나열)\n" " -H, --long-help 긴 도움말을 표시하고 빠져나갑니다" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" msgstr "" " -h, --help 간단한 도움말을 표시하고 빠져나갑니다\n" -" -H, --long-help 긴 도움말을 표시합니다 (고급 옵션도 나열)" +" -H, --long-help 긴 도움말을 표시합니다(고급 옵션도 나열)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version 버전 번호를 표시하고 빠져나갑니다" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1010,125 +940,131 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "<%s> (영문 또는 핀란드어)에 버그를 보고하십시오.\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 홈페이지: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "!! 주의 !! 개발 버전이며 실제 사용 용도가 아닙니다." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"--filters=<필터> 또는 --filters1=<필터> ... --filters9=<필터> 옵션으로\n" -"필터 체인을 지정합니다. 체인의 각 필터는 공백 문자 또는 '--'으로 구분할 수 있습니다.\n" -"필터 체인 대신 <0-9>[e] 사전 설정 값을 지정할 수 있습니다.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "지원하는 필터와 옵션은 다음과 같습니다:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" -msgstr "%s: 옵션은 쉼표로 구분한 '이름=값' 쌍이어야합니다" +msgid "%s: Options must be `name=value' pairs separated with commas" +msgstr "%s: 옵션은 쉼표로 구분한 `이름=값' 쌍이어야합니다" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: 잘못된 옵션 이름" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: 잘못된 옵션 값" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" -msgstr "지원하지 않는 LZMA1/LZMA2 사전 설정: %s" +msgstr "지원하지 않는 LZMA1/LZMA2 프리셋: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "lc값과 lp값의 합이 4를 초과하면 안됩니다" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: 파일 이름에 알 수 없는 확장자 붙음, 건너뜀" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" -msgstr "%s: 파일에 이미 '%s' 확장자가 붙음, 건너뜀" +msgid "%s: File already has `%s' suffix, skipping" +msgstr "%s: 파일에 이미 `%s' 확장자가 붙음, 건너뜀" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: 잘못된 파일 이름 확장자" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: 값은 10진 양수입니다" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" -msgstr "%s: 잘못된 승수 단위" +msgstr "%s: 잘못된 승수 후위 단위" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." -msgstr "사용할 수 있는 단위는 'KiB' (2^10), 'MiB' (2^20), 'GiB' (2^30) 입니다." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." +msgstr "유효한 후위 단위는 `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30) 입니다." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" -msgstr "'%s' 옵션 값은 [%, %] 범위 안에 있어야 합니다" +msgid "Value of the option `%s' must be in the range [%, %]" +msgstr "`%s' 옵션 값은 범위[%, %] 안에 있어야 합니다" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "압축 데이터를 터미널에서 읽을 수 없습니다" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "압축 데이터를 터미널에 기록할 수 없습니다" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"사용법: %s [--help] [--version] [<파일>]...\n" -".lzma 파일 헤더에 저장한 정보를 보여줍니다" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr ".lzma 파일이기에는 너무 작습니다" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr ".lzma 파일이 아닙니다" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "표준 출력 기록 실패" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "알 수 없는 오류" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "샌드박스 활성화 실패" +#~ msgid "The selected match finder requires at least nice=%" +#~ msgstr "선택한 일치 탐색기는 최소한 nice=% 상태여야합니다" + +#~ msgid "Sandbox is disabled due to incompatible command line arguments" +#~ msgstr "비호환 명령행 인자값이 있어 샌드박스를 비활성했습니다" + +#~ msgid "Sandbox was successfully enabled" +#~ msgstr "샌드 박스 활성화에 성공했습니다" + +#~ msgid "Memory usage limit for compression: " +#~ msgstr "압축 메모리 사용 제한량: " + +#~ msgid " Streams: %s\n" +#~ msgstr " 스트림: %s\n" + +#~ msgid " Blocks: %s\n" +#~ msgstr " 블록: %s\n" + +#~ msgid " Ratio: %s\n" +#~ msgstr " 압축률: %s\n" + +#~ msgid " Check: %s\n" +#~ msgstr " 검사: %s\n" + +#~ msgid "" +#~ " Streams:\n" +#~ " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" +#~ msgstr "" +#~ " 스트림:\n" +#~ " 스트림 블록 압축오프셋 압축해제 오프셋 압축용량 압축해제용량 압축율 검사 패딩" + +#~ msgid "" +#~ " Blocks:\n" +#~ " Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check" +#~ msgstr "" +#~ " 블록:\n" +#~ " 스트림 블록 압축오프셋 압축해제오프셋 총용량 압축해제용량 압축율 검사" + +#~ msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" +#~ msgstr " CheckVal %*s Header 플래그 압축용량 메모리사용량 필터" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/pl.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/pl.gmo differ diff -Nru xz-utils-5.6.0/po/pl.po xz-utils-5.6.1+really5.4.5/po/pl.po --- xz-utils-5.6.0/po/pl.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/pl.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,15 +1,13 @@ -# SPDX-License-Identifier: 0BSD -# # Polish translation for xz. -# This file is published under the BSD Zero Clause License. -# Jakub Bogusz , 2011-2024. +# This file is put in the public domain. +# Jakub Bogusz , 2011-2023. # msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-15 21:15+0100\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-19 21:30+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -29,164 +27,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Zbyt dużo argumentów dla --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "W --block-list brakuje rozmiaru bloku po numerze łańcucha filtrów „%c:”" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 w --block-list może być użyte wyłącznie jako ostatni element" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Nieznany typ formatu pliku" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Nieobsługiwany typ kontroli spójności" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." -msgstr "Wraz z opcją „--files” lub „--files0” można podać tylko jeden plik." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." +msgstr "Wraz z opcją `--files' lub `--files0' można podać tylko jeden plik." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Zmienna środowiskowa %s zawiera zbyt dużo argumentów" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Obsługa kompresji została wyłączona na etapie budowania" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Obsługa dekompresji została wyłączona na etapie budowania" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Kompresja plików lzip (.lz) nie jest osbługiwana" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "--block-list jest ignorowane poza kompresją do formatu .xz" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "Przy --format=raw i zapisie do pliku wymagana jest opcja --suffix=.ROZ" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Maksymalna liczba filtrów to cztery" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Błąd w opcji --filters%s=FILTRY:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Limit użycia pamięci jest zbyt mały dla podanej konfiguracji filtra." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "łańcuch filtrów %u użyty w --block-list, ale nie podany przez --filters%u=" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Użycie ustawień predefiniowanych w trybie surowym jest odradzane." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Dokładne opcje ustawień predefiniowanych mogą różnić się między wersjami oprogramowania." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Format .lzma obsługuje tylko filtr LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 nie może być używany z formatem .xz" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "Łańcuch filtrów %u jest niezgodny z --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "Łańcuch filtrów jest niezgodny z --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Przełączanie w tryb jednowątkowy z powodu --flush-timeout" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Nieobsługiwane opcje w łańcuchu filtrów %u" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Maksymalna liczba używanych wątków: %." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Nieobsługiwany łańcuch filtrów lub opcje filtra" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Dekompresja będzie wymagała %s MiB pamięci." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Zmniejszono liczbę wątków z %s do %s, aby nie przekroczyć limitu użycia pamięci %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "Zmniejszono liczbę wątków z %s do jednego. Automatyczny limit użycia pamięci %s MiB jest nadal przekroczony - wymagane jest %s MiB. Kontynuacja mimo to." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Przełączenie w tryb jednowątkowy, aby nie przekroczyć limitu użycia pamięci %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Skorygowano rozmiar słownika LZMA%c z %s MiB do %s MiB aby nie przekroczyć limitu użycia pamięci %s MiB" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Skorygowano rozmiar słownika LZMA%c dla --filters%u z %s MiB do %s MiB, aby nie przekroczyć limitu użycia pamięci %s MiB" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Błąd podczas zmiany w łańcuchu filtrów %u: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Błąd tworzenia potoku: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Nie udało się włączyć piaskownicy" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() nie powiodło się: %s" @@ -201,252 +167,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Plik wygląda na przeniesiony, nie zostanie usunięty" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Nie można usunąć: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Nie można ustawić właściciela pliku: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Nie można ustawić grupy pliku: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Nie można ustawić uprawnień pliku: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Błąd podczas pobierania flag stanu pliku ze standardowego wejścia: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Jest dowiązaniem symbolicznym, pominięto" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Jest katalogiem, pominięto" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Nie jest zwykłym plikiem, pominięto" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Plik ma ustawiony bit setuid lub setgid, pominięto" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Plik ma ustawiony bit sticky, pominięto" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Plik wejściowy ma więcej niż jedno dowiązanie zwykłe, pominięto" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Pusta nazwa pliku, pominięto" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Błąd podczas odtwarzania flag stanu dla standardowego wejścia: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Błąd podczas pobierania flag stanu pliku ze standardowego wyjścia: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Błąd podczas odtwarzania flagi O_APPEND dla standardowego wyjścia: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Zamknięcie pliku nie powiodło się: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Zmiana pozycji nie powiodła się podczas próby utworzenia pliku rzadkiego: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Błąd odczytu: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Błąd podczas zmiany pozycji w pliku: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Nieoczekiwany koniec pliku" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Błąd zapisu: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Wyłączony" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Rozmiar pamięci fizycznej (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Liczba wątków procesora:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Kompresja:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Dekompresja:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Dekompresja wielowątkowa:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Domyślnie dla -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Informacje o sprzęcie:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Limity użycia pamięci" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Strumienie:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Bloki:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Rozmiar spakowany:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Rozmiar rozpakowany:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Współczynnik:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Kontrola spójności:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Wyrównanie strumienia:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Wymagana pamięć:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Rozmiar w nagłówkach:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Liczba plików:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Strumień" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Blok" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Bloki" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "Offset spak." -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "Offset rozp." -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "Rozm.spak." -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "Rozm.rozp." -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "Rozm.całk." -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Wsp." -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Kontrola" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "S.kontr." -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Wyrównanie" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Nagłówek" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Flagi" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "Uż.pamięci" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Filtry" @@ -454,7 +420,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Brak" @@ -462,60 +428,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Nieznany-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Nieznany-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Nieznany-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Nieznany-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Nieznany-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Nieznany-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Nieznany-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Nieznany11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Nieznany12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Nieznany13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Nieznany14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Nieznany15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Plik jest pusty" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Za mały na poprawny plik .xz" @@ -524,26 +490,26 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Strum. Bloki Spakowany Rozpakowany Wsp. Kontrola Nazwa pliku" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Tak" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Nie" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Minimalna wersja XZ Utils: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" @@ -551,19 +517,15 @@ msgstr[1] "%s pliki\n" msgstr[2] "%s plików\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Sumarycznie:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list działa tylko z plikami .xz (--format=xz lub --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Proszę spróbować „lzmainfo” z plikami .lzma." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list nie obsługuje odczytu ze standardowego wejścia" @@ -579,14 +541,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" -msgstr "%s: Napotkano znak NUL podczas odczytu nazw plików; może miało być „--files0” zamiast „--files”?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" +msgstr "%s: Napotkano znak NUL podczas odczytu nazw plików; może miało być `--files0' zamiast `--files'?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Kompresja i dekompresja z opcją --robot nie jest jeszcze obsługiwana." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Nie można odczytać danych ze standardowego wejścia przy czytaniu nazw plików ze standardowego wejścia" @@ -594,68 +556,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Błąd wewnętrzny" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Nie można ustawić obsługi sygnałów" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Brak kontroli spójności; poprawność plików nie będzie weryfikowana" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Nieobsługiwany typ kontroli spójności; poprawność plików nie będzie weryfikowana" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Osiągnięto limit użycia pamięci" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Nie rozpoznany format pliku" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Nieobsługiwane opcje" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Dane skompresowane są uszkodzone" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Nieoczekiwany koniec wejścia" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "Wymagane jest %s MiB pamięci. Limit jest wyłączony." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Wymagane jest %s MiB pamięci. Limit to %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Łańcuch filtrów: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." -msgstr "Polecenie „%s --help” pokaże więcej informacji." +msgid "Try `%s --help' for more information." +msgstr "Polecenie `%s --help' pokaże więcej informacji." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -666,17 +628,17 @@ "Kompresja lub dekompresja PLIKÓW w formacie .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Argumenty obowiązkowe dla opcji długich są obowiązkowe również dla opcji\n" "krótkich.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Tryb pracy:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -688,7 +650,7 @@ " -t, --test sprawdzenie spójności plików skompresowanych\n" " -l, --list wypisanie informacji o plikach .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -696,7 +658,7 @@ "\n" " Modyfikatory operacji:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -706,7 +668,7 @@ " -f, --force nadpisywanie plików wyjściowych i (de)kompresja dowiązań\n" " -c, --stdout zapis na standardowe wyjście, nieusuwanie plików wej." -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -714,23 +676,23 @@ " --single-stream dekompresja tylko pierwszego strumienia, ciche\n" " zignorowanie pozostałych danych wejściowych" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" " --no-sparse nietworzenie plików rzadkich podczas dekompresji\n" -" -S, --suffix=.ROZ użycie rozszerzenia „.ROZ” dla plików skompresowanych\n" +" -S, --suffix=.ROZ użycie rozszerzenia `.ROZ' dla plików skompresowanych\n" " --files[=PLIK] odczyt nazw plików do przetworzenia z PLIKU; jeśli PLIK\n" " nie został podany, nazwy są czytane ze standardowego\n" " wejścia; muszą być zakończone znakiem nowej linii\n" " --files0[=PLIK] podobnie do --files, ale znakiem kończącym musi być NUL" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -738,23 +700,23 @@ "\n" " Podstawowe opcje formatu pliku i kompresji:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FORM format pliki do kodowania lub dekodowania; możliwe to\n" -" „auto” (domyślny), „xz”, „lzma”, „lzip” i „raw”\n" -" -C, --check=TEST typ kontroli spójności: „none” (ostrożnie!),\n" -" „crc32”, „crc64” (domyślny) lub „sha256”" +" `auto' (domyślny), `xz', 'lzma', `lzip' i `raw'\n" +" -C, --check=TEST typ kontroli spójności: `none' (ostrożnie!),\n" +" `crc32', `crc64' (domyślny) lub `sha256'" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check bez kontroli sprawdzania integralności przy dekompresji" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -763,7 +725,7 @@ " użyciem wartości 7-9 należy wziąć pod uwagę wykorzystanie\n" " pamięci przy kompresji *oraz* dekompresji!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -772,15 +734,15 @@ " ilości czasu procesora; nie wpływa na wymagania\n" " pamięciowe dekompresora" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" -" -T, --threads=ILE użycie maksymalnie ILU wątków; domyślnie 0, co oznacza\n" +" -T, --threads=ILE użycie maksymalnie ILU wątków; domyślnie 1; 0 oznacza\n" " tyle, ile jest rdzeni procesorów" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -791,21 +753,17 @@ " opcja służy do ustawienia rozmiaru bloku dla kompresji\n" " wielowątkowej" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=ROZMIARY\n" " rozpoczęcie nowego bloku .xz po rozdzielonych przecinkiem\n" -" przedziałach danych nieskompresowanych; opcjonalnie można\n" -" podać numer łańcucha filtrów (0-9) ze znakiem „:” przed\n" -" rozmiarem danych nieskompresowanych" +" przedziałach danych nieskompresowanych" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -817,7 +775,7 @@ " ostatniegu zapisu bloku, a odczyt kolejnych danych byłby\n" " blokujący, wszystkie gotowe dane są zapisywane" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -836,7 +794,7 @@ " dekompresji, dekompresji wielowątkowej lub wszystkich;\n" " LIMIT jest w bajtach, % RAM lub 0 dla limitów domyślnych" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -845,7 +803,7 @@ " pamięci, zostanie zgłoszony błąd zamiast zmniejszania\n" " ustawień" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -853,35 +811,6 @@ "\n" " Łańcuch własnych filtrów do kompresji (alternatywa do używania -0 .. -9):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=FILTRY ustawienie łańcucha filtrów przy użyciu składni łańcucha\n" -" filtrów liblzma; więcej informacji z opcją --filters-help" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=FILTRY ... --filters9=FILTRY\n" -" ustawienie dodatkowego łańcucha filtrów przy użyciu\n" -" składni łańcucha filtrów liblzma do użyciaw opcji\n" -" --block-list" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help więcej informacji o składni lańcuchów filtrów libzma\n" -" i zakończenie." - #: src/xz/message.c:1067 msgid "" "\n" @@ -921,7 +850,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -933,11 +861,10 @@ " --powerpc[=OPCJE] Filtr BCJ PowerPC (tylko big-endian)\n" " --ia64[=OPCJE] Filtr BCJ IA-64 (Itanium)\n" " --sparc[=OPCJE] Filtr BCJ SPARC\n" -" --riscv[=OPTS] Filtr BCJ RISC-V\n" " Poprawne OPCJE dla wszystkich filtrów BCJ:\n" " start=ILE offset początku konwersji (domyślnie=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -949,7 +876,7 @@ " dist=ILE odległość między bajtami odejmowanymi od\n" " siebie (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -957,7 +884,7 @@ "\n" " Inne opcje:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -965,15 +892,15 @@ " -q, --quiet pominięcie ostrzeżeń; dwukrotne podanie pomija też błędy\n" " -v, --verbose więcej informacji; dwukrotne podanie to jeszcze więcej" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn ostrzeżenia nie mają wpływu na status zakończenia" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot komunikaty w formacie dla maszyny (do skryptów)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -981,7 +908,7 @@ " --info-memory wyświetlenie całkowitej ilości pamięci RAM oraz aktualnie\n" " aktywnych limitów pamięci i zakończenie pracy" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -989,7 +916,7 @@ " -h, --help wyświetlenie krótkiego opisu (tylko podstawowe opcje)\n" " -H, --long-help wyświetlenie tego długiego opisu i zakończenie" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -997,12 +924,11 @@ " -h, --help wyświetlenie tego krótkiego opisu i zakończenie\n" " -H, --long-help wyświetlenie długiego opisu (także opcje zaawansowane)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version wyświetlenie informacji o wersji i zakończenie" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1014,7 +940,7 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" @@ -1023,121 +949,85 @@ "Błędy w tłumaczeniu prosimy zgłaszać na adres\n" ".\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Strona domowa %s: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "TA WERSJA JEST ROZWOJOWA, NIE PRZEZNACZONA DO UŻYTKU PRODUKCYJNEGO." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"Łańcuchy filtrów ustawia się przy użyciu --filters=FILTRY lub\n" -"--filters1=FILTRY ... --filters9=FILTRY. Każdy filtr w łańcuchu może być\n" -"rozdzielony spacjami lub „--”. Alternatywnie zamiast łańcucha filtrów można\n" -"podać predefiniowane <0-9>[e].\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "Obsługiwane filtry i ich opcje to:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" -msgstr "%s: Opcje muszą być parami „nazwa=wartość” rozdzielonymi przecinkami" +msgid "%s: Options must be `name=value' pairs separated with commas" +msgstr "%s: Opcje muszą być parami `nazwa=wartość' rozdzielonymi przecinkami" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Błędna nazwa opcji" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Błędna wartość opcji" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Nieobsługiwane ustawienie predefiniowane LZMA1/LZMA2: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Suma lc i lp nie może przekroczyć 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Nazwa pliku ma nieznane rozszerzenie, pominięto" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" -msgstr "%s: Plik już ma rozszerzenie „%s”, pominięto" +msgid "%s: File already has `%s' suffix, skipping" +msgstr "%s: Plik już ma rozszerzenie `%s', pominięto" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Błędne rozszerzenie nazwy pliku" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Wartość nie jest nieujemną liczbą całkowitą" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Błędny przyrostek mnożnika" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." -msgstr "Poprawne przyrostki to „KiB” (2^10), „MiB” (2^20) i „GiB” (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." +msgstr "Poprawne przyrostki to `KiB' (2^10), `MiB' (2^20) i `GiB' (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" -msgstr "Wartość opcji „%s” musi być w przedziale [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" +msgstr "Wartość opcji `%s' musi być w przedziale [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Dane skompresowane nie mogą być czytane z terminala" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Dane skompresowane nie mogą być zapisywane na terminal" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Składnia: %s [--help] [--version] [PLIK]...\n" -"Wyświetlanie informacji zapisanych w nagłówku pliku .lzma" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "Plik jest za mały, aby był plikiem .lzma" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "To nie jest plik .lzma" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Zapis na standardowe wyjście nie powiódł się" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Nieznany błąd" - -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Nie udało się włączyć piaskownicy" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/pt.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/pt.gmo differ diff -Nru xz-utils-5.6.0/po/pt.po xz-utils-5.6.1+really5.4.5/po/pt.po --- xz-utils-5.6.0/po/pt.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/pt.po 2023-11-01 12:27:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xz 5.2.4\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2019-09-27 08:08+0100\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Portuguese \n" @@ -29,175 +29,137 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: demasiados argumentos para --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 só pode ser usado como o último elemento em --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: tipo de formato de ficheiro desconhecido" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: tipo de verificação de integridade não suportado" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Só pode especificar um ficheiro com \"--files\" ou \"--files0\"." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s: " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "A variável de ambiente %s contém demasiados argumentos" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "O suporte a compressão foi desactivado ao compilar" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "O suporte a descompressão foi desactivado ao compilar" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: com --format=raw, --suffix=.SUF é requerido, a menos que seja escrito em stdout" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "O número máximo de filtros é quatro" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "O limite de uso de memória é baixo demais para a configuração de filtro dada." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "O uso de uma predefinição em modo bruto é desencorajado." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "As opções exactas de predefinições podem variar entre versões do programa." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "O formato .lzma tem só suporta o filtro LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "Impossível utilizar LZMA1 com o formato .xz" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "A cadeia de filtros é incompatível com --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "A mudar para o modo de linha única devido a --flush-timeout" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Opções não suportadas" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "A usar até % linhas." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Opções de filtro ou cadeia de filtros não suportadas" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "A descompressão precisará de %s MiB de memória." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, fuzzy, c-format #| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Ajustado o número de linhas de %s de %s para não exceder o limite de uso de memória de %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "" -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, fuzzy, c-format #| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Ajustado o número de linhas de %s de %s para não exceder o limite de uso de memória de %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Ajustado o tamanho de dicionário de LZMA%c de %s MiB para %s MiB para não exceder o limite de uso de memória de %s MiB" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Ajustado o tamanho de dicionário de LZMA%c de %s MiB para %s MiB para não exceder o limite de uso de memória de %s MiB" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "Erro ao criar um túnel: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Erro ao criar um túnel: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Falha ao activar a Sandbox" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() falhou: %s" @@ -212,275 +174,275 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: o ficheiro parece ter sido movido, não será eliminado" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: impossível remover: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: impossível definir o proprietário do ficheiro: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: impossível definir o grupo do ficheiro: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: impossível definir as permissões do ficheiro: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Erro ao obter as bandeiras de estado da entrada padrão: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: é uma ligação simbólica, a ignorar" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: é uma pasta, a ignorar" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: não é um ficheiro normal, a ignorar" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: o ficheiro tem o bit setuid ou setgid definido, a ignorar" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: o ficheiro tem o bit sticky definido, a ignorar" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: o ficheiro de entrada tem mais de uma ligação absoluta, a ignorar" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Nome de ficheiro vazio, a ignorar" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Erro ao restaurar as bandeiras de estado para a entrada padrão: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Erro ao obter as bandeiras de estado do ficheiro da saída padrão: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Erro ao restaurar a bandeira O_APPEND para a saída padrão: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: falha ao fechar o ficheiro: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: falha na procura ao tentar criar um ficheiro escasso: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: erro de leitura: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: erro ao procurar o ficheiro: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: fim de ficheiro inesperado" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: erro de escrita: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Desactivado" # Espaços adicionados para manter alinhamento com mensagens adjacentes -- Rafael -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 #, fuzzy #| msgid "Total amount of physical memory (RAM): " msgid "Amount of physical memory (RAM):" msgstr "Quantidade total de memória física (RAM): " -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "" # Espaços reduzidos para manter alinhamento com mensagens adjacentes -- Rafael -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 #, fuzzy #| msgid "Memory usage limit for decompression: " msgid "Multi-threaded decompression:" msgstr "Limite de uso de memória para descompressão: " -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 #, fuzzy #| msgid "Memory usage limit reached" msgid "Memory usage limits:" msgstr "Limite de uso de memória alcançado" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "" -#: src/xz/list.c:69 +#: src/xz/list.c:70 #, fuzzy #| msgid " Compressed size: %s\n" msgid "Compressed size:" msgstr " Tam. comprimido: %s\n" -#: src/xz/list.c:70 +#: src/xz/list.c:71 #, fuzzy #| msgid " Uncompressed size: %s\n" msgid "Uncompressed size:" msgstr " Tam. descomprimido: %s\n" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "" -#: src/xz/list.c:73 +#: src/xz/list.c:74 #, fuzzy #| msgid " Stream padding: %s\n" msgid "Stream Padding:" msgstr " Espaço do fluxo: %s\n" -#: src/xz/list.c:74 +#: src/xz/list.c:75 #, fuzzy #| msgid " Memory needed: %s MiB\n" msgid "Memory needed:" msgstr " Memória requerida: %s MiB\n" # Espaço adicionado para promover alinhamento, vide "xz -lvv foo.xz" -#: src/xz/list.c:75 +#: src/xz/list.c:76 #, fuzzy #| msgid " Sizes in headers: %s\n" msgid "Sizes in headers:" msgstr " Tam. em cabeçalhos: %s\n" -#: src/xz/list.c:78 +#: src/xz/list.c:79 #, fuzzy #| msgid " Number of files: %s\n" msgid "Number of files:" msgstr " Nº. de ficheiros: %s\n" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "" -#: src/xz/list.c:128 +#: src/xz/list.c:129 #, fuzzy #| msgid "Totals:" msgid "TotalSize" msgstr "Totais:" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "" @@ -488,7 +450,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Nenhum" @@ -496,71 +458,71 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "SemNome-2" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "SemNome-3" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "SemNome-5" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "SemNome-6" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "SemNome-7" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "SemNome-8" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "SemNome-9" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "SemNome-11" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "SemNome-12" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "SemNome-13" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "SemNome-14" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "SemNome-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: o ficheiro está vazio" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: muito pequeno para um ficheiro .xz válido" @@ -569,45 +531,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Fluxos Blocos Comprimido Descomprimido Rácio Verif. Nome de ficheiro" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Sim" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Não" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Versão mínima do XZ Utils: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s ficheiro\n" msgstr[1] "%s ficheiros\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Totais:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list só funciona em ficheiros .xz (--format=xz ou --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list não suporta a leitura da entrada padrão" @@ -622,16 +580,15 @@ msgstr "%s: fim de entrada inesperado ao ler nomes de ficheiros" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: encontrado carácter nulo ao ler nomes de ficheiro; talvez queira usar \"--files0\" em vez de \"--files\"?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Compressão e descompressão com --robot ainda não são suportadas." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Impossível ler dados da entrada padrão ao ler nomes de ficheiro da entrada padrão" @@ -639,69 +596,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Erro interno (erro)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Impossível estabelecer gestores de sinais" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Sem teste de integridade; a integridade do ficheiro não será verificada" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Tipo de verificação de integridade não suportada; a integridade do ficheiro não será verificada" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Limite de uso de memória alcançado" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Formato de ficheiro não reconhecido" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Opções não suportadas" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Os dados comprimidos estão corrompidos" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Fim de entrada inesperado" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "São necessários %s MiB de memória. O limitador está desactivado." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "São necessários %s MiB de memória. O limite é %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: cadeia de filtros: %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Tente \"%s --help\" para mais informações." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -712,17 +668,17 @@ "Comprime ou descomprime FICHEIROs no formato .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Argumentos obrigatórios para opções longas são também obrigatórios para\n" "opções curtas.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Modo de operação:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -734,7 +690,7 @@ " -t, --test testa a integridade do ficheiro comprimido\n" " -l, --list lista informações sobre ficheiros .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -742,7 +698,7 @@ "\n" " Modificadores de operações:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -754,7 +710,7 @@ " -c, --stdout escreve na saída padrão e não elimina os ficheiros de\n" " entrada" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -762,18 +718,10 @@ " --single-stream descomprime só o primeiro fluxo e ignora silenciosamente\n" " possíveis dados de entrada restantes" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -787,7 +735,7 @@ " devem ser terminados com o carácter de nova linha\n" " --files0[=FICH] igual a --files, mas usa o carácter nulo como terminador" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -795,7 +743,7 @@ "\n" " Opções básicas de formato e compressão de ficheiro:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 #, fuzzy #| msgid "" #| " -F, --format=FMT file format to encode or decode; possible values are\n" @@ -804,9 +752,9 @@ #| " `crc32', `crc64' (default), or `sha256'" msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT formato de ficheiro a codificar ou descodificar; os\n" " valores possíveis são \"auto\" (predefinição), \"xz\",\n" @@ -814,11 +762,11 @@ " -C, --check=TESTE tipo de teste de integridade: \"none\" (cuidado!),\n" " \"crc32\", \"crc64\" (predefinição) ou \"sha256\"" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check não verifica a integridade ao descomprimir" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -827,7 +775,7 @@ " conta o uso de memória do compressor *e* descompressor\n" " antes de usar 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -835,20 +783,16 @@ " -e, --extreme tenta melhorar o rácio de compressão usando mais tempo de\n" " CPU; não afecta os requisitos de memória do descompressor" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=NÚM usa no máximo NÚM linhas; a predefinição é 1; defina para\n" " 0 para usar tantas linhas como núcleos de processadores\n" " haja" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -859,24 +803,17 @@ " use para definir o tamanho de bloco para compressão com\n" " linhas" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=TAM\n" " inicia um novo bloco .xz após os intervalos dados,\n" " separados por vírgulas, de dados descomprimidos" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -889,7 +826,7 @@ " entrada bloquearia, todos os dados pendentes serão\n" " despejados" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, fuzzy, no-c-format #| msgid "" #| " --memlimit-compress=LIMIT\n" @@ -913,7 +850,7 @@ " descompressão ou ambos; LIMITE é em bytes, % de RAM ou 0\n" " para predefinições" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -922,7 +859,7 @@ " uso de memória, devolve um erro em vez de reduzir as\n" " configurações" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -930,26 +867,6 @@ "\n" " Cadeia de filtros personalizada para compressão (alternativa às predefinições):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -1003,7 +920,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -1018,7 +934,7 @@ " start=NUM desvio inicial para conversões\n" " (predefinição=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -1031,7 +947,7 @@ " dist=NÚM distância entre bytes a serem subtraídos\n" " de cada um (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -1039,7 +955,7 @@ "\n" " Outras opções:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -1047,15 +963,15 @@ " -q, --quiet suprime avisos, use duas vezes para suprimir também erros\n" " -v, --verbose é verboso; use duas vezes para ainda mais verbosidade" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn fazer avisos não afecta o estado da saída" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot usa mensagens analisáveis por máquina (útil para scripts)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1063,7 +979,7 @@ " --info-memory mostra a quantidade total de RAM e os limites de uso\n" " de memória actualmente activos e sai" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1071,7 +987,7 @@ " -h, --help mostra a ajuda curta (lista só as opções básicas)\n" " -H, --long-help mostra esta mensagem de ajuda e sai" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1079,12 +995,11 @@ " -h, --help mostra esta mensagem de ajuda e sai\n" " -H, --long-help mostra a ajuda longa (lista também as opções avançadas)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version mostra o número da versão e sai" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1096,135 +1011,96 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Reporte erros em <%s> (em inglês ou finlandês).\n" "Relate erros de tradução em .\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Página inicial %s: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "ESTA É UMA VERSÃO DE DESENVOLVIMENTO NÃO DESTINADA A USO EM PRODUÇÃO." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Opções de filtro ou cadeia de filtros não suportadas" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: as opções devem ser pares \"nome=valor\" separados por vírgulas" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: nome de opção inválido" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: valor de opção inválido" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Predefinição LZMA1/LZMA2 não suportada: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "A soma de lc e lp não deve exceder 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: nome de ficheiro com sufixo desconhecido, a ignorar" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: o ficheiro já tem o sufixo \"%s\", a ignorar" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: sufixo de nome de ficheiro inválido" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: o valor não é um inteiro decimal não-negativo" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: sufixo multiplicador inválido" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Sufixos válidos são \"KiB\" (2^10), \"MiB\" (2^20) e \"GiB\" (2^30)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "O valor da opção \"%s\" deve estar no intervalo [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Dados comprimidos não podem ser lidos de um terminal" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Dados comprimidos não podem ser escritos num terminal" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s: muito pequeno para um ficheiro .xz válido" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "A escrita para a saída padrão falhou" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Erro desconhecido" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Falha ao activar a Sandbox" - # Espaços adicionados para manter alinhamento com mensagens adjacentes -- Rafael #~ msgid "Memory usage limit for compression: " #~ msgstr "Limite de uso de memória para compressão: " Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/pt_BR.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/pt_BR.gmo differ diff -Nru xz-utils-5.6.0/po/pt_BR.po xz-utils-5.6.1+really5.4.5/po/pt_BR.po --- xz-utils-5.6.0/po/pt_BR.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/pt_BR.po 2023-11-01 12:27:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xz 5.4.0-pre2\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2023-01-12 14:40-0300\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -29,173 +29,135 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Argumentos demais para --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 só pode ser usado como o último elemento em --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Tipo de formato de arquivo desconhecido" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Tipo de verificação de integridade sem suporte" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Somente um arquivo pode ser especificado com \"--files\" ou \"--files0\"." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s: " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "A variável de ambiente %s contém argumentos demais" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Suporte a compressão foi desabilitado em tempo de compilação" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Suporte a descompressão foi desabilitado em tempo de compilação" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "A compactação de arquivos lzip (.lz) não é suportada" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: Com --format=raw, --suffix=.SUF é exigido, a menos que esteja escrevendo para stdout" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "O número máximo de filtros é quatro" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "O limite de uso de memória é baixo demais para a configuração de filtro dada." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "O uso de uma predefinição em modo bruto é desencorajado." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "As opções exatas de predefinições podem variar entre versões do software." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "O formato .lzma possui suporte apenas ao filtro LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 não pode ser usado com o formato .xz" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "A cadeia de filtros é incompatível com --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Alternando para o modo de thread única por causa de --flush-timeout" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Opções sem suporte" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Usando até % threads." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Opções de filtro ou cadeia de filtros sem suporte" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "A descompressão precisará de %s MiB de memória." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Reduzido o número de threads de %s para %s para não exceder o limite de uso de memória de %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "Reduzido o número de threads de %s para um. O limite de uso de memória automática de %s MiB ainda está sendo excedido. %s MiB de memória é necessário. Continuando de qualquer maneira." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Alternando para o modo de thread única para não exceder o limite de uso de memória de %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Ajustado o tamanho de dicionário de LZMA%c de %s MiB para %s MiB para não exceder o limite de uso de memória de %s MiB" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Ajustado o tamanho de dicionário de LZMA%c de %s MiB para %s MiB para não exceder o limite de uso de memória de %s MiB" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "Erro ao criar um pipe: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Erro ao criar um pipe: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Falha ao habilitar o sandbox" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() falhou: %s" @@ -210,252 +172,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: O arquivo parece ter sido movido, não será removido" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Não foi possível remover: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Não foi possível definir o dono do arquivo: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Não foi possível definir o grupo do arquivo: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Não foi possível definir as permissões do arquivo: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Erro ao obter os sinalizadores de status da entrada padrão: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: É um link simbólico, ignorando" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: É um diretório, ignorando" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Não é um arquivo comum, ignorando" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: O arquivo possui o bit setuid ou setgid definido, ignorando" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: O arquivo possui o bit sticky definido, ignorando" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: O arquivo de entrada possui mais de um link físico, ignorando" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Nome de arquivo vazio, ignorando" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Erro ao restaurar os sinalizadores de status para entrada padrão: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Erro ao obter os sinalizadores de status de arquivo da saída padrão: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Erro ao restaurar o sinalizador O_APPEND para a saída padrão: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Fechamento do arquivo falhou: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Busca falhou ao tentar criar um arquivo esparso: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Erro de leitura: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Erro ao buscar o arquivo: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Fim de arquivo inesperado" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Erro de escrita: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Desabilitado" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Quantidade total de memória física (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Número de threads de processador:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Compactação:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Descompactação:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Descompactação com várias threads:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Padrão para -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Informações de hardware:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Memory usage limits:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Fluxos:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Blocos:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Tamanho compactado:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Tamanho não compactado:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Proporção:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Verificação:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Ajuste do fluxo:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Memória exigida:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Tamanhos nos cabeçalhos:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Número de arquivos:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Fluxo" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Bloco" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Blocos" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "DeslocComp" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "DeslocDescomp" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "TamComp" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "TamDescomp" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "TamTotal" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Proporção" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Verificação" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "ValorVerific." -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Preench." -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Cabeçalho" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Sinalizadores" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "UsoMem" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Filtros" @@ -463,7 +425,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Nenhuma" @@ -471,71 +433,71 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Incógnito2" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Incógnito3" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Incógnito5" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Incógnito6" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Incógnito7" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Incógnito8" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Incógnito9" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Incógnito11" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Incógnito12" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Incógnito13" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Incógnito14" # Não exceder 10 caracteres e espaços não são permitidos -- Rafael -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Incógnito15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: O arquivo está vazio" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Pequeno demais para ser um arquivo .xz válido" @@ -544,45 +506,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Fluxos Blocos Comprimido Descomprimid Propo Verif Nome de Arquivo" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Sim" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Não" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Versão mínima do XZ Utils: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s arquivo\n" msgstr[1] "%s arquivos\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Totais:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list funciona apenas em arquivos .xz (--format=xz ou --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list não possui suporte a leitura da entrada padrão" @@ -597,16 +555,15 @@ msgstr "%s: Fim da entrada inesperado ao ler nomes de arquivos" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: Caractere nulo encontrado ao ler nomes de arquivos; talvez você queria usar \"--files0\" em vez de \"--files\"?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Ainda não há suporte a compressão e descompressão com --robot." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Não é possível ler dados da entrada padrão ao ler nomes de arquivos da entrada padrão" @@ -614,69 +571,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Erro interno (bug)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Não foi possível estabelecer manipuladores de sinais" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Sem verificação de integridade; não será verificada a integridade do arquivo" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Tipo de verificação de integridade sem suporte; não será verificada a integridade do arquivo" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Limite de uso de memória alcançado" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Formato de arquivo não reconhecido" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Opções sem suporte" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Os dados comprimidos estão corrompidos" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Fim da entrada inesperado" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB de memória é necessário. O limitador está desabilitado." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB de memória é necessário. O limite é %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Cadeia de filtros: %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Tente \"%s --help\" para mais informações." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -687,15 +643,15 @@ "Comprime e descomprime ARQUIVOs no formato .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Argumentos obrigatórios para opções longas também o são para opções curtas.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Modo de operação:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -707,7 +663,7 @@ " -t, --test testa a integridade do arquivo comprimido\n" " -l, --list lista informações sobre arquivos .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -715,7 +671,7 @@ "\n" " Modificadores de opções:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -727,7 +683,7 @@ " -c, --stdout escreve a entrada padrão e não exclui os arquivos\n" " de entrada" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -735,18 +691,10 @@ " --single-stream descomprime apenas o primeiro fluxo, e ignora de forma\n" " silenciosa possíveis dados de entrada restantes" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -763,7 +711,7 @@ " similar a --files, mas usa o caractere nulo como\n" " terminador" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -771,18 +719,12 @@ "\n" " Opções básicas de formato de arquivo e compressão:\n" -#: src/xz/message.c:988 -#, fuzzy -#| msgid "" -#| " -F, --format=FMT file format to encode or decode; possible values are\n" -#| " `auto' (default), `xz', `lzma', `lzip', and `raw'\n" -#| " -C, --check=CHECK integrity check type: `none' (use with caution),\n" -#| " `crc32', `crc64' (default), or `sha256'" +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT formato de arquivo para codificar ou decodificar;\n" " valores possíveis são\n" @@ -790,11 +732,11 @@ " -C, --check=VERIF tipo de verificação de integridade: \"none\" (cuidado!),\n" " \"crc32\", \"crc64\" (padrão) ou \"sha256\"" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check não faz a verificação de integridade ao descomprimir" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -803,7 +745,7 @@ " memória do compressor *e* descompressor em conta\n" " antes de usar 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -812,20 +754,16 @@ " tempo de CPU; não afeta os requisitos de memória do\n" " descompressor" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=NÚM usa no máximo NÚM threads; o padrão é 1; defina para\n" " 0 para usar o máximo de threads que há de núcleos de\n" " processador" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -836,24 +774,17 @@ " use isso para definido o tamanho de bloco para\n" " compressão com threads" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=TAM\n" " inicia um novo bloco .xz após os intervalos dados,\n" " separados por vírgula, de dados descomprimidos" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -866,7 +797,7 @@ " de mais entrada bloquearia, todos os dados pendentes\n" " serão liberados" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -885,7 +816,7 @@ " descompressão, compactação em threads ou todas essas;\n" " LIMITE é em bytes, % de RAM ou 0 para padrões" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -894,7 +825,7 @@ " de uso de memória, fornece um erro em vez de\n" " ajustar as configurações para baixo" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -902,26 +833,6 @@ "\n" " Cadeia de filtros personalizada para compressão (alternativa à predefinição):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -953,18 +864,6 @@ " 0=automatic (padrão)" #: src/xz/message.c:1082 -#, fuzzy -#| msgid "" -#| "\n" -#| " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" -#| " --arm[=OPTS] ARM BCJ filter\n" -#| " --armthumb[=OPTS] ARM-Thumb BCJ filter\n" -#| " --arm64[=OPTS] ARM64 BCJ filter\n" -#| " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" -#| " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" -#| " --sparc[=OPTS] SPARC BCJ filter\n" -#| " Valid OPTS for all BCJ filters:\n" -#| " start=NUM start offset for conversions (default=0)" msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -974,7 +873,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -990,7 +888,7 @@ " start=NUM deslocamento inicial para conversões\n" " (padrão=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -1002,7 +900,7 @@ " dist=NÚM distância entre bytes sendo subtraído\n" " de cada um (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -1010,7 +908,7 @@ "\n" " Outras opções:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -1018,15 +916,15 @@ " -q, --quiet suprime avisos, use duas vezes para suprimir erros também\n" " -v, --verbose ser detalhado; use duas vezes para ainda mais detalhes" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn faz os avisos não afetarem o status de saída" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot usa mensagens analisáveis por máquina (útil p/ scripts)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1034,7 +932,7 @@ " --info-memory exibe a quantidade total de RAM e os limites de uso\n" " de memória atualmente ativos e sai" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1042,7 +940,7 @@ " -h, --help exibe a ajuda curto (lista apenas as opções básicas)\n" " -H, --long-help exibe essa ajuda longa e sai" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1050,12 +948,11 @@ " -h, --help exibe essa ajuda curta e sai\n" " -H, --long-help exibe a ajuda longa (lista também as opções avançadas)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version exibe o número de versão e sai" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1067,135 +964,96 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Relate erros para <%s> (em inglês ou finlandês).\n" "Relate erros de tradução para .\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Site do %s: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "ESSA É UMA VERSÃO DE DESENVOLVIMENTO, NÃO DESTINADA PARA USO EM PRODUÇÃO." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Opções de filtro ou cadeia de filtros sem suporte" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: As opções devem ser pares \"nome=valor\" separados por vírgulas" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Nome de opção inválido" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Valor de opção inválido" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Predefinição LZMA1/LZMA2 sem suporte: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "A soma de lc e lp não deve exceder 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: O nome de arquivo tem um sufixo desconhecido, ignorando" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: O arquivo já tem o sufixo \"%s\", ignorando" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Sufixo de nome de arquivo inválido" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: O valor não é um inteiro integral decimal" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Sufixo multiplicador inválido" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Sufixos válidos são \"KiB\" (2^10), \"MiB\" (2^20) e \"GiB\" (2^30)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "O valor da opção \"%s\" deve estar no intervalo [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Dados comprimidos não podem ser lidos de um terminal" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Dados comprimidos não podem ser escrito para um terminal" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s: Pequeno demais para ser um arquivo .xz válido" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "A escrita para a saída padrão falhou" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Erro desconhecido" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Falha ao habilitar o sandbox" - #~ msgid "Sandbox is disabled due to incompatible command line arguments" #~ msgstr "Sandbox está desabilitado em razão de argumentos de linha de comando incompatíveis" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/ro.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/ro.gmo differ diff -Nru xz-utils-5.6.0/po/ro.po xz-utils-5.6.1+really5.4.5/po/ro.po --- xz-utils-5.6.0/po/ro.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/ro.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,10 +1,8 @@ -# SPDX-License-Identifier: 0BSD +# Romanian translation for xz. +# Mesajele în limba română pentru pachetul xz. +# This file is put in the public domain. # -# Romanian translation for XZ Utils package. -# Mesajele în limba română pentru pachetul XZ Utils. -# This file is published under the BSD Zero Clause License. -# -# Remus-Gabriel Chelu , 2022 - 2024. +# Remus-Gabriel Chelu , 2022 = 2023. # # Cronologia traducerii fișierului „xz”: # Traducerea inițială, făcută de R-GC, pentru versiunea xz 5.2.5. @@ -14,16 +12,14 @@ # Actualizare a traducerii pentru versiunea 5.4.0-pre2, făcută de R-GC, dec-2022. # Actualizare a traducerii pentru versiunea 5.4.3, făcută de R-GC, mai-2023. # Actualizare a traducerii pentru versiunea 5.4.4-pre1, făcută de R-GC, iul-2023. -# Actualizare a traducerii pentru versiunea 5.6.0-pre1, făcută de R-GC, feb-2024. -# Actualizare a traducerii pentru versiunea 5.6.0-pre2, făcută de R-GC, feb-2024. # Actualizare a traducerii pentru versiunea Y, făcută de X, Z(luna-anul). # msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-16 13:27+0100\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-19 19:34+0200\n" "Last-Translator: Remus-Gabriel Chelu \n" "Language-Team: Romanian \n" "Language: ro\n" @@ -44,116 +40,90 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Prea multe argumente pentru opțiunea „--block-list”" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "În „--block-list”, dimensiunea blocului lipsește după numărul lanțului de filtrare „%c”:" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 poate fi folosit doar ca ultimul element din opțiunea „--block-list”" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Tip de format de fișier necunoscut" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Tip de verificare a integrității neacceptat" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Numai un fișier poate fi specificat cu „--files” sau „--files0”." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Variabila de mediu „%s” conține prea multe argumente" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Suportul de comprimare a fost dezactivat în timpul construirii" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Suportul de decomprimare a fost dezactivat în timpul construirii" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Comprimarea fișierelor lzip (.lz) nu este acceptată" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "opțiunea „--block-list” este ignorată dacă nu se comprimă în formatul .xz" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" -msgstr "Cu opțiunea „--format=raw”, este necesară opțiunea „--suffix=.SUF”, cu excepția cazului în care se scrie la ieșirea standard" +msgstr "Cu --format=raw, este necesar --suffix=.SUF, cu excepția cazului în care se scrie la ieșirea standard(stdout)" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Numărul maxim de filtre este patru" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Eroare în opțiunea „--filters%s=FILTRE”:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Limita de utilizare a memoriei este prea mică pentru configurarea dată filtrului." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "lanțul de filtre %u este utilizat de „--block-list”, dar nu este specificat cu „--filters%u=”" - # Notă: # cu toate că sunt împotriva americanismelor, am preferat folosirea cuvîntului american, „românizat”, pentru a avea o traducere fluidă, fără construcții încărcate și inecesare... -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Utilizarea unei presetări în modul brut este descurajată." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Opțiunile exacte ale presetărilor pot varia între versiunile de software." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Formatul .lzma acceptă numai filtrul LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 nu poate fi utilizat cu formatul .xz" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "Lanțul de filtre %u este incompatibil cu opțiunea „--flush-timeout”" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "Lanțul de filtre este incompatibil cu opțiunea „--flush-timeout”" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Se trece la modul cu un singur fir de execuție datorită opțiunii „--flush-timeout”" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Opțiuni neacceptate în lanțul de filtre %u" - # NOTĂ: # - să intru în contact cu dezvoltatorii, pentru ai ruga să introducă a doua formă de plural # (necesară cel puțin pentru limba română): @@ -163,56 +133,50 @@ # procesoare/nuclee > 10 # === # cred că deja au apărut astfel de „monștrii” -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Se utilizează până la % fire de execuție." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Lanț de filtre sau opțiuni de filtrare neacceptate" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Decomprimarea va avea nevoie de %sMio de memorie." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Numărul de fire de execuție a fost redus de la %s la %s pentru a nu se depăși limita de utilizare a memoriei de %sMio" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "S-a redus numărul de fire de execuție de la %s la unul. Limita automată de utilizare a memoriei de %sMio este încă depășită. Sunt necesari %sMio de memorie. Se continuă în ciuda acestui lucru." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "S-a trecut la modul cu un singur-fir de execuție pentru a nu se depăși limita de utilizare a memoriei de %sMio" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "S-a ajustat dimensiunea dicționarului LZMA%c de la %sMio la %sMio pentru a nu se depăși limita de utilizare a memoriei de %sMio" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "S-a ajustat dimensiunea dicționarului LZMA%c pentru „--filters%u” de la %sMio la %sMio pentru a nu depăși limita de utilizare a memoriei de %sMio" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Eroare la schimbarea lanțului de filtrare %u: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" -msgstr "Eroare la crearea unei conducte: %s" +msgstr "Eroare la crearea unei conducte(pipe): %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Nu s-a reușit activarea cutiei de probă(sandbox)" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() a eșuat: %s" @@ -227,138 +191,138 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Fișierul pare să fi fost mutat, nu eliminat" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Nu se poate elimina: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Nu se poate configura proprietarul fișierului: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Nu se poate configura grupul proprietar al fișierului: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Nu se pot configura permisiunile fișierului: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Eroare la obținerea indicatorilor de stare a fișierului de la intrarea standard: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Este o legătură simbolică, se omite" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Este un director, se omite" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Nu este un fișier obișnuit, se omite" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Fișierul are activați biții «setuid» sau «setgid», se omite" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Fișierul are activat bitul lipicios(sticky), se omite" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Fișierul de intrare are mai mult de o legătură dură, se omite" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Numele fișierului este gol, se omite" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Eroare la restabilirea indicatorilor de stare la intrarea standard: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Eroare la obținerea indicatorilor de stare a fișierului de la ieșirea standard: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Eroare la restabilirea indicatorului O_APPEND la ieșirea standard: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Închiderea fișierului a eșuat: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Căutarea a eșuat când se încerca crearea unui fișier dispers(sparse): %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Eroare de citire: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Eroare la căutarea fișierului: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Sfârșit neașteptat al fișierului" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Eroare de scriere: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Dezactivat" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Cantitatea totală de memorie fizică (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Numărul de fire de execuție ale procesorului:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Comprimare:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Decomprimare:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" -msgstr "Decomprimare cu multiple-fire de execuție:" +msgstr "Decomprimare multiple-fire de execuție:" # R-GC, scrie: # ATENȚIE: @@ -368,119 +332,119 @@ # **** # probabil tipul de literă folosit de mine în Poedit, să # nu diferențieze prea mult O de 0... -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Implicit pentru -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Informații despre componentele mașinii:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Limitele de utilizare a memoriei:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Fluxuri:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Blocuri:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Dimensiune comprimată:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Dimensiune decomprimată:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Raport:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Verificare:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Completare flux:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Memorie necesară:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Dim. în antete:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Numărul de fișiere:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Flux" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Bloc" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Blocuri" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "PozițieComprim" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "PozițieDecomprim" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "DimComp" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "DimDecomp" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "DimTotală" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Raport" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Verificare" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "ValVerificare" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Completare" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Antet" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Indicatori" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "UtilizareMem" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Filtre" @@ -488,7 +452,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Nici una" @@ -496,60 +460,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Necunos-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Necunos-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Necunos-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Necunos-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Necunos-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Necunos-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Necunos-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Necunos-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Necunos-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Necunos-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Necunos-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Necunos-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Fișierul este gol" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Prea mic pentru a fi un fișier .xz valid" @@ -558,26 +522,26 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Fluxuri Blocuri Comprimare Decomprimare Raport Verificare Nume fișier" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Da" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Nu" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Versiunea minimă XZ Utils: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" @@ -586,19 +550,15 @@ msgstr[2] "%s fișiere\n" msgstr[3] "%s de fișiere\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Totaluri:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list funcționează numai pe fișierele .xz (--format=xz sau --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Încercați «lzmainfo» cu fișiere .lzma." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list nu acceptă citirea de la intrarea standard" @@ -613,7 +573,7 @@ msgstr "%s: Sfârșit neașteptat al intrării la citirea numelor de fișiere" # Adaptînd sugestia făcută de Daniel Șerbănescu asupra traducerii cuvîntului „null”, am modificat -# traducerea de la:„Caracter nul găsit...”, la: +# traducere de la:„Caracter nul găsit...”, la: # „Caracter nul(null) găsit...” # Sugestia făcută de el în baza obiecției că în pagina web, «dexonline» definiția cuvîntului nul, este un pic ambiguă; nu are o bază prea solidă, # din următoarele motive: @@ -622,14 +582,14 @@ # - utilizatorul software-ului «xz», direct de la linia de comandă, mă îndoiesc că va fi un utilizator ce nu este familiarizat cu nomenclatura din informatică (pentru restul utilizatorilor, acest mesaj nu va fi vizibil, pentru că-l vor utiliza din spatele unui software „IGU” «InterfațăGrafică(de)Utilizator» #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: Caracter nul(null) găsit la citirea numelor de fișiere; poate ați vrut să utilizați „--files0” în loc de „--files”?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Comprimarea și decomprimarea cu „--robot” nu sunt încă acceptate." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Nu se pot citi date de la intrarea standard atunci când se citesc numele de fișiere de la intrarea standard" @@ -637,68 +597,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Eroare internă (bug)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Nu se pot stabili operatorii de semnal" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Fără verificare a integrității; nu se verifică integritatea fișierului" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Tip neacceptat de verificare a integrității; nu se verifică integritatea fișierului" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Limita de utilizare a memoriei a fost atinsă" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Formatul fișierului nu este recunoscut" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Opțiuni neacceptate" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Datele comprimate sunt corupte" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Sfârșit neașteptat al intrării" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." -msgstr "Se necesită %sMio de memorie. Limitarea este dezactivată." +msgstr "Se necesită %s Mio de memorie. Limitarea este dezactivată." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Se necesită %sMio de memorie. Limita este de %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Lanț de filtre: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." +msgid "Try `%s --help' for more information." msgstr "Încercați «%s --help» pentru mai multe informații." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -709,17 +669,17 @@ "Comprimă sau decomprimă FIȘIER(e) în formatul .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Argumentele obligatorii pentru opțiunile lungi sunt obligatorii și\n" "pentru opțiunile scurte.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Mod de operare:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -731,7 +691,7 @@ " -t, --test testează integritatea fișierului comprimat\n" " -l, --list listează informații despre fișierele .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -739,7 +699,7 @@ "\n" " Modificatori de operare:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -751,7 +711,7 @@ " -c, --stdout scrie la ieșirea standard și nu șterge fișierele de\n" " intrare" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -759,10 +719,10 @@ " --single-stream decomprimă doar primul flux și ignoră în tăcere\n" " posibilele date de intrare rămase" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -776,9 +736,10 @@ " de la intrarea standard; numele de fișiere trebuie să\n" " fie terminate cu caracterul de linie nouă\n" " --files0[=FIȘIER]\n" -" ca „--files”, dar folosește caracterul null ca terminator" +" ca --files, dar folosește caracterul nul(null) ca\n" +" terminator" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -786,12 +747,12 @@ "\n" " Formatul de bază al fișierului și opțiunile de comprimare:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FORMAT\n" " formatul de fișier pentru codificare sau decodificare;\n" @@ -802,11 +763,11 @@ " cu precauție), „crc32”, „crc64” (implicit) sau\n" " „sha256”" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check nu se efectuează verificarea integrității la decomprimare" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -816,7 +777,7 @@ " comprimare *și* de instrumentul de decomprimare, înainte\n" " de a utiliza presetările 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -825,17 +786,17 @@ " folosind mai mult timp CPU-ul; nu afectează cerințele\n" " de memorie ale instrumentului de decomprimare" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=NUMĂR\n" -" utilizează cel mult NUMĂR fire de execuție; valoarea\n" -" implicită este 0, care utilizează atâtea fire de execuție\n" -" câte nuclee există în procesor" +" utilizați cel mult NUMĂR fire de execuție; implicit\n" +" este 1; specificați valoarea 0 pentru a utiliza atâtea\n" +" fire de execuție câte nuclee de procesor există" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -846,21 +807,17 @@ " utilizați acest lucru pentru a stabili dimensiunea\n" " blocului pentru comprimarea cu fire de execuție" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" -" --block-list=BLOCURI\n" +" --block-list=DM\n" " începe un nou bloc .xz după intervalele date separate\n" -" prin virgulă, de date necomprimate; opțional, specificați\n" -" un număr de lanț de filtrare (0-9) urmat de „:” înainte\n" -" de dimensiunea datelor necomprimate" +" prin virgulă, de date necomprimate" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -873,7 +830,7 @@ " multor intrări s-ar bloca, toate datele în așteptare\n" " sunt eliminate" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -893,7 +850,7 @@ " execuție sau toate acestea; LIMITA este exprimată în\n" " octeți, % din RAM sau 0 pt. a activa valoarea implicită" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -901,7 +858,7 @@ " --no-adjust dacă setările de comprimare depășesc limita de utilizare\n" " a memoriei, dă o eroare în loc să reducă val. stabilite" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -910,36 +867,6 @@ " Lanț de filtrare personalizat pentru comprimare (alternativă la utilizarea\n" " presetărilor):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=FILTRE definește lanțul de filtre folosind sintaxa șirului de\n" -" filtre liblzma; utilizați „--filters-help” pentru mai\n" -" multe informații" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=FILTRE ... --filters9=FILTRE\n" -" definește lanțuri de filtre suplimentare folosind sintaxa\n" -" șirului de filtre liblzma pentru a fi utilizate cu\n" -" opțiunea „--block-list”" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help afișează mai multe informații despre sintaxa șirului de\n" -" filtre liblzma și iese" - #: src/xz/message.c:1067 msgid "" "\n" @@ -984,7 +911,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -996,11 +922,10 @@ " --powerpc[=OPȚIUNI] filtru BCJ PowerPC (numai big endian)\n" " --ia64[=OPȚIUNI] filtru BCJ IA-64 (Itanium)\n" " --sparc[=OPȚIUNI] filtru BCJ SPARC\n" -" --riscv[=OPȚIUNI] filtru RISC-V BCJ\n" " OPȚIUNI valide pentru toate filtrele BCJ:\n" -" start=NUM poziția de pornire a conversiilor (implicit=0)" +" start=NUM poziția de pornire a conversiilor (implicit=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -1012,7 +937,7 @@ " dist=NUM distanța dintre octeți fiind dedusă\n" " scăzând un octet din celălalt (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -1020,27 +945,27 @@ "\n" " Alte opțiuni:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" msgstr "" -" -q, --quiet suprimă avertismentele; specificați-o de două ori pentru\n" +" -q, --quiet suprimă avertismentele; specificați de două ori pentru\n" " a suprima și erorile\n" -" -v, --verbose descriere detaliată; specificați-o de două ori pentru și\n" +" -v, --verbose descriere detaliată; specificați de două ori pentru și\n" " mai multe detalii" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn face ca avertismentele să nu afecteze starea de ieșire" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot utilizează mesaje analizabile de mașină (utile pentru\n" " scripturi)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1048,7 +973,7 @@ " --info-memory afișează cantitatea totală de memorie RAM și limitele de\n" " utilizare a memoriei active în prezent, și iese" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1056,7 +981,7 @@ " -h, --help afișează ajutorul scurt (enumeră doar opțiunile de bază)\n" " -H, --long-help afișează acest ajutor lung(detaliat) și iese" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1065,12 +990,11 @@ " -H, --long-help afișează mesajul detaliat de ajutor (afișează și opțiunile\n" " avansate)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version afișează numărul versiunii, și iese" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1082,128 +1006,133 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Raportați erorile la <%s> (în engleză sau finlandeză).\n" "Raportați erorile de traducere la \n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Pagina principală a %s: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "ACEASTA ESTE O VERSIUNE DE DEZVOLTARE, NEDESTINATĂ UTILIZĂRII ÎN PRODUCȚIE." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"Lanțurile de filtre sunt definite cu ajutorul opțiunilor „--filters=FILTRE” sau\n" -"„--filters1=FILTRE ... --filters9=FILTRE”. Fiecare filtru din lanț poate fi\n" -"separat prin spații sau „--”. Alternativ, se poate specifica o presetare\n" -"<0-9>[e] în locul unui lanț de filtre.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "Filtrele acceptate și opțiunile acestora sunt:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Opțiunile trebuie să fie perechi „nume=valoare” separate prin virgule" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Nume de opțiune nevalid" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Valoare nevalidă a opțiunii" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Presetare LZMA1/LZMA2 neacceptată: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Suma de lc și lp nu trebuie să depășească 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Numele fișierului are un sufix necunoscut, care se omite" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Fișierul are deja sufixul „%s”, se omite" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Sufixul numelui de fișier nu este valid" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Valoarea nu este un număr întreg zecimal nenegativ" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Sufix multiplicator nevalid" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Sufixele valide sunt „KiB” (2^10), „MiB” (2^20) și „GiB” (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Valoarea opțiunii „%s” trebuie să fie în intervalul [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Datele comprimate nu pot fi citite de pe un terminal" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Datele comprimate nu pot fi scrise pe un terminal" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Utilizare: %s [--help] [--version] [FIȘIER]...\n" -"Afișează informațiile stocate în antetul fișierului .lzma" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "Prea mic pentru a fi un fișier .lzma" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "Nu este un fișier .lzma" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Scrierea la ieșirea standard a eșuat" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Eroare necunoscută" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Nu s-a reușit activarea cutiei de probă(sandbox)" +#~ msgid "The selected match finder requires at least nice=%" +#~ msgstr "Găsitorul de potriviri selectat necesită cel puțin nice=%" + +#~ msgid "Memory usage limit for compression: " +#~ msgstr "Limita de utilizare a memoriei pentru comprimare: " + +#~ msgid " Streams: %s\n" +#~ msgstr " Fluxuri: %s\n" + +#~ msgid " Blocks: %s\n" +#~ msgstr " Blocuri: %s\n" + +#~ msgid " Ratio: %s\n" +#~ msgstr " Raport: %s\n" + +#~ msgid " Check: %s\n" +#~ msgstr " Verificare: %s\n" + +#~ msgid "" +#~ " Streams:\n" +#~ " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" +#~ msgstr "" +#~ " Fluxuri:\n" +#~ " Flux Blocuri DecalajComp. DecalajDecomp. Dim.Comp. Dim.Decomp. Raport Verif. Compl.Flux" + +#~ msgid "" +#~ " Blocks:\n" +#~ " Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check" +#~ msgstr "" +#~ " Blocuri:\n" +#~ " Flux Bloc DecalajComp. DecalajDecomp. Dim.Totală Dim.Decomp. Raport Verif." + +#~ msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" +#~ msgstr " Val.Verif. %*sAntet Indicat. Dim.Comp. UzMem. Filtre" + +#~ msgid "Sandbox is disabled due to incompatible command line arguments" +#~ msgstr "Cutia de probă(sandbox) este dezactivată din cauza argumentelor incompatibile din linia de comandă" + +#~ msgid "Sandbox was successfully enabled" +#~ msgstr "Cutia de probă(sandbox) a fost activată cu succes" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/sr.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/sr.gmo differ diff -Nru xz-utils-5.6.0/po/sr.po xz-utils-5.6.1+really5.4.5/po/sr.po --- xz-utils-5.6.0/po/sr.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/sr.po 2023-11-01 12:27:57.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: xz 5.2.4\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2022-06-24 22:07+0800\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" @@ -26,175 +26,137 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Превише аргумената за „--block-list“" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 се може користити само као последњи елемент у „--block-list“-у" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Непозната врста формата датотеке" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Неподржана врста провере целовитости" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Само једну датотеку можете навести са „--files“ или „--files0“." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s: " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Променљива окружења „%s“ садржи превише аргумената" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Подршка запакивања је искључена у време изградње" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Подршка распакивања је искључена у време изградње" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: Са „--format=raw“, „--suffix=.SUF“ је потребно осим ако пише на стандардни излаз" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Највећи број филтера је четири" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Ограничење коришћења меморије је премало за дато подешавање филтера." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Коришћење претподешавања у сировом режиму је обесхрабрујуће." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Тачне опције претподешавања се могу разликовати од издања до издања софтвера." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Формат „.lzma“ подржава само „LZMA1“ филтер" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "Не можете користити „LZMA1“ са „.xz“ форматом" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "Ланац филтера није сагласан са „--flush-timeout“" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Пребацујем се на режим једне нити због „--flush-timeout“" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Неподржане опције" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Користим до % нити." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Неподржан ланац филтера или опције филтера" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "За распакивање ће бити потребно %s MiB меморије." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, fuzzy, c-format #| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Број нити је промењен са %s на %s да се неби прекорачило ограничење коришћења меморије од %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "" -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, fuzzy, c-format #| msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Број нити је промењен са %s на %s да се неби прекорачило ограничење коришћења меморије од %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Величина „LZMA%c“ речника је промењена са %s на %s да се неби прекорачило ограничење коришћења меморије од %s MiB" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Величина „LZMA%c“ речника је промењена са %s на %s да се неби прекорачило ограничење коришћења меморије од %s MiB" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "Грешка стварања спојке: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Грешка стварања спојке: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Нисам успео да укључим безбедно окружење" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: „poll()“ није успело: %s" @@ -209,272 +171,272 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Изгледа да је датотека премештена, не уклањам" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Не могу да уклоним: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Не могу да поставим власника датотеке: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Не могу да поставим групу датотеке: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Не могу да поставим овлашћења датотеке: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Грешка добављања заставица стања датотеке са стандардног улаза: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Јесте симболичка веза прескачем" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Јесте директоријум, прескачем" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Није обична датотека, прескачем" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Датотека има постављен „setuid“ или „setgid“ бит, прескачем" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Датотека има постављен лепљиви бит, прескачем" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Улазна датотека има више од једне чврсте везе, прескачем" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Празан назив датотеке, прескачем" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Грешка повраћаја заставица стања на стандардни улаз: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Грешка добављања заставица стања датотеке са стандардног излаза: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Грешка повраћаја заставице „O_APPEND“ на стандардни излаз: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Затварање датотеке није успело: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Премотавање није успело приликом покушаја прављења оскудне датотеке: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Грешка читања: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Грешка приликом претраге датотеке: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Неочекиван крај датотеке" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Грешка писања: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Искључено" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 #, fuzzy #| msgid "Total amount of physical memory (RAM): " msgid "Amount of physical memory (RAM):" msgstr "Укупна количина физичке меморије (RAM): " -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 #, fuzzy #| msgid "Memory usage limit for decompression: " msgid "Multi-threaded decompression:" msgstr "Ограничење коришћења меморије за распакивање: " -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 #, fuzzy #| msgid "Memory usage limit reached" msgid "Memory usage limits:" msgstr "Ограничење коришћења меморије је достигнуто" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "" -#: src/xz/list.c:69 +#: src/xz/list.c:70 #, fuzzy #| msgid " Compressed size: %s\n" msgid "Compressed size:" msgstr " Величина сажетог: %s\n" -#: src/xz/list.c:70 +#: src/xz/list.c:71 #, fuzzy #| msgid " Uncompressed size: %s\n" msgid "Uncompressed size:" msgstr " Величина несажетог: %s\n" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "" -#: src/xz/list.c:73 +#: src/xz/list.c:74 #, fuzzy #| msgid " Stream padding: %s\n" msgid "Stream Padding:" msgstr " Попуна тока: %s\n" -#: src/xz/list.c:74 +#: src/xz/list.c:75 #, fuzzy #| msgid " Memory needed: %s MiB\n" msgid "Memory needed:" msgstr " Потребна меморија: %s MiB\n" -#: src/xz/list.c:75 +#: src/xz/list.c:76 #, fuzzy #| msgid " Sizes in headers: %s\n" msgid "Sizes in headers:" msgstr " Величине у заглављима: %s\n" -#: src/xz/list.c:78 +#: src/xz/list.c:79 #, fuzzy #| msgid " Number of files: %s\n" msgid "Number of files:" msgstr " Број датотека: %s\n" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "" -#: src/xz/list.c:128 +#: src/xz/list.c:129 #, fuzzy #| msgid "Totals:" msgid "TotalSize" msgstr "Укупно:" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "" @@ -482,7 +444,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Ништа" @@ -490,60 +452,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Незнано-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Незнано-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Незнано-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Незнано-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Незнано-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Незнано-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Незнано-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Незнано-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Незнано-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Незнано-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Незнано-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Незнано-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Датотека је празна" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Премало је да би било исправна „.xz“ датотека" @@ -552,26 +514,26 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Токови Блокови Запаковано Распаковано Однос Провера Датотека" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Да" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Не" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Најмање издање XZ помагала: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" @@ -579,19 +541,15 @@ msgstr[1] "%s датотеке\n" msgstr[2] "%s датотека\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Укупно:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "„--list“ ради само над „.xz“ датотекама (--format=xz или --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "„--list“ не подржава читање са стандардног улаза" @@ -606,16 +564,15 @@ msgstr "%s: Неочекивани крај улаза приликом читања назива датотека" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: Нађох ништаван знак приликом читања назива датотека; можта сте хтели да користите „--files0“ уместо „--files“?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Запакивање и распакивање са „--robot“ није још подржано." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Не могу да читам податке са стандардног улаза приликом читања назива датотека са стандардног улаза" @@ -623,69 +580,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Унутрашња грешка (бубица)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Не могу да успоставим руковаоце сигналом" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Нема провере целовитости; не проверавам целовитост датотеке" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Неподржана врста провере целовитости; не проверавам целовитост датотеке" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Ограничење коришћења меморије је достигнуто" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Није препознат формат датотеке" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Неподржане опције" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Запаковани подаци су оштећени" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Неочекиван крај улаза" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB меморије је потребно. Ограничавач је онемогућен." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB меморије је потребно. Ограничење је %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Ланац филтера: %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Пробајте „%s --help“ за више података." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -696,15 +652,15 @@ "Пакује или распакује ДАТОТЕКЕ у „.xz“ формату.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Обавезни аргументи за дуге опције су такође обавезни и за кратке опције.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Режим рада:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -716,7 +672,7 @@ " -t, --test тестира целовитост запаковане датотеке\n" " -l, --list исписује податке о „.xz“ датотекама" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -724,7 +680,7 @@ "\n" " Измењивачи рада:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -735,7 +691,7 @@ " (рас)запакивања\n" " -c, --stdout пише на стандардни излаз и не брише улазне датотеке" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -743,18 +699,10 @@ " --single-stream распакује само први ток, и тихо\n" " занемарује могуће преостале улазне податке" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -768,7 +716,7 @@ " завршавати знаком новог реда\n" " --files0[=ДТТКА] као „--files“ али користи празан знак као завршни" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -776,7 +724,7 @@ "\n" " Основне опције формата датотеке и запакивања:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 #, fuzzy #| msgid "" #| " -F, --format=FMT file format to encode or decode; possible values are\n" @@ -785,9 +733,9 @@ #| " `crc32', `crc64' (default), or `sha256'" msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=ФМТ формат датотеке за кодирање и декодирање; могуће\n" " вредности су „auto“ (основно), „xz“, „lzma“,\n" @@ -795,13 +743,13 @@ " -C, --check=ПРОВЕРА врста провере целовитости: „none“ (користите уз\n" " опрез), „crc32“, „crc64“ (основно), или „sha256“" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr "" " --ignore-check не потврђује проверу целовитости приликом\n" " распакивања" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -810,7 +758,7 @@ " обзир коришћење меморије запакивања *и* распакивања\n" " пре него ли употребите 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -819,20 +767,16 @@ " времена процесора; не утиче на потребе меморије\n" " распакивача" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=БР користи највише БР нити; основно је 1; поставите\n" " на 0 за коришћење онолико нити колико има\n" " процесорских језгара" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -843,24 +787,17 @@ " бајта улаза; користите ово да поставите величину\n" " блока за нитирано запакивање" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=ВЕЛИЧИНА\n" " започиње нови „.xz“ блок након датих зарезом\n" " раздвојених периода незапакованих података" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -873,7 +810,7 @@ " читања још улаза блокираће, сви подаци на чекању се\n" " истискују ван" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, fuzzy, no-c-format #| msgid "" #| " --memlimit-compress=LIMIT\n" @@ -897,7 +834,7 @@ " запакивање, распакивање, или оба; ОГРАНИЧЕЊЕ је у\n" " бајтовима, % o РАМ, или 0 за основно" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -906,7 +843,7 @@ " коришћења меморије, даје грешку уместо дотеривања\n" " подешавања" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -915,26 +852,6 @@ " Произвољни ланац филтера за запакивање (алтернатива за коришћење\n" " претподешавања):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -987,7 +904,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -1002,7 +918,7 @@ " start=БРОЈ померај почетка за претварања\n" " (основно=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -1015,7 +931,7 @@ " dist=БРОЈ растојање између бајтова који су\n" " одузети из свих других (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -1023,7 +939,7 @@ "\n" " Остале опције:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -1032,17 +948,17 @@ " грешке такође\n" " -v, --verbose бива опширан; наведите два пута за још опширније" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn чини да упозорења не делују на стање излаза" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot користи поруке обрадиве рачунаром\n" " (корисно за скрипте)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1050,7 +966,7 @@ " --info-memory приказује укупан износ РАМ-а и тренутно активна\n" " ограничења коришћења меморије, и излази" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1059,7 +975,7 @@ " опције)\n" " -H, --long-help приказује ову дугу помоћ и излази" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1068,12 +984,11 @@ " -H, --long-help приказује дугу помоћ (исписује такође и напредне\n" " опције)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version приказује број издања и излази" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1085,133 +1000,94 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Грешке пријавите на <%s> (на енглеском или финском).\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "„%s“ матична страница: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "ОВО ЈЕ РАЗВОЈНО ИЗДАЊЕ И НИЈЕ НАМЕЊЕНО ЗА ПРОФЕСИОНАЛНУ УПОТРЕБУ." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Неподржан ланац филтера или опције филтера" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Опције морају бити парови „name=value“ раздвојени зарезима" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Неисправан назив опције" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Неисправна вредност опције" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Неподржано претподешавање „LZMA1/LZMA2“: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Збир „lc“ и „lp“ не сме премашити 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Назив датотеке има непознат суфикс, прескачем" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Датотека већ има суфикс „%s“, прескачем" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Неисправан суфикс назива датотеке" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Вредност није не-негативан децимални цео број" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Неисправан суфикс умножавача" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Исправни суфикси су KiB (2^10), MiB (2^20), и GiB (2^30)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Вредност опције „%s“ мора бити у опсегу [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Запаковани подаци се не могу читати из терминала" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Запаковани подаци се не могу писати на терминал" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s: Премало је да би било исправна „.xz“ датотека" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Писање на стандардни излаз није успело" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Непозната грешка" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Нисам успео да укључим безбедно окружење" - #~ msgid "Memory usage limit for compression: " #~ msgstr "Ограничење коришћења меморије за запакивање: " Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/sv.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/sv.gmo differ diff -Nru xz-utils-5.6.0/po/sv.po xz-utils-5.6.1+really5.4.5/po/sv.po --- xz-utils-5.6.0/po/sv.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/sv.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,20 +1,15 @@ -# SPDX-License-Identifier: 0BSD -# -# Swedish translation for xz. -# Copyright (C) The XZ Utils authors and contributors -# This file is published under the BSD Zero Clause License. -# +# Swedish messages for xz. +# This file is put in the public domain. # Sebastian Rasmussen , 2019. -# Luna Jernberg , 2022, 2023, 2024. -# Anders Jonsson , 2024. +# Luna Jernberg , 2022, 2023. # msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-15 21:37+0100\n" -"Last-Translator: Anders Jonsson \n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-19 20:25+0200\n" +"Last-Translator: Luna Jernberg \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -22,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Poedit 3.3.2\n" "X-Poedit-Bookmarks: -1,10,-1,-1,-1,-1,-1,-1,-1,-1\n" #: src/xz/args.c:77 @@ -35,164 +30,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: För många argument till --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "I --block-list saknas blockstorlek efter filterkedjenummer ”%c:”" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 kan endast användas som det sista elementet i --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Okänd filformatstyp" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Integritetskontrolltyp stöds inte" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Endast en fil kan anges med ”--files” eller ”--files0”." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Miljövariabeln %s innehåller för många argument" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Komprimeringsstöd inaktiverades vid byggtid" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Dekomprimeringsstöd inaktiverades vid byggtid" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Komprimering av lzip-filer (.lz) stöds inte" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "--block-list ignoreras såvida du inte komprimerar till .xz-formatet" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" -msgstr "Med --format=raw krävs --suffix=.SUF om data inte skrivs till standard ut" +msgstr "Med --format=raw, --suffix=.SUF krävs om data inte skrivs till standard ut" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Maximalt antal filter är fyra" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Fel i flagga för --filters%s=FILTER:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Begränsning av minnesanvändning är allt för låg för den angivna filteruppsättningen." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "filterkedja %u används av --block-list men inte specificerad med --filters%u=" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Det avråds från att använda en förinställning i rått läge." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "De exakta flaggorna för förinställningar kan variera mellan programversioner." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Formatet .lzma har endast stöd för LZMA1-filtret" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 kan inte användas tillsammans med .xz-formatet" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "Filterkedja %u är inkompatibel med --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "Filterkedjan är inkompatibel med --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Växlar till entrådsläge på grund av --flush-timeout" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Flaggor som inte stöds i filterkedjan %u" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Använder upp till % trådar." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Filterkedja eller filterflaggor stöds inte" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Dekomprimering kommer att kräva %s MiB minne." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Reducerade antalet trådar från %s till %s för att inte överstiga begränsningen av minnesanvändning på %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "Reducerade antalet trådar från %s till en. Den automatiska minnesanvändningsgränsen på %s MiB överskrids fortfarande. %s MiB minne krävs. Fortsätter i alla fall." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Ändrar till enkeltrådat läge för att inte överskrida minnesanvändningsgränsen på %s MiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Justerade storlek för LZMA%c-lexikon från %s MiB till %s MiB för att inte överstiga begränsningen av minnesanvändning på %s MiB" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Justerade storlek för LZMA%c-lexikon för --filters%u från %s MiB till %s MiB för att inte överskrida minnesanvändningsgränsen på %s MiB" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Fel vid ändring till filterkedja %u: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Fel vid skapande av rörledning: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Misslyckades med att aktivera sandlådan" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() misslyckades: %s" @@ -207,252 +170,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Filen verkar ha flyttats, tar inte bort" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Kan inte ta bort: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Kan inte sätta filägaren: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Kan inte sätta filgruppen: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Kan inte sätta filrättigheterna: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Fel vid hämtning av filstatusflaggor från standard in: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Är en symbolisk länk, hoppar över" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Är en katalog, hoppar över" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Är inte en vanlig fil, hoppar över" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Filen har setuid- eller setgid-biten satt, hoppar över" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Filen har stickybiten satt, hoppar över" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Indatafilen har mer än en hårdlänk, hoppar över" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Tomt filnamn, hoppar över" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Fel vid återställning av statusflaggorna för standard in: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Fel vid hämtning av filstatusflaggorna från standard ut: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Fel vid återställning av O_APPEND-flaggan till standard ut: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Stängning av filen misslyckades: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Sökning misslyckades vid skapande av gles fil: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Läsfel: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Fel vid sökning i fil: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Oväntat filslut" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Skrivfel: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Inaktiverad" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Totalt mängd fysiskt minne (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Antal processortrådar:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Komprimering:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Dekomprimering:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Flertrådad dekomprimering:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Standard för -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Hårdvaruinformation:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Minnesanvändningsgränser:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Strömmar:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Block:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Komprimerad storlek:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Okomprimerad storlek:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Förhållande:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Kontroll:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Strömfyllnad:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Minne som behövs:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Storlek i huvuden:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Antal filer:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Ström" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Block" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Block" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "Komprimerad position" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "Okomprimerad position" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "Komprimerad storlek" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "Okomprimerad storlek" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "Total storlek" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Förhållande" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Kontroll" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "Kontrollvärde" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Fyllnad" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Huvud" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Flaggor" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "Minnesanvändning" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Filters" @@ -460,7 +423,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Ingen" @@ -468,107 +431,103 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Okänd-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Okänd-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Okänd-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Okänd-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Okänd-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Okänd-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Okänd-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Okänd-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Okänd-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Okänd-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Okänd-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Okänd-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Fil är tom" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" -msgstr "%s: För liten för att vara en giltig .xz-fil" +msgstr "%s: För lite för att vara en giltig xz-fil" #. TRANSLATORS: These are column headings. From Strms (Streams) #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Strmr Block Komprimerd Okomprimerd Förh. Kntrll Filnamn" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Ja" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Nej" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Minsta XZ Utils-version: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s fil\n" msgstr[1] "%s filer\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Total:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list fungerar endast med .xz-filer (--format=xz eller --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Pröva ”lzmainfo” med .lzma-filer." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list saknar stöd för att läsa från standard in" @@ -584,14 +543,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" -msgstr "%s: Nulltecken hittades vid läsning av filnamn; kanske du menade att använda ”--files0” istället för ”--files”?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" +msgstr "%s: Null-tecken hittat vid läsning av filnamn; kanske menade du att använda ”--files0” istället för ”--files”?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Komprimering och dekomprimering med --robot stöds inte än." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Kan inte läsa data från standard in när filnamn läses från standard in" @@ -599,68 +558,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Internt fel" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Kan inte etablera signalhanterare" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Ingen integritetskontroll; kan inte verifiera filintegritet" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Typ av integritetskontroll stöds inte; verifierar inte filintegritet" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Begränsning av minnesanvändning uppnådd" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Filformat okänt" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Flaggor stöds inte" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Komprimerad data är korrupt" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Oväntat avslut av indata" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB minne krävs. Begränsaren inaktiverad." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB minne krävs. Begränsningen är %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Filterkedja: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." -msgstr "Testa ”%s --help” för mer information." +msgid "Try `%s --help' for more information." +msgstr "Prova ”%s --help” för vidare information." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -671,15 +630,15 @@ "Komprimera eller dekomprimera FILer i .xz-formatet.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Nödvändiga argument till långa flaggor är också nödvändiga för korta flaggor.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Operationsläge:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -691,7 +650,7 @@ " -t, --test testa integritet för komprimerad fil\n" " -l, --list lista information om .xz-filer" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -699,7 +658,7 @@ "\n" " Operationsmodifierare:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -710,7 +669,7 @@ " länkar\n" " -c, --stdout skriv till standard ut och ta inte bort indatafiler" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -718,10 +677,10 @@ " --single-stream dekomprimera endast den första strömmen och hoppa\n" " tyst över eventuellt återstående indata" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -734,7 +693,7 @@ " filnamn måste avslutas med nyradstecken\n" " --files0[=FIL] som --files men null-tecknet måste användas" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -742,23 +701,23 @@ "\n" " Grundläggande filformat och komprimeringsflaggor:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=FMT filformat att koda eller avkoda; möjliga värden är\n" " ”auto” (standard), ”xz”, ”lzma”, ”lzip” och ”raw”\n" " -C, --check=CHECK typ av integritetskontroll: ”none” (använd med\n" " försiktighet), ”crc32”, ”crc64” (standard), eller ”sha256”" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check verifiera inte integritet vid dekomprimering" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -767,7 +726,7 @@ " minnesanvändning för komprimerare *och* dekomprimerare\n" " i beaktande innan du använder 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -776,15 +735,16 @@ " använda mer CPU-tid; påverkar inte minnesanvändning för\n" " dekomprimerare" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" -" -T, --threads=NUM använd högst NUM trådar; standard är 0 vilket använder\n" -" lika många trådar som det finns processorkärnor" +" -T, --threads=NUM använd som mest NUM trådar; standard är 1; sätt till 0\n" +" för att använda så många trådar som det finns\n" +" processorkärnor" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -795,21 +755,17 @@ " använd detta för att sätta blockstorleken för trådad\n" " komprimering" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" -msgstr "" -" --block-list=BLOCK\n" -" starta ett nytt .xz-block efter de givna\n" -" kommaseparerade intervallen av okomprimerad data;\n" -" ange valfritt ett filterkedjenummer (0-9) följt av ett\n" -" ”:” före den okomprimerade datastorleken" +" intervals of uncompressed data" +msgstr "" +" --block-list=STORLEKAR\n" +" påbörja ett nytt .xz-block efter de angivna\n" +" komma-separerade intervallen av okomprimerad data" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -822,7 +778,7 @@ " mer indata skulle blockera, så kommer all väntande data\n" " att spolas ut" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -841,7 +797,7 @@ " dekomprimering, trådad dekomprimering, eller alla av\n" " dessa; BEGR är i byte, % RAM, eller 0 för standardvärden" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -850,7 +806,7 @@ " minnesanvändning, ge ett fel istället för att justera ner\n" " inställningarna" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -859,36 +815,6 @@ " Anpassad filterkedja för komprimering (alternativ till att använda\n" " förinställningar):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=FILTER ställ in filterkedjan med syntax för\n" -" liblzma-filtersträngar; använd --filters-help för\n" -" mer information" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=FILTER ... --filters9=FILTER\n" -" ställ in ytterligare filterkedjor som använder\n" -" syntax för liblzma-filtersträngar att\n" -" använda med --block-list" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help visa mer information om syntax för\n" -" liblzma-filtersträngar och avsluta." - #: src/xz/message.c:1067 msgid "" "\n" @@ -930,7 +856,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -939,15 +864,14 @@ " --arm[=FLAGGOR] ARM BCJ-filter\n" " --armthumb[=FLAGGOR] ARM-Thumb BCJ-filter\n" " --arm64[=FLAGGOR] ARM64 BCJ-filter\n" -" --powerpc[=FLAGGOR] PowerPC BCJ-filter (endast big endian)\n" +" --powerpc[=FLAGGOR] PowerPC BCJ-filter (endast rak byteordning)\n" " --ia64[=FLAGGOR] IA-64 (Itanium) BCJ-filter\n" " --sparc[=FLAGGOR] SPARC BCJ-filter\n" -" --riscv[=FLAGGOR] RISC-V BCJ-filter\n" " Giltiga FLAGGOR för alla BCJ-filter:\n" -" start=NUM startposition för\n" -" konverteringar (standard=0)" +" start=NUM startposition för konverteringar\n" +" (standard=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -959,7 +883,7 @@ " dist=NUM avstånd mellan byte som subtraheras\n" " från varandra (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -967,7 +891,7 @@ "\n" " Andra flaggor:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -976,17 +900,17 @@ " undertrycka fel\n" " -v, --verbose var utförlig; ange två gånger för än mer utförlig" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn låt inte varningar påverka avslutningsstatus" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot använd maskintolkningsbara meddelanden\n" " (användbara för skript)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -994,7 +918,7 @@ " --info-memory visa den totala mängden RAM och den för närvarande aktiva\n" " begränsningen av minnesanvändning och avsluta" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1003,7 +927,7 @@ " flaggorna)\n" " -H, --long-help visar denna långa hjälp av avsluta" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1012,12 +936,11 @@ " -H, --long-help visa den långa hjälpen (listar också de avancerade\n" " flaggorna)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version visa versionsnumret och avsluta" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1029,132 +952,96 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" -"Rapportera fel till <%s> (på engelska eller finska).\n" -"Rapportera översättningsfel till \n" +"Rapportera buggar till <%s> (på engelska eller finska).\n" +"Rapportera översättningsfel till tp-sv@listor.tp-sv.se\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s webbsida: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "DETTA ÄR EN UTVECKLINGSVERSION SOM INTE ÄR AVSEDD FÖR PRODUKTIONSANVÄNDNING." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"Filterkedjor ställs in med flaggorna --filters=FILTER eller\n" -"--filters1=FILTER ... --filters9=FILTER. Varje filter i kedjan kan\n" -"separeras med mellanslag eller ”--”. Alternativt kan en förinställning\n" -"<0-9>[e] anges istället för en filterkedja.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "Filtren som stöds och flaggorna för dem är:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Flaggor måste vara ”namn=värde”-par separerade med kommatecken" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Ogiltigt flaggnamn" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Ogiltigt flaggvärde" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "LZMA1/LZMA2-förinställning stöds inte: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Summan av lc och lp får inte överstiga 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Filnamn har okänd filändelse, hoppar över" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" -msgstr "%s: Filen har redan ändelsen ”%s”, hoppar över" +msgid "%s: File already has `%s' suffix, skipping" +msgstr "%s: Fil har redan ”%s”-ändelse, hoppar över" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Ogiltig filnamnsändelse" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Värdet är inte ett icke-negativt, decimalt heltal" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Ogiltig multipeländelse" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." -msgstr "Giltiga suffix är ”KiB” (2^10), ”MiB” (2^20) och ”GiB” (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." +msgstr "Giltiga ändelser är ”KiB” (2^10), ”MiB” (2^20) och ”GiB” (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Värdet för flaggan ”%s” måste vara inom intervallet [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Komprimerad data kan inte läsas från en terminal" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Komprimerad data kan inte skrivas till en terminal" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Användning: %s [--help] [--version] [FIL]…\n" -"Visa information som lagrats i .lzma-filhuvudet" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "Filen är för liten för att vara en giltig .lzma-fil" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "Inte en .lzma-fil" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Skrivning till standard ut misslyckades" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Okänt fel" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Misslyckades med att aktivera sandlådan" - #~ msgid "The selected match finder requires at least nice=%" #~ msgstr "Den valda matchningshittaren kräver åtminstone nice=%" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/tr.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/tr.gmo differ diff -Nru xz-utils-5.6.0/po/tr.po xz-utils-5.6.1+really5.4.5/po/tr.po --- xz-utils-5.6.0/po/tr.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/tr.po 2023-11-01 12:27:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: xz 5.4.0-pre2\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2022-12-05 19:00+0300\n" "Last-Translator: Emir SARI \n" "Language-Team: Turkish \n" @@ -29,173 +29,135 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: --block-list için çok fazla argüman" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0, yalnızca --block-list içindeki son öge olarak kullanılabilir" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Bilinmeyen dosya biçimi türü" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Desteklenmeyen bütünlük denetimi türü" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "'--files' veya '--files0' ile yalnızca bir dosya belirtilebilir." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s: " -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Çevre değişkeni %s, pek fazla argüman içeriyor" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Sıkıştırma desteği, yapım sırasında devre dışı bırakıldı" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Sıkıştırma açma desteği, yapım sırasında devre dışı bırakıldı" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "lzip dosyalarının (.lz) sıkıştırılması desteklenmiyor" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 #, fuzzy #| msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: --format-raw ile, stdout'a yazılmıyorsa --suffix=.SUF gereklidir" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Olabilecek en çok süzgeç sayısı dörttür" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Verilen süzgeç ayarı için bellek kullanım sınırı pek düşük." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Ham kipte bir önayar kullanımı önerilmez." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Önayarların kesin seçenekleri yazılım sürümleri arasında ayrım gösterebilir." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr ".lzma biçimi, yalnızca LZMA1 süzgecini destekler" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1, .xz biçimi ile birlikte kullanılamaz" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "Süzgeç zinciri, --flush-timeout ile uyumsuz" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "--flush-timeout nedeniyle tek iş parçacıklı kipe geçiliyor" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "Desteklenmeyen seçenekler" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "En çok % iş parçacığı kullanılıyor." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Desteklenmeyen süzgeç zinciri veya süzgeç seçenekleri" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Sıkıştırma açma, %s MiB belleğe gereksinim duyacak." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "%3$s MiB bellek kullanımı sınırını aşmamak için iş parçacığı sayısı %1$s -> %2$s olarak ayarlandı" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "İş parçacıklarının sayısı %s -> 1 olarak azaltıldı. %s MiB otomatik bellek sınırı hâlâ aşılıyor. %s MiB belleğe gereksinim var. Yine de sürdürülüyor." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "%s MiB bellek kullanım sınırını aşmamak için tek iş parçacıklı kipe geçiliyor" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "%4$s MiB bellek kullanımı sınırını aşmamak için LZMA%1$c sözlük boyutu %2$s MiB'tan %3$s MiB'a ayarlandı" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "%4$s MiB bellek kullanımı sınırını aşmamak için LZMA%1$c sözlük boyutu %2$s MiB'tan %3$s MiB'a ayarlandı" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "Veriyolu oluştururken hata: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Veriyolu oluştururken hata: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Kum havuzu etkinleştirilemedi" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: poll() başarısız oldu: %s" @@ -210,252 +172,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Dosya taşınmış gibi görünüyor, kaldırılmıyor" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Kaldırılamıyor: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Dosya sahibi ayarlanamıyor: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Dosya grubu ayarlanamıyor: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Dosya izinleri ayarlanamıyor: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Standart girdi'den dosya durum bayrakları alınırken hata: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Bir sembolik bağ, atlanıyor" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Bir dizin, atlanıyor" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Olağan bir dosya değil, atlanıyor" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Dosyanın setuid'si veya setgid biti ayarlanmış, atlanıyor" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Dosyanın yapışkan bit seti var, atlanıyor" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Girdi dosyasında birden çok sabit bağ var, atlanıyor" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Boş dosya adı, atlanıyor" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Standart girdi'ye durum bayrakları geri yüklenirken hata: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Standart çıktı'dan dosya durum bayrakları alınırken hata: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Standart çıktı'dan O_APPEND bayrağı geri yüklenirken hata: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Dosyayı kapatma başarısız: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Bir aralıklı dosya oluşturmaya çalışırken arama başarısız: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Okuma hatası: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Dosyayı ararken hata: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Dosyanın beklenmedik sonu" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Yazma hatası: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Devre dışı" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Fiziksel bellek miktarı (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "İşlemci iş parçacığı sayısı:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Sıkıştırma:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Sıkıştırma açma:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Çok iş parçacıklı sıkıştırma açma:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "-T0 için öntanımlı:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Donanım bilgisi:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Bellek kullanım sınırları:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Akışlar:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Bloklar:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Sıkıştırılmış boyut:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Sıkıştırılmamış boyut:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Oran:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Denetim:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Akış dolgusu:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Gereken bellek:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Üstbilgideki boyut:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Dosya sayısı:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Akış" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Blok" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Bloklar" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "SkştrOfseti" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "SkştrmmşOfset" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "SkştrBoyut" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "SkştrmmşBoyut" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "ToplamBoyut" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Oran" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Denetim" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "DğrDentm" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Dolgu" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Üstveri" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Bayrak" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "BelKullnm" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Süzgeçler" @@ -463,7 +425,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Yok" @@ -471,60 +433,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "?-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "?-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "?-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "?-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "?-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "?-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "?-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "?-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "?-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "?-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "?-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "?-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Dosya boş" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Geçerli bir .xz dosyası olabilmek için pek küçük" @@ -533,45 +495,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " Akış Blok Sıkıştırıl. Sıkıştırmas. Oran Denetim Dosya ad" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Evet" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Hayır" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " En düşük XZ Utils sürümü: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s dosya\n" msgstr[1] "%s dosya\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Toplamlar:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list, yalnızca .xz dosyalarında çalışır (--format=xz veya --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list, standart girdi'den okumayı desteklemez" @@ -586,16 +544,15 @@ msgstr "%s: Dosya adları okunurken beklenmedik girdi sonu" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: Dosya adları okunurken boş karakter bulundu; '--files' yerine '--files0' mı demek istediniz?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "--robot ile sıkıştırma ve sıkıştırma açma henüz desteklenmiyor." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Standart girdi'den dosya adları okunurken standart girdi'den veri okunamıyor" @@ -603,69 +560,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "İç hata (yazılım hatası)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Sinyal işleyicileri tesis edilemiyor" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Bütünlülük denetimi yok; dosya bütünlüğü doğrulanmıyor" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Desteklenmeyen bütünlülük denetimi türü; dosya bütünlüğü doğrulanmıyor" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Bellek kullanım sınırına erişildi" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Dosya biçimi tanımlanamıyor" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Desteklenmeyen seçenekler" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Sıkıştırılmış veri hasarlı" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Beklenmedik girdi sonu" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "%s MiB bellek gerekiyor. Sınırlandırıcı devre dışı bırakıldı." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB bellek gerekiyor. Sınır, %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Süzgeç zinciri: %s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "Daha fazla bilgi için '%s --help' deneyin." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -676,15 +632,15 @@ ".xz biçimindeki dosyaları sıkıştırın veya sıkıştırmasını açın.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Uzun seçenekler için zorunlu olan argümanlar kısa seçenekler için de geçerlidir.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " İşlem kipi:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -696,7 +652,7 @@ " -t, --test sıkıştırılmış dosya bütünlüğünü sına\n" " -l, --list .xz dosyaları hakkında bilgi listele" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -704,7 +660,7 @@ "\n" " İşlem değiştiricileri:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -715,7 +671,7 @@ " sıkıştır/sıkıştırmayı aç\n" " -c, --stdout standart çıktıya yaz ve girdi dosyalarını silme" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -723,18 +679,10 @@ " --single-stream yalnızca ilk akışın sıkıştırmasını aç ve sessizce\n" " kalan girdi verisini yok say" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -748,7 +696,7 @@ " --files0[=DSYA] --files gibi; ancak sonlandırıcı olarak null karakteri\n" " kullan" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -756,18 +704,12 @@ "\n" " Temel dosya biçimi ve sıkıştırma seçenekleri:\n" -#: src/xz/message.c:988 -#, fuzzy -#| msgid "" -#| " -F, --format=FMT file format to encode or decode; possible values are\n" -#| " `auto' (default), `xz', `lzma', `lzip', and `raw'\n" -#| " -C, --check=CHECK integrity check type: `none' (use with caution),\n" -#| " `crc32', `crc64' (default), or `sha256'" +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=BÇM kodlanacak veya kodu çözülecek dosya biçimi; olası\n" " değerler: `auto' (öntanımlı), `xz', `lzma', 'lzip'\n" @@ -775,11 +717,11 @@ " -C, --check=DNTLE bütünlük denetimi türü: `none' (dikkatli kullanın),\n" " `crc32', `crc64' (öntanımlı) veya `sha256'" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check sıkıştırma açarken bütünlük denetimini doğrulama" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -787,7 +729,7 @@ " -0 ... -9 sıkıştırma önayarı; öntanımlı 6; 7-9 kullanmadan önce\n" " sıkıştırma açıcı bellek kullanımını hesaba katın!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -796,20 +738,16 @@ " iyileştirmeye çalış; sıkıştırma açıcı bellek\n" " gereksinimlerini etkilemez" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=SAYI en çok SAYI iş parçacığı kullan; öntanımlı 1; var olan\n" " işlemci çekirdeği kadar iş parçacığı kullanmak için\n" " 0'a ayarlayın" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -820,24 +758,17 @@ " iş parçacığı kullanan sıkıştırma için blok boyutunu\n" " ayarlamak için bunu kullanın" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=BOYUTLAR\n" " sıkıştırılmamış verinin virgülle ayrılmış verilen\n" " aralıklarından sonra yeni bir .xz bloku başlat" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -849,7 +780,7 @@ " milisaniye geçmişse ve daha çok girdi okuma bloklarsa\n" " tüm bekleyen veri floşlanır" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -868,7 +799,7 @@ " açma veya tümü için bellek kullanımı sınırını ayarla;\n" " LİMİT, bayt, RAM % veya öntanımlılar için 0'dır" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -876,7 +807,7 @@ " --no-adjust sıkıştırma ayarları bellek kullanımı sınırını aşarsa\n" " ayarı aşağı doğru düzeltmek yerine bir hata ver" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -884,26 +815,6 @@ "\n" " Sıkıştırma için özel süzgeç zinciri (önayar kullanımı alternatifi):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -934,18 +845,6 @@ " depth=NUM en büyük arama derinliği; 0=oto (öntanımlı)" #: src/xz/message.c:1082 -#, fuzzy -#| msgid "" -#| "\n" -#| " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" -#| " --arm[=OPTS] ARM BCJ filter\n" -#| " --armthumb[=OPTS] ARM-Thumb BCJ filter\n" -#| " --arm64[=OPTS] ARM64 BCJ filter\n" -#| " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" -#| " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" -#| " --sparc[=OPTS] SPARC BCJ filter\n" -#| " Valid OPTS for all BCJ filters:\n" -#| " start=NUM start offset for conversions (default=0)" msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -955,7 +854,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -970,7 +868,7 @@ " Tüm BCJ süzgeçleri için geçerli SÇNKLR:\n" " start=NUM dönüşümler başlangıç ofseti (öntanımlı=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -983,7 +881,7 @@ " dist=NUM birbirinden çırakılar baytlar arasındaki\n" " uzaklık (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -991,7 +889,7 @@ "\n" " Diğer seçenekler:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -1000,17 +898,17 @@ " belirt\n" " -v, --verbose ayrıntılı ol; daha da çok ayrıntı için iki kez belirt" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn uyarıların çıkış durumunu etkilemesine izin verme" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot makine-ayrıştırılabilir iletiler kullan (betikler için\n" " yararlı)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1018,7 +916,7 @@ " --info-memory toplam RAM miktarını ve şu anki bellek kullanımı\n" " sınırlarını görüntüle ve çık" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1026,7 +924,7 @@ " -h, --help kısa yardımı görüntüle (temel seçenekleri listeler)\n" " -H, --long-help bu uzun yardımı görüntüle ve çık" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1034,12 +932,11 @@ " -h, --help bu kısa yardımı görüntüle ve çık\n" " -H, --long-help uzun yardımı görüntüle (gelişmiş seçenekleri listeler)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version sürüm numarasını görüntüle ve çık" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1051,129 +948,90 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Hataları <%s> adresine bildirin (İngilizce veya Fince).\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfası: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "BU, NORMAL KULLANIM İÇİN OLMAYAN BİR GELİŞTİRME SÜRÜMÜDÜR." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "Desteklenmeyen süzgeç zinciri veya süzgeç seçenekleri" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: Seçenekler, virgülle ayrılmış 'ad=değer' çiftleri olmalıdır" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Geçersiz seçenek adı" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Geçersiz seçenek değeri" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Desteklenmeyen LZMA1/LZMA2 önayarı: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "lc ve lp'nin toplamı 4'ü geçmemelidir" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Dosya adında bilinmeyen sonek var, atlanıyor" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Dosyada '%s' soneki halihazırda var, atlanıyor" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Geçersiz dosya adı soneki" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Değer, bir negatif olmayan ondalık tamsayı" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Geçersiz çoklayıcı soneki" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Geçerli sonekler: 'KiB' (2^10), 'MiB' (2^20) ve 'GiB' (2^30)." -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "'%s' seçeneği değeri erimde olmalıdır [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Bir uçbirimden sıkıştırılmış veri okunamaz" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Bir uçbirime sıkıştırılmış veri yazılamaz" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s: Geçerli bir .xz dosyası olabilmek için pek küçük" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Standart çıktı'ya yazma başarısız" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Bilinmeyen hata" - -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Kum havuzu etkinleştirilemedi" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/uk.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/uk.gmo differ diff -Nru xz-utils-5.6.0/po/uk.po xz-utils-5.6.1+really5.4.5/po/uk.po --- xz-utils-5.6.0/po/uk.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/uk.po 2023-11-01 12:27:57.000000000 +0000 @@ -1,16 +1,13 @@ -# SPDX-License-Identifier: 0BSD -# # Ukrainian translation for xz. -# This file is published under the BSD Zero Clause License. -# Copyright (C) The XZ Utils authors and contributors +# This file is put in the public domain. # -# Yuri Chornoivan , 2019, 2022, 2023, 2024. +# Yuri Chornoivan , 2019, 2022, 2023. msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-15 17:26+0200\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-19 20:53+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -19,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "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 23.04.1\n" +"X-Generator: Lokalize 20.12.0\n" #: src/xz/args.c:77 #, c-format @@ -31,166 +28,134 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: забагато аргументів --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "У --block-list пропущено розмір блоку після номера ланцюжка фільтрів «%c:»" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 можна використовувати лише як останній елемент у --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: невідомий тип формату файлів" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: непідтримуваний тип перевірки цілісності" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Разом із параметрами --files або --files0 можна вказувати лише один файл." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "У змінній середовища %s міститься надто багато аргументів" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Підтримку стискання було вимкнено під час збирання програми" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Підтримку розпаковування було вимкнено під час збирання програми" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Підтримки стискання файлів lzip (.lz) не передбачено" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "--block-list буде проігноровано, якщо дані не стискаються до формату .xz" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "" "Якщо вказано --format=raw, слід вказати і --suffix=.SUF, якщо дані\n" "виводяться не до стандартного виведення" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Максимальна кількість фільтрів — чотири" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Помилка у параметрі --filters%s=ФІЛЬТРИ:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Обмеження на використання пам'яті є надто жорстким для вказаного налаштування фільтрів." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "у --block-list використано ланцюжок фільтрів %u, але його не вказано за допомогою --filters%u=" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Не варто користуватися визначенням рівня у режимі без обробки." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Точний перелік параметрів рівнів може залежати від версій програмного забезпечення." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "У форматі .lzma передбачено підтримку лише фільтра LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 не можна використовувати разом із визначенням формату .xz" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "Ланцюжок фільтрування %u є несумісним із параметром --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "Ланцюжок фільтрування є несумісним із параметром --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Перемикаємося на однопотоковий режим через використання --flush-timeout" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Непідтримувані параметри у ланцюжку фільтрів %u" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Використовуємо до % потоків обробки." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Непідтримуваний ланцюжок фільтрування або непідтримувані параметри фільтрування" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Для розпаковування знадобляться %s МіБ пам'яті." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Зменшено кількість потоків обробки з %s до %s, щоб не перевищувати обмеження щодо використання пам'яті у %s МіБ" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "Кількість потоків обробки зменшено з %s до одного. Автоматичне обмеження використання пам'яті у %s МіБ усе ще перевищено. Потрібно %s МіБ пам'яті. Продовжуємо роботу попри це." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Перемикаємося на однопотоковий режим, щоб не перевищувати обмеження щодо використання пам'яті у %s МіБ" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Скориговано розмір словника LZMA%c з %s МіБ до %s МіБ, щоб не перевищувати обмеження на використання пам'яті у %s МіБ" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Скориговано розмір словника LZMA%c для --filters%u з %s МіБ до %s МіБ, щоб не перевищувати обмеження на використання пам'яті у %s МіБ" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Помилка під час спроби перейти до ланцюжка фільтрів %u: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Помилка під час створення каналу: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Не вдалося увімкнути пісочницю" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: помилка poll(): %s" @@ -205,252 +170,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: здається, файл пересунуто; не вилучаємо" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: не вдалося вилучити: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: не вдалося встановити власника файла: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: не вдалося встановити групу власника файла: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: не вдалося встановити права доступу до файла: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Помилка під час спроби отримання прапорців стану файла зі стандартного джерела вхідних даних: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: є символічним посиланням; пропускаємо" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: є каталогом; пропускаємо" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: не є звичайним файлом; пропускаємо" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: для файла встановлено біт setuid або setgid; пропускаємо" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: для файла встановлено липкий біт; пропускаємо" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: виявлено декілька жорстких посилань на файл із вхідними даними; пропускаємо" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Порожня назва файла; пропускаємо" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Помилка під час спроби відновлення прапорців стану для стандартного джерела вхідних даних: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Помилка під час спроби отримання прапорців стану файла зі стандартного виведення: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Помилка під час спроби відновлення прапорця O_APPEND для стандартного виведення: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: не вдалося закрити файл: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: помилка позиціювання під час спроби створити розріджений файл: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: помилка читання: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: помилка позиціювання у файлі: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: неочікуваний кінець файла" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: помилка під час спроби запису: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Вимкнено" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Обсяг фізичної пам'яті (RAM): " -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Кількість потоків обробки процесором:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Стискання:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Розпакування:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Багатопотокове розпаковування:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Типове для -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Дані щодо обладнання:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Обмеження на використання пам'яті:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Потоки:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Блоки:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Стиснутий розмір:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Нестиснутий розмір:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Пропорція:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Перевірка:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Доповнення потоку:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Потрібний об'єм пам'яті:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Розмір у заголовках:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Кількість файлів:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Потік" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Блок" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Блоки" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "СтисЗсув" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "НестисЗсув" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "СтисРозмір" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "НестисРозмір" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "Загальний розмір" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Пропорція" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Перевірка" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "ЗначПерев" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Заповн" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Заголов" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Прапор" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "ВикПам" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Фільтри" @@ -458,7 +423,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Немає" @@ -466,60 +431,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "Невідомо-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "Невідомо-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "Невідомо-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "Невідомо-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "Невідомо-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "Невідомо-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "Невідомо-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "Невідом-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "Невідом-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "Невідом-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "Невідом-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "Невідом-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: файл порожній" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: є надто малим для коректного файла .xz" @@ -528,26 +493,26 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Потоки Блоки Стиснуті Нестиснуті Коеф. Перев. Назва файла" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Так" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Ні" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Мінімальна версія програм XZ: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" @@ -555,19 +520,15 @@ msgstr[1] "%s файли\n" msgstr[2] "%s файлів\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Загалом:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list працює лише для файлів .xz (--format=xz або --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Спробуйте «lzmainfo» із файлами .lzma." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "Використання --list скасовує підтримку читання зі стандартного джерела вхідних даних" @@ -583,14 +544,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s: під час читання назв файлів виявлено нуль-символ; можливо, ви хотіли скористатися --files0, а не --files?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "У поточній версії ще не передбачено підтримки стискання або розпаковування з параметром --robot." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Читання даних зі стандартного джерела вхідних даних неможливе, якщо зі стандартного джерела даних виконується читання назв файлів standard input" @@ -598,68 +559,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Внутрішня помилка (вада)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Не вдалося встановити обробники сигналів" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Немає перевірки цілісності; цілісність файлів перевірено не буде" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Непідтримуваний тип перевірки цілісності; перевірки цілісності виконано не буде" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Перевищено обмеження на використання пам'яті" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Формат файла не розпізнано" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Непідтримувані параметри" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Стиснені дані пошкоджено" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Несподіваний кінець вхідних даних" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "Потрібно %s МіБ пам'яті. Обмеження вимкнено." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Потрібно %s МіБ пам'яті. Маємо обмеження у %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: ланцюжок фільтрування: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." +msgid "Try `%s --help' for more information." msgstr "Спробуйте «%s --help» для отримання докладнішого опису." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -670,17 +631,17 @@ "Стиснути або розпакувати файли у форматі .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Обов’язкові аргументи для довгих форм запису параметрів є обов’язковими і для\n" "скорочених форм.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Режим роботи:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -692,7 +653,7 @@ " -t, --test перевірити цілісність стиснених файлів\n" " -l, --list вивести дані щодо файлів .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -700,7 +661,7 @@ "\n" " Модифікатори дій:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -712,7 +673,7 @@ " -c, --stdout записувати дані до стандартного виведення і не вилучати\n" " вхідні файли" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -720,10 +681,10 @@ " --single-stream розпакувати лише перший потік і без запитань\n" " ігнорувати решту вхідних даних" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -738,7 +699,7 @@ " --files0[=ФАЙЛ] подібний до --files, але список файлів завершується\n" " нуль-символом" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -746,23 +707,23 @@ "\n" " Базові параметри формату файлів і стискання:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=ФОРМАТ формат файлів для кодування або декодування; можливими\n" " є значення auto (типове), xz, lzma, lzip та raw\n" " -C, --check=ТИП тип перевірки цілісності: none («немає», будьте обережні),\n" " crc32, crc64 (типовий) або sha256" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check не виконувати перевірку цілісності при розпаковуванні" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -771,7 +732,7 @@ " параметри використання пам'яті для пакування і\n" " розпакування, перш ніж використовувати рівні 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -780,16 +741,17 @@ " процесора; не впливає на вимоги щодо пам'яті для\n" " розпаковування" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=N використовувати не більше N потоків; типовим є\n" -" значення 0, за якого програма використовує стільки\n" -" потоків, скільки є ядер у процесора" +" значення 1; встановіть значення 0, щоб програма\n" +" використовувала стільки потоків, скільки є ядер\n" +" у процесора" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -801,21 +763,17 @@ " встановлення розміру блоку для пакування у декілька\n" " потоків" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" -" --block-list=БЛОКИ\n" +" --block-list=РОЗМІРИ\n" " розпочинати нові блоки .xz після вказаних інтервалів\n" -" нестиснених даних; записи відокремлюються комами;\n" -" можна вказати номер ланцюжка фільтрів (0-9) із\n" -" завершальною «:» до розміру нестиснених даних" +" нестиснених даних; записи відокремлюються комами" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -828,7 +786,7 @@ " минуло більше за ЧАС_ОЧІКУВАННЯ мілісекунд, витерти\n" " усі дані у черзі" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -847,7 +805,7 @@ " або усіх режимів; ОБМЕЖЕННЯ слід вказувати у байтах,\n" " % RAM або вказати 0 (типове значення)" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -856,7 +814,7 @@ " обмежень на пам'ять, вивести помилку і не коригувати\n" " параметри" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -865,36 +823,6 @@ " Нетиповий ланцюжок фільтрування для стискання (альтернатива використання\n" " рівнів):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=ФІЛЬТРИ встановити ланцюжок фільтрів за допомогою синтаксису\n" -" рядків фільтрів liblzma; скористайтеся --filters-help,\n" -" щоб дізнатися більше" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=ФІЛЬТРИ ... --filters9=ФІЛЬТРИ\n" -" встановити додаткові ланцюжки фільтрів за допомогою\n" -" синтаксису рядків ланцюжка фільтрів liblzma для\n" -" використання з --block-list" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help вивести докладніші відомості щодо синтаксису рядків\n" -" liblzma і завершити роботу." - #: src/xz/message.c:1067 msgid "" "\n" @@ -936,7 +864,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -948,11 +875,10 @@ " --powerpc[=ПАРАМ] фільтр BCJ PowerPC (лише зворотний порядок байтів)\n" " --ia64[=ПАРАМ] фільтр BCJ IA-64 (Itanium)\n" " --sparc[=ПАРАМ] фільтр BCJ SPARC\n" -" --riscv[=ПАРАМ] фільтр BCJ RISC-V\n" " Коректні значення ПАРАМЕТРИ для усіх фільтрів BCJ:\n" " start=N початковий зсув для перетворень (типовий=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -964,7 +890,7 @@ " dist=N відстань між байтами, які віднімаються\n" " один від одного (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -972,7 +898,7 @@ "\n" " Інші параметри:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -982,17 +908,17 @@ " -v, --verbose режим докладних повідомлень; вкажіть двічі, щоб підвищити\n" " докладність" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn попередження не впливають на стан виходу" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot використовувати повідомлення для обробки комп'ютером\n" " (корисно для створення сценаріїв)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -1000,7 +926,7 @@ " --info-memory вивести загальні дані щодо оперативної пам'яті і поточних\n" " обмежень щодо її використання, потім завершити роботу" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1010,7 +936,7 @@ " -H, --long-help вивести це розширене довідкове повідомлення і завершити\n" " роботу" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1019,12 +945,11 @@ " -H, --long-help показати розгорнуту довідку (із усіма додатковими\n" " параметрами)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version вивести дані щодо версії програми і завершити роботу" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1037,128 +962,133 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Сповіщайте розробників про вади за адресою <%s>\n" "(англійською і фінською).\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Домашня сторінка %s: <%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "ЦЕ ТЕСТОВА ВЕРСІЯ, ЯКУ НЕ ПРИЗНАЧЕНО ДЛЯ ПРОМИСЛОВОГО ВИКОРИСТАННЯ." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"Ланцюжки фільтрування встановлюються за допомогою параметрів --filters=ФІЛЬТРИ\n" -"або --filters1=ФІЛЬТРИ ... --filters9=ФІЛЬТРИ. Кожен фільтр у ланцюжку\n" -"можна відокремлювати від інших пробілами або «--». Крім того, можна вказати\n" -"шаблон <0-9>[e] замість ланцюжка фільтрів.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "Підтримувані фільтри та їхні параметри:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s: параметри -- пари «назва=значення», відокремлені комами" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: некоректна назва параметра" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: некоректне значення параметра" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Непідтримуваний рівень стискання LZMA1/LZMA2: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Сума lc і lp не повинна перевищувати 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: назва файла має невідомий суфікс; пропускаємо" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: файл вже має суфікс назви %s; пропускаємо" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: некоректний суфікс назви файла" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: значення не є невід'ємним десятковим цілим" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: некоректний суфікс множника" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Коректними є суфікси «KiB» (2^10), «MiB» (2^20) та «GiB» (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "Значення параметра «%s» має належати до діапазону [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Стиснені дані неможливо прочитати з термінала" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Стиснені дані неможливо записати до термінала" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Користування: %s [--help] [--version] [ФАЙЛ]...\n" -"Показати відомості, що зберігаються у заголовку файла .lzma" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "Файл є надто малим, щоб бути файлом .lzma" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "Не є файлом .lzma" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Не вдалося записати дані до стандартного виведення" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Невідома помилка" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Не вдалося увімкнути пісочницю" +#~ msgid "The selected match finder requires at least nice=%" +#~ msgstr "Вибраний засіб пошуку відповідності потребує принаймні nice=%" + +#~ msgid "Memory usage limit for compression: " +#~ msgstr "Обмеження пам'яті для пакування: " + +#~ msgid " Streams: %s\n" +#~ msgstr " Потоки: %s\n" + +#~ msgid " Blocks: %s\n" +#~ msgstr " Блоки: %s\n" + +#~ msgid " Ratio: %s\n" +#~ msgstr " Коефіцієнт: %s\n" + +#~ msgid " Check: %s\n" +#~ msgstr " Перевірка: %s\n" + +#~ msgid "" +#~ " Streams:\n" +#~ " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" +#~ msgstr "" +#~ " Потоки:\n" +#~ " Потік Блоки ЗсувСтисн. ЗсувНестисн. РозмСтисн. РозмНестисн Коеф. Перевірка Доповнення" + +#~ msgid "" +#~ " Blocks:\n" +#~ " Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check" +#~ msgstr "" +#~ " Блоки:\n" +#~ " Потік Блок ЗсувСтисн. ЗсувНестисн. ЗагРозм. РозмНестисн Коеф. Перевірка" + +#~ msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" +#~ msgstr " ЗначПер %*s Загол. Прапорці РозмСтисн ВикПам Фільтри" + +#~ msgid "Sandbox is disabled due to incompatible command line arguments" +#~ msgstr "Пісочницю вимкнено через несумісні параметри у рядку команди" + +#~ msgid "Sandbox was successfully enabled" +#~ msgstr "Пісочницю успішно увімкнено" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/vi.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/vi.gmo differ diff -Nru xz-utils-5.6.0/po/vi.po xz-utils-5.6.1+really5.4.5/po/vi.po --- xz-utils-5.6.0/po/vi.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/vi.po 2023-11-01 12:27:58.000000000 +0000 @@ -1,16 +1,14 @@ -# SPDX-License-Identifier: 0BSD -# # Vietnamese translations for xz package # Bản dịch tiếng Việt cho gói xz. -# This file is published under the BSD Zero Clause License. -# Trần Ngọc Quân , 2014-2024. +# This file is put in the public domain. +# Trần Ngọc Quân , 2014, 2023. # msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre2\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-24 10:23+0700\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-22 10:00+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -19,7 +17,6 @@ "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: Gtranslator 42.0\n" #: src/xz/args.c:77 #, c-format @@ -31,164 +28,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s: Quá nhiều đối số cho --block-list" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "Trong --block-list, cỡ khối thiếu sau số mắt xích bộ lọc '%c:'" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 chỉ có thể dùng như là phần tử cuối trong --block-list" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s: Không hiểu kiểu định dạng tập tin" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: Không hỗ trợ kiểu kiểm tra toàn vẹn" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Chỉ được đưa ra một tập tin cho “--files” hay “--files0”." #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "Biến môi trường %s chứa quá nhiều đối số" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "Hỗ trợ nén đã bị vô hiệu hóa tại thời điểm biên dịch" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "Hỗ trợ giải nén đã bị vô hiệu hóa tại thời điểm biên dịch" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "Nén tệp lzip (.lz) không được hỗ trợ" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "--block-list bị bỏ qua trừ khi nén theo định dạng .xz" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "Với --format=raw, --suffix=.SUF được yêu cầu trừ trường hợp ghi ra đầu ra tiêu chuẩn" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "Số lượng bộ lọc tối đa là bốn" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "Có lỗi trong tùy chọn --filters%s=FILTERS:" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "Mức giới hạn dùng bộ nhớ là quá thấp cho việc cài đặt bộ lọc đã cho." -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "móc xích lọc %u được sử dụng bởi --block-list nhưng lại chưa đưa ra gì với --filters%u=" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "Dùng hiện tại trong chế độ thô là ngớ ngẩn." -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "Các tùy chọn trích xuất của chỉnh trước có thể biến đổi phụ thuộc vào phiên bản." -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Định dạng .lzma chỉ hỗ trợ bộ lọc LZMA1" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 không thể được dùng với định dạng .xz" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "Móc xích lọc %u là không tương thích với --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "Móc xích lọc là không tương thích với --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "Chuyển sang chế độ đơn tuyến trình bởi vì --flush-timeout" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "Các tùy chọn không được hỗ trợ trong chuỗi móc xích %u" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "Dùng đến % tuyến trình." -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "Không hỗ trợ lọc móc xích hay tùy chọn lọc" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Giải nén sẽ cần %s MiB bộ nhớ." -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "Đã giảm số lượng tuyến trình từ %s xuống %s để không vượt quá giới hạn sử dụng bộ nhớ là %s MiB" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "Đã giảm số lượng tuyến trình từ %s xuống còn một. Giới hạn sử dụng bộ nhớ tự động %s MiB vẫn đang bị vượt quá. Cần có %s MiB bộ nhớ. Vẫn tiếp tục." -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "Chuyển sang chế độ đơn tuyến trình để không vượt quá giới hạn sử dụng bộ nhớ là %sMiB" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Chỉnh cỡ từ điển LZMA%c từ %s MiB thành %s MiB để không vượt quá giới hạn tiêu dùng bộ nhớ là %s MiB" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "Chỉnh cỡ từ điển LZMA%c cho --filters%u từ %s MiB thành %s MiB để không vượt quá giới hạn tiêu dùng bộ nhớ là %s MiB" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "Gặp lỗi thay đổi chuỗi móc xích lọc %u: %s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "Gặp lỗi khi tạo một ống dẫn: %s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "Không bật được sandbox" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s: hàm poll() bị lỗi: %s" @@ -203,252 +168,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Tập tin có lẽ đã bị di chuyển, không phải gỡ bỏ" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Không thể gỡ bỏ: %s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Không thể đặt chủ sở hữu tập tin: %s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Không thể đặt nhóm tập tin: %s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Không thể đặt chế độ đọc ghi cho tập tin: %s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "Gặp lỗi khi lấy các cờ trạng thái tập tin từ đầu vào tiêu chuẩn: %s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Là một liên kết mềm nên bỏ qua" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Không phải là một thư mục nên bỏ qua" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Không phải là tập tin thường nên bỏ qua" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Tập tin có đặt bít setuid hoặc setgid nên bỏ qua" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Tập tin có bít sticky nên bỏ qua" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Tập tin đầu vào có nhiều hơn một liên kết cứng nên bỏ qua" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "Tên tập tin trống rỗng nên bỏ qua" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "Gặp lỗi khi phục hồi các cờ trạng thái tới đầu vào tiêu chuẩn: %s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "Gặp lỗi khi lấy các cờ trạng thái tập tin từ đầu vào tiêu chuẩn: %s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Gặp lỗi khi phục hồi cờ O_APPEND trên đầu ra tiêu chuẩn: %s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Gặp lỗi khi đóng tập tin: %s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Gặp lỗi khi di chuyển vị trí đọc khi cố tạo một tập tin rải rác: %s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s: Lỗi đọc: %s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Gặp lỗi khi di chuyển vị trí đọc tập tin: %s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Kết thúc tập tin bất ngờ" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s: Lỗi ghi: %s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "Bị tắt" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "Tổng dung lượng bộ nhớ vật lý (RAM):" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "Số luồng bộ xử lý:" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "Nén:" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "Giải nén:" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "Giải nén đa luồng:" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "Mặc định cho -T0:" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "Thông tin phần cứng:" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "Đã chạm mốc giới hạn sử dụng bộ nhớ:" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "Các luồng dữ liệu:" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "Khối:" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "Kích cỡ đã nén:" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "Kích cỡ đã giải nén:" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "Tỉ lệ:" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "Kiểm tra:" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "Đệm luồng dữ liệu:" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "Bộ nhớ cần:" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "Kích cỡ phần đầu:" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "Số lượng tập tin:" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "Luồng dữ liệu" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "Khối" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "Khối" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "BùNén" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "BùGiảiNén" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "CỡNén" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "CỡGiảiNén" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "CỡTổng" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "Tỷ lệ" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "Kiểm tra" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "Gtr.Kiểm" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "Đệm" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "Phần đầu" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "Cờ" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "DùngBộNhớ" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "Bộ lọc" @@ -456,7 +421,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "Không" @@ -464,60 +429,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" -msgstr "ChưaBiết2" +msgstr "Chưa_biết2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" -msgstr "ChưaBiết3" +msgstr "Chưa_biết3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" -msgstr "ChưaBiết5" +msgstr "Chưa_biết5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" -msgstr "ChưaBiết6" +msgstr "Chưa_biết6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" -msgstr "ChưaBiết7" +msgstr "Chưa_biết7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" -msgstr "ChưaBiết8" +msgstr "Chưa_biết8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" -msgstr "ChưaBiết9" +msgstr "Chưa_biết9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "ChưaBiết11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "ChưaBiết12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "ChưaBiết13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "ChưaBiết14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "ChưaBiết15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s: Tập tin trống rỗng" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: Là quá nhỏ đối với tập tin .xz hợp lệ" @@ -526,44 +491,40 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Luồng Khối Nén Giải nén Tỷ lệ Ktra Tập tin" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "Có" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "Không" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " Phiên bản “XZ Utils” tối thiểu: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s tập tin\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "Tổng cộng:" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list chỉ hoạt động trên các tập tin .xz (--format=xz hay --format=auto)" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "Thử 'lzmainfo' với các tập tin .lzma." - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list không hỗ trợ đọc từ đầu vào tiêu chuẩn" @@ -579,14 +540,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" -msgstr "%s: Gặp ký hiệu null khi đọc tên tập tin; có lẽ ý bạn muốn là dùng “--files0” chứ không phải “--files'?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" +msgstr "%s: Gặp ký hiệu Null khi đọc tên tập tin; có lẽ ý bạn muốn là dùng “--files0” chứ không phải “--files'?" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "Nén và giải nén với --robot vẫn chưa được hỗ trợ." -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Không thể đọc dữ liệu từ đầu vào tiêu chuẩn khi đọc tập tin từ đầu vào tiêu chuẩn" @@ -594,68 +555,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s: " -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "Lỗi nội bộ (lỗi)" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "Không thể thiết lập bộ xử lý tín hiệu" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "Không có kiểm tra toàn vẹn nên không thể thẩm tra tính toàn vẹn của tập tin" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Kiểu kiểm tra toàn vẹn chưa được hỗ trợ; nên không thể thẩm tra tính toàn vẹn của tập tin" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "Đã chạm mốc giới hạn sử dụng bộ nhớ" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "Không nhận ra định dạng tập tin" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "Tùy chọn không được hỗ trợ" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "Dữ liệu đã nén bị hỏng" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "Gặp kết thúc đầu vào bất ngờ" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "Yêu cầu cần có %s MiB bộ nhớ. Nhưng giới hạn bị tắt." -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Yêu cầu cần có %s MiB bộ nhớ. Nhưng giới hạn là %s." -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Móc xích lọc: %s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." +msgid "Try `%s --help' for more information." msgstr "Hãy chạy lệnh “%s --help” để xem thông tin thêm." -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -666,15 +627,15 @@ "Nén hoặc giải nén các TẬP TIN có định dạng .xz.\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Các tùy chọn dài bắt buộc phải có đối số thì với tùy chọn ngắn cũng vậy.\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " Chế độ thao tác:\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -686,7 +647,7 @@ " -t, --test kiểm tra tính toàn vẹn của tập tin nén\n" " -l, --list liệt kê các thông tin về tập tin .xz" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -694,7 +655,7 @@ "\n" " Bộ chỉnh sửa thao tác:\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -704,7 +665,7 @@ " -f, --force buộc ghi đè tập tin đầu ra và (giải) nén các liên kết\n" " -c, --stdout ghi ra đầu ra tiêu chuẩn và không xóa tập tin đầu vào" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -712,10 +673,10 @@ " --single-stream chỉ giải nén luồng dữ liệu đầu, và bỏ qua\n" " dữ liệu đầu vào còn lại có thể" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -728,7 +689,7 @@ " chuẩn; chúng phải được kết thúc bằng ký tự dòng mới\n" " --files0[=TẬP-TIN] giống --files nhưng ký tự kết thúc là null" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -736,23 +697,23 @@ "\n" " Các tùy chọn về định dạng và nén cơ bản:\n" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=ĐDạng định dạng tập tin cần mã hóa hoặc giải mã; giá trị có thể\n" " là “auto” (mặc định), “xz”, “lzma”, “lzip”, và “raw”\n" " -C, --check=KIỂM kiểu kiểm tra toàn vẹn: “none” (thận trọng khi dùng),\n" " “crc32”, “crc64” (mặc định), hay “sha256”" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check không thẩm tra tính toàn vẹn khi giải nén" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -760,7 +721,7 @@ " -0 ... -9 đặt mức nén; mặc định là 6; tiêu dùng nhiều bộ nhớ khi nén\n" " và giải nén, nên tính toán trước khi dùng 7-9!" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -768,15 +729,15 @@ " -e, --extreme cố gắng nâng cao mức nén bằng cách dùng nhiều CPU hơn;\n" " nhưng không yêu cần nhiều bộ nhớ khi giải nén" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" -" -T, --threads=SỐ dùng tối đa là SỐ tuyến trình; mặc định là 0 ý là\n" -" dùng số lượng bằng số lõi vi xử lý" +" -T, --threads=SỐ dùng tối đa là SỐ tuyến trình; mặc định là 1; đặt\n" +" thành 0 để dùng số lượng bằng số lõi vi xử lý" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -786,21 +747,17 @@ " bắt đầu một khối .xz mới sau mỗi CỠ byte của đầu vào;\n" " dùng tùy chọn này để đặt cỡ khối cho nén tuyến trình" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=CỠ\n" " bắt đầu một khối .xz mới sau một danh sách ngăn\n" -" cách bằng dấu phẩy nhịp dữ của dữ liệu chưa nén; tùy chọn\n" -" chỉ định số móc xích bộ lọc (0-9) theo sau là ':' trước\n" -" kích cỡ dữ liệu chưa nén" +" cách bằng dấu phẩy nhịp dữ của dữ liệu chưa nén" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -812,7 +769,7 @@ " kể từ lần đẩy dữ liệu lên đĩa trước đó và đang đọc thêm\n" " khối nữa, mọi dữ liệu đang chờ sẽ được ghi lên đĩa" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -831,7 +788,7 @@ " giải nén tuyến trình, hoặc tất cả; GIỚI_HẠN có đơn vị là\n" " byte, % của RAM, hay 0 cho mặc định" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -839,7 +796,7 @@ " --no-adjust nếu các cài đặt nén vượt quá giới hạn dùng bộ nhớ,\n" " đưa ra một lỗi thay vì sửa đổi các cài đặt xuống" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -847,34 +804,6 @@ "\n" " Móc xích lọc tùy chỉnh cho nén (thay cho việc dùng chỉnh trước):" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" -"\n" -" --filters=CÁC_BỘ_LỌC đặt móc xích bộ lọc sử dụng cú pháp chuỗi bộ lọc\n" -" liblzma dùng để biết thêm chi tiết" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" -" --filters1=CÁC_BỘ_LỌC ... --filters9=CÁC_BỘ_LỌC\n" -" đặt móc xích lọc thêm sử dụng cú pháp chuỗi bộ lọc\n" -" liblzma để dùng với --block-list" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" -" --filters-help hiển thị thêm thông tin về cú pháp bộ lọc liblzma\n" -" rồi thoát." - #: src/xz/message.c:1067 msgid "" "\n" @@ -913,7 +842,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -925,11 +853,10 @@ " --powerpc[=OPTS] bộ lọc PowerPC BCJ (chỉ big endian)\n" " --ia64[=OPTS] bộ lọc IA-64 (Itanium) BCJ\n" " --sparc[=OPTS] bộ lọc SPARC BCJ\n" -" --riscv[=OPTS] bộ lọc RISC-V BCJ\n" " các tùy chọn hợp lệ cho mọi bộ lọc BCJ:\n" " start=SỐ khoảng bù khởi đầu cho chuyển đổi (mặc định=0)" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -942,7 +869,7 @@ " dist=SỐ khoảng cách giữa các byte được trừ từ\n" " những cái khác (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -950,59 +877,56 @@ "\n" " Tùy chọn khác:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" msgstr "" " -q, --quiet không xuất các cảnh báo;\n" -" chỉ định hai lần nến bạn muốn chặn cả báo lỗi\n" +" chỉ định hai lần nến bạn muốn chặn cả báo lỗi\n" " -v, --verbose thông báo chi tiết; dùng hai lần nếu muốn chi tiết hơn" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" -msgstr "" -" -Q, --no-warn làm cho các cảnh báo không ảnh hưởng đến\n" -" trạng thái thoát" +msgstr " -Q, --no-warn làm cho các cảnh báo không ảnh hưởng đến trạng thái thoát" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" -" --robot dùng các thông báo mà máy có thể phân tích\n" -" (hữu dụng với scripts)" +" --robot dùng các thông điệp máy có thể phân tích\n" +" (hữu dụng với scripts)" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" msgstr "" " --info-memory hiển thị tổng lượng RAM và mức giới hạn tiêu dùng\n" -" bộ nhớ hiện tại, rồi thoát" +" bộ nhớ hiện tại, rồi thoát" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" msgstr "" " -h, --help hiển thị trợ giúp dạng ngắn gọn\n" -" (chỉ liệt kê các tùy chọn cơ bản)\n" +" (chỉ liệt kê các tùy chọn cơ bản)\n" " -H, --long-help hiển thị trợ giúp đầy đủ rồi thoát" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" msgstr "" " -h, --help hiển thị trợ giúp dạng ngắn gọn rồi thoát\n" " -H, --long-help hiển thị trợ giúp đầy đủ\n" -" (liệt kê cả những tùy chọn cấp cao)" +" (liệt kê cả những tùy chọn cấp cao)" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version hiển thị số phiên bản và thoát" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1014,132 +938,96 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Hãy báo cáo lỗi cho <%s> (bằng tiếng Anh hoặc Phần Lan).\n" -"Thông báo lỗi dịch cho: .\n" +"Thông báo lỗi dịch cho: .\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "Trang chủ %s: <%s>.\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "ĐÂY LÀ PHIÊN BẢN PHÁT TRIỂN VÀ NÓ KHÔNG PHÙ HỢP VỚI MỤC ĐÍCH SẢN XUẤT." -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" -"Các móc xích lọc được đặt bằng --filters=CÁC_BỘ_LỌC hoặc các tùy chọn\n" -"--filters1=CÁC_BỘ_LỌC ... --filters9=CÁC_BỘ_LỌC. Mỗi bộ lọc trong chuỗi\n" -"có thể được ngăn cách bằng khoảng trắng hoặc '--'. Cách khác là dùng <0-9>[e]\n" -"để chỉ định thay thay cho móc xích lọc.\n" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "Các bộ lọc và các tùy chọn của chúng được hỗ trợ là:" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" -msgstr "%s: Các tùy chọn phải là các cặp “tên=giá_trị” ngăn cách nhau bằng dấu phẩy" +msgid "%s: Options must be `name=value' pairs separated with commas" +msgstr "%s: Các tùy chọn phải là các cặp “name=value” ngăn cách nhau bằng dấu phẩy" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: Tên tùy chọn không hợp lệ" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: Giá trị của tùy chọn không hợp lệ" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Hiện nay chưa hỗ trợ LZMA1/LZMA2: %s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "Tổng số lượng lc và lp không được vượt quá 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Tên tập tin có phần hậu tố chưa biết nên bỏ qua" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Tập tin đã sẵn có hậu tố “%s” nên bỏ qua" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Hậu tố tên tập tin không hợp lệ" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Giá trị không phải là số thập phân nguyên không âm" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" -msgstr "%s: Hậu tố (đơn vị) nhân tố không hợp lệ" +msgstr "%s: Hậu tố nhân tố không hợp lệ" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." -msgstr "Các hậu tố (đơn vị) hợp lệ là “KiB” (2^10), “MiB” (2^20), và “GiB” (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." +msgstr "Các hậu tố hợp lệ là “KiB” (2^10), “MiB” (2^20), và “GiB” (2^30)." -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" -msgstr "Giá trị của tùy chọn “%s” phải nằm trong vùng [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" +msgstr "Giá trị cuả tùy chọn “%s” phải nằm trong vùng [%, %]" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "Dữ liệu đã nén không thể đọc từ thiết bị cuối" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "Dữ liệu đã nén không thể ghi ra thiết bị cuối" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" -"Cách dùng: %s [--help] [--version] [TẬP TIN]...\n" -"Hiển thị thông tin được lưu trong phần đầu của tập tin .lzma" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "Tập tin quá nhỏ để có thể là một tin .lzma" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "Không phải là một tập tin .lzma" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "Gặp lỗi khi ghi dữ liệu vào đầu ra tiêu chuẩn" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "Lỗi chưa biết" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "Không bật được sandbox" - #~ msgid "Memory usage limit for compression: " #~ msgstr "Mức giới hạn dùng bộ nhớ cho nén: " diff -Nru xz-utils-5.6.0/po/xz.pot xz-utils-5.6.1+really5.4.5/po/xz.pot --- xz-utils-5.6.0/po/xz.pot 2024-02-24 08:31:08.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/xz.pot 2023-10-31 14:33:09.000000000 +0000 @@ -1,16 +1,13 @@ -# SPDX-License-Identifier: 0BSD -# # SOME DESCRIPTIVE TITLE. -# Copyright (C) The XZ Utils authors and contributors -# This file is published under the BSD Zero Clause License. +# This file is put in the public domain. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: XZ Utils 5.6.0\n" +"Project-Id-Version: xz 5.4.5\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,164 +27,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "" #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "" -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "" -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "" -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr "" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "" -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "" -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "" -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "" -#: src/xz/coder.c:766 -#, c-format -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "" - -#: src/xz/coder.c:1140 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format -msgid "Error changing to filter chain %u: %s" +msgid "Error creating a pipe: %s" msgstr "" -#: src/xz/file_io.c:122 src/xz/file_io.c:130 -#, c-format -msgid "Error creating a pipe: %s" +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" msgstr "" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "" @@ -202,252 +167,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "" @@ -455,7 +420,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "" @@ -463,60 +428,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "" @@ -525,45 +490,41 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr "" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "" msgstr[1] "" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "" @@ -579,14 +540,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "" -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "" @@ -594,68 +555,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "" -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "" -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "" -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." +msgid "Try `%s --help' for more information." msgstr "" -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -663,15 +624,15 @@ "\n" msgstr "" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr "" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -679,88 +640,86 @@ " -l, --list list information about .xz files" msgstr "" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" msgstr "" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" " -c, --stdout write to standard output and don't delete input files" msgstr "" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" msgstr "" -#: src/xz/message.c:977 +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" msgstr "" -#: src/xz/message.c:988 +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr "" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" msgstr "" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" msgstr "" -#: src/xz/message.c:1005 +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" " use this to set the block size for threaded compression" msgstr "" -#: src/xz/message.c:1014 +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -768,7 +727,7 @@ " would block, all pending data is flushed out" msgstr "" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -780,38 +739,18 @@ " bytes, % of RAM, or 0 for defaults" msgstr "" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" msgstr "" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" msgstr "" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -838,12 +777,11 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -851,50 +789,49 @@ " from each other (1-256; 1)" msgstr "" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" msgstr "" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" msgstr "" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr "" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" msgstr "" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" msgstr "" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" msgstr "" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr "" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -904,117 +841,90 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "" -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -msgid "The supported filters and their options are:" -msgstr "" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" +msgid "%s: File already has `%s' suffix, skipping" msgstr "" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "" -#: src/xz/util.c:150 -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "" -#: src/xz/util.c:167 +#: src/xz/util.c:168 #, c-format -msgid "Value of the option '%s' must be in the range [%, %]" +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -msgid "File is too small to be a .lzma file" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "" diff -Nru xz-utils-5.6.0/po/xz.pot-header xz-utils-5.6.1+really5.4.5/po/xz.pot-header --- xz-utils-5.6.0/po/xz.pot-header 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/xz.pot-header 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: 0BSD -# -# SOME DESCRIPTIVE TITLE. -# Copyright (C) The XZ Utils authors and contributors -# This file is published under the BSD Zero Clause License. -# FIRST AUTHOR , YEAR. -# Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/zh_CN.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/zh_CN.gmo differ diff -Nru xz-utils-5.6.0/po/zh_CN.po xz-utils-5.6.1+really5.4.5/po/zh_CN.po --- xz-utils-5.6.0/po/zh_CN.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/zh_CN.po 2023-11-01 12:27:58.000000000 +0000 @@ -1,14 +1,14 @@ # Chinese translations for xz package # xz 软件包的简体中文翻译。 # This file is put in the public domain. -# Boyuan Yang <073plan@gmail.com>, 2019, 2022, 2023, 2024. +# Boyuan Yang <073plan@gmail.com>, 2019, 2022, 2023. # msgid "" msgstr "" -"Project-Id-Version: xz 5.6.0-pre1\n" +"Project-Id-Version: xz 5.4.4-pre1\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" -"PO-Revision-Date: 2024-02-05 15:15-0500\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" +"PO-Revision-Date: 2023-07-19 14:24-0400\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Poedit 3.2.2\n" #: src/xz/args.c:77 #, c-format @@ -29,165 +29,132 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s：--block-list 得到过多参数" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "在 --block-list 中，块大小在过滤器链编号 '%c:' 之后缺失" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 仅可用于 --block-list 的最后一个元素" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s：未知文件格式类型" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s：不支持的完整性检查类型" -#: src/xz/args.c:606 -msgid "Only one file can be specified with '--files' or '--files0'." -msgstr "仅可使用 '--files' 或 '--files0' 指定单个文件。" +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." +msgstr "仅可使用“--files”或“--files0”指定一个文件。" #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "环境变量 %s 包含过多参数" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "压缩支持已在构建时禁用" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "解压支持已在构建时禁用" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "不支持对 lzip 文件 (.lz) 的压缩" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "除非压缩为 .xz 格式，--block-list 将被忽略" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "启用 --format-raw 选项时，必须指定 --suffix=.SUF 获知写入至标准输出" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "过滤器最多数量为四" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "在 --filters%s=过滤器 选项中出现错误：" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "内存用量限制对指定过滤器设置过低。" -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "--block-list 使用了过滤器链 %u，但未经由 --filters%u= 指定" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "不推荐在 raw 模式使用预设等级。" -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "各个预设等级所使用的准确选项列表在不同软件版本之间可能不同。" -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr ".lzma 格式只支持 LZMA1 过滤器" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 无法用于 .xz 格式" -#: src/xz/coder.c:434 -#, c-format -msgid "Filter chain %u is incompatible with --flush-timeout" -msgstr "过滤器链 %u 和 --flush-timeout 不兼容" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" +msgstr "过滤器链和 --flush-timeout 不兼容" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "因 --flush-timeout 而切换至单线程模式" -#: src/xz/coder.c:484 -#, c-format -msgid "Unsupported options in filter chain %u" -msgstr "过滤器链 %u 中存在不支持的选项" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "使用最多 % 个线程。" -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "不支持的过滤器链或过滤器选项" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "解压缩需要 %s MiB 的内存。" -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "已将所使用的线程数从 %s 减小为 %s，以不超出 %s MiB 的内存用量限制" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "已将所使用的线程数从 %s 减小为 1。这仍然超出了自动的内存使用限制 %s MiB。需要 %s MiB 的内存。继续操作。" -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "正在切换到单线程模式以不超出 %s MiB 的内存用量限制" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "已调整 LZMA%c 字典大小（从 %s MiB 调整为 %s MiB），以不超出 %s MiB 的内存用量限制" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "已调整 LZMA%c 字典大小（从 %s MiB 调整为 %s MiB），以不超出 %s MiB 的内存用量限制" - -#: src/xz/coder.c:1140 -#, c-format -msgid "Error changing to filter chain %u: %s" -msgstr "更改为过滤器链 %u 时出错：%s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "创建管道时出错：%s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "沙盒启用失败" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s：poll() 失败：%s" @@ -202,252 +169,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s：文件似乎已移动，不再进行删除操作" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s：无法删除：%s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s：无法设置文件所有者：%s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s：无法设置文件所有组：%s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s：无法设置文件权限：%s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "从标准输入获取文件状态标志出错：%s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s：是符号链接，跳过" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s：是目录，跳过" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s：不是标准文件，跳过" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s：文件有设置用户ID或设置组ID标识，跳过" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s：文件有粘滞位标识，跳过" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s：输入文件有多于一个硬链接，跳过" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "空文件名，跳过" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "回复标准输入的状态标志时出错：%s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "获取标准输出的文件状态标志时出错：%s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "恢复标准输出的 O_APPEND 标志时出错：%s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s：关闭文件失败：%s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s：尝试创建稀疏文件时 seek 失败：%s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s：读取错误：%s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s：seek 文件时出错：%s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s：未预期的文件结束" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s：写入错误：%s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "已禁用" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "物理内存（RAM）用量：" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "处理器线程数：" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "压缩：" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "解压缩：" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "多线程解压缩：" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "-T0 的默认值：" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "硬件信息：" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "内存使用限制：" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "流：" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "块：" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "压缩后大小：" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "解压缩大小：" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "比例：" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "校验：" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "流填充大小：" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "所需内存：" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "头部存放大小：" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "文件数量：" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "流" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "块" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "块" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "压缩偏移量" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "解压偏移量" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "压缩后大小" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "解压缩大小" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "总大小" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "比例" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "校验" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "校验值" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "填充" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "头部" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "标志" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "内存用量" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "过滤器" @@ -455,7 +422,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "无" @@ -463,60 +430,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "未知-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "未知-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "未知-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "未知-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "未知-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "未知-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "未知-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "未知-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "未知-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "未知-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "未知-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "未知-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s：文件为空" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s：过小而不是有效的 .xz 文件" @@ -525,44 +492,40 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " 流 块 压缩大小 解压大小 比例 校验 文件名" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "是" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "否" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " 最低 XZ Utils 版本：%s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s 文件\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "总计：" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list 仅适用于 .xz 文件（--format=xz 或 --format=auto）" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list 不支持从标准输入读取" @@ -578,14 +541,14 @@ #: src/xz/main.c:120 #, c-format -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" -msgstr "%s：读取文件名列表时获得了空字符；您可能想要使用 '--files0' 而非 '--files'？" +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" +msgstr "%s：读取文件名列表时获得了空字符；您可能想要使用“--files0”而非“--files”？" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "尚不支持带 --robot 的压缩和解压缩。" -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "无法同时从标准输入读取数据和文件名列表" @@ -593,68 +556,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s：" -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "内部错误（bug）" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "无法建立信号处理器" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "无完整性检查；将不验证文件完整性" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "不支持的完整性检查类型；将不验证文件完整性" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "达到内存使用限制" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "无法识别文件格式" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "不支持的选项" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "压缩数据已损坏" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "输入意外结束" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "需要 %s MiB 的内存空间。限制已禁用。" -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "需要 %s MiB 的内存空间。限制为 %s。" -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s：过滤器链：%s\n" -#: src/xz/message.c:916 +#: src/xz/message.c:935 #, c-format -msgid "Try '%s --help' for more information." -msgstr "请尝试执行 '%s --help' 来获取更多信息。" +msgid "Try `%s --help' for more information." +msgstr "请尝试执行“%s --help”来获取更多信息。" -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -665,15 +628,15 @@ "使用 .xz 格式压缩或解压缩文件。\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "必选参数对长短选项同时适用。\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " 操作模式：\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -685,7 +648,7 @@ " -t, --test 测试压缩文件完整性\n" " -l, --list 列出 .xz 文件的信息" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -693,7 +656,7 @@ "\n" " 操作修饰符：\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -703,24 +666,16 @@ " -f, --force 强制覆写输出文件和（解）压缩链接\n" " -c, --stdout 向标准输出写入，同时不要删除输入文件" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" msgstr " --single-stream 仅解压缩第一个流，忽略其后可能继续出现的输入数据" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -732,7 +687,7 @@ " 将从标准输入读取文件名列表；文件名必须使用换行符分隔\n" " --files0[=文件] 类似 --files，但使用空字符进行分隔" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -740,18 +695,12 @@ "\n" " 基本文件格式和压缩选项：\n" -#: src/xz/message.c:988 -#, fuzzy -#| msgid "" -#| " -F, --format=FMT file format to encode or decode; possible values are\n" -#| " `auto' (default), `xz', `lzma', `lzip', and `raw'\n" -#| " -C, --check=CHECK integrity check type: `none' (use with caution),\n" -#| " `crc32', `crc64' (default), or `sha256'" +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=格式 要编码或解码的文件格式；可能的值包括\n" " “auto”（默认）、“xz”、“lzma”、\n" @@ -759,11 +708,11 @@ " -C, --check=类型 完整性检查类型：“none”（请谨慎使用）、\n" " “crc32”、“crc64”（默认）或“sha256”" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check 解压缩时不要进行完整性检查验证" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -771,7 +720,7 @@ " -0 ... -9 压缩预设等级；默认为 6；使用 7-9 的等级之前，请先考虑\n" " 压缩和解压缩所需的内存用量！（会占用大量内存空间）" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -779,19 +728,15 @@ " -e, --extreme 尝试使用更多 CPU 时间来改进压缩比率；\n" " 不会影响解压缩的内存需求量" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=数量 使用最多指定数量的线程；默认值为 1；设置为 0\n" " 可以使用与处理器内核数量相同的线程数" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -801,24 +746,17 @@ " 输入每读取指定块大小的数据后即开始一个新的 .xz 块；\n" " 使用该选项可以设置多线程压缩中的块大小" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=块大小列表\n" " 在所给出的未压缩数据间隔大小的数据之后开始一个新的\n" " .xz 块（使用逗号分隔）" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -829,7 +767,7 @@ " 进行压缩时，如果从上次刷洗输出之后经过了指定的超时时间\n" " 且读取更多数据会被阻塞，则刷洗输出所有缓冲数据" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -848,13 +786,13 @@ " 所指定限制量单位为字节，或以百分号 % 结尾表示内存比例，\n" " 或者指定 0 取软件默认值" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" msgstr " --no-adjust 如果压缩设置超出内存用量限制，不调整设置而直接报错" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -862,26 +800,6 @@ "\n" " 用于压缩的自定义过滤器链（不使用预设等级时的备选用法）：" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -912,18 +830,6 @@ " depth=数字 最大搜索深度； 0=自动（默认）" #: src/xz/message.c:1082 -#, fuzzy -#| msgid "" -#| "\n" -#| " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" -#| " --arm[=OPTS] ARM BCJ filter\n" -#| " --armthumb[=OPTS] ARM-Thumb BCJ filter\n" -#| " --arm64[=OPTS] ARM64 BCJ filter\n" -#| " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" -#| " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" -#| " --sparc[=OPTS] SPARC BCJ filter\n" -#| " Valid OPTS for all BCJ filters:\n" -#| " start=NUM start offset for conversions (default=0)" msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -933,7 +839,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -948,7 +853,7 @@ " 所有过滤器可用选项：\n" " start=数字 转换的起始偏移量（默认=0）" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -959,7 +864,7 @@ " --delta[=选项] 增量过滤器；有效选项（有效值；默认值）：\n" " dist=NUM 相减的字节之间的距离 (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -967,7 +872,7 @@ "\n" " 其它选项：\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -975,21 +880,21 @@ " -q, --quiet 不显示警告信息；指定两次可不显示错误信息\n" " -v, --verbose 输出详细信息；指定两次可以输出更详细的信息" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn 使得警告信息不影响程序退出返回值" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot 使用机器可解析的信息（对于脚本有用）" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" msgstr " --info-memory 显示 RAM 总量和当前配置的内存用量限制，然后退出" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -997,7 +902,7 @@ " -h, --help 显示短帮助信息（仅列出基本选项）\n" " -H, --long-help 显示本长帮助信息" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1005,12 +910,11 @@ " -h, --help 显示本短帮助信息并退出\n" " -H, --long-help 显示长帮助信息（同时列出高级选项）" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version 显示软件版本号并退出" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1022,7 +926,7 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" @@ -1030,126 +934,89 @@ "请使用中文向 TP 简体中文翻译团队 \n" "报告软件的简体中文翻译错误。\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 主页：<%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "这是开发版本，不适用于生产环境使用。" -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "不支持的过滤器链或过滤器选项" - -#: src/xz/options.c:85 +#: src/xz/options.c:86 #, c-format -msgid "%s: Options must be 'name=value' pairs separated with commas" -msgstr "%s：选项必须按照 '名称=值' 的格式成对出现，使用半角逗号分隔" +msgid "%s: Options must be `name=value' pairs separated with commas" +msgstr "%s：选项必须按照“名称=值”的格式成对出现，使用半角逗号分隔" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s：无效的选项名称" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s：无效的选项值" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "不支持的 LZMA1/LZMA2 预设等级：%s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "lc 和 lp 的和必须不大于 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s：文件名有未知后缀，跳过" -#: src/xz/suffix.c:186 +#: src/xz/suffix.c:181 #, c-format -msgid "%s: File already has '%s' suffix, skipping" -msgstr "%s：文件已有 '%s' 后缀名，跳过" +msgid "%s: File already has `%s' suffix, skipping" +msgstr "%s：文件已有“%s”后缀名，跳过" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s：无效的文件名后缀" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s：值不是非负十进制整数" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s：无效的乘数后缀" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "有效的后缀包括“KiB”（2^10）、“MiB”（2^20）和“GiB”（2^30）。" -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "选项“%s”的值必须位于 [%, %] 范围内" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "压缩数据不能从终端读取" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "压缩数据不能向终端写入" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s：过小而不是有效的 .xz 文件" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "写入标准输出失败" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "未知错误" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "沙盒启用失败" - #~ msgid "The selected match finder requires at least nice=%" #~ msgstr "所选中的匹配搜索器（match finder）至少需要 nice=%" Binary files /tmp/tmpa7v678ef/yJds64K8T3/xz-utils-5.6.0/po/zh_TW.gmo and /tmp/tmpa7v678ef/QtbZzEb_bF/xz-utils-5.6.1+really5.4.5/po/zh_TW.gmo differ diff -Nru xz-utils-5.6.0/po/zh_TW.po xz-utils-5.6.1+really5.4.5/po/zh_TW.po --- xz-utils-5.6.0/po/zh_TW.po 2024-02-24 08:31:09.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po/zh_TW.po 2023-11-01 12:27:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: xz 5.4.3\n" "Report-Msgid-Bugs-To: xz@tukaani.org\n" -"POT-Creation-Date: 2024-02-24 16:31+0800\n" +"POT-Creation-Date: 2023-10-31 22:33+0800\n" "PO-Revision-Date: 2023-07-08 23:05+0800\n" "Last-Translator: Yi-Jyun Pan \n" "Language-Team: Chinese (traditional) \n" @@ -29,171 +29,133 @@ msgid "%s: Too many arguments to --block-list" msgstr "%s：傳入 --block-list 的參數過多" -#: src/xz/args.c:124 -#, c-format -msgid "In --block-list, block size is missing after filter chain number '%c:'" -msgstr "" - -#: src/xz/args.c:150 +#: src/xz/args.c:116 msgid "0 can only be used as the last element in --block-list" msgstr "0 只能作為 --block-list 的最後一個元素" -#: src/xz/args.c:539 +#: src/xz/args.c:451 #, c-format msgid "%s: Unknown file format type" msgstr "%s：未知檔案格式類型" -#: src/xz/args.c:562 src/xz/args.c:570 +#: src/xz/args.c:474 src/xz/args.c:482 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s：不支援的完整性檢查類型" -#: src/xz/args.c:606 -#, fuzzy -#| msgid "Only one file can be specified with `--files' or `--files0'." -msgid "Only one file can be specified with '--files' or '--files0'." +#: src/xz/args.c:518 +msgid "Only one file can be specified with `--files' or `--files0'." msgstr "「--files」或「--files0」只能指定一個檔案。" #. TRANSLATORS: This is a translatable #. string because French needs a space #. before the colon ("%s : %s"). -#: src/xz/args.c:621 src/xz/coder.c:1058 src/xz/coder.c:1074 -#: src/xz/coder.c:1374 src/xz/coder.c:1377 src/xz/file_io.c:518 -#: src/xz/file_io.c:592 src/xz/file_io.c:682 src/xz/file_io.c:854 -#: src/xz/list.c:368 src/xz/list.c:414 src/xz/list.c:476 src/xz/list.c:590 -#: src/xz/list.c:599 +#: src/xz/args.c:533 src/xz/coder.c:692 src/xz/coder.c:708 src/xz/coder.c:968 +#: src/xz/coder.c:971 src/xz/file_io.c:605 src/xz/file_io.c:679 +#: src/xz/file_io.c:769 src/xz/file_io.c:940 src/xz/list.c:369 +#: src/xz/list.c:415 src/xz/list.c:477 src/xz/list.c:581 src/xz/list.c:590 #, fuzzy, c-format #| msgid "%s: " msgid "%s: %s" msgstr "%s：" -#: src/xz/args.c:677 +#: src/xz/args.c:589 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "%s 環境變數包含過多參數" -#: src/xz/args.c:779 +#: src/xz/args.c:691 msgid "Compression support was disabled at build time" msgstr "已在編譯時停用壓縮支援" -#: src/xz/args.c:786 +#: src/xz/args.c:698 msgid "Decompression support was disabled at build time" msgstr "已在編譯時停用解壓縮支援" -#: src/xz/args.c:792 +#: src/xz/args.c:704 msgid "Compression of lzip files (.lz) is not supported" msgstr "不支援壓縮為 lzip 檔案 (.lz)" -#: src/xz/args.c:814 -msgid "--block-list is ignored unless compressing to the .xz format" -msgstr "" - -#: src/xz/args.c:827 src/xz/args.c:836 +#: src/xz/args.c:735 msgid "With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "搭配 --format=raw 時，除非寫入標準輸出，否則需要傳入 --suffix=.SUF" -#: src/xz/coder.c:140 +#: src/xz/coder.c:115 msgid "Maximum number of filters is four" msgstr "最多只能指定 4 個篩選器" -#: src/xz/coder.c:178 -#, c-format -msgid "Error in --filters%s=FILTERS option:" -msgstr "" - -#: src/xz/coder.c:228 +#: src/xz/coder.c:135 msgid "Memory usage limit is too low for the given filter setup." msgstr "記憶體用量限制過低，不足以設定指定的篩選器。" -#: src/xz/coder.c:243 -#, c-format -msgid "filter chain %u used by --block-list but not specified with --filters%u=" -msgstr "" - -#: src/xz/coder.c:374 +#: src/xz/coder.c:170 msgid "Using a preset in raw mode is discouraged." msgstr "不建議在 Raw 模式使用設定檔。" -#: src/xz/coder.c:376 +#: src/xz/coder.c:172 msgid "The exact options of the presets may vary between software versions." msgstr "設定檔的選項可能因軟體版本而有異。" -#: src/xz/coder.c:402 +#: src/xz/coder.c:195 msgid "The .lzma format supports only the LZMA1 filter" msgstr ".lzma 格式僅支援 LZMA1 篩選器" -#: src/xz/coder.c:410 +#: src/xz/coder.c:203 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 不能與 .xz 格式一同使用" -#: src/xz/coder.c:434 -#, fuzzy, c-format -#| msgid "The filter chain is incompatible with --flush-timeout" -msgid "Filter chain %u is incompatible with --flush-timeout" +#: src/xz/coder.c:220 +msgid "The filter chain is incompatible with --flush-timeout" msgstr "篩選鏈不相容 --flush-timeout" -#: src/xz/coder.c:443 +#: src/xz/coder.c:226 msgid "Switching to single-threaded mode due to --flush-timeout" msgstr "因指定 --flush-timeout，因此切換到單執行緒模式" -#: src/xz/coder.c:484 -#, fuzzy, c-format -#| msgid "Unsupported options" -msgid "Unsupported options in filter chain %u" -msgstr "不支援的選項" - -#: src/xz/coder.c:515 +#: src/xz/coder.c:250 #, c-format msgid "Using up to % threads." msgstr "使用最多 % 個執行緒。" -#: src/xz/coder.c:531 +#: src/xz/coder.c:266 msgid "Unsupported filter chain or filter options" msgstr "不支援的篩選鏈或篩選器選項" -#: src/xz/coder.c:552 +#: src/xz/coder.c:278 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "解壓縮將需要 %s MiB 的記憶體。" -#: src/xz/coder.c:584 +#: src/xz/coder.c:310 #, c-format msgid "Reduced the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" msgstr "已將執行緒數量從 %s 個減少至 %s 個，以不超過記憶體用量的 %s MiB 限制" -#: src/xz/coder.c:604 +#: src/xz/coder.c:330 #, c-format msgid "Reduced the number of threads from %s to one. The automatic memory usage limit of %s MiB is still being exceeded. %s MiB of memory is required. Continuing anyway." msgstr "已將執行緒數量從 %s 減少至一個，但依然超出 %s MiB 的自動記憶體用量限制。需要 %s MiB 的記憶體。依然繼續執行。" -#: src/xz/coder.c:631 +#: src/xz/coder.c:357 #, c-format msgid "Switching to single-threaded mode to not exceed the memory usage limit of %s MiB" msgstr "正在切換至單執行緒模式，以免超出 %s MiB 的記憶體用量限制" -#: src/xz/coder.c:756 +#: src/xz/coder.c:412 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "已將 LZMA%c 的字典大小從 %s MiB 調整至 %s MiB，以不超過記憶體用量的 %s MiB 限制" -#: src/xz/coder.c:766 -#, fuzzy, c-format -#| msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgid "Adjusted LZMA%c dictionary size for --filters%u from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" -msgstr "已將 LZMA%c 的字典大小從 %s MiB 調整至 %s MiB，以不超過記憶體用量的 %s MiB 限制" - -#: src/xz/coder.c:1140 -#, fuzzy, c-format -#| msgid "Error creating a pipe: %s" -msgid "Error changing to filter chain %u: %s" -msgstr "建立管線時發生錯誤：%s" - -#: src/xz/file_io.c:122 src/xz/file_io.c:130 +#: src/xz/file_io.c:110 src/xz/file_io.c:118 #, c-format msgid "Error creating a pipe: %s" msgstr "建立管線時發生錯誤：%s" -#: src/xz/file_io.c:207 +#: src/xz/file_io.c:252 +msgid "Failed to enable the sandbox" +msgstr "無法啟用沙盒" + +#: src/xz/file_io.c:294 #, c-format msgid "%s: poll() failed: %s" msgstr "%s：poll() 失敗：%s" @@ -208,252 +170,252 @@ #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:274 +#: src/xz/file_io.c:361 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s：檔案似乎已經遷移，不移除" -#: src/xz/file_io.c:281 src/xz/file_io.c:838 +#: src/xz/file_io.c:368 src/xz/file_io.c:924 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s：無法移除：%s" -#: src/xz/file_io.c:307 +#: src/xz/file_io.c:394 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s：無法設定檔案所有者：%s" -#: src/xz/file_io.c:320 +#: src/xz/file_io.c:407 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s：無法設定檔案群組：%s" -#: src/xz/file_io.c:339 +#: src/xz/file_io.c:426 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s：無法設定檔案權限：%s" -#: src/xz/file_io.c:465 +#: src/xz/file_io.c:552 #, c-format msgid "Error getting the file status flags from standard input: %s" msgstr "從標準輸入取得檔案狀態旗標時發生錯誤：%s" -#: src/xz/file_io.c:523 src/xz/file_io.c:585 +#: src/xz/file_io.c:610 src/xz/file_io.c:672 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s：是個符號連結，跳過" -#: src/xz/file_io.c:614 +#: src/xz/file_io.c:701 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s：是個目錄，跳過" -#: src/xz/file_io.c:620 +#: src/xz/file_io.c:707 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s：不是一般檔案，跳過" -#: src/xz/file_io.c:637 +#: src/xz/file_io.c:724 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s：檔案已設定 setuid 或 setgid 位元，跳過" -#: src/xz/file_io.c:644 +#: src/xz/file_io.c:731 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s：檔案已設定黏性位元（sticky bit），跳過" -#: src/xz/file_io.c:651 +#: src/xz/file_io.c:738 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s：輸入檔有超過一個實際連結 (hard link)，跳過" -#: src/xz/file_io.c:693 +#: src/xz/file_io.c:780 msgid "Empty filename, skipping" msgstr "空檔名，跳過" -#: src/xz/file_io.c:748 +#: src/xz/file_io.c:834 #, c-format msgid "Error restoring the status flags to standard input: %s" msgstr "將狀態旗標還原到標準輸入時發生錯誤：%s" -#: src/xz/file_io.c:796 +#: src/xz/file_io.c:882 #, c-format msgid "Error getting the file status flags from standard output: %s" msgstr "從標準輸出取得檔案狀態旗標時發生錯誤：%s" -#: src/xz/file_io.c:995 +#: src/xz/file_io.c:1081 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "將 O_APPEND 旗標還原到標準輸出時發生錯誤：%s" -#: src/xz/file_io.c:1007 +#: src/xz/file_io.c:1093 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s：關閉檔案失敗：%s" -#: src/xz/file_io.c:1043 src/xz/file_io.c:1305 +#: src/xz/file_io.c:1129 src/xz/file_io.c:1391 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s：嘗試建立疏鬆檔案時發生搜尋失敗：%s" -#: src/xz/file_io.c:1143 +#: src/xz/file_io.c:1229 #, c-format msgid "%s: Read error: %s" msgstr "%s：讀取時發生錯誤：%s" -#: src/xz/file_io.c:1173 +#: src/xz/file_io.c:1259 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s：搜尋檔案時發生錯誤：%s" -#: src/xz/file_io.c:1197 +#: src/xz/file_io.c:1283 #, c-format msgid "%s: Unexpected end of file" msgstr "%s：非期望的檔案結尾" -#: src/xz/file_io.c:1256 +#: src/xz/file_io.c:1342 #, c-format msgid "%s: Write error: %s" msgstr "%s：寫入時發生錯誤：%s" -#: src/xz/hardware.c:237 +#: src/xz/hardware.c:238 msgid "Disabled" msgstr "已停用" -#: src/xz/hardware.c:268 +#: src/xz/hardware.c:269 msgid "Amount of physical memory (RAM):" msgstr "實體記憶體 (RAM) 數量：" -#: src/xz/hardware.c:269 +#: src/xz/hardware.c:270 msgid "Number of processor threads:" msgstr "處理器執行緒的數量：" -#: src/xz/hardware.c:270 +#: src/xz/hardware.c:271 msgid "Compression:" msgstr "壓縮：" -#: src/xz/hardware.c:271 +#: src/xz/hardware.c:272 msgid "Decompression:" msgstr "解壓縮：" -#: src/xz/hardware.c:272 +#: src/xz/hardware.c:273 msgid "Multi-threaded decompression:" msgstr "多執行緒解壓縮：" -#: src/xz/hardware.c:273 +#: src/xz/hardware.c:274 msgid "Default for -T0:" msgstr "-T0 的預設值：" -#: src/xz/hardware.c:291 +#: src/xz/hardware.c:292 msgid "Hardware information:" msgstr "硬體資訊：" -#: src/xz/hardware.c:298 +#: src/xz/hardware.c:299 msgid "Memory usage limits:" msgstr "記憶體用量上限：" -#: src/xz/list.c:67 +#: src/xz/list.c:68 msgid "Streams:" msgstr "串流：" -#: src/xz/list.c:68 +#: src/xz/list.c:69 msgid "Blocks:" msgstr "區塊：" -#: src/xz/list.c:69 +#: src/xz/list.c:70 msgid "Compressed size:" msgstr "壓縮後大小：" -#: src/xz/list.c:70 +#: src/xz/list.c:71 msgid "Uncompressed size:" msgstr "壓縮前大小：" -#: src/xz/list.c:71 +#: src/xz/list.c:72 msgid "Ratio:" msgstr "壓縮比：" -#: src/xz/list.c:72 +#: src/xz/list.c:73 msgid "Check:" msgstr "檢查：" -#: src/xz/list.c:73 +#: src/xz/list.c:74 msgid "Stream Padding:" msgstr "串流填充：" -#: src/xz/list.c:74 +#: src/xz/list.c:75 msgid "Memory needed:" msgstr "所需記憶體：" -#: src/xz/list.c:75 +#: src/xz/list.c:76 msgid "Sizes in headers:" msgstr "檔頭中標示大小：" -#: src/xz/list.c:78 +#: src/xz/list.c:79 msgid "Number of files:" msgstr "檔案數：" -#: src/xz/list.c:121 +#: src/xz/list.c:122 msgid "Stream" msgstr "串流" -#: src/xz/list.c:122 +#: src/xz/list.c:123 msgid "Block" msgstr "區塊" -#: src/xz/list.c:123 +#: src/xz/list.c:124 msgid "Blocks" msgstr "區塊" -#: src/xz/list.c:124 +#: src/xz/list.c:125 msgid "CompOffset" msgstr "壓縮偏移" -#: src/xz/list.c:125 +#: src/xz/list.c:126 msgid "UncompOffset" msgstr "未壓縮偏移" -#: src/xz/list.c:126 +#: src/xz/list.c:127 msgid "CompSize" msgstr "壓縮大小" -#: src/xz/list.c:127 +#: src/xz/list.c:128 msgid "UncompSize" msgstr "未壓縮大小" -#: src/xz/list.c:128 +#: src/xz/list.c:129 msgid "TotalSize" msgstr "總計大小" -#: src/xz/list.c:129 +#: src/xz/list.c:130 msgid "Ratio" msgstr "比率" -#: src/xz/list.c:130 +#: src/xz/list.c:131 msgid "Check" msgstr "檢查" -#: src/xz/list.c:131 +#: src/xz/list.c:132 msgid "CheckVal" msgstr "檢查值" -#: src/xz/list.c:132 +#: src/xz/list.c:133 msgid "Padding" msgstr "填充" -#: src/xz/list.c:133 +#: src/xz/list.c:134 msgid "Header" msgstr "檔頭" -#: src/xz/list.c:134 +#: src/xz/list.c:135 msgid "Flags" msgstr "旗標" -#: src/xz/list.c:135 +#: src/xz/list.c:136 msgid "MemUsage" msgstr "Mem用量" -#: src/xz/list.c:136 +#: src/xz/list.c:137 msgid "Filters" msgstr "篩選器" @@ -461,7 +423,7 @@ #. This string is used in tables. In older xz version this #. string was limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:168 +#: src/xz/list.c:169 msgid "None" msgstr "無" @@ -469,60 +431,60 @@ #. but the Check ID is known (here 2). In older xz version these #. strings were limited to ten columns in a fixed-width font, but #. nowadays there is no strict length restriction anymore. -#: src/xz/list.c:174 +#: src/xz/list.c:175 msgid "Unknown-2" msgstr "未知-2" -#: src/xz/list.c:175 +#: src/xz/list.c:176 msgid "Unknown-3" msgstr "未知-3" -#: src/xz/list.c:177 +#: src/xz/list.c:178 msgid "Unknown-5" msgstr "未知-5" -#: src/xz/list.c:178 +#: src/xz/list.c:179 msgid "Unknown-6" msgstr "未知-6" -#: src/xz/list.c:179 +#: src/xz/list.c:180 msgid "Unknown-7" msgstr "未知-7" -#: src/xz/list.c:180 +#: src/xz/list.c:181 msgid "Unknown-8" msgstr "未知-8" -#: src/xz/list.c:181 +#: src/xz/list.c:182 msgid "Unknown-9" msgstr "未知-9" -#: src/xz/list.c:183 +#: src/xz/list.c:184 msgid "Unknown-11" msgstr "未知-11" -#: src/xz/list.c:184 +#: src/xz/list.c:185 msgid "Unknown-12" msgstr "未知-12" -#: src/xz/list.c:185 +#: src/xz/list.c:186 msgid "Unknown-13" msgstr "未知-13" -#: src/xz/list.c:186 +#: src/xz/list.c:187 msgid "Unknown-14" msgstr "未知-14" -#: src/xz/list.c:187 +#: src/xz/list.c:188 msgid "Unknown-15" msgstr "未知-15" -#: src/xz/list.c:350 +#: src/xz/list.c:351 #, c-format msgid "%s: File is empty" msgstr "%s：檔案是空的" -#: src/xz/list.c:355 +#: src/xz/list.c:356 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s：因過小而不認為是個有效 .xz 檔" @@ -531,44 +493,40 @@ #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:740 +#: src/xz/list.c:731 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " 串流 區塊 已壓縮 未壓縮 比例 檢驗碼 檔名" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "Yes" msgstr "是" -#: src/xz/list.c:1035 src/xz/list.c:1213 +#: src/xz/list.c:1026 src/xz/list.c:1204 msgid "No" msgstr "否" -#: src/xz/list.c:1037 src/xz/list.c:1215 +#: src/xz/list.c:1028 src/xz/list.c:1206 #, c-format msgid " Minimum XZ Utils version: %s\n" msgstr " 最小 XZ 工具程式版本: %s\n" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:1188 +#: src/xz/list.c:1179 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s 個檔案\n" -#: src/xz/list.c:1201 +#: src/xz/list.c:1192 msgid "Totals:" msgstr "總計：" -#: src/xz/list.c:1284 +#: src/xz/list.c:1270 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list 只能在 .xz 檔使用（--format=xz 或 --format=auto）" -#: src/xz/list.c:1289 -msgid "Try 'lzmainfo' with .lzma files." -msgstr "" - -#: src/xz/list.c:1297 +#: src/xz/list.c:1276 msgid "--list does not support reading from standard input" msgstr "--list 不支援從標準輸入讀取" @@ -583,16 +541,15 @@ msgstr "%s：讀取檔名時遇到非預期的輸入結尾" #: src/xz/main.c:120 -#, fuzzy, c-format -#| msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" -msgid "%s: Null character found when reading filenames; maybe you meant to use '--files0' instead of '--files'?" +#, c-format +msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?" msgstr "%s：讀取檔名時發現空字元；或許您想使用「--files0」而非「--files」？" -#: src/xz/main.c:191 +#: src/xz/main.c:188 msgid "Compression and decompression with --robot are not supported yet." msgstr "尚未支援搭配 --robot 壓縮和解壓縮。" -#: src/xz/main.c:289 +#: src/xz/main.c:266 msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "從標準輸入讀取檔名時，無法從標準輸入讀取資料" @@ -600,69 +557,68 @@ #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: src/xz/message.c:651 src/xz/message.c:706 +#: src/xz/message.c:670 src/xz/message.c:725 #, c-format msgid "%s: " msgstr "%s：" -#: src/xz/message.c:778 src/xz/message.c:837 src/lzmainfo/lzmainfo.c:131 +#: src/xz/message.c:797 src/xz/message.c:856 msgid "Internal error (bug)" msgstr "內部錯誤（臭蟲）" -#: src/xz/message.c:785 +#: src/xz/message.c:804 msgid "Cannot establish signal handlers" msgstr "無法確立信號處理器" -#: src/xz/message.c:794 +#: src/xz/message.c:813 msgid "No integrity check; not verifying file integrity" msgstr "沒有完整性檢查；不驗證檔案完整性" -#: src/xz/message.c:797 +#: src/xz/message.c:816 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "未知完整性檢查類型；不驗證檔案完整性" -#: src/xz/message.c:804 +#: src/xz/message.c:823 msgid "Memory usage limit reached" msgstr "達到記憶體用量上限" -#: src/xz/message.c:807 +#: src/xz/message.c:826 msgid "File format not recognized" msgstr "無法識別檔案格式" -#: src/xz/message.c:810 +#: src/xz/message.c:829 msgid "Unsupported options" msgstr "不支援的選項" -#: src/xz/message.c:813 +#: src/xz/message.c:832 msgid "Compressed data is corrupt" msgstr "壓縮資料是損壞的" -#: src/xz/message.c:816 +#: src/xz/message.c:835 msgid "Unexpected end of input" msgstr "遇到非預期輸入結尾" -#: src/xz/message.c:858 +#: src/xz/message.c:877 #, c-format msgid "%s MiB of memory is required. The limiter is disabled." msgstr "需要 %s MiB 的記憶體。已停用記憶體限制器。" -#: src/xz/message.c:886 +#: src/xz/message.c:905 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "需要 %s MiB 的記憶體。記憶體限制為 %s。" -#: src/xz/message.c:905 +#: src/xz/message.c:924 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s：篩選鏈：%s\n" -#: src/xz/message.c:916 -#, fuzzy, c-format -#| msgid "Try `%s --help' for more information." -msgid "Try '%s --help' for more information." +#: src/xz/message.c:935 +#, c-format +msgid "Try `%s --help' for more information." msgstr "嘗試「%s --help」取得更多資訊。" -#: src/xz/message.c:942 +#: src/xz/message.c:961 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -673,15 +629,15 @@ "用 .xz 格式壓縮，或解壓縮 .xz 格式中的 <檔案>。\n" "\n" -#: src/xz/message.c:949 +#: src/xz/message.c:968 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "長選項的必填參數，對短選項也是必填。\n" -#: src/xz/message.c:953 +#: src/xz/message.c:972 msgid " Operation mode:\n" msgstr " 操作模式：\n" -#: src/xz/message.c:956 +#: src/xz/message.c:975 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -693,7 +649,7 @@ " -t, --test 測試壓縮檔完整性\n" " -l, --list 列出 .xz 檔的資訊" -#: src/xz/message.c:962 +#: src/xz/message.c:981 msgid "" "\n" " Operation modifiers:\n" @@ -701,7 +657,7 @@ "\n" " 操作修飾詞：\n" -#: src/xz/message.c:965 +#: src/xz/message.c:984 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -711,7 +667,7 @@ " -f, --force 強制覆寫輸出檔並（解）壓縮連結\n" " -c, --stdout 寫入標準輸出並不刪除輸入檔" -#: src/xz/message.c:974 +#: src/xz/message.c:993 msgid "" " --single-stream decompress only the first stream, and silently\n" " ignore possible remaining input data" @@ -719,18 +675,10 @@ " --single-stream 僅解壓縮第一個串流，再\n" " 安靜地忽略可能剩餘的輸入檔" -#: src/xz/message.c:977 -#, fuzzy -#| msgid "" -#| " --no-sparse do not create sparse files when decompressing\n" -#| " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" -#| " --files[=FILE] read filenames to process from FILE; if FILE is\n" -#| " omitted, filenames are read from the standard input;\n" -#| " filenames must be terminated with the newline character\n" -#| " --files0[=FILE] like --files but use the null character as terminator" +#: src/xz/message.c:996 msgid "" " --no-sparse do not create sparse files when decompressing\n" -" -S, --suffix=.SUF use the suffix '.SUF' on compressed files\n" +" -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" " --files[=FILE] read filenames to process from FILE; if FILE is\n" " omitted, filenames are read from the standard input;\n" " filenames must be terminated with the newline character\n" @@ -742,7 +690,7 @@ " 則從標準輸入讀取檔名；檔名必須以換行字元作為結尾\n" " --files0[=檔案] 類似 --files 但是以 null 空字元作結尾" -#: src/xz/message.c:986 +#: src/xz/message.c:1005 msgid "" "\n" " Basic file format and compression options:\n" @@ -750,29 +698,23 @@ "\n" " 基本檔案格式與壓縮選項：\n" -#: src/xz/message.c:988 -#, fuzzy -#| msgid "" -#| " -F, --format=FMT file format to encode or decode; possible values are\n" -#| " `auto' (default), `xz', `lzma', `lzip', and `raw'\n" -#| " -C, --check=CHECK integrity check type: `none' (use with caution),\n" -#| " `crc32', `crc64' (default), or `sha256'" +#: src/xz/message.c:1007 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" -" 'auto' (default), 'xz', 'lzma', 'lzip', and 'raw'\n" -" -C, --check=CHECK integrity check type: 'none' (use with caution),\n" -" 'crc32', 'crc64' (default), or 'sha256'" +" `auto' (default), `xz', `lzma', `lzip', and `raw'\n" +" -C, --check=CHECK integrity check type: `none' (use with caution),\n" +" `crc32', `crc64' (default), or `sha256'" msgstr "" " -F, --format=格式 用於編碼或解碼的檔案格式；可用的值有：\n" " “auto”（預設）、“xz”、“lzma”、“lzip” 及 “raw”\n" " -C, --check=檢查碼 完整性檢查類型：“none”（謹慎使用）、“crc32”、\n" " “crc64”（預設值）或“sha256”" -#: src/xz/message.c:993 +#: src/xz/message.c:1012 msgid " --ignore-check don't verify the integrity check when decompressing" msgstr " --ignore-check 不在解壓縮時驗證完整性" -#: src/xz/message.c:997 +#: src/xz/message.c:1016 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -780,7 +722,7 @@ " -0 ... -9 壓縮設定檔；預設值為 6；使用 7-9 前請考慮\n" " 壓縮和解壓縮所使用的記憶體！" -#: src/xz/message.c:1001 +#: src/xz/message.c:1020 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -788,19 +730,15 @@ " -e, --extreme 使用更多 CPU 時間以嘗試改善壓縮比；\n" " 不影響解壓縮器的記憶體需求" -#: src/xz/message.c:1005 -#, fuzzy -#| msgid "" -#| " -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" -#| " to use as many threads as there are processor cores" +#: src/xz/message.c:1024 msgid "" -" -T, --threads=NUM use at most NUM threads; the default is 0 which uses\n" -" as many threads as there are processor cores" +" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" +" to use as many threads as there are processor cores" msgstr "" " -T, --threads=NUM 使用最多 NUM 個執行緒；預設為 1；設成 0 則使用所有的\n" " 處理機核心" -#: src/xz/message.c:1010 +#: src/xz/message.c:1029 msgid "" " --block-size=SIZE\n" " start a new .xz block after every SIZE bytes of input;\n" @@ -810,24 +748,17 @@ " 輸入每 SIZE 位元組後，開始一個新 .xz 區塊；\n" " 使用此功能以設定多執行緒壓縮的區塊大小" -#: src/xz/message.c:1014 -#, fuzzy -#| msgid "" -#| " --block-list=SIZES\n" -#| " start a new .xz block after the given comma-separated\n" -#| " intervals of uncompressed data" +#: src/xz/message.c:1033 msgid "" -" --block-list=BLOCKS\n" +" --block-list=SIZES\n" " start a new .xz block after the given comma-separated\n" -" intervals of uncompressed data; optionally, specify a\n" -" filter chain number (0-9) followed by a ':' before the\n" -" uncompressed data size" +" intervals of uncompressed data" msgstr "" " --block-list=SIZES\n" " 在指定以逗號隔開的未壓縮資料間隔之後\n" " 開始新的 .xz 區塊" -#: src/xz/message.c:1020 +#: src/xz/message.c:1037 msgid "" " --flush-timeout=TIMEOUT\n" " when compressing, if more than TIMEOUT milliseconds has\n" @@ -838,7 +769,7 @@ " 壓縮時，倘若繼上次排清 (flush) 已經超過 TIMEOUT 毫秒\n" " 而且讀入更多輸入會阻塞，則所有待排清的資料都將排清" -#: src/xz/message.c:1026 +#: src/xz/message.c:1043 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -857,7 +788,7 @@ " 用量上限。LIMIT 得是位元組、記憶體百分比 (%)，或 0\n" " (預設值)" -#: src/xz/message.c:1035 +#: src/xz/message.c:1052 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -865,7 +796,7 @@ " --no-adjust 若壓縮設定超過記憶體用量上限，請給出\n" " 錯誤而非下調設定" -#: src/xz/message.c:1041 +#: src/xz/message.c:1058 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -873,26 +804,6 @@ "\n" " 自訂壓縮篩選鏈（使用設定檔時選用）：" -#: src/xz/message.c:1044 -msgid "" -"\n" -" --filters=FILTERS set the filter chain using the liblzma filter string\n" -" syntax; use --filters-help for more information" -msgstr "" - -#: src/xz/message.c:1050 -msgid "" -" --filters1=FILTERS ... --filters9=FILTERS\n" -" set additional filter chains using the liblzma filter\n" -" string syntax to use with --block-list" -msgstr "" - -#: src/xz/message.c:1056 -msgid "" -" --filters-help display more information about the liblzma filter string\n" -" syntax and exit." -msgstr "" - #: src/xz/message.c:1067 msgid "" "\n" @@ -922,18 +833,6 @@ " depth=NUM 最大搜尋深度；0=自動（預設）" #: src/xz/message.c:1082 -#, fuzzy -#| msgid "" -#| "\n" -#| " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" -#| " --arm[=OPTS] ARM BCJ filter\n" -#| " --armthumb[=OPTS] ARM-Thumb BCJ filter\n" -#| " --arm64[=OPTS] ARM64 BCJ filter\n" -#| " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" -#| " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" -#| " --sparc[=OPTS] SPARC BCJ filter\n" -#| " Valid OPTS for all BCJ filters:\n" -#| " start=NUM start offset for conversions (default=0)" msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -943,7 +842,6 @@ " --powerpc[=OPTS] PowerPC BCJ filter (big endian only)\n" " --ia64[=OPTS] IA-64 (Itanium) BCJ filter\n" " --sparc[=OPTS] SPARC BCJ filter\n" -" --riscv[=OPTS] RISC-V BCJ filter\n" " Valid OPTS for all BCJ filters:\n" " start=NUM start offset for conversions (default=0)" msgstr "" @@ -958,7 +856,7 @@ " 所有 BCJ 篩選器可用的 OPTS：\n" " start=NUM 轉換起始位移（預設值=0）" -#: src/xz/message.c:1096 +#: src/xz/message.c:1095 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -970,7 +868,7 @@ " dist=NUM 相減的位元組之間的距離\n" " (1-256; 1)" -#: src/xz/message.c:1104 +#: src/xz/message.c:1103 msgid "" "\n" " Other options:\n" @@ -978,7 +876,7 @@ "\n" " 其他選項：\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1106 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -986,21 +884,21 @@ " -q, --quiet 隱藏警告訊息；指定兩次也一併隱藏錯誤訊息\n" " -v, --verbose 輸出較詳細內容；指定兩次更詳細輸出" -#: src/xz/message.c:1112 +#: src/xz/message.c:1111 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn 即使有警告，退出狀態碼仍不變" -#: src/xz/message.c:1114 +#: src/xz/message.c:1113 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot 使用機器可解析訊息（適合用於指令稿）" -#: src/xz/message.c:1117 +#: src/xz/message.c:1116 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" msgstr " --info-memory 顯示記憶體總量和使用中的記憶體用量限制後退出" -#: src/xz/message.c:1120 +#: src/xz/message.c:1119 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -1008,7 +906,7 @@ " -h, --help 顯示較短說明（僅列出基本選項）\n" " -H, --long-help 顯示較長說明後退出" -#: src/xz/message.c:1124 +#: src/xz/message.c:1123 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -1016,12 +914,11 @@ " -h, --help 顯示較短說明後退出\n" " -H, --long-help 顯示較長說明（也列出進階選項）" -#: src/xz/message.c:1129 +#: src/xz/message.c:1128 msgid " -V, --version display the version number and exit" msgstr " -V, --version 顯示版本號碼後退出" -#: src/xz/message.c:1131 src/lzmainfo/lzmainfo.c:37 -#, c-format +#: src/xz/message.c:1130 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -1033,133 +930,94 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1137 src/lzmainfo/lzmainfo.c:40 +#: src/xz/message.c:1136 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "請回報臭蟲至 <%s>（使用英文或芬蘭語）。\n" -#: src/xz/message.c:1139 src/lzmainfo/lzmainfo.c:42 +#: src/xz/message.c:1138 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 首頁：<%s>\n" -#: src/xz/message.c:1143 +#: src/xz/message.c:1142 msgid "THIS IS A DEVELOPMENT VERSION NOT INTENDED FOR PRODUCTION USE." msgstr "此為開發版本，不打算在生產環境使用。" -#: src/xz/message.c:1160 -msgid "" -"Filter chains are set using the --filters=FILTERS or\n" -"--filters1=FILTERS ... --filters9=FILTERS options. Each filter in the chain\n" -"can be separated by spaces or '--'. Alternatively a preset <0-9>[e] can be\n" -"specified instead of a filter chain.\n" -msgstr "" - -#: src/xz/message.c:1166 -#, fuzzy -#| msgid "Unsupported filter chain or filter options" -msgid "The supported filters and their options are:" -msgstr "不支援的篩選鏈或篩選器選項" - -#: src/xz/options.c:85 -#, fuzzy, c-format -#| msgid "%s: Options must be `name=value' pairs separated with commas" -msgid "%s: Options must be 'name=value' pairs separated with commas" +#: src/xz/options.c:86 +#, c-format +msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "%s：選項形式必須為以逗號分隔的「name=value」值對" -#: src/xz/options.c:92 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s：選項名稱無效" -#: src/xz/options.c:112 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s：選項值無效" -#: src/xz/options.c:247 +#: src/xz/options.c:248 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "不支援的 LZMA1/LZMA2 設定檔：%s" -#: src/xz/options.c:355 +#: src/xz/options.c:356 msgid "The sum of lc and lp must not exceed 4" msgstr "lc 和 lp 的總和不能超過 4" -#: src/xz/suffix.c:165 +#: src/xz/suffix.c:160 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s：檔名有未知後綴，跳過" -#: src/xz/suffix.c:186 -#, fuzzy, c-format -#| msgid "%s: File already has `%s' suffix, skipping" -msgid "%s: File already has '%s' suffix, skipping" +#: src/xz/suffix.c:181 +#, c-format +msgid "%s: File already has `%s' suffix, skipping" msgstr "%s：檔案已有「%s」後綴，跳過" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:388 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s：檔名後綴無效" -#: src/xz/util.c:106 +#: src/xz/util.c:107 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s：數值不是非負數十進位整數" -#: src/xz/util.c:148 +#: src/xz/util.c:149 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s：乘數後綴無效" -#: src/xz/util.c:150 -#, fuzzy -#| msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." -msgid "Valid suffixes are 'KiB' (2^10), 'MiB' (2^20), and 'GiB' (2^30)." +#: src/xz/util.c:151 +msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "有效的後綴有「KiB」(2^10)、「MiB」(2^20) 及「GiB」(2^30)。" -#: src/xz/util.c:167 -#, fuzzy, c-format -#| msgid "Value of the option `%s' must be in the range [%, %]" -msgid "Value of the option '%s' must be in the range [%, %]" +#: src/xz/util.c:168 +#, c-format +msgid "Value of the option `%s' must be in the range [%, %]" msgstr "選項「%s」的數值必須在 [%, %] 範圍內" -#: src/xz/util.c:290 +#: src/xz/util.c:270 msgid "Compressed data cannot be read from a terminal" msgstr "不能從終端機讀入已壓縮資料" -#: src/xz/util.c:303 +#: src/xz/util.c:283 msgid "Compressed data cannot be written to a terminal" msgstr "不能將已壓縮資料寫入終端機" -#: src/lzmainfo/lzmainfo.c:33 -#, c-format -msgid "" -"Usage: %s [--help] [--version] [FILE]...\n" -"Show information stored in the .lzma file header" -msgstr "" - -#: src/lzmainfo/lzmainfo.c:109 -#, fuzzy -#| msgid "%s: Too small to be a valid .xz file" -msgid "File is too small to be a .lzma file" -msgstr "%s：因過小而不認為是個有效 .xz 檔" - -#: src/lzmainfo/lzmainfo.c:122 -msgid "Not a .lzma file" -msgstr "" - -#: src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:40 msgid "Writing to standard output failed" msgstr "寫入標準輸出失敗" -#: src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:43 msgid "Unknown error" msgstr "未知錯誤" -#~ msgid "Failed to enable the sandbox" -#~ msgstr "無法啟用沙盒" - #~ msgid "Sandbox is disabled due to incompatible command line arguments" #~ msgstr "由於指定不相容的指令列參數，已停用沙盒" diff -Nru xz-utils-5.6.0/po4a/.gitignore xz-utils-5.6.1+really5.4.5/po4a/.gitignore --- xz-utils-5.6.0/po4a/.gitignore 2024-02-23 18:36:31.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po4a/.gitignore 2023-10-31 14:24:02.000000000 +0000 @@ -1,3 +1,2 @@ /man /xz-man.pot -/*.po.authors diff -Nru xz-utils-5.6.0/po4a/de.po xz-utils-5.6.1+really5.4.5/po4a/de.po --- xz-utils-5.6.0/po4a/de.po 2024-02-24 08:21:29.000000000 +0000 +++ xz-utils-5.6.1+really5.4.5/po4a/de.po 2023-11-01 12:27:10.000000000 +0000 @@ -1,15 +1,13 @@ -# SPDX-License-Identifier: 0BSD -# German translation for xz-man. -# This file is published under the BSD Zero Clause License. -# Copyright (C) The XZ Utils authors and contributors +# XZ Utils man pages German translation +# This file is put in the public domain. # -# Mario Blättermann , 2015, 2019-2020, 2022-2024. +# Mario Blättermann , 2015, 2019-2020, 2022-2023. msgid "" msgstr "" -"Project-Id-Version: xz-man 5.6.0-pre2\n" +"Project-Id-Version: xz-man 5.4.4-pre1\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2024-02-15 01:58+0800\n" -"PO-Revision-Date: 2024-02-15 19:18+0100\n" +"POT-Creation-Date: 2023-11-01 20:27+0800\n" +"PO-Revision-Date: 2023-07-19 20:47+0200\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "Language: de\n" @@ -18,2902 +16,4360 @@ "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 23.08.4\n" +"X-Generator: Lokalize 23.04.3\n" #. type: TH -#: ../src/xz/xz.1:7 +#: ../src/xz/xz.1:9 #, no-wrap msgid "XZ" msgstr "XZ" #. type: TH -#: ../src/xz/xz.1:7 ../src/scripts/xzdiff.1:8 ../src/scripts/xzgrep.1:8 +#: ../src/xz/xz.1:9 #, no-wrap -msgid "2024-02-13" -msgstr "13. Februar 2024" +msgid "2023-07-17" +msgstr "17. Juli 2023" #. type: TH -#: ../src/xz/xz.1:7 ../src/xzdec/xzdec.1:5 ../src/lzmainfo/lzmainfo.1:5 -#: ../src/scripts/xzdiff.1:8 ../src/scripts/xzgrep.1:8 -#: ../src/scripts/xzless.1:8 ../src/scripts/xzmore.1:8 +#: ../src/xz/xz.1:9 ../src/xzdec/xzdec.1:7 ../src/lzmainfo/lzmainfo.1:7 +#: ../src/scripts/xzdiff.1:9 ../src/scripts/xzgrep.1:9 +#: ../src/scripts/xzless.1:10 ../src/scripts/xzmore.1:7 #, no-wrap msgid "Tukaani" msgstr "Tukaani" #. type: TH -#: ../src/xz/xz.1:7 ../src/xzdec/xzdec.1:5 ../src/lzmainfo/lzmainfo.1:5 -#: ../src/scripts/xzdiff.1:8 ../src/scripts/xzgrep.1:8 -#: ../src/scripts/xzless.1:8 ../src/scripts/xzmore.1:8 +#: ../src/xz/xz.1:9 ../src/xzdec/xzdec.1:7 ../src/lzmainfo/lzmainfo.1:7 +#: ../src/scripts/xzdiff.1:9 ../src/scripts/xzgrep.1:9 +#: ../src/scripts/xzless.1:10 ../src/scripts/xzmore.1:7 #, no-wrap msgid "XZ Utils" msgstr "XZ-Dienstprogramme" #. type: SH -#: ../src/xz/xz.1:9 ../src/xzdec/xzdec.1:6 ../src/lzmainfo/lzmainfo.1:6 -#: ../src/scripts/xzdiff.1:9 ../src/scripts/xzgrep.1:9 -#: ../src/scripts/xzless.1:9 ../src/scripts/xzmore.1:9 +#: ../src/xz/xz.1:11 ../src/xzdec/xzdec.1:8 ../src/lzmainfo/lzmainfo.1:8 +#: ../src/scripts/xzdiff.1:10 ../src/scripts/xzgrep.1:10 +#: ../src/scripts/xzless.1:11 ../src/scripts/xzmore.1:8 #, no-wrap msgid "NAME" msgstr "BEZEICHNUNG" #. type: Plain text -#: ../src/xz/xz.1:11 -msgid "xz, unxz, xzcat, lzma, unlzma, lzcat - Compress or decompress .xz and .lzma files" -msgstr "xz, unxz, xzcat, lzma, unlzma, lzcat - .xz- und .lzma-Dateien komprimieren oder dekomprimieren" +#: ../src/xz/xz.1:13 +msgid "" +"xz, unxz, xzcat, lzma, unlzma, lzcat - Compress or decompress .xz and .lzma " +"files" +msgstr "" +"xz, unxz, xzcat, lzma, unlzma, lzcat - .xz- und .lzma-Dateien komprimieren " +"oder dekomprimieren" #. type: SH -#: ../src/xz/xz.1:12 ../src/xzdec/xzdec.1:8 ../src/lzmainfo/lzmainfo.1:8 +#: ../src/xz/xz.1:14 ../src/xzdec/xzdec.1:10 ../src/lzmainfo/lzmainfo.1:10 #: ../src/scripts/xzdiff.1:12 ../src/scripts/xzgrep.1:12 -#: ../src/scripts/xzless.1:11 ../src/scripts/xzmore.1:12 +#: ../src/scripts/xzless.1:13 ../src/scripts/xzmore.1:10 #, no-wrap msgid "SYNOPSIS" msgstr "ÜBERSICHT" #. type: Plain text -#: ../src/xz/xz.1:16 +#: ../src/xz/xz.1:18 msgid "B [I] [I]" msgstr "B [I] [I]" #. type: SH -#: ../src/xz/xz.1:17 +#: ../src/xz/xz.1:19 #, no-wrap msgid "COMMAND ALIASES" msgstr "BEFEHLSALIASE" #. type: Plain text -#: ../src/xz/xz.1:21 +#: ../src/xz/xz.1:23 msgid "B is equivalent to B." msgstr "B ist gleichbedeutend mit B." #. type: Plain text -#: ../src/xz/xz.1:25 +#: ../src/xz/xz.1:27 msgid "B is equivalent to B." msgstr "B ist gleichbedeutend mit B." #. type: Plain text -#: ../src/xz/xz.1:29 +#: ../src/xz/xz.1:31 msgid "B is equivalent to B." msgstr "B ist gleichbedeutend mit B." #. type: Plain text -#: ../src/xz/xz.1:33 +#: ../src/xz/xz.1:35 msgid "B is equivalent to B." msgstr "B ist gleichbedeutend mit B." #. type: Plain text -#: ../src/xz/xz.1:37 +#: ../src/xz/xz.1:39 msgid "B is equivalent to B." -msgstr "B ist gleichbedeutend mit B." +msgstr "" +"B ist gleichbedeutend mit B." #. type: Plain text -#: ../src/xz/xz.1:49 -msgid "When writing scripts that need to decompress files, it is recommended to always use the name B with appropriate arguments (B or B) instead of the names B and B." -msgstr "Wenn Sie Skripte schreiben, die Dateien dekomprimieren, sollten Sie stets den Namen B mit den entsprechenden Argumenten (B oder B) anstelle der Namen B und B verwenden." +#: ../src/xz/xz.1:51 +msgid "" +"When writing scripts that need to decompress files, it is recommended to " +"always use the name B with appropriate arguments (B or B) instead of the names B and B." +msgstr "" +"Wenn Sie Skripte schreiben, die Dateien dekomprimieren, sollten Sie stets " +"den Namen B mit den entsprechenden Argumenten (B oder B) " +"anstelle der Namen B und B verwenden." #. type: SH -#: ../src/xz/xz.1:50 ../src/xzdec/xzdec.1:16 ../src/lzmainfo/lzmainfo.1:13 -#: ../src/scripts/xzdiff.1:27 ../src/scripts/xzgrep.1:33 -#: ../src/scripts/xzless.1:17 ../src/scripts/xzmore.1:19 +#: ../src/xz/xz.1:52 ../src/xzdec/xzdec.1:18 ../src/lzmainfo/lzmainfo.1:15 +#: ../src/scripts/xzdiff.1:24 ../src/scripts/xzgrep.1:33 +#: ../src/scripts/xzless.1:19 ../src/scripts/xzmore.1:16 #, no-wrap msgid "DESCRIPTION" msgstr "BESCHREIBUNG" #. type: Plain text -#: ../src/xz/xz.1:69 -msgid "B is a general-purpose data compression tool with command line syntax similar to B(1) and B(1). The native file format is the B<.xz> format, but the legacy B<.lzma> format used by LZMA Utils and raw compressed streams with no container format headers are also supported. In addition, decompression of the B<.lz> format used by B is supported." -msgstr "B ist ein Allzweckwerkzeug zur Datenkompression, dessen Befehlszeilensyntax denen von B(1) und B(1) ähnelt. Das native Dateiformat ist das B<.xz>-Format, aber das veraltete, von den LZMA-Dienstprogrammen verwendete Format sowie komprimierte Rohdatenströme ohne Containerformat-Header werden ebenfalls unterstützt. Außerdem wird die Dekompression des von B verwendeten B<.lz>-Formats unterstützt." +#: ../src/xz/xz.1:71 +msgid "" +"B is a general-purpose data compression tool with command line syntax " +"similar to B(1) and B(1). The native file format is the B<." +"xz> format, but the legacy B<.lzma> format used by LZMA Utils and raw " +"compressed streams with no container format headers are also supported. In " +"addition, decompression of the B<.lz> format used by B is supported." +msgstr "" +"B ist ein Allzweckwerkzeug zur Datenkompression, dessen " +"Befehlszeilensyntax denen von B(1) und B(1) ähnelt. Das native " +"Dateiformat ist das B<.xz>-Format, aber das veraltete, von den LZMA-" +"Dienstprogrammen verwendete Format sowie komprimierte Rohdatenströme ohne " +"Containerformat-Header werden ebenfalls unterstützt. Außerdem wird die " +"Dekompression des von B verwendeten B<.lz>-Formats unterstützt." #. type: Plain text -#: ../src/xz/xz.1:91 -msgid "B compresses or decompresses each I according to the selected operation mode. If no I are given or I is B<->, B reads from standard input and writes the processed data to standard output. B will refuse (display an error and skip the I) to write compressed data to standard output if it is a terminal. Similarly, B will refuse to read compressed data from standard input if it is a terminal." -msgstr "B komprimiert oder dekomprimiert jede I entsprechend des gewählten Vorgangsmodus. Falls entweder B<-> oder keine Datei angegeben ist, liest B aus der Standardeingabe und leitet die verarbeiteten Dateien in die Standardausgabe. Wenn die Standardausgabe kein Terminal ist, verweigert B das Schreiben komprimierter Daten in die Standardausgabe. Dabei wird eine Fehlermeldung angezeigt und die I übersprungen. Ebenso verweigert B das Lesen komprimierter Daten aus der Standardeingabe, wenn diese ein Terminal ist." +#: ../src/xz/xz.1:93 +msgid "" +"B compresses or decompresses each I according to the selected " +"operation mode. If no I are given or I is B<->, B reads " +"from standard input and writes the processed data to standard output. B " +"will refuse (display an error and skip the I) to write compressed " +"data to standard output if it is a terminal. Similarly, B will refuse " +"to read compressed data from standard input if it is a terminal." +msgstr "" +"B komprimiert oder dekomprimiert jede I entsprechend des " +"gewählten Vorgangsmodus. Falls entweder B<-> oder keine Datei angegeben ist, " +"liest B aus der Standardeingabe und leitet die verarbeiteten Dateien in " +"die Standardausgabe. Wenn die Standardausgabe kein Terminal ist, verweigert " +"B das Schreiben komprimierter Daten in die Standardausgabe. Dabei wird " +"eine Fehlermeldung angezeigt und die I übersprungen. Ebenso " +"verweigert B das Lesen komprimierter Daten aus der Standardeingabe, wenn " +"diese ein Terminal ist." #. type: Plain text -#: ../src/xz/xz.1:101 -msgid "Unless B<--stdout> is specified, I other than B<-> are written to a new file whose name is derived from the source I name:" -msgstr "I, die nicht als B<-> angegeben sind, werden in eine neue Datei geschrieben, deren Name aus dem Namen der Quell-I abgeleitet wird (außer wenn B<--stdout> angegeben ist):" +#: ../src/xz/xz.1:103 +msgid "" +"Unless B<--stdout> is specified, I other than B<-> are written to a " +"new file whose name is derived from the source I name:" +msgstr "" +"I, die nicht als B<-> angegeben sind, werden in eine neue Datei " +"geschrieben, deren Name aus dem Namen der Quell-I abgeleitet wird " +"(außer wenn B<--stdout> angegeben ist):" #. type: IP -#: ../src/xz/xz.1:101 ../src/xz/xz.1:107 ../src/xz/xz.1:132 ../src/xz/xz.1:137 -#: ../src/xz/xz.1:140 ../src/xz/xz.1:143 ../src/xz/xz.1:159 ../src/xz/xz.1:420 -#: ../src/xz/xz.1:423 ../src/xz/xz.1:430 ../src/xz/xz.1:675 ../src/xz/xz.1:677 -#: ../src/xz/xz.1:776 ../src/xz/xz.1:787 ../src/xz/xz.1:796 ../src/xz/xz.1:802 -#: ../src/xz/xz.1:965 ../src/xz/xz.1:969 ../src/xz/xz.1:973 ../src/xz/xz.1:977 -#: ../src/xz/xz.1:981 ../src/xz/xz.1:983 ../src/xz/xz.1:1079 -#: ../src/xz/xz.1:1088 ../src/xz/xz.1:1100 ../src/xz/xz.1:1837 -#: ../src/xz/xz.1:1843 ../src/xz/xz.1:1884 ../src/xz/xz.1:1889 -#: ../src/xz/xz.1:1904 ../src/xz/xz.1:1908 ../src/xz/xz.1:1986 -#: ../src/xz/xz.1:1990 ../src/xz/xz.1:1993 ../src/xz/xz.1:1996 -#: ../src/xz/xz.1:2000 ../src/xz/xz.1:2007 ../src/xz/xz.1:2009 +#: ../src/xz/xz.1:103 ../src/xz/xz.1:109 ../src/xz/xz.1:134 ../src/xz/xz.1:139 +#: ../src/xz/xz.1:142 ../src/xz/xz.1:145 ../src/xz/xz.1:161 ../src/xz/xz.1:422 +#: ../src/xz/xz.1:425 ../src/xz/xz.1:432 ../src/xz/xz.1:677 ../src/xz/xz.1:679 +#: ../src/xz/xz.1:778 ../src/xz/xz.1:789 ../src/xz/xz.1:798 ../src/xz/xz.1:806 +#: ../src/xz/xz.1:1034 ../src/xz/xz.1:1043 ../src/xz/xz.1:1055 +#: ../src/xz/xz.1:1729 ../src/xz/xz.1:1735 ../src/xz/xz.1:1853 +#: ../src/xz/xz.1:1857 ../src/xz/xz.1:1860 ../src/xz/xz.1:1863 +#: ../src/xz/xz.1:1867 ../src/xz/xz.1:1874 ../src/xz/xz.1:1876 #, no-wrap msgid "\\(bu" msgstr "\\(bu" #. type: Plain text -#: ../src/xz/xz.1:107 -msgid "When compressing, the suffix of the target file format (B<.xz> or B<.lzma>) is appended to the source filename to get the target filename." -msgstr "Bei der Kompression wird das Suffix des Formats der Zieldatei (B<.xz> oder B<.lzma>) an den Namen der Quelldatei angehängt und so der Name der Zieldatei gebildet." +#: ../src/xz/xz.1:109 +msgid "" +"When compressing, the suffix of the target file format (B<.xz> or B<.lzma>) " +"is appended to the source filename to get the target filename." +msgstr "" +"Bei der Kompression wird das Suffix des Formats der Zieldatei (B<.xz> oder " +"B<.lzma>) an den Namen der Quelldatei angehängt und so der Name der " +"Zieldatei gebildet." #. type: Plain text -#: ../src/xz/xz.1:122 -msgid "When decompressing, the B<.xz>, B<.lzma>, or B<.lz> suffix is removed from the filename to get the target filename. B also recognizes the suffixes B<.txz> and B<.tlz>, and replaces them with the B<.tar> suffix." -msgstr "Bei der Dekompression wird das Suffix B<.xz>, B<.lzma> oder B<.lz> vom Dateinamen entfernt und so der Name der Zieldatei gebildet. Außerdem erkennt B die Suffixe B<.txz> und B<.tlz> und ersetzt diese durch B<.tar>." +#: ../src/xz/xz.1:124 +msgid "" +"When decompressing, the B<.xz>, B<.lzma>, or B<.lz> suffix is removed from " +"the filename to get the target filename. B also recognizes the suffixes " +"B<.txz> and B<.tlz>, and replaces them with the B<.tar> suffix." +msgstr "" +"Bei der Dekompression wird das Suffix B<.xz>, B<.lzma> oder B<.lz> vom " +"Dateinamen entfernt und so der Name der Zieldatei gebildet. Außerdem erkennt " +"B die Suffixe B<.txz> und B<.tlz> und ersetzt diese durch B<.tar>." #. type: Plain text -#: ../src/xz/xz.1:126 -msgid "If the target file already exists, an error is displayed and the I is skipped." -msgstr "Wenn die Zieldatei bereits existiert, wird eine Fehlermeldung angezeigt und die I übersprungen." +#: ../src/xz/xz.1:128 +msgid "" +"If the target file already exists, an error is displayed and the I is " +"skipped." +msgstr "" +"Wenn die Zieldatei bereits existiert, wird eine Fehlermeldung angezeigt und " +"die I übersprungen." #. type: Plain text -#: ../src/xz/xz.1:132 -msgid "Unless writing to standard output, B will display a warning and skip the I if any of the following applies:" -msgstr "Außer beim Schreiben in die Standardausgabe zeigt B eine Warnung an und überspringt die I, wenn eine der folgenden Bedingungen zutreffend ist:" +#: ../src/xz/xz.1:134 +msgid "" +"Unless writing to standard output, B will display a warning and skip the " +"I if any of the following applies:" +msgstr "" +"Außer beim Schreiben in die Standardausgabe zeigt B eine Warnung an und " +"überspringt die I, wenn eine der folgenden Bedingungen zutreffend ist:" #. type: Plain text -#: ../src/xz/xz.1:137 -msgid "I is not a regular file. Symbolic links are not followed, and thus they are not considered to be regular files." -msgstr "Die I ist keine reguläre Datei. Symbolischen Verknüpfungen wird nicht gefolgt und diese daher nicht zu den regulären Dateien gezählt." +#: ../src/xz/xz.1:139 +msgid "" +"I is not a regular file. Symbolic links are not followed, and thus " +"they are not considered to be regular files." +msgstr "" +"Die I ist keine reguläre Datei. Symbolischen Verknüpfungen wird nicht " +"gefolgt und diese daher nicht zu den regulären Dateien gezählt." #. type: Plain text -#: ../src/xz/xz.1:140 +#: ../src/xz/xz.1:142 msgid "I has more than one hard link." msgstr "Die I hat mehr als eine harte Verknüpfung." #. type: Plain text -#: ../src/xz/xz.1:143 +#: ../src/xz/xz.1:145 msgid "I has setuid, setgid, or sticky bit set." -msgstr "Für die I ist das »setuid«-, »setgid«- oder »sticky«-Bit gesetzt." +msgstr "" +"Für die I ist das »setuid«-, »setgid«- oder »sticky«-Bit gesetzt." #. type: Plain text -#: ../src/xz/xz.1:159 -msgid "The operation mode is set to compress and the I already has a suffix of the target file format (B<.xz> or B<.txz> when compressing to the B<.xz> format, and B<.lzma> or B<.tlz> when compressing to the B<.lzma> format)." -msgstr "Der Aktionsmodus wird auf Kompression gesetzt und die I hat bereits das Suffix des Zieldateiformats (B<.xz> oder B<.txz> beim Komprimieren in das B<.xz>-Format und B<.lzma> oder B<.tlz> beim Komprimieren in das B<.lzma>-Format)." +#: ../src/xz/xz.1:161 +msgid "" +"The operation mode is set to compress and the I already has a suffix " +"of the target file format (B<.xz> or B<.txz> when compressing to the B<.xz> " +"format, and B<.lzma> or B<.tlz> when compressing to the B<.lzma> format)." +msgstr "" +"Der Aktionsmodus wird auf Kompression gesetzt und die I hat bereits " +"das Suffix des Zieldateiformats (B<.xz> oder B<.txz> beim Komprimieren in " +"das B<.xz>-Format und B<.lzma> oder B<.tlz> beim Komprimieren in das B<." +"lzma>-Format)." #. type: Plain text -#: ../src/xz/xz.1:169 -msgid "The operation mode is set to decompress and the I doesn't have a suffix of any of the supported file formats (B<.xz>, B<.txz>, B<.lzma>, B<.tlz>, or B<.lz>)." -msgstr "Der Aktionsmodus wird auf Dekompression gesetzt und die I hat nicht das Suffix eines der unterstützten Zieldateiformate (B<.xz>, B<.txz>, B<.lzma>, B<.tlz> oder B<.lz>)." +#: ../src/xz/xz.1:171 +msgid "" +"The operation mode is set to decompress and the I doesn't have a " +"suffix of any of the supported file formats (B<.xz>, B<.txz>, B<.lzma>, B<." +"tlz>, or B<.lz>)." +msgstr "" +"Der Aktionsmodus wird auf Dekompression gesetzt und die I hat nicht " +"das Suffix eines der unterstützten Zieldateiformate (B<.xz>, B<.txz>, B<." +"lzma>, B<.tlz> oder B<.lz>)." #. type: Plain text -#: ../src/xz/xz.1:184 -msgid "After successfully compressing or decompressing the I, B copies the owner, group, permissions, access time, and modification time from the source I to the target file. If copying the group fails, the permissions are modified so that the target file doesn't become accessible to users who didn't have permission to access the source I. B doesn't support copying other metadata like access control lists or extended attributes yet." -msgstr "Nach erfolgreicher Kompression oder Dekompression der I kopiert B Eigentümer, Gruppe, Zugriffsrechte, Zugriffszeit und Änderungszeit aus der Ursprungs-I in die Zieldatei. Sollte das Kopieren der Gruppe fehlschlagen, werden die Zugriffsrechte so angepasst, dass jenen Benutzern der Zugriff auf die Zieldatei verwehrt bleibt, die auch keinen Zugriff auf die Ursprungs-I hatten. Das Kopieren anderer Metadaten wie Zugriffssteuerlisten oder erweiterter Attribute wird von B noch nicht unterstützt." +#: ../src/xz/xz.1:186 +msgid "" +"After successfully compressing or decompressing the I, B copies " +"the owner, group, permissions, access time, and modification time from the " +"source I to the target file. If copying the group fails, the " +"permissions are modified so that the target file doesn't become accessible " +"to users who didn't have permission to access the source I. B " +"doesn't support copying other metadata like access control lists or extended " +"attributes yet." +msgstr "" +"Nach erfolgreicher Kompression oder Dekompression der I kopiert B " +"Eigentümer, Gruppe, Zugriffsrechte, Zugriffszeit und Änderungszeit aus der " +"Ursprungs-I in die Zieldatei. Sollte das Kopieren der Gruppe " +"fehlschlagen, werden die Zugriffsrechte so angepasst, dass jenen Benutzern " +"der Zugriff auf die Zieldatei verwehrt bleibt, die auch keinen Zugriff auf " +"die Ursprungs-I hatten. Das Kopieren anderer Metadaten wie " +"Zugriffssteuerlisten oder erweiterter Attribute wird von B noch nicht " +"unterstützt." #. type: Plain text -#: ../src/xz/xz.1:194 -msgid "Once the target file has been successfully closed, the source I is removed unless B<--keep> was specified. The source I is never removed if the output is written to standard output or if an error occurs." -msgstr "Sobald die Zieldatei erfolgreich geschlossen wurde, wird die Ursprungs-I entfernt. Dies wird durch die Option B<--keep> verhindert. Die Ursprungs-I wird niemals entfernt, wenn die Ausgabe in die Standardausgabe geschrieben wird oder falls ein Fehler auftritt." +#: ../src/xz/xz.1:196 +msgid "" +"Once the target file has been successfully closed, the source I is " +"removed unless B<--keep> was specified. The source I is never removed " +"if the output is written to standard output or if an error occurs." +msgstr "" +"Sobald die Zieldatei erfolgreich geschlossen wurde, wird die Ursprungs-" +"I entfernt. Dies wird durch die Option B<--keep> verhindert. Die " +"Ursprungs-I wird niemals entfernt, wenn die Ausgabe in die " +"Standardausgabe geschrieben wird oder falls ein Fehler auftritt." #. type: Plain text -#: ../src/xz/xz.1:206 -msgid "Sending B or B to the B process makes it print progress information to standard error. This has only limited use since when standard error is a terminal, using B<--verbose> will display an automatically updating progress indicator." -msgstr "Durch Senden der Signale B oder B an den B-Prozess werden Fortschrittsinformationen in den Fehlerkanal der Standardausgabe geleitet. Dies ist nur eingeschränkt hilfreich, wenn die Standardfehlerausgabe ein Terminal ist. Mittels B<--verbose> wird ein automatisch aktualisierter Fortschrittsanzeiger angezeigt." +#: ../src/xz/xz.1:208 +msgid "" +"Sending B or B to the B process makes it print " +"progress information to standard error. This has only limited use since " +"when standard error is a terminal, using B<--verbose> will display an " +"automatically updating progress indicator." +msgstr "" +"Durch Senden der Signale B oder B an den B-Prozess " +"werden Fortschrittsinformationen in den Fehlerkanal der Standardausgabe " +"geleitet. Dies ist nur eingeschränkt hilfreich, wenn die " +"Standardfehlerausgabe ein Terminal ist. Mittels B<--verbose> wird ein " +"automatisch aktualisierter Fortschrittsanzeiger angezeigt." #. type: SS -#: ../src/xz/xz.1:207 +#: ../src/xz/xz.1:209 #, no-wrap msgid "Memory usage" msgstr "Speicherbedarf" #. type: Plain text -#: ../src/xz/xz.1:223 -msgid "The memory usage of B varies from a few hundred kilobytes to several gigabytes depending on the compression settings. The settings used when compressing a file determine the memory requirements of the decompressor. Typically the decompressor needs 5\\ % to 20\\ % of the amount of memory that the compressor needed when creating the file. For example, decompressing a file created with B currently requires 65\\ MiB of memory. Still, it is possible to have B<.xz> files that require several gigabytes of memory to decompress." -msgstr "In Abhängigkeit von den gewählten Kompressionseinstellungen bewegt sich der Speicherverbrauch zwischen wenigen hundert Kilobyte und mehreren Gigabyte. Die Einstellungen bei der Kompression einer Datei bestimmen dabei den Speicherbedarf bei der Dekompression. Die Dekompression benötigt üblicherweise zwischen 5\\ % und 20\\ % des Speichers, der bei der Kompression der Datei erforderlich war. Beispielsweise benötigt die Dekompression einer Datei, die mit B komprimiert wurde, gegenwärtig etwa 65\\ MiB Speicher. Es ist jedoch auch möglich, dass B<.xz>-Dateien mehrere Gigabyte an Speicher zur Dekompression erfordern." +#: ../src/xz/xz.1:225 +msgid "" +"The memory usage of B varies from a few hundred kilobytes to several " +"gigabytes depending on the compression settings. The settings used when " +"compressing a file determine the memory requirements of the decompressor. " +"Typically the decompressor needs 5\\ % to 20\\ % of the amount of memory " +"that the compressor needed when creating the file. For example, " +"decompressing a file created with B currently requires 65\\ MiB of " +"memory. Still, it is possible to have B<.xz> files that require several " +"gigabytes of memory to decompress." +msgstr "" +"In Abhängigkeit von den gewählten Kompressionseinstellungen bewegt sich der " +"Speicherverbrauch zwischen wenigen hundert Kilobyte und mehreren Gigabyte. " +"Die Einstellungen bei der Kompression einer Datei bestimmen dabei den " +"Speicherbedarf bei der Dekompression. Die Dekompression benötigt " +"üblicherweise zwischen 5\\ % und 20\\ % des Speichers, der bei der " +"Kompression der Datei erforderlich war. Beispielsweise benötigt die " +"Dekompression einer Datei, die mit B komprimiert wurde, gegenwärtig " +"etwa 65\\ MiB Speicher. Es ist jedoch auch möglich, dass B<.xz>-Dateien " +"mehrere Gigabyte an Speicher zur Dekompression erfordern." # cripple → lahmlegen...? War mir hier zu sehr Straßenslang. #. type: Plain text -#: ../src/xz/xz.1:235 -msgid "Especially users of older systems may find the possibility of very large memory usage annoying. To prevent uncomfortable surprises, B has a built-in memory usage limiter, which is disabled by default. While some operating systems provide ways to limit the memory usage of processes, relying on it wasn't deemed to be flexible enough (for example, using B(1) to limit virtual memory tends to cripple B(2))." -msgstr "Insbesondere für Benutzer älterer Systeme wird eventuell ein sehr großer Speicherbedarf ärgerlich sein. Um unangenehme Überraschungen zu vermeiden, verfügt B über eine eingebaute Begrenzung des Speicherbedarfs, die allerdings in der Voreinstellung deaktiviert ist. Zwar verfügen einige Betriebssysteme über eingebaute Möglichkeiten zur prozessabhängigen Speicherbegrenzung, doch diese sind zu unflexibel (zum Beispiel kann B(1) beim Begrenzen des virtuellen Speichers B(2) beeinträchtigen)." +#: ../src/xz/xz.1:237 +msgid "" +"Especially users of older systems may find the possibility of very large " +"memory usage annoying. To prevent uncomfortable surprises, B has a " +"built-in memory usage limiter, which is disabled by default. While some " +"operating systems provide ways to limit the memory usage of processes, " +"relying on it wasn't deemed to be flexible enough (for example, using " +"B(1) to limit virtual memory tends to cripple B(2))." +msgstr "" +"Insbesondere für Benutzer älterer Systeme wird eventuell ein sehr großer " +"Speicherbedarf ärgerlich sein. Um unangenehme Überraschungen zu vermeiden, " +"verfügt B über eine eingebaute Begrenzung des Speicherbedarfs, die " +"allerdings in der Voreinstellung deaktiviert ist. Zwar verfügen einige " +"Betriebssysteme über eingebaute Möglichkeiten zur prozessabhängigen " +"Speicherbegrenzung, doch diese sind zu unflexibel (zum Beispiel kann " +"B(1) beim Begrenzen des virtuellen Speichers B(2) " +"beeinträchtigen)." #. type: Plain text -#: ../src/xz/xz.1:257 -msgid "The memory usage limiter can be enabled with the command line option B<--memlimit=>I. Often it is more convenient to enable the limiter by default by setting the environment variable B, for example, B. It is possible to set the limits separately for compression and decompression by using B<--memlimit-compress=>I and B<--memlimit-decompress=>I. Using these two options outside B is rarely useful because a single run of B cannot do both compression and decompression and B<--memlimit=>I (or B<-M> I) is shorter to type on the command line." -msgstr "Die Begrenzung des Speicherbedarfs kann mit der Befehlszeilenoption B<--memlimit=>I aktiviert werden. Oft ist es jedoch bequemer, die Begrenzung durch Setzen der Umgebungsvariable B standardmäßig zu aktivieren, zum Beispiel B. Die Begrenzungen können getrennt für Kompression und Dekompression mittels B<--memlimit-compress=>I und B<--memlimit-decompress=>I festgelegt werden. Die Verwendung einer solchen Option außerhalb der Variable B ist kaum sinnvoll, da B in einer einzelnen Aktion nicht gleichzeitig Kompression und Dekompression ausführen kann und B<--memlimit=>I (oder B<-M> I) lässt sich einfacher in der Befehlszeile eingeben." +#: ../src/xz/xz.1:259 +msgid "" +"The memory usage limiter can be enabled with the command line option B<--" +"memlimit=>I. Often it is more convenient to enable the limiter by " +"default by setting the environment variable B, for example, " +"B. It is possible to set the limits " +"separately for compression and decompression by using B<--memlimit-" +"compress=>I and B<--memlimit-decompress=>I. Using these two " +"options outside B is rarely useful because a single run of " +"B cannot do both compression and decompression and B<--" +"memlimit=>I (or B<-M> I) is shorter to type on the command " +"line." +msgstr "" +"Die Begrenzung des Speicherbedarfs kann mit der Befehlszeilenoption B<--" +"memlimit=>I aktiviert werden. Oft ist es jedoch bequemer, die " +"Begrenzung durch Setzen der Umgebungsvariable B standardmäßig " +"zu aktivieren, zum Beispiel B. Die " +"Begrenzungen können getrennt für Kompression und Dekompression mittels B<--" +"memlimit-compress=>I und B<--memlimit-decompress=>I " +"festgelegt werden. Die Verwendung einer solchen Option außerhalb der " +"Variable B ist kaum sinnvoll, da B in einer einzelnen " +"Aktion nicht gleichzeitig Kompression und Dekompression ausführen kann und " +"B<--memlimit=>I (oder B<-M> I) lässt sich einfacher " +"in der Befehlszeile eingeben." #. type: Plain text -#: ../src/xz/xz.1:276 -msgid "If the specified memory usage limit is exceeded when decompressing, B will display an error and decompressing the file will fail. If the limit is exceeded when compressing, B will try to scale the settings down so that the limit is no longer exceeded (except when using B<--format=raw> or B<--no-adjust>). This way the operation won't fail unless the limit is very small. The scaling of the settings is done in steps that don't match the compression level presets, for example, if the limit is only slightly less than the amount required for B, the settings will be scaled down only a little, not all the way down to B." -msgstr "Wenn die angegebene Speicherbegrenzung bei der Dekompression überschritten wird, schlägt der Vorgang fehl und B zeigt eine Fehlermeldung an. Wird die Begrenzung bei der Kompression überschritten, dann versucht B die Einstellungen entsprechend anzupassen, außer wenn B<--format=raw> oder B<--no-adjust> angegeben ist. Auf diese Weise schlägt die Aktion nicht fehl, es sei denn, die Begrenzung wurde sehr niedrig angesetzt. Die Anpassung der Einstellungen wird schrittweise vorgenommen, allerdings entsprechen die Schritte nicht den Voreinstellungen der Kompressionsstufen. Das bedeutet, wenn beispielsweise die Begrenzung nur geringfügig unter den Anforderungen für B liegt, werden auch die Einstellungen nur wenig angepasst und nicht vollständig herunter zu den Werten für B" +#: ../src/xz/xz.1:278 +msgid "" +"If the specified memory usage limit is exceeded when decompressing, B " +"will display an error and decompressing the file will fail. If the limit is " +"exceeded when compressing, B will try to scale the settings down so that " +"the limit is no longer exceeded (except when using B<--format=raw> or B<--no-" +"adjust>). This way the operation won't fail unless the limit is very " +"small. The scaling of the settings is done in steps that don't match the " +"compression level presets, for example, if the limit is only slightly less " +"than the amount required for B, the settings will be scaled down only " +"a little, not all the way down to B." +msgstr "" +"Wenn die angegebene Speicherbegrenzung bei der Dekompression überschritten " +"wird, schlägt der Vorgang fehl und B zeigt eine Fehlermeldung an. Wird " +"die Begrenzung bei der Kompression überschritten, dann versucht B die " +"Einstellungen entsprechend anzupassen, außer wenn B<--format=raw> oder B<--" +"no-adjust> angegeben ist. Auf diese Weise schlägt die Aktion nicht fehl, es " +"sei denn, die Begrenzung wurde sehr niedrig angesetzt. Die Anpassung der " +"Einstellungen wird schrittweise vorgenommen, allerdings entsprechen die " +"Schritte nicht den Voreinstellungen der Kompressionsstufen. Das bedeutet, " +"wenn beispielsweise die Begrenzung nur geringfügig unter den Anforderungen " +"für B liegt, werden auch die Einstellungen nur wenig angepasst und " +"nicht vollständig herunter zu den Werten für B" #. type: SS -#: ../src/xz/xz.1:277 +#: ../src/xz/xz.1:279 #, no-wrap msgid "Concatenation and padding with .xz files" msgstr "Verkettung und Auffüllung von .xz-Dateien" #. type: Plain text -#: ../src/xz/xz.1:285 -msgid "It is possible to concatenate B<.xz> files as is. B will decompress such files as if they were a single B<.xz> file." -msgstr "Es ist möglich, B<.xz>-Dateien direkt zu verketten. Solche Dateien werden von B genauso dekomprimiert wie eine einzelne B<.xz>-Datei." +#: ../src/xz/xz.1:287 +msgid "" +"It is possible to concatenate B<.xz> files as is. B will decompress " +"such files as if they were a single B<.xz> file." +msgstr "" +"Es ist möglich, B<.xz>-Dateien direkt zu verketten. Solche Dateien werden " +"von B genauso dekomprimiert wie eine einzelne B<.xz>-Datei." #. type: Plain text -#: ../src/xz/xz.1:294 -msgid "It is possible to insert padding between the concatenated parts or after the last part. The padding must consist of null bytes and the size of the padding must be a multiple of four bytes. This can be useful, for example, if the B<.xz> file is stored on a medium that measures file sizes in 512-byte blocks." -msgstr "Es ist weiterhin möglich, eine Auffüllung zwischen den verketteten Teilen oder nach dem letzten Teil einzufügen. Die Auffüllung muss aus Null-Bytes bestehen und deren Größe muss ein Vielfaches von vier Byte sein. Dies kann zum Beispiel dann vorteilhaft sein, wenn die B<.xz>-Datei auf einem Datenträger gespeichert wird, dessen Dateisystem die Dateigrößen in 512-Byte-Blöcken speichert." +#: ../src/xz/xz.1:296 +msgid "" +"It is possible to insert padding between the concatenated parts or after the " +"last part. The padding must consist of null bytes and the size of the " +"padding must be a multiple of four bytes. This can be useful, for example, " +"if the B<.xz> file is stored on a medium that measures file sizes in 512-" +"byte blocks." +msgstr "" +"Es ist weiterhin möglich, eine Auffüllung zwischen den verketteten Teilen " +"oder nach dem letzten Teil einzufügen. Die Auffüllung muss aus Null-Bytes " +"bestehen und deren Größe muss ein Vielfaches von vier Byte sein. Dies kann " +"zum Beispiel dann vorteilhaft sein, wenn die B<.xz>-Datei auf einem " +"Datenträger gespeichert wird, dessen Dateisystem die Dateigrößen in 512-Byte-" +"Blöcken speichert." #. type: Plain text -#: ../src/xz/xz.1:298 -msgid "Concatenation and padding are not allowed with B<.lzma> files or raw streams." -msgstr "Verkettung und Auffüllung sind für B<.lzma>-Dateien oder Rohdatenströme nicht erlaubt." +#: ../src/xz/xz.1:300 +msgid "" +"Concatenation and padding are not allowed with B<.lzma> files or raw streams." +msgstr "" +"Verkettung und Auffüllung sind für B<.lzma>-Dateien oder Rohdatenströme " +"nicht erlaubt." #. type: SH -#: ../src/xz/xz.1:299 ../src/xzdec/xzdec.1:59 +#: ../src/xz/xz.1:301 ../src/xzdec/xzdec.1:61 #, no-wrap msgid "OPTIONS" msgstr "OPTIONEN" #. type: SS -#: ../src/xz/xz.1:301 +#: ../src/xz/xz.1:303 #, no-wrap msgid "Integer suffixes and special values" msgstr "Ganzzahlige Suffixe und spezielle Werte" #. type: Plain text -#: ../src/xz/xz.1:305 -msgid "In most places where an integer argument is expected, an optional suffix is supported to easily indicate large integers. There must be no space between the integer and the suffix." -msgstr "An den meisten Stellen, wo ein ganzzahliges Argument akzeptiert wird, kann ein optionales Suffix große Ganzzahlwerte einfacher darstellen. Zwischen Ganzzahl und dem Suffix dürfen sich keine Leerzeichen befinden." +#: ../src/xz/xz.1:307 +msgid "" +"In most places where an integer argument is expected, an optional suffix is " +"supported to easily indicate large integers. There must be no space between " +"the integer and the suffix." +msgstr "" +"An den meisten Stellen, wo ein ganzzahliges Argument akzeptiert wird, kann " +"ein optionales Suffix große Ganzzahlwerte einfacher darstellen. Zwischen " +"Ganzzahl und dem Suffix dürfen sich keine Leerzeichen befinden." #. type: TP -#: ../src/xz/xz.1:305 +#: ../src/xz/xz.1:307 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:316 -msgid "Multiply the integer by 1,024 (2^10). B, B, B, B, and B are accepted as synonyms for B." -msgstr "multipliziert die Ganzzahl mit 1.024 (2^10). B, B, B, B und B werden als Synonyme für B akzeptiert." +#: ../src/xz/xz.1:318 +msgid "" +"Multiply the integer by 1,024 (2^10). B, B, B, B, and B " +"are accepted as synonyms for B." +msgstr "" +"multipliziert die Ganzzahl mit 1.024 (2^10). B, B, B, B und " +"B werden als Synonyme für B akzeptiert." #. type: TP -#: ../src/xz/xz.1:316 +#: ../src/xz/xz.1:318 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:326 -msgid "Multiply the integer by 1,048,576 (2^20). B, B, B, and B are accepted as synonyms for B." -msgstr "multipliziert die Ganzzahl mit 1.048.576 (2^20). B, B, B und B werden als Synonyme für B akzeptiert." +#: ../src/xz/xz.1:328 +msgid "" +"Multiply the integer by 1,048,576 (2^20). B, B, B, and B are " +"accepted as synonyms for B." +msgstr "" +"multipliziert die Ganzzahl mit 1.048.576 (2^20). B, B, B und B " +"werden als Synonyme für B akzeptiert." #. type: TP -#: ../src/xz/xz.1:326 +#: ../src/xz/xz.1:328 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:336 -msgid "Multiply the integer by 1,073,741,824 (2^30). B, B, B, and B are accepted as synonyms for B." -msgstr "multipliziert die Ganzzahl mit 1.073.741.824 (2^30). B, B, B und B werden als Synonyme für B akzeptiert." +#: ../src/xz/xz.1:338 +msgid "" +"Multiply the integer by 1,073,741,824 (2^30). B, B, B, and B " +"are accepted as synonyms for B." +msgstr "" +"multipliziert die Ganzzahl mit 1.073.741.824 (2^30). B, B, B und " +"B werden als Synonyme für B akzeptiert." #. type: Plain text -#: ../src/xz/xz.1:341 -msgid "The special value B can be used to indicate the maximum integer value supported by the option." -msgstr "Der spezielle Wert B kann dazu verwendet werden, um den von der jeweiligen Option akzeptierten maximalen Ganzzahlwert anzugeben." +#: ../src/xz/xz.1:343 +msgid "" +"The special value B can be used to indicate the maximum integer value " +"supported by the option." +msgstr "" +"Der spezielle Wert B kann dazu verwendet werden, um den von der " +"jeweiligen Option akzeptierten maximalen Ganzzahlwert anzugeben." #. type: SS -#: ../src/xz/xz.1:342 +#: ../src/xz/xz.1:344 #, no-wrap msgid "Operation mode" msgstr "Aktionsmodus" #. type: Plain text -#: ../src/xz/xz.1:345 -msgid "If multiple operation mode options are given, the last one takes effect." -msgstr "Falls mehrere Aktionsmodi angegeben sind, wird der zuletzt angegebene verwendet." +#: ../src/xz/xz.1:347 +msgid "" +"If multiple operation mode options are given, the last one takes effect." +msgstr "" +"Falls mehrere Aktionsmodi angegeben sind, wird der zuletzt angegebene " +"verwendet." #. type: TP -#: ../src/xz/xz.1:345 +#: ../src/xz/xz.1:347 #, no-wrap msgid "B<-z>, B<--compress>" msgstr "B<-z>, B<--compress>" #. type: Plain text -#: ../src/xz/xz.1:354 -msgid "Compress. This is the default operation mode when no operation mode option is specified and no other operation mode is implied from the command name (for example, B implies B<--decompress>)." -msgstr "Kompression. Dies ist der voreingestellte Aktionsmodus, sofern keiner angegeben ist und auch kein bestimmter Modus aus dem Befehlsnamen abgeleitet werden kann (der Befehl B impliziert zum Beispiel B<--decompress>)." +#: ../src/xz/xz.1:356 +msgid "" +"Compress. This is the default operation mode when no operation mode option " +"is specified and no other operation mode is implied from the command name " +"(for example, B implies B<--decompress>)." +msgstr "" +"Kompression. Dies ist der voreingestellte Aktionsmodus, sofern keiner " +"angegeben ist und auch kein bestimmter Modus aus dem Befehlsnamen abgeleitet " +"werden kann (der Befehl B impliziert zum Beispiel B<--decompress>)." #. type: TP -#: ../src/xz/xz.1:354 ../src/xzdec/xzdec.1:60 +#: ../src/xz/xz.1:356 ../src/xzdec/xzdec.1:62 #, no-wrap msgid "B<-d>, B<--decompress>, B<--uncompress>" msgstr "B<-d>, B<--decompress>, B<--uncompress>" #. type: Plain text -#: ../src/xz/xz.1:357 +#: ../src/xz/xz.1:359 msgid "Decompress." msgstr "dekomprimpiert." #. type: TP -#: ../src/xz/xz.1:357 +#: ../src/xz/xz.1:359 #, no-wrap msgid "B<-t>, B<--test>" msgstr "B<-t>, B<--test>" #. type: Plain text -#: ../src/xz/xz.1:366 -msgid "Test the integrity of compressed I. This option is equivalent to B<--decompress --stdout> except that the decompressed data is discarded instead of being written to standard output. No files are created or removed." -msgstr "prüft die Integrität der komprimierten I. Diese Option ist gleichbedeutend mit B<--decompress --stdout>, außer dass die dekomprimierten Daten verworfen werden, anstatt sie in die Standardausgabe zu leiten. Es werden keine Dateien erstellt oder entfernt." +#: ../src/xz/xz.1:368 +msgid "" +"Test the integrity of compressed I. This option is equivalent to B<--" +"decompress --stdout> except that the decompressed data is discarded instead " +"of being written to standard output. No files are created or removed." +msgstr "" +"prüft die Integrität der komprimierten I. Diese Option ist " +"gleichbedeutend mit B<--decompress --stdout>, außer dass die dekomprimierten " +"Daten verworfen werden, anstatt sie in die Standardausgabe zu leiten. Es " +"werden keine Dateien erstellt oder entfernt." #. type: TP -#: ../src/xz/xz.1:366 +#: ../src/xz/xz.1:368 #, no-wrap msgid "B<-l>, B<--list>" msgstr "B<-l>, B<--list>" #. type: Plain text -#: ../src/xz/xz.1:375 -msgid "Print information about compressed I. No uncompressed output is produced, and no files are created or removed. In list mode, the program cannot read the compressed data from standard input or from other unseekable sources." -msgstr "gibt Informationen zu den komprimierten I aus. Es werden keine unkomprimierten Dateien ausgegeben und keine Dateien angelegt oder entfernt. Im Listenmodus kann das Programm keine komprimierten Daten aus der Standardeingabe oder anderen nicht durchsuchbaren Quellen lesen." +#: ../src/xz/xz.1:377 +msgid "" +"Print information about compressed I. No uncompressed output is " +"produced, and no files are created or removed. In list mode, the program " +"cannot read the compressed data from standard input or from other unseekable " +"sources." +msgstr "" +"gibt Informationen zu den komprimierten I aus. Es werden keine " +"unkomprimierten Dateien ausgegeben und keine Dateien angelegt oder entfernt. " +"Im Listenmodus kann das Programm keine komprimierten Daten aus der " +"Standardeingabe oder anderen nicht durchsuchbaren Quellen lesen." #. type: Plain text -#: ../src/xz/xz.1:390 -msgid "The default listing shows basic information about I, one file per line. To get more detailed information, use also the B<--verbose> option. For even more information, use B<--verbose> twice, but note that this may be slow, because getting all the extra information requires many seeks. The width of verbose output exceeds 80 characters, so piping the output to, for example, B may be convenient if the terminal isn't wide enough." -msgstr "Die Liste zeigt in der Standardeinstellung grundlegende Informationen zu den I an, zeilenweise pro Datei. Detailliertere Informationen erhalten Sie mit der Option B<--verbose>. Wenn Sie diese Option zweimal angeben, werden noch ausführlichere Informationen ausgegeben. Das kann den Vorgang allerdings deutlich verlangsamen, da die Ermittlung der zusätzlichen Informationen zahlreiche Suchvorgänge erfordert. Die Breite der ausführlichen Ausgabe übersteigt 80 Zeichen, daher könnte die Weiterleitung in beispielsweise\\& B sinnvoll sein, falls das Terminal nicht breit genug ist." +#: ../src/xz/xz.1:392 +msgid "" +"The default listing shows basic information about I, one file per " +"line. To get more detailed information, use also the B<--verbose> option. " +"For even more information, use B<--verbose> twice, but note that this may be " +"slow, because getting all the extra information requires many seeks. The " +"width of verbose output exceeds 80 characters, so piping the output to, for " +"example, B may be convenient if the terminal isn't wide enough." +msgstr "" +"Die Liste zeigt in der Standardeinstellung grundlegende Informationen zu den " +"I an, zeilenweise pro Datei. Detailliertere Informationen erhalten " +"Sie mit der Option B<--verbose>. Wenn Sie diese Option zweimal angeben, " +"werden noch ausführlichere Informationen ausgegeben. Das kann den Vorgang " +"allerdings deutlich verlangsamen, da die Ermittlung der zusätzlichen " +"Informationen zahlreiche Suchvorgänge erfordert. Die Breite der " +"ausführlichen Ausgabe übersteigt 80 Zeichen, daher könnte die Weiterleitung " +"in beispielsweise\\& B sinnvoll sein, falls das Terminal nicht " +"breit genug ist." #. type: Plain text -#: ../src/xz/xz.1:397 -msgid "The exact output may vary between B versions and different locales. For machine-readable output, B<--robot --list> should be used." -msgstr "Die exakte Ausgabe kann in verschiedenen B-Versionen und Spracheinstellungen unterschiedlich sein. Wenn eine maschinell auswertbare Ausgabe gewünscht ist, dann sollten Sie B<--robot --list> verwenden." +#: ../src/xz/xz.1:399 +msgid "" +"The exact output may vary between B versions and different locales. For " +"machine-readable output, B<--robot --list> should be used." +msgstr "" +"Die exakte Ausgabe kann in verschiedenen B-Versionen und " +"Spracheinstellungen unterschiedlich sein. Wenn eine maschinell auswertbare " +"Ausgabe gewünscht ist, dann sollten Sie B<--robot --list> verwenden." #. type: SS -#: ../src/xz/xz.1:398 +#: ../src/xz/xz.1:400 #, no-wrap msgid "Operation modifiers" msgstr "Aktionsattribute" #. type: TP -#: ../src/xz/xz.1:399 ../src/xzdec/xzdec.1:67 +#: ../src/xz/xz.1:401 ../src/xzdec/xzdec.1:69 #, no-wrap msgid "B<-k>, B<--keep>" msgstr "B<-k>, B<--keep>" #. type: Plain text -#: ../src/xz/xz.1:402 +#: ../src/xz/xz.1:404 msgid "Don't delete the input files." msgstr "verhindert das Löschen der Eingabedateien." #. type: Plain text -#: ../src/xz/xz.1:416 -msgid "Since B 5.2.6, this option also makes B compress or decompress even if the input is a symbolic link to a regular file, has more than one hard link, or has the setuid, setgid, or sticky bit set. The setuid, setgid, and sticky bits are not copied to the target file. In earlier versions this was only done with B<--force>." -msgstr "Seit der B-Version 5.2.6 wird die Kompression oder Dekompression auch dann ausgeführt, wenn die Eingabe ein symbolischer Link zu einer regulären Datei ist, mehr als einen harten Link hat oder das »setuid«-, »setgid«- oder »sticky«-Bit gesetzt ist. Die genannten Bits werden nicht in die Zieldatei kopiert. In früheren Versionen geschah dies nur mit B<--force>." +#: ../src/xz/xz.1:418 +msgid "" +"Since B 5.2.6, this option also makes B compress or decompress even " +"if the input is a symbolic link to a regular file, has more than one hard " +"link, or has the setuid, setgid, or sticky bit set. The setuid, setgid, and " +"sticky bits are not copied to the target file. In earlier versions this was " +"only done with B<--force>." +msgstr "" +"Seit der B-Version 5.2.6 wird die Kompression oder Dekompression auch " +"dann ausgeführt, wenn die Eingabe ein symbolischer Link zu einer regulären " +"Datei ist, mehr als einen harten Link hat oder das »setuid«-, »setgid«- oder " +"»sticky«-Bit gesetzt ist. Die genannten Bits werden nicht in die Zieldatei " +"kopiert. In früheren Versionen geschah dies nur mit B<--force>." #. type: TP -#: ../src/xz/xz.1:416 +#: ../src/xz/xz.1:418 #, no-wrap msgid "B<-f>, B<--force>" msgstr "B<-f>, B<--force>" #. type: Plain text -#: ../src/xz/xz.1:419 +#: ../src/xz/xz.1:421 msgid "This option has several effects:" msgstr "Diese Option hat verschiedene Auswirkungen:" #. type: Plain text -#: ../src/xz/xz.1:423 -msgid "If the target file already exists, delete it before compressing or decompressing." -msgstr "Wenn die Zieldatei bereits existiert, wird diese vor der Kompression oder Dekompression gelöscht." +#: ../src/xz/xz.1:425 +msgid "" +"If the target file already exists, delete it before compressing or " +"decompressing." +msgstr "" +"Wenn die Zieldatei bereits existiert, wird diese vor der Kompression oder " +"Dekompression gelöscht." #. type: Plain text -#: ../src/xz/xz.1:430 -msgid "Compress or decompress even if the input is a symbolic link to a regular file, has more than one hard link, or has the setuid, setgid, or sticky bit set. The setuid, setgid, and sticky bits are not copied to the target file." -msgstr "Die Kompression oder Dekompression wird auch dann ausgeführt, wenn die Eingabe ein symbolischer Link zu einer regulären Datei ist, mehr als einen harten Link hat oder das »setuid«-, »setgid«- oder »sticky«-Bit gesetzt ist. Die genannten Bits werden nicht in die Zieldatei kopiert." +#: ../src/xz/xz.1:432 +msgid "" +"Compress or decompress even if the input is a symbolic link to a regular " +"file, has more than one hard link, or has the setuid, setgid, or sticky bit " +"set. The setuid, setgid, and sticky bits are not copied to the target file." +msgstr "" +"Die Kompression oder Dekompression wird auch dann ausgeführt, wenn die " +"Eingabe ein symbolischer Link zu einer regulären Datei ist, mehr als einen " +"harten Link hat oder das »setuid«-, »setgid«- oder »sticky«-Bit gesetzt ist. " +"Die genannten Bits werden nicht in die Zieldatei kopiert." #. type: Plain text -#: ../src/xz/xz.1:455 -msgid "When used with B<--decompress> B<--stdout> and B cannot recognize the type of the source file, copy the source file as is to standard output. This allows B B<--force> to be used like B(1) for files that have not been compressed with B. Note that in future, B might support new compressed file formats, which may make B decompress more types of files instead of copying them as is to standard output. B<--format=>I can be used to restrict B to decompress only a single file format." -msgstr "Wenn es zusammen mit B<--decompress> und B<--stdout> verwendet wird und B den Typ der Quelldatei nicht ermitteln kann, wird die Quelldatei unverändert in die Standardausgabe kopiert. Dadurch kann B B<--force> für Dateien, die nicht mit B komprimiert wurden, wie B(1) verwendet werden. Zukünftig könnte B neue Dateikompressionsformate unterstützen, wodurch B mehr Dateitypen dekomprimieren kann, anstatt sie unverändert in die Standardausgabe zu kopieren. Mit der Option B<--format=>I können Sie B anweisen, nur ein einzelnes Dateiformat zu dekomprimieren." +#: ../src/xz/xz.1:457 +msgid "" +"When used with B<--decompress> B<--stdout> and B cannot recognize the " +"type of the source file, copy the source file as is to standard output. " +"This allows B B<--force> to be used like B(1) for files that " +"have not been compressed with B. Note that in future, B might " +"support new compressed file formats, which may make B decompress more " +"types of files instead of copying them as is to standard output. B<--" +"format=>I can be used to restrict B to decompress only a single " +"file format." +msgstr "" +"Wenn es zusammen mit B<--decompress> und B<--stdout> verwendet wird und " +"B den Typ der Quelldatei nicht ermitteln kann, wird die Quelldatei " +"unverändert in die Standardausgabe kopiert. Dadurch kann B B<--force> " +"für Dateien, die nicht mit B komprimiert wurden, wie B(1) verwendet " +"werden. Zukünftig könnte B neue Dateikompressionsformate unterstützen, " +"wodurch B mehr Dateitypen dekomprimieren kann, anstatt sie unverändert " +"in die Standardausgabe zu kopieren. Mit der Option B<--format=>I " +"können Sie B anweisen, nur ein einzelnes Dateiformat zu dekomprimieren." #. type: TP -#: ../src/xz/xz.1:456 ../src/xzdec/xzdec.1:74 +#: ../src/xz/xz.1:458 ../src/xzdec/xzdec.1:76 #, no-wrap msgid "B<-c>, B<--stdout>, B<--to-stdout>" msgstr "B<-c>, B<--stdout>, B<--to-stdout>" #. type: Plain text -#: ../src/xz/xz.1:462 -msgid "Write the compressed or decompressed data to standard output instead of a file. This implies B<--keep>." -msgstr "schreibt die komprimierten oder dekomprimierten Daten in die Standardausgabe anstatt in eine Datei. Dies impliziert B<--keep>." +#: ../src/xz/xz.1:464 +msgid "" +"Write the compressed or decompressed data to standard output instead of a " +"file. This implies B<--keep>." +msgstr "" +"schreibt die komprimierten oder dekomprimierten Daten in die Standardausgabe " +"anstatt in eine Datei. Dies impliziert B<--keep>." #. type: TP -#: ../src/xz/xz.1:462 +#: ../src/xz/xz.1:464 #, no-wrap msgid "B<--single-stream>" msgstr "B<--single-stream>" #. type: Plain text -#: ../src/xz/xz.1:471 -msgid "Decompress only the first B<.xz> stream, and silently ignore possible remaining input data following the stream. Normally such trailing garbage makes B display an error." -msgstr "dekomprimiert nur den ersten B<.xz>-Datenstrom und ignoriert stillschweigend weitere Eingabedaten, die möglicherweise dem Datenstrom folgen. Normalerweise führt solcher anhängender Datenmüll dazu, dass B eine Fehlermeldung ausgibt." +#: ../src/xz/xz.1:473 +msgid "" +"Decompress only the first B<.xz> stream, and silently ignore possible " +"remaining input data following the stream. Normally such trailing garbage " +"makes B display an error." +msgstr "" +"dekomprimiert nur den ersten B<.xz>-Datenstrom und ignoriert stillschweigend " +"weitere Eingabedaten, die möglicherweise dem Datenstrom folgen. " +"Normalerweise führt solcher anhängender Datenmüll dazu, dass B eine " +"Fehlermeldung ausgibt." #. type: Plain text -#: ../src/xz/xz.1:480 -msgid "B never decompresses more than one stream from B<.lzma> files or raw streams, but this option still makes B ignore the possible trailing data after the B<.lzma> file or raw stream." -msgstr "B dekomprimiert niemals mehr als einen Datenstrom aus B<.lzma>-Dateien oder Rohdatenströmen, aber dennoch wird durch diese Option möglicherweise vorhandener Datenmüll nach der B<.lzma>-Datei oder dem Rohdatenstrom ignoriert." +#: ../src/xz/xz.1:482 +msgid "" +"B never decompresses more than one stream from B<.lzma> files or raw " +"streams, but this option still makes B ignore the possible trailing data " +"after the B<.lzma> file or raw stream." +msgstr "" +"B dekomprimiert niemals mehr als einen Datenstrom aus B<.lzma>-Dateien " +"oder Rohdatenströmen, aber dennoch wird durch diese Option möglicherweise " +"vorhandener Datenmüll nach der B<.lzma>-Datei oder dem Rohdatenstrom " +"ignoriert." #. type: Plain text -#: ../src/xz/xz.1:485 -msgid "This option has no effect if the operation mode is not B<--decompress> or B<--test>." -msgstr "Diese Option ist wirkungslos, wenn der Aktionsmodus nicht B<--decompress> oder B<--test> ist." +#: ../src/xz/xz.1:487 +msgid "" +"This option has no effect if the operation mode is not B<--decompress> or " +"B<--test>." +msgstr "" +"Diese Option ist wirkungslos, wenn der Aktionsmodus nicht B<--decompress> " +"oder B<--test> ist." #. type: TP -#: ../src/xz/xz.1:485 +#: ../src/xz/xz.1:487 #, no-wrap msgid "B<--no-sparse>" msgstr "B<--no-sparse>" #. type: Plain text -#: ../src/xz/xz.1:497 -msgid "Disable creation of sparse files. By default, if decompressing into a regular file, B tries to make the file sparse if the decompressed data contains long sequences of binary zeros. It also works when writing to standard output as long as standard output is connected to a regular file and certain additional conditions are met to make it safe. Creating sparse files may save disk space and speed up the decompression by reducing the amount of disk I/O." -msgstr "verhindert die Erzeugung von Sparse-Dateien. In der Voreinstellung versucht B, bei der Dekompression in eine reguläre Datei eine Sparse-Datei zu erzeugen, wenn die dekomprimierten Daten lange Abfolgen von binären Nullen enthalten. Dies funktioniert auch beim Schreiben in die Standardausgabe, sofern diese in eine reguläre Datei weitergeleitet wird und bestimmte Zusatzbedingungen erfüllt sind, die die Aktion absichern. Die Erzeugung von Sparse-Dateien kann Plattenplatz sparen und beschleunigt die Dekompression durch Verringerung der Ein-/Ausgaben der Platte." +#: ../src/xz/xz.1:499 +msgid "" +"Disable creation of sparse files. By default, if decompressing into a " +"regular file, B tries to make the file sparse if the decompressed data " +"contains long sequences of binary zeros. It also works when writing to " +"standard output as long as standard output is connected to a regular file " +"and certain additional conditions are met to make it safe. Creating sparse " +"files may save disk space and speed up the decompression by reducing the " +"amount of disk I/O." +msgstr "" +"verhindert die Erzeugung von Sparse-Dateien. In der Voreinstellung versucht " +"B, bei der Dekompression in eine reguläre Datei eine Sparse-Datei zu " +"erzeugen, wenn die dekomprimierten Daten lange Abfolgen von binären Nullen " +"enthalten. Dies funktioniert auch beim Schreiben in die Standardausgabe, " +"sofern diese in eine reguläre Datei weitergeleitet wird und bestimmte " +"Zusatzbedingungen erfüllt sind, die die Aktion absichern. Die Erzeugung von " +"Sparse-Dateien kann Plattenplatz sparen und beschleunigt die Dekompression " +"durch Verringerung der Ein-/Ausgaben der Platte." #. type: TP -#: ../src/xz/xz.1:497 +#: ../src/xz/xz.1:499 #, no-wrap msgid "B<-S> I<.suf>, B<--suffix=>I<.suf>" msgstr "B<-S> I<.suf>, B<--suffix=>I<.suf>" #. type: Plain text -#: ../src/xz/xz.1:509 -msgid "When compressing, use I<.suf> as the suffix for the target file instead of B<.xz> or B<.lzma>. If not writing to standard output and the source file already has the suffix I<.suf>, a warning is displayed and the file is skipped." -msgstr "verwendet I<.suf> bei der Dekompression anstelle von B<.xz> oder B<.lzma> als Suffix für die Zieldatei. Falls nicht in die Standardausgabe geschrieben wird und die Quelldatei bereits das Suffix I<.suf> hat, wird eine Warnung angezeigt und die Datei übersprungen." +#: ../src/xz/xz.1:511 +msgid "" +"When compressing, use I<.suf> as the suffix for the target file instead of " +"B<.xz> or B<.lzma>. If not writing to standard output and the source file " +"already has the suffix I<.suf>, a warning is displayed and the file is " +"skipped." +msgstr "" +"verwendet I<.suf> bei der Dekompression anstelle von B<.xz> oder B<.lzma> " +"als Suffix für die Zieldatei. Falls nicht in die Standardausgabe geschrieben " +"wird und die Quelldatei bereits das Suffix I<.suf> hat, wird eine Warnung " +"angezeigt und die Datei übersprungen." #. type: Plain text -#: ../src/xz/xz.1:523 -msgid "When decompressing, recognize files with the suffix I<.suf> in addition to files with the B<.xz>, B<.txz>, B<.lzma>, B<.tlz>, or B<.lz> suffix. If the source file has the suffix I<.suf>, the suffix is removed to get the target filename." -msgstr "berücksichtigt bei der Dekompression zusätzlich zu Dateien mit den Suffixen B<.xz>, B<.txz>, B<.lzma>, B<.tlz> oder B<.lz> auch jene mit dem Suffix I<.suf>. Falls die Quelldatei das Suffix I<.suf> hat, wird dieses entfernt und so der Name der Zieldatei abgeleitet." +#: ../src/xz/xz.1:525 +msgid "" +"When decompressing, recognize files with the suffix I<.suf> in addition to " +"files with the B<.xz>, B<.txz>, B<.lzma>, B<.tlz>, or B<.lz> suffix. If the " +"source file has the suffix I<.suf>, the suffix is removed to get the target " +"filename." +msgstr "" +"berücksichtigt bei der Dekompression zusätzlich zu Dateien mit den Suffixen " +"B<.xz>, B<.txz>, B<.lzma>, B<.tlz> oder B<.lz> auch jene mit dem Suffix I<." +"suf>. Falls die Quelldatei das Suffix I<.suf> hat, wird dieses entfernt und " +"so der Name der Zieldatei abgeleitet." #. type: Plain text -#: ../src/xz/xz.1:529 -msgid "When compressing or decompressing raw streams (B<--format=raw>), the suffix must always be specified unless writing to standard output, because there is no default suffix for raw streams." -msgstr "Beim Komprimieren oder Dekomprimieren von Rohdatenströmen mit B<--format=raw> muss das Suffix stets angegeben werden, außer wenn die Ausgabe in die Standardausgabe erfolgt. Der Grund dafür ist, dass es kein vorgegebenes Suffix für Rohdatenströme gibt." +#: ../src/xz/xz.1:531 +msgid "" +"When compressing or decompressing raw streams (B<--format=raw>), the suffix " +"must always be specified unless writing to standard output, because there is " +"no default suffix for raw streams." +msgstr "" +"Beim Komprimieren oder Dekomprimieren von Rohdatenströmen mit B<--" +"format=raw> muss das Suffix stets angegeben werden, außer wenn die Ausgabe " +"in die Standardausgabe erfolgt. Der Grund dafür ist, dass es kein " +"vorgegebenes Suffix für Rohdatenströme gibt." #. type: TP -#: ../src/xz/xz.1:529 +#: ../src/xz/xz.1:531 #, no-wrap msgid "B<--files>[B<=>I]" msgstr "B<--files>[B<=>I]" #. type: Plain text -#: ../src/xz/xz.1:543 -msgid "Read the filenames to process from I; if I is omitted, filenames are read from standard input. Filenames must be terminated with the newline character. A dash (B<->) is taken as a regular filename; it doesn't mean standard input. If filenames are given also as command line arguments, they are processed before the filenames read from I." -msgstr "liest die zu verarbeitenden Dateinamen aus I. Falls keine I angegeben ist, werden die Dateinamen aus der Standardeingabe gelesen. Dateinamen müssen mit einem Zeilenumbruch beendet werden. Ein Bindestrich (B<->) wird als regulärer Dateiname angesehen und nicht als Standardeingabe interpretiert. Falls Dateinamen außerdem als Befehlszeilenargumente angegeben sind, werden diese vor den Dateinamen aus der I verarbeitet." +#: ../src/xz/xz.1:545 +msgid "" +"Read the filenames to process from I; if I is omitted, filenames " +"are read from standard input. Filenames must be terminated with the newline " +"character. A dash (B<->) is taken as a regular filename; it doesn't mean " +"standard input. If filenames are given also as command line arguments, they " +"are processed before the filenames read from I." +msgstr "" +"liest die zu verarbeitenden Dateinamen aus I. Falls keine I " +"angegeben ist, werden die Dateinamen aus der Standardeingabe gelesen. " +"Dateinamen müssen mit einem Zeilenumbruch beendet werden. Ein Bindestrich " +"(B<->) wird als regulärer Dateiname angesehen und nicht als Standardeingabe " +"interpretiert. Falls Dateinamen außerdem als Befehlszeilenargumente " +"angegeben sind, werden diese vor den Dateinamen aus der I verarbeitet." #. type: TP -#: ../src/xz/xz.1:543 +#: ../src/xz/xz.1:545 #, no-wrap msgid "B<--files0>[B<=>I]" msgstr "B<--files0>[B<=>I]" #. type: Plain text -#: ../src/xz/xz.1:547 -msgid "This is identical to B<--files>[B<=>I] except that each filename must be terminated with the null character." -msgstr "Dies ist gleichbedeutend mit B<--files>[B<=>I], außer dass jeder Dateiname mit einem Null-Zeichen abgeschlossen werden muss." +#: ../src/xz/xz.1:549 +msgid "" +"This is identical to B<--files>[B<=>I] except that each filename must " +"be terminated with the null character." +msgstr "" +"Dies ist gleichbedeutend mit B<--files>[B<=>I], außer dass jeder " +"Dateiname mit einem Null-Zeichen abgeschlossen werden muss." #. type: SS -#: ../src/xz/xz.1:548 +#: ../src/xz/xz.1:550 #, no-wrap msgid "Basic file format and compression options" msgstr "Grundlegende Dateiformat- und Kompressionsoptionen" #. type: TP -#: ../src/xz/xz.1:549 +#: ../src/xz/xz.1:551 #, no-wrap msgid "B<-F> I, B<--format=>I" msgstr "B<-F> I, B<--format=>I" #. type: Plain text -#: ../src/xz/xz.1:554 +#: ../src/xz/xz.1:556 msgid "Specify the file I to compress or decompress:" -msgstr "gibt das I der zu komprimierenden oder dekomprimierenden Datei an:" +msgstr "" +"gibt das I der zu komprimierenden oder dekomprimierenden Datei an:" #. type: TP -#: ../src/xz/xz.1:555 +#: ../src/xz/xz.1:557 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:567 -msgid "This is the default. When compressing, B is equivalent to B. When decompressing, the format of the input file is automatically detected. Note that raw streams (created with B<--format=raw>) cannot be auto-detected." -msgstr "Dies ist die Voreinstellung. Bei der Kompression ist B gleichbedeutend mit B. Bei der Dekompression wird das Format der Eingabedatei automatisch erkannt. Beachten Sie, dass Rohdatenströme, wie sie mit B<--format=raw> erzeugt werden, nicht automatisch erkannt werden können." +#: ../src/xz/xz.1:569 +msgid "" +"This is the default. When compressing, B is equivalent to B. " +"When decompressing, the format of the input file is automatically detected. " +"Note that raw streams (created with B<--format=raw>) cannot be auto-" +"detected." +msgstr "" +"Dies ist die Voreinstellung. Bei der Kompression ist B gleichbedeutend " +"mit B. Bei der Dekompression wird das Format der Eingabedatei " +"automatisch erkannt. Beachten Sie, dass Rohdatenströme, wie sie mit B<--" +"format=raw> erzeugt werden, nicht automatisch erkannt werden können." #. type: TP -#: ../src/xz/xz.1:567 +#: ../src/xz/xz.1:569 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:574 -msgid "Compress to the B<.xz> file format, or accept only B<.xz> files when decompressing." -msgstr "Die Kompression erfolgt in das B<.xz>-Dateiformat oder akzeptiert nur B<.xz>-Dateien bei der Dekompression." +#: ../src/xz/xz.1:576 +msgid "" +"Compress to the B<.xz> file format, or accept only B<.xz> files when " +"decompressing." +msgstr "" +"Die Kompression erfolgt in das B<.xz>-Dateiformat oder akzeptiert nur B<.xz>-" +"Dateien bei der Dekompression." #. type: TP -#: ../src/xz/xz.1:574 +#: ../src/xz/xz.1:576 #, no-wrap msgid "B, B" msgstr "B, B" #. type: Plain text -#: ../src/xz/xz.1:584 -msgid "Compress to the legacy B<.lzma> file format, or accept only B<.lzma> files when decompressing. The alternative name B is provided for backwards compatibility with LZMA Utils." -msgstr "Die Kompression erfolgt in das veraltete B<.lzma>-Dateiformat oder akzeptiert nur B<.lzma>-Dateien bei der Dekompression. Der alternative Name B dient der Abwärtskompatibilität zu den LZMA-Dienstprogrammen." +#: ../src/xz/xz.1:586 +msgid "" +"Compress to the legacy B<.lzma> file format, or accept only B<.lzma> files " +"when decompressing. The alternative name B is provided for backwards " +"compatibility with LZMA Utils." +msgstr "" +"Die Kompression erfolgt in das veraltete B<.lzma>-Dateiformat oder " +"akzeptiert nur B<.lzma>-Dateien bei der Dekompression. Der alternative Name " +"B dient der Abwärtskompatibilität zu den LZMA-Dienstprogrammen." #. type: TP -#: ../src/xz/xz.1:584 +#: ../src/xz/xz.1:586 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:590 -msgid "Accept only B<.lz> files when decompressing. Compression is not supported." -msgstr "Akzeptiert nur B<.lz>-Dateien bei der Dekompression. Kompression wird nicht unterstützt." +#: ../src/xz/xz.1:592 +msgid "" +"Accept only B<.lz> files when decompressing. Compression is not supported." +msgstr "" +"Akzeptiert nur B<.lz>-Dateien bei der Dekompression. Kompression wird nicht " +"unterstützt." #. type: Plain text -#: ../src/xz/xz.1:603 -msgid "The B<.lz> format version 0 and the unextended version 1 are supported. Version 0 files were produced by B 1.3 and older. Such files aren't common but may be found from file archives as a few source packages were released in this format. People might have old personal files in this format too. Decompression support for the format version 0 was removed in B 1.18." -msgstr "Das B<.lz>-Format wird in Version 0 und der unerweiterten Version 1 unterstützt. Dateien der Version 0 wurden von B 1.3 und älter erstellt. Solche Dateien sind nicht sehr weit verbreitet, können aber in Dateiarchiven gefunden werden, da einige Quellpakete in diesem Format veröffentlicht wurden. Es ist auch möglich, dass Benutzer alte persönliche Dateien in diesem Format haben. Die Dekompressionsunterstützung für das Format der Version 0 wurde mit der Version 1.18 aus B entfernt." +#: ../src/xz/xz.1:605 +msgid "" +"The B<.lz> format version 0 and the unextended version 1 are supported. " +"Version 0 files were produced by B 1.3 and older. Such files aren't " +"common but may be found from file archives as a few source packages were " +"released in this format. People might have old personal files in this " +"format too. Decompression support for the format version 0 was removed in " +"B 1.18." +msgstr "" +"Das B<.lz>-Format wird in Version 0 und der unerweiterten Version 1 " +"unterstützt. Dateien der Version 0 wurden von B 1.3 und älter " +"erstellt. Solche Dateien sind nicht sehr weit verbreitet, können aber in " +"Dateiarchiven gefunden werden, da einige Quellpakete in diesem Format " +"veröffentlicht wurden. Es ist auch möglich, dass Benutzer alte persönliche " +"Dateien in diesem Format haben. Die Dekompressionsunterstützung für das " +"Format der Version 0 wurde mit der Version 1.18 aus B entfernt." #. type: Plain text -#: ../src/xz/xz.1:612 -msgid "B 1.4 and later create files in the format version 1. The sync flush marker extension to the format version 1 was added in B 1.6. This extension is rarely used and isn't supported by B (diagnosed as corrupt input)." -msgstr "B-Versionen ab 1.4 erstellen Dateien im Format der Version 0. Die Erweiterung »Sync Flush Marker« zur Formatversion 1 wurde in B 1.6 hinzugefügt. Diese Erweiterung wird sehr selten verwendet und wird von B nicht unterstützt (die Eingabe wird als beschädigt erkannt)." +#: ../src/xz/xz.1:614 +msgid "" +"B 1.4 and later create files in the format version 1. The sync flush " +"marker extension to the format version 1 was added in B 1.6. This " +"extension is rarely used and isn't supported by B (diagnosed as corrupt " +"input)." +msgstr "" +"B-Versionen ab 1.4 erstellen Dateien im Format der Version 0. Die " +"Erweiterung »Sync Flush Marker« zur Formatversion 1 wurde in B 1.6 " +"hinzugefügt. Diese Erweiterung wird sehr selten verwendet und wird von B " +"nicht unterstützt (die Eingabe wird als beschädigt erkannt)." #. type: TP -#: ../src/xz/xz.1:612 +#: ../src/xz/xz.1:614 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:620 -msgid "Compress or uncompress a raw stream (no headers). This is meant for advanced users only. To decode raw streams, you need use B<--format=raw> and explicitly specify the filter chain, which normally would have been stored in the container headers." -msgstr "Komprimiert oder dekomprimiert einen Rohdatenstrom (ohne Header). Diese Option ist nur für fortgeschrittene Benutzer bestimmt. Zum Dekodieren von Rohdatenströmen müssen Sie die Option B<--format=raw> verwenden und die Filterkette ausdrücklich angeben, die normalerweise in den (hier fehlenden) Container-Headern gespeichert worden wäre." +#: ../src/xz/xz.1:622 +msgid "" +"Compress or uncompress a raw stream (no headers). This is meant for " +"advanced users only. To decode raw streams, you need use B<--format=raw> " +"and explicitly specify the filter chain, which normally would have been " +"stored in the container headers." +msgstr "" +"Komprimiert oder dekomprimiert einen Rohdatenstrom (ohne Header). Diese " +"Option ist nur für fortgeschrittene Benutzer bestimmt. Zum Dekodieren von " +"Rohdatenströmen müssen Sie die Option B<--format=raw> verwenden und die " +"Filterkette ausdrücklich angeben, die normalerweise in den (hier fehlenden) " +"Container-Headern gespeichert worden wäre." #. type: TP -#: ../src/xz/xz.1:621 +#: ../src/xz/xz.1:623 #, no-wrap msgid "B<-C> I, B<--check=>I" msgstr "B<-C> I, B<--check=>I" #. type: Plain text -#: ../src/xz/xz.1:636 -msgid "Specify the type of the integrity check. The check is calculated from the uncompressed data and stored in the B<.xz> file. This option has an effect only when compressing into the B<.xz> format; the B<.lzma> format doesn't support integrity checks. The integrity check (if any) is verified when the B<.xz> file is decompressed." -msgstr "gibt den Typ der Integritätsprüfung an. Die Prüfsumme wird aus den unkomprimierten Daten berechnet und in der B<.xz>-Datei gespeichert. Diese Option wird nur bei der Kompression in das B<.xz>-Format angewendet, da das B<.lzma>-Format keine Integritätsprüfungen unterstützt. Die eigentliche Integritätsprüfung erfolgt (falls möglich), wenn die B<.xz>-Datei dekomprimiert wird." +#: ../src/xz/xz.1:638 +msgid "" +"Specify the type of the integrity check. The check is calculated from the " +"uncompressed data and stored in the B<.xz> file. This option has an effect " +"only when compressing into the B<.xz> format; the B<.lzma> format doesn't " +"support integrity checks. The integrity check (if any) is verified when the " +"B<.xz> file is decompressed." +msgstr "" +"gibt den Typ der Integritätsprüfung an. Die Prüfsumme wird aus den " +"unkomprimierten Daten berechnet und in der B<.xz>-Datei gespeichert. Diese " +"Option wird nur bei der Kompression in das B<.xz>-Format angewendet, da das " +"B<.lzma>-Format keine Integritätsprüfungen unterstützt. Die eigentliche " +"Integritätsprüfung erfolgt (falls möglich), wenn die B<.xz>-Datei " +"dekomprimiert wird." #. type: Plain text -#: ../src/xz/xz.1:640 +#: ../src/xz/xz.1:642 msgid "Supported I types:" msgstr "Folgende Typen von I werden unterstützt:" #. type: TP -#: ../src/xz/xz.1:641 +#: ../src/xz/xz.1:643 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:647 -msgid "Don't calculate an integrity check at all. This is usually a bad idea. This can be useful when integrity of the data is verified by other means anyway." -msgstr "führt keine Integritätsprüfung aus. Dies ist eine eher schlechte Idee. Dennoch kann es nützlich sein, wenn die Integrität der Daten auf andere Weise sichergestellt werden kann." +#: ../src/xz/xz.1:649 +msgid "" +"Don't calculate an integrity check at all. This is usually a bad idea. " +"This can be useful when integrity of the data is verified by other means " +"anyway." +msgstr "" +"führt keine Integritätsprüfung aus. Dies ist eine eher schlechte Idee. " +"Dennoch kann es nützlich sein, wenn die Integrität der Daten auf andere " +"Weise sichergestellt werden kann." #. type: TP -#: ../src/xz/xz.1:647 +#: ../src/xz/xz.1:649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:650 +#: ../src/xz/xz.1:652 msgid "Calculate CRC32 using the polynomial from IEEE-802.3 (Ethernet)." -msgstr "berechnet die CRC32-Prüfsumme anhand des Polynoms aus IEEE-802.3 (Ethernet)." +msgstr "" +"berechnet die CRC32-Prüfsumme anhand des Polynoms aus IEEE-802.3 (Ethernet)." #. type: TP -#: ../src/xz/xz.1:650 +#: ../src/xz/xz.1:652 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:655 -msgid "Calculate CRC64 using the polynomial from ECMA-182. This is the default, since it is slightly better than CRC32 at detecting damaged files and the speed difference is negligible." -msgstr "berechnet die CRC64-Prüfsumme anhand des Polynoms aus ECMA-182. Dies ist die Voreinstellung, da beschädigte Dateien etwas besser als mit CRC32 erkannt werden und die Geschwindigkeitsdifferenz unerheblich ist." +#: ../src/xz/xz.1:657 +msgid "" +"Calculate CRC64 using the polynomial from ECMA-182. This is the default, " +"since it is slightly better than CRC32 at detecting damaged files and the " +"speed difference is negligible." +msgstr "" +"berechnet die CRC64-Prüfsumme anhand des Polynoms aus ECMA-182. Dies ist die " +"Voreinstellung, da beschädigte Dateien etwas besser als mit CRC32 erkannt " +"werden und die Geschwindigkeitsdifferenz unerheblich ist." #. type: TP -#: ../src/xz/xz.1:655 +#: ../src/xz/xz.1:657 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:659 +#: ../src/xz/xz.1:661 msgid "Calculate SHA-256. This is somewhat slower than CRC32 and CRC64." -msgstr "berechnet die SHA-256-Prüfsumme. Dies ist etwas langsamer als CRC32 und CRC64." +msgstr "" +"berechnet die SHA-256-Prüfsumme. Dies ist etwas langsamer als CRC32 und " +"CRC64." #. type: Plain text -#: ../src/xz/xz.1:665 -msgid "Integrity of the B<.xz> headers is always verified with CRC32. It is not possible to change or disable it." -msgstr "Die Integrität der B<.xz>-Header wird immer mit CRC32 geprüft. Es ist nicht möglich, dies zu ändern oder zu deaktivieren." +#: ../src/xz/xz.1:667 +msgid "" +"Integrity of the B<.xz> headers is always verified with CRC32. It is not " +"possible to change or disable it." +msgstr "" +"Die Integrität der B<.xz>-Header wird immer mit CRC32 geprüft. Es ist nicht " +"möglich, dies zu ändern oder zu deaktivieren." #. type: TP -#: ../src/xz/xz.1:665 +#: ../src/xz/xz.1:667 #, no-wrap msgid "B<--ignore-check>" msgstr "B<--ignore-check>" #. type: Plain text -#: ../src/xz/xz.1:671 -msgid "Don't verify the integrity check of the compressed data when decompressing. The CRC32 values in the B<.xz> headers will still be verified normally." -msgstr "verifiziert die Integritätsprüfsumme der komprimierten Daten bei der Dekompression nicht. Die CRC32-Werte in den B<.xz>-Headern werden weiterhin normal verifiziert." +#: ../src/xz/xz.1:673 +msgid "" +"Don't verify the integrity check of the compressed data when decompressing. " +"The CRC32 values in the B<.xz> headers will still be verified normally." +msgstr "" +"verifiziert die Integritätsprüfsumme der komprimierten Daten bei der " +"Dekompression nicht. Die CRC32-Werte in den B<.xz>-Headern werden weiterhin " +"normal verifiziert." #. type: Plain text -#: ../src/xz/xz.1:674 -msgid "B Possible reasons to use this option:" -msgstr "B Mögliche Gründe, diese Option zu verwenden:" +#: ../src/xz/xz.1:676 +msgid "" +"B Possible " +"reasons to use this option:" +msgstr "" +"B Mögliche " +"Gründe, diese Option zu verwenden:" #. type: Plain text -#: ../src/xz/xz.1:677 +#: ../src/xz/xz.1:679 msgid "Trying to recover data from a corrupt .xz file." msgstr "Versuchen, Daten aus einer beschädigten .xz-Datei wiederherzustellen." # Irgendwie ist mir »extrem gut komprimiert« hier zu diffus. Was soll »gut« hier bedeuten? Besonders stark, besonders clever, was auch immer... #. type: Plain text -#: ../src/xz/xz.1:683 -msgid "Speeding up decompression. This matters mostly with SHA-256 or with files that have compressed extremely well. It's recommended to not use this option for this purpose unless the file integrity is verified externally in some other way." -msgstr "Erhöhung der Geschwindigkeit bei der Dekompression. Dies macht sich meist mit SHA-256 bemerkbar, oder mit Dateien, die extrem stark komprimiert sind. Wir empfehlen, diese Option nicht für diesen Zweck zu verwenden, es sei denn, die Integrität der Datei wird extern auf andere Weise überprüft." +#: ../src/xz/xz.1:685 +msgid "" +"Speeding up decompression. This matters mostly with SHA-256 or with files " +"that have compressed extremely well. It's recommended to not use this " +"option for this purpose unless the file integrity is verified externally in " +"some other way." +msgstr "" +"Erhöhung der Geschwindigkeit bei der Dekompression. Dies macht sich meist " +"mit SHA-256 bemerkbar, oder mit Dateien, die extrem stark komprimiert sind. " +"Wir empfehlen, diese Option nicht für diesen Zweck zu verwenden, es sei " +"denn, die Integrität der Datei wird extern auf andere Weise überprüft." #. type: TP -#: ../src/xz/xz.1:684 +#: ../src/xz/xz.1:686 #, no-wrap msgid "B<-0> ... B<-9>" msgstr "B<-0> … B<-9>" #. type: Plain text -#: ../src/xz/xz.1:693 -msgid "Select a compression preset level. The default is B<-6>. If multiple preset levels are specified, the last one takes effect. If a custom filter chain was already specified, setting a compression preset level clears the custom filter chain." -msgstr "wählt eine der voreingestellten Kompressionsstufen, standardmäßig B<-6>. Wenn mehrere Voreinstellungsstufen angegeben sind, ist nur die zuletzt angegebene wirksam. Falls bereits eine benutzerdefinierte Filterkette angegeben wurde, wird diese durch die Festlegung der Voreinstellung geleert." +#: ../src/xz/xz.1:695 +msgid "" +"Select a compression preset level. The default is B<-6>. If multiple " +"preset levels are specified, the last one takes effect. If a custom filter " +"chain was already specified, setting a compression preset level clears the " +"custom filter chain." +msgstr "" +"wählt eine der voreingestellten Kompressionsstufen, standardmäßig B<-6>. " +"Wenn mehrere Voreinstellungsstufen angegeben sind, ist nur die zuletzt " +"angegebene wirksam. Falls bereits eine benutzerdefinierte Filterkette " +"angegeben wurde, wird diese durch die Festlegung der Voreinstellung geleert." #. type: Plain text -#: ../src/xz/xz.1:708 -msgid "The differences between the presets are more significant than with B(1) and B(1). The selected compression settings determine the memory requirements of the decompressor, thus using a too high preset level might make it painful to decompress the file on an old system with little RAM. Specifically, B like it often is with B(1) and B(1)." -msgstr "Die Unterschiede zwischen den Voreinstellungsstufen sind deutlicher als bei B(1) und B(1). Die gewählten Kompressionseinstellungen bestimmen den Speicherbedarf bei der Dekompression, daher ist es auf älteren Systemen mit wenig Speicher bei einer zu hoch gewählten Voreinstellung schwer, eine Datei zu dekomprimieren. Insbesondere B zu verwenden, wie dies häufig mit B(1) und B(1) gehandhabt wird." +#: ../src/xz/xz.1:710 +msgid "" +"The differences between the presets are more significant than with " +"B(1) and B(1). The selected compression settings determine " +"the memory requirements of the decompressor, thus using a too high preset " +"level might make it painful to decompress the file on an old system with " +"little RAM. Specifically, B like it often is with B(1) and B(1)." +msgstr "" +"Die Unterschiede zwischen den Voreinstellungsstufen sind deutlicher als bei " +"B(1) und B(1). Die gewählten Kompressionseinstellungen " +"bestimmen den Speicherbedarf bei der Dekompression, daher ist es auf älteren " +"Systemen mit wenig Speicher bei einer zu hoch gewählten Voreinstellung " +"schwer, eine Datei zu dekomprimieren. Insbesondere B zu verwenden, wie dies häufig mit B(1) und " +"B(1) gehandhabt wird." #. type: TP -#: ../src/xz/xz.1:709 +#: ../src/xz/xz.1:711 #, no-wrap msgid "B<-0> ... B<-3>" msgstr "B<-0> … B<-3>" #. type: Plain text -#: ../src/xz/xz.1:721 -msgid "These are somewhat fast presets. B<-0> is sometimes faster than B while compressing much better. The higher ones often have speed comparable to B(1) with comparable or better compression ratio, although the results depend a lot on the type of data being compressed." -msgstr "Diese Voreinstellungen sind recht schnell. B<-0> ist manchmal schneller als B, wobei aber die Kompression wesentlich besser ist. Die schnelleren Voreinstellungen sind im Hinblick auf die Geschwindigkeit mit B(1) vergleichbar , mit einem ähnlichen oder besseren Kompressionsverhältnis, wobei das Ergebnis aber stark vom Typ der zu komprimierenden Daten abhängig ist." +#: ../src/xz/xz.1:723 +msgid "" +"These are somewhat fast presets. B<-0> is sometimes faster than B " +"while compressing much better. The higher ones often have speed comparable " +"to B(1) with comparable or better compression ratio, although the " +"results depend a lot on the type of data being compressed." +msgstr "" +"Diese Voreinstellungen sind recht schnell. B<-0> ist manchmal schneller als " +"B, wobei aber die Kompression wesentlich besser ist. Die " +"schnelleren Voreinstellungen sind im Hinblick auf die Geschwindigkeit mit " +"B(1) vergleichbar , mit einem ähnlichen oder besseren " +"Kompressionsverhältnis, wobei das Ergebnis aber stark vom Typ der zu " +"komprimierenden Daten abhängig ist." #. type: TP -#: ../src/xz/xz.1:721 +#: ../src/xz/xz.1:723 #, no-wrap msgid "B<-4> ... B<-6>" msgstr "B<-4> … B<-6>" #. type: Plain text -#: ../src/xz/xz.1:735 -msgid "Good to very good compression while keeping decompressor memory usage reasonable even for old systems. B<-6> is the default, which is usually a good choice for distributing files that need to be decompressible even on systems with only 16\\ MiB RAM. (B<-5e> or B<-6e> may be worth considering too. See B<--extreme>.)" -msgstr "Gute bis sehr gute Kompression, wobei der Speicherbedarf für die Dekompression selbst auf alten Systemen akzeptabel ist. B<-6> ist die Voreinstellung, welche üblicherweise eine gute Wahl für die Verteilung von Dateien ist, die selbst noch auf Systemen mit nur 16\\ MiB Arbeitsspeicher dekomprimiert werden müssen (B<-5e> oder B<-6e> sind ebenfalls eine Überlegung wert. Siehe B<--extreme>)." +#: ../src/xz/xz.1:737 +msgid "" +"Good to very good compression while keeping decompressor memory usage " +"reasonable even for old systems. B<-6> is the default, which is usually a " +"good choice for distributing files that need to be decompressible even on " +"systems with only 16\\ MiB RAM. (B<-5e> or B<-6e> may be worth considering " +"too. See B<--extreme>.)" +msgstr "" +"Gute bis sehr gute Kompression, wobei der Speicherbedarf für die " +"Dekompression selbst auf alten Systemen akzeptabel ist. B<-6> ist die " +"Voreinstellung, welche üblicherweise eine gute Wahl für die Verteilung von " +"Dateien ist, die selbst noch auf Systemen mit nur 16\\ MiB Arbeitsspeicher " +"dekomprimiert werden müssen (B<-5e> oder B<-6e> sind ebenfalls eine " +"Überlegung wert. Siehe B<--extreme>)." #. type: TP -#: ../src/xz/xz.1:735 +#: ../src/xz/xz.1:737 #, no-wrap msgid "B<-7 ... -9>" msgstr "B<-7 … -9>" #. type: Plain text -#: ../src/xz/xz.1:742 -msgid "These are like B<-6> but with higher compressor and decompressor memory requirements. These are useful only when compressing files bigger than 8\\ MiB, 16\\ MiB, and 32\\ MiB, respectively." -msgstr "Ähnlich wie B<-6>, aber mit einem höheren Speicherbedarf für die Kompression und Dekompression. Sie sind nur nützlich, wenn Dateien komprimiert werden sollen, die größer als 8\\ MiB, 16\\ MiB beziehungsweise 32\\ MiB sind." +#: ../src/xz/xz.1:744 +msgid "" +"These are like B<-6> but with higher compressor and decompressor memory " +"requirements. These are useful only when compressing files bigger than 8\\ " +"MiB, 16\\ MiB, and 32\\ MiB, respectively." +msgstr "" +"Ähnlich wie B<-6>, aber mit einem höheren Speicherbedarf für die Kompression " +"und Dekompression. Sie sind nur nützlich, wenn Dateien komprimiert werden " +"sollen, die größer als 8\\ MiB, 16\\ MiB beziehungsweise 32\\ MiB sind." #. type: Plain text -#: ../src/xz/xz.1:750 -msgid "On the same hardware, the decompression speed is approximately a constant number of bytes of compressed data per second. In other words, the better the compression, the faster the decompression will usually be. This also means that the amount of uncompressed output produced per second can vary a lot." -msgstr "Auf der gleichen Hardware ist die Dekompressionsgeschwindigkeit ein nahezu konstanter Wert in Bytes komprimierter Daten pro Sekunde. Anders ausgedrückt: Je besser die Kompression, umso schneller wird üblicherweise die Dekompression sein. Das bedeutet auch, dass die Menge der pro Sekunde ausgegebenen unkomprimierten Daten stark variieren kann." +#: ../src/xz/xz.1:752 +msgid "" +"On the same hardware, the decompression speed is approximately a constant " +"number of bytes of compressed data per second. In other words, the better " +"the compression, the faster the decompression will usually be. This also " +"means that the amount of uncompressed output produced per second can vary a " +"lot." +msgstr "" +"Auf der gleichen Hardware ist die Dekompressionsgeschwindigkeit ein nahezu " +"konstanter Wert in Bytes komprimierter Daten pro Sekunde. Anders " +"ausgedrückt: Je besser die Kompression, umso schneller wird üblicherweise " +"die Dekompression sein. Das bedeutet auch, dass die Menge der pro Sekunde " +"ausgegebenen unkomprimierten Daten stark variieren kann." #. type: Plain text -#: ../src/xz/xz.1:752 +#: ../src/xz/xz.1:754 msgid "The following table summarises the features of the presets:" -msgstr "Die folgende Tabelle fasst die Eigenschaften der Voreinstellungen zusammen:" +msgstr "" +"Die folgende Tabelle fasst die Eigenschaften der Voreinstellungen zusammen:" #. type: tbl table -#: ../src/xz/xz.1:759 ../src/xz/xz.1:847 ../src/xz/xz.1:3000 +#: ../src/xz/xz.1:761 ../src/xz/xz.1:842 ../src/xz/xz.1:2839 #, no-wrap msgid "Preset" msgstr "Voreinst." #. type: tbl table -#: ../src/xz/xz.1:759 ../src/xz/xz.1:847 +#: ../src/xz/xz.1:761 ../src/xz/xz.1:842 #, no-wrap msgid "DictSize" msgstr "Wörtb.Gr" #. type: tbl table -#: ../src/xz/xz.1:759 ../src/xz/xz.1:847 ../src/xz/xz.1:3000 +#: ../src/xz/xz.1:761 ../src/xz/xz.1:842 ../src/xz/xz.1:2839 #, no-wrap msgid "CompCPU" msgstr "KomprCPU" #. type: tbl table -#: ../src/xz/xz.1:759 ../src/xz/xz.1:847 +#: ../src/xz/xz.1:761 ../src/xz/xz.1:842 #, no-wrap msgid "CompMem" msgstr "KompSpeich" #. type: tbl table -#: ../src/xz/xz.1:759 ../src/xz/xz.1:847 +#: ../src/xz/xz.1:761 ../src/xz/xz.1:842 #, no-wrap msgid "DecMem" msgstr "DekompSpeich" #. type: tbl table -#: ../src/xz/xz.1:760 ../src/xz/xz.1:2611 ../src/xz/xz.1:2636 -#: ../src/xz/xz.1:3001 +#: ../src/xz/xz.1:762 ../src/xz/xz.1:2450 ../src/xz/xz.1:2475 +#: ../src/xz/xz.1:2840 #, no-wrap msgid "-0" msgstr "-0" #. type: tbl table -#: ../src/xz/xz.1:760 ../src/xz/xz.1:848 ../src/xz/xz.1:2611 +#: ../src/xz/xz.1:762 ../src/xz/xz.1:843 ../src/xz/xz.1:2450 #, no-wrap msgid "256 KiB" msgstr "256 KiB" #. type: TP -#: ../src/xz/xz.1:760 ../src/xz/xz.1:3001 ../src/scripts/xzgrep.1:111 +#: ../src/xz/xz.1:762 ../src/xz/xz.1:2840 ../src/scripts/xzgrep.1:82 #, no-wrap msgid "0" msgstr "0" #. type: tbl table -#: ../src/xz/xz.1:760 ../src/xz/xz.1:762 ../src/xz/xz.1:850 ../src/xz/xz.1:2636 +#: ../src/xz/xz.1:762 ../src/xz/xz.1:764 ../src/xz/xz.1:845 ../src/xz/xz.1:2475 #, no-wrap msgid "3 MiB" msgstr "3 MiB" #. type: tbl table -#: ../src/xz/xz.1:760 ../src/xz/xz.1:761 ../src/xz/xz.1:848 ../src/xz/xz.1:849 -#: ../src/xz/xz.1:2612 ../src/xz/xz.1:2613 ../src/xz/xz.1:2615 +#: ../src/xz/xz.1:762 ../src/xz/xz.1:763 ../src/xz/xz.1:843 ../src/xz/xz.1:844 +#: ../src/xz/xz.1:2451 ../src/xz/xz.1:2452 ../src/xz/xz.1:2454 #, no-wrap msgid "1 MiB" msgstr "1 MiB" #. type: tbl table -#: ../src/xz/xz.1:761 ../src/xz/xz.1:2612 ../src/xz/xz.1:2637 -#: ../src/xz/xz.1:3002 +#: ../src/xz/xz.1:763 ../src/xz/xz.1:2451 ../src/xz/xz.1:2476 +#: ../src/xz/xz.1:2841 #, no-wrap msgid "-1" msgstr "-1" #. type: TP -#: ../src/xz/xz.1:761 ../src/xz/xz.1:1866 ../src/xz/xz.1:3002 -#: ../src/scripts/xzgrep.1:115 +#: ../src/xz/xz.1:763 ../src/xz/xz.1:1758 ../src/xz/xz.1:2841 +#: ../src/scripts/xzgrep.1:86 #, no-wrap msgid "1" msgstr "1" #. type: tbl table -#: ../src/xz/xz.1:761 ../src/xz/xz.1:765 ../src/xz/xz.1:766 ../src/xz/xz.1:853 -#: ../src/xz/xz.1:854 ../src/xz/xz.1:2637 +#: ../src/xz/xz.1:763 ../src/xz/xz.1:767 ../src/xz/xz.1:768 ../src/xz/xz.1:848 +#: ../src/xz/xz.1:849 ../src/xz/xz.1:2476 #, no-wrap msgid "9 MiB" msgstr "9 MiB" #. type: tbl table -#: ../src/xz/xz.1:761 ../src/xz/xz.1:762 ../src/xz/xz.1:849 ../src/xz/xz.1:850 -#: ../src/xz/xz.1:2613 ../src/xz/xz.1:2616 ../src/xz/xz.1:2637 +#: ../src/xz/xz.1:763 ../src/xz/xz.1:764 ../src/xz/xz.1:844 ../src/xz/xz.1:845 +#: ../src/xz/xz.1:2452 ../src/xz/xz.1:2455 ../src/xz/xz.1:2476 #, no-wrap msgid "2 MiB" msgstr "2 MiB" #. type: tbl table -#: ../src/xz/xz.1:762 ../src/xz/xz.1:2613 ../src/xz/xz.1:2638 -#: ../src/xz/xz.1:3003 +#: ../src/xz/xz.1:764 ../src/xz/xz.1:2452 ../src/xz/xz.1:2477 +#: ../src/xz/xz.1:2842 #, no-wrap msgid "-2" msgstr "-2" #. type: tbl table -#: ../src/xz/xz.1:762 ../src/xz/xz.1:1868 ../src/xz/xz.1:1873 -#: ../src/xz/xz.1:3003 +#: ../src/xz/xz.1:764 ../src/xz/xz.1:1760 ../src/xz/xz.1:2842 #, no-wrap msgid "2" msgstr "2" #. type: tbl table -#: ../src/xz/xz.1:762 ../src/xz/xz.1:767 ../src/xz/xz.1:855 ../src/xz/xz.1:2638 +#: ../src/xz/xz.1:764 ../src/xz/xz.1:769 ../src/xz/xz.1:850 ../src/xz/xz.1:2477 #, no-wrap msgid "17 MiB" msgstr "17 MiB" #. type: tbl table -#: ../src/xz/xz.1:763 ../src/xz/xz.1:2614 ../src/xz/xz.1:2639 -#: ../src/xz/xz.1:3004 +#: ../src/xz/xz.1:765 ../src/xz/xz.1:2453 ../src/xz/xz.1:2478 +#: ../src/xz/xz.1:2843 #, no-wrap msgid "-3" msgstr "-3" #. type: tbl table -#: ../src/xz/xz.1:763 ../src/xz/xz.1:764 ../src/xz/xz.1:848 ../src/xz/xz.1:851 -#: ../src/xz/xz.1:852 ../src/xz/xz.1:2614 ../src/xz/xz.1:2615 -#: ../src/xz/xz.1:2617 +#: ../src/xz/xz.1:765 ../src/xz/xz.1:766 ../src/xz/xz.1:843 ../src/xz/xz.1:846 +#: ../src/xz/xz.1:847 ../src/xz/xz.1:2453 ../src/xz/xz.1:2454 +#: ../src/xz/xz.1:2456 #, no-wrap msgid "4 MiB" msgstr "4 MiB" #. type: tbl table -#: ../src/xz/xz.1:763 ../src/xz/xz.1:3004 +#: ../src/xz/xz.1:765 ../src/xz/xz.1:2843 #, no-wrap msgid "3" msgstr "3" #. type: tbl table -#: ../src/xz/xz.1:763 ../src/xz/xz.1:768 ../src/xz/xz.1:856 ../src/xz/xz.1:2619 -#: ../src/xz/xz.1:2620 ../src/xz/xz.1:2639 +#: ../src/xz/xz.1:765 ../src/xz/xz.1:770 ../src/xz/xz.1:851 ../src/xz/xz.1:2458 +#: ../src/xz/xz.1:2459 ../src/xz/xz.1:2478 #, no-wrap msgid "32 MiB" msgstr "32 MiB" #. type: tbl table -#: ../src/xz/xz.1:763 ../src/xz/xz.1:764 ../src/xz/xz.1:851 ../src/xz/xz.1:852 +#: ../src/xz/xz.1:765 ../src/xz/xz.1:766 ../src/xz/xz.1:846 ../src/xz/xz.1:847 #, no-wrap msgid "5 MiB" msgstr "5 MiB" #. type: tbl table -#: ../src/xz/xz.1:764 ../src/xz/xz.1:2615 ../src/xz/xz.1:2640 -#: ../src/xz/xz.1:3005 +#: ../src/xz/xz.1:766 ../src/xz/xz.1:2454 ../src/xz/xz.1:2479 +#: ../src/xz/xz.1:2844 #, no-wrap msgid "-4" msgstr "-4" #. type: tbl table -#: ../src/xz/xz.1:764 ../src/xz/xz.1:1867 ../src/xz/xz.1:1869 -#: ../src/xz/xz.1:1870 ../src/xz/xz.1:1872 ../src/xz/xz.1:3005 +#: ../src/xz/xz.1:766 ../src/xz/xz.1:1759 ../src/xz/xz.1:1761 +#: ../src/xz/xz.1:1762 ../src/xz/xz.1:1764 ../src/xz/xz.1:2844 #, no-wrap msgid "4" msgstr "4" #. type: tbl table -#: ../src/xz/xz.1:764 ../src/xz/xz.1:851 ../src/xz/xz.1:852 ../src/xz/xz.1:2640 +#: ../src/xz/xz.1:766 ../src/xz/xz.1:846 ../src/xz/xz.1:847 ../src/xz/xz.1:2479 #, no-wrap msgid "48 MiB" msgstr "48 MiB" #. type: tbl table -#: ../src/xz/xz.1:765 ../src/xz/xz.1:2616 ../src/xz/xz.1:2641 -#: ../src/xz/xz.1:3006 +#: ../src/xz/xz.1:767 ../src/xz/xz.1:2455 ../src/xz/xz.1:2480 +#: ../src/xz/xz.1:2845 #, no-wrap msgid "-5" msgstr "-5" #. type: tbl table -#: ../src/xz/xz.1:765 ../src/xz/xz.1:766 ../src/xz/xz.1:853 ../src/xz/xz.1:854 -#: ../src/xz/xz.1:2616 ../src/xz/xz.1:2617 ../src/xz/xz.1:2618 +#: ../src/xz/xz.1:767 ../src/xz/xz.1:768 ../src/xz/xz.1:848 ../src/xz/xz.1:849 +#: ../src/xz/xz.1:2455 ../src/xz/xz.1:2456 ../src/xz/xz.1:2457 #, no-wrap msgid "8 MiB" msgstr "8 MiB" #. type: tbl table -#: ../src/xz/xz.1:765 ../src/xz/xz.1:3006 +#: ../src/xz/xz.1:767 ../src/xz/xz.1:2845 #, no-wrap msgid "5" msgstr "5" #. type: tbl table -#: ../src/xz/xz.1:765 ../src/xz/xz.1:766 ../src/xz/xz.1:853 ../src/xz/xz.1:854 -#: ../src/xz/xz.1:2641 ../src/xz/xz.1:2642 +#: ../src/xz/xz.1:767 ../src/xz/xz.1:768 ../src/xz/xz.1:848 ../src/xz/xz.1:849 +#: ../src/xz/xz.1:2480 ../src/xz/xz.1:2481 #, no-wrap msgid "94 MiB" msgstr "94 MiB" #. type: tbl table -#: ../src/xz/xz.1:766 ../src/xz/xz.1:2617 ../src/xz/xz.1:2642 -#: ../src/xz/xz.1:3007 +#: ../src/xz/xz.1:768 ../src/xz/xz.1:2456 ../src/xz/xz.1:2481 +#: ../src/xz/xz.1:2846 #, no-wrap msgid "-6" msgstr "-6" #. type: tbl table -#: ../src/xz/xz.1:766 ../src/xz/xz.1:767 ../src/xz/xz.1:768 ../src/xz/xz.1:769 -#: ../src/xz/xz.1:3007 +#: ../src/xz/xz.1:768 ../src/xz/xz.1:769 ../src/xz/xz.1:770 ../src/xz/xz.1:771 +#: ../src/xz/xz.1:2846 #, no-wrap msgid "6" msgstr "6" #. type: tbl table -#: ../src/xz/xz.1:767 ../src/xz/xz.1:2618 ../src/xz/xz.1:2643 +#: ../src/xz/xz.1:769 ../src/xz/xz.1:2457 ../src/xz/xz.1:2482 #, no-wrap msgid "-7" msgstr "-7" #. type: tbl table -#: ../src/xz/xz.1:767 ../src/xz/xz.1:855 ../src/xz/xz.1:2618 -#: ../src/xz/xz.1:2619 ../src/xz/xz.1:2640 +#: ../src/xz/xz.1:769 ../src/xz/xz.1:850 ../src/xz/xz.1:2457 +#: ../src/xz/xz.1:2458 ../src/xz/xz.1:2479 #, no-wrap msgid "16 MiB" msgstr "16 MiB" #. type: tbl table -#: ../src/xz/xz.1:767 ../src/xz/xz.1:855 ../src/xz/xz.1:2643 +#: ../src/xz/xz.1:769 ../src/xz/xz.1:850 ../src/xz/xz.1:2482 #, no-wrap msgid "186 MiB" msgstr "186 MiB" #. type: tbl table -#: ../src/xz/xz.1:768 ../src/xz/xz.1:2619 ../src/xz/xz.1:2644 +#: ../src/xz/xz.1:770 ../src/xz/xz.1:2458 ../src/xz/xz.1:2483 #, no-wrap msgid "-8" msgstr "-8" #. type: tbl table -#: ../src/xz/xz.1:768 ../src/xz/xz.1:856 ../src/xz/xz.1:2644 +#: ../src/xz/xz.1:770 ../src/xz/xz.1:851 ../src/xz/xz.1:2483 #, no-wrap msgid "370 MiB" msgstr "370 MiB" #. type: tbl table -#: ../src/xz/xz.1:768 ../src/xz/xz.1:856 +#: ../src/xz/xz.1:770 ../src/xz/xz.1:851 #, no-wrap msgid "33 MiB" msgstr "33 MiB" #. type: tbl table -#: ../src/xz/xz.1:769 ../src/xz/xz.1:2620 ../src/xz/xz.1:2645 +#: ../src/xz/xz.1:771 ../src/xz/xz.1:2459 ../src/xz/xz.1:2484 #, no-wrap msgid "-9" msgstr "-9" #. type: tbl table -#: ../src/xz/xz.1:769 ../src/xz/xz.1:857 ../src/xz/xz.1:2620 +#: ../src/xz/xz.1:771 ../src/xz/xz.1:852 ../src/xz/xz.1:2459 #, no-wrap msgid "64 MiB" msgstr "64 MiB" #. type: tbl table -#: ../src/xz/xz.1:769 ../src/xz/xz.1:857 ../src/xz/xz.1:2645 +#: ../src/xz/xz.1:771 ../src/xz/xz.1:852 ../src/xz/xz.1:2484 #, no-wrap msgid "674 MiB" msgstr "674 MiB" #. type: tbl table -#: ../src/xz/xz.1:769 ../src/xz/xz.1:857 +#: ../src/xz/xz.1:771 ../src/xz/xz.1:852 #, no-wrap msgid "65 MiB" msgstr "65 MiB" #. type: Plain text -#: ../src/xz/xz.1:775 +#: ../src/xz/xz.1:777 msgid "Column descriptions:" msgstr "Spaltenbeschreibungen:" #. type: Plain text -#: ../src/xz/xz.1:787 -msgid "DictSize is the LZMA2 dictionary size. It is waste of memory to use a dictionary bigger than the size of the uncompressed file. This is why it is good to avoid using the presets B<-7> ... B<-9> when there's no real need for them. At B<-6> and lower, the amount of memory wasted is usually low enough to not matter." -msgstr "Wörtb.Größe ist die Größe des LZMA2-Wörterbuchs. Es ist Speicherverschwendung, ein Wörterbuch zu verwenden, das größer als die unkomprimierte Datei ist. Daher ist es besser, die Voreinstellungen B<-7> … B<-9> zu vermeiden, falls es keinen wirklichen Bedarf dafür gibt. Mit B<-6> und weniger wird üblicherweise so wenig Speicher verschwendet, dass dies nicht ins Gewicht fällt." - -#. type: Plain text -#: ../src/xz/xz.1:796 -msgid "CompCPU is a simplified representation of the LZMA2 settings that affect compression speed. The dictionary size affects speed too, so while CompCPU is the same for levels B<-6> ... B<-9>, higher levels still tend to be a little slower. To get even slower and thus possibly better compression, see B<--extreme>." -msgstr "KomprCPU ist eine vereinfachte Repräsentation der LZMA2-Einstellungen, welche die Kompressionsgeschwindigkeit beeinflussen. Die Wörterbuchgröße wirkt sich ebenfalls auf die Geschwindigkeit aus. Während KompCPU für die Stufen B<-6> bis B<-9> gleich ist, tendieren höhere Stufen dazu, etwas langsamer zu sein. Um eine noch langsamere, aber möglicherweise bessere Kompression zu erhalten, siehe B<--extreme>." +#: ../src/xz/xz.1:789 +msgid "" +"DictSize is the LZMA2 dictionary size. It is waste of memory to use a " +"dictionary bigger than the size of the uncompressed file. This is why it is " +"good to avoid using the presets B<-7> ... B<-9> when there's no real need " +"for them. At B<-6> and lower, the amount of memory wasted is usually low " +"enough to not matter." +msgstr "" +"Wörtb.Größe ist die Größe des LZMA2-Wörterbuchs. Es ist " +"Speicherverschwendung, ein Wörterbuch zu verwenden, das größer als die " +"unkomprimierte Datei ist. Daher ist es besser, die Voreinstellungen B<-7> … " +"B<-9> zu vermeiden, falls es keinen wirklichen Bedarf dafür gibt. Mit B<-6> " +"und weniger wird üblicherweise so wenig Speicher verschwendet, dass dies " +"nicht ins Gewicht fällt." #. type: Plain text -#: ../src/xz/xz.1:802 -msgid "CompMem contains the compressor memory requirements in the single-threaded mode. It may vary slightly between B versions." -msgstr "KompSpeich enthält den Speicherbedarf des Kompressors im Einzel-Thread-Modus. Dieser kann zwischen den B-Versionen leicht variieren." +#: ../src/xz/xz.1:798 +msgid "" +"CompCPU is a simplified representation of the LZMA2 settings that affect " +"compression speed. The dictionary size affects speed too, so while CompCPU " +"is the same for levels B<-6> ... B<-9>, higher levels still tend to be a " +"little slower. To get even slower and thus possibly better compression, see " +"B<--extreme>." +msgstr "" +"KomprCPU ist eine vereinfachte Repräsentation der LZMA2-Einstellungen, " +"welche die Kompressionsgeschwindigkeit beeinflussen. Die Wörterbuchgröße " +"wirkt sich ebenfalls auf die Geschwindigkeit aus. Während KompCPU für die " +"Stufen B<-6> bis B<-9> gleich ist, tendieren höhere Stufen dazu, etwas " +"langsamer zu sein. Um eine noch langsamere, aber möglicherweise bessere " +"Kompression zu erhalten, siehe B<--extreme>." #. type: Plain text -#: ../src/xz/xz.1:809 -msgid "DecMem contains the decompressor memory requirements. That is, the compression settings determine the memory requirements of the decompressor. The exact decompressor memory usage is slightly more than the LZMA2 dictionary size, but the values in the table have been rounded up to the next full MiB." -msgstr "DekompSpeich enthält den Speicherbedarf für die Dekompression. Das bedeutet, dass die Kompressionseinstellungen den Speicherbedarf bei der Dekompression bestimmen. Der exakte Speicherbedarf bei der Dekompression ist geringfügig größer als die Größe des LZMA2-Wörterbuchs, aber die Werte in der Tabelle wurden auf ganze MiB aufgerundet." +#: ../src/xz/xz.1:806 +msgid "" +"CompMem contains the compressor memory requirements in the single-threaded " +"mode. It may vary slightly between B versions. Memory requirements of " +"some of the future multithreaded modes may be dramatically higher than that " +"of the single-threaded mode." +msgstr "" +"KompSpeich enthält den Speicherbedarf des Kompressors im Einzel-Thread-" +"Modus. Dieser kann zwischen den B-Versionen leicht variieren. Der " +"Speicherbedarf einiger der zukünftigen Multithread-Modi kann dramatisch " +"höher sein als im Einzel-Thread-Modus." #. type: Plain text -#: ../src/xz/xz.1:819 -msgid "Memory requirements of the multi-threaded mode are significantly higher than that of the single-threaded mode. With the default value of B<--block-size>, each thread needs 3*3*DictSize plus CompMem or DecMem. For example, four threads with preset B<-6> needs 660\\(en670\\ MiB of memory." -msgstr " Der Speicherbedarf einiger der zukünftigen Multithread-Modi kann dramatisch höher sein als im Einzel-Thread-Modus. Mit dem Standardwert von B<--block-size> benötigt jeder Thread 3*3*Wörtb.Gr plus KompSpeich oder DekompSpeich. Beispielsweise benötigen vier Threads mit der Voreinstellung B<-6> etwa 660 bis 670 MiB Speicher." +#: ../src/xz/xz.1:813 +msgid "" +"DecMem contains the decompressor memory requirements. That is, the " +"compression settings determine the memory requirements of the decompressor. " +"The exact decompressor memory usage is slightly more than the LZMA2 " +"dictionary size, but the values in the table have been rounded up to the " +"next full MiB." +msgstr "" +"DekompSpeich enthält den Speicherbedarf für die Dekompression. Das bedeutet, " +"dass die Kompressionseinstellungen den Speicherbedarf bei der Dekompression " +"bestimmen. Der exakte Speicherbedarf bei der Dekompression ist geringfügig " +"größer als die Größe des LZMA2-Wörterbuchs, aber die Werte in der Tabelle " +"wurden auf ganze MiB aufgerundet." #. type: TP -#: ../src/xz/xz.1:819 +#: ../src/xz/xz.1:814 #, no-wrap msgid "B<-e>, B<--extreme>" msgstr "B<-e>, B<--extreme>" #. type: Plain text -#: ../src/xz/xz.1:828 -msgid "Use a slower variant of the selected compression preset level (B<-0> ... B<-9>) to hopefully get a little bit better compression ratio, but with bad luck this can also make it worse. Decompressor memory usage is not affected, but compressor memory usage increases a little at preset levels B<-0> ... B<-3>." -msgstr "verwendet eine langsamere Variante der gewählten Kompressions-Voreinstellungsstufe (B<-0> … B<-9>), um hoffentlich ein etwas besseres Kompressionsverhältnis zu erreichen, das aber in ungünstigen Fällen auch schlechter werden kann. Der Speicherverbrauch bei der Dekompression wird dabei nicht beeinflusst, aber der Speicherverbrauch der Kompression steigt in den Voreinstellungsstufen B<-0> bis B<-3> geringfügig an." +#: ../src/xz/xz.1:823 +msgid "" +"Use a slower variant of the selected compression preset level (B<-0> ... " +"B<-9>) to hopefully get a little bit better compression ratio, but with bad " +"luck this can also make it worse. Decompressor memory usage is not " +"affected, but compressor memory usage increases a little at preset levels " +"B<-0> ... B<-3>." +msgstr "" +"verwendet eine langsamere Variante der gewählten Kompressions-" +"Voreinstellungsstufe (B<-0> … B<-9>), um hoffentlich ein etwas besseres " +"Kompressionsverhältnis zu erreichen, das aber in ungünstigen Fällen auch " +"schlechter werden kann. Der Speicherverbrauch bei der Dekompression wird " +"dabei nicht beeinflusst, aber der Speicherverbrauch der Kompression steigt " +"in den Voreinstellungsstufen B<-0> bis B<-3> geringfügig an." #. type: Plain text -#: ../src/xz/xz.1:840 -msgid "Since there are two presets with dictionary sizes 4\\ MiB and 8\\ MiB, the presets B<-3e> and B<-5e> use slightly faster settings (lower CompCPU) than B<-4e> and B<-6e>, respectively. That way no two presets are identical." -msgstr "Da es zwei Voreinstellungen mit den Wörterbuchgrößen 4\\ MiB und 8\\ MiB gibt, verwenden die Voreinstellungsstufen B<-3e> und B<-5e> etwas schnellere Einstellungen (niedrigere KompCPU) als B<-4e> beziehungsweise B<-6e>. Auf diese Weise sind zwei Voreinstellungen nie identisch." +#: ../src/xz/xz.1:835 +msgid "" +"Since there are two presets with dictionary sizes 4\\ MiB and 8\\ MiB, the " +"presets B<-3e> and B<-5e> use slightly faster settings (lower CompCPU) than " +"B<-4e> and B<-6e>, respectively. That way no two presets are identical." +msgstr "" +"Da es zwei Voreinstellungen mit den Wörterbuchgrößen 4\\ MiB und 8\\ MiB " +"gibt, verwenden die Voreinstellungsstufen B<-3e> und B<-5e> etwas schnellere " +"Einstellungen (niedrigere KompCPU) als B<-4e> beziehungsweise B<-6e>. Auf " +"diese Weise sind zwei Voreinstellungen nie identisch." #. type: tbl table -#: ../src/xz/xz.1:848 +#: ../src/xz/xz.1:843 #, no-wrap msgid "-0e" msgstr "-0e" #. type: tbl table -#: ../src/xz/xz.1:848 ../src/xz/xz.1:849 ../src/xz/xz.1:850 ../src/xz/xz.1:852 -#: ../src/xz/xz.1:854 ../src/xz/xz.1:855 ../src/xz/xz.1:856 ../src/xz/xz.1:857 -#: ../src/xz/xz.1:3009 +#: ../src/xz/xz.1:843 ../src/xz/xz.1:844 ../src/xz/xz.1:845 ../src/xz/xz.1:847 +#: ../src/xz/xz.1:849 ../src/xz/xz.1:850 ../src/xz/xz.1:851 ../src/xz/xz.1:852 +#: ../src/xz/xz.1:2848 #, no-wrap msgid "8" msgstr "8" #. type: tbl table -#: ../src/xz/xz.1:849 +#: ../src/xz/xz.1:844 #, no-wrap msgid "-1e" msgstr "-1e" #. type: tbl table -#: ../src/xz/xz.1:849 +#: ../src/xz/xz.1:844 #, no-wrap msgid "13 MiB" msgstr "13 MiB" #. type: tbl table -#: ../src/xz/xz.1:850 +#: ../src/xz/xz.1:845 #, no-wrap msgid "-2e" msgstr "-2e" #. type: tbl table -#: ../src/xz/xz.1:850 +#: ../src/xz/xz.1:845 #, no-wrap msgid "25 MiB" msgstr "25 MiB" #. type: tbl table -#: ../src/xz/xz.1:851 +#: ../src/xz/xz.1:846 #, no-wrap msgid "-3e" msgstr "-3e" #. type: tbl table -#: ../src/xz/xz.1:851 ../src/xz/xz.1:853 ../src/xz/xz.1:3008 +#: ../src/xz/xz.1:846 ../src/xz/xz.1:848 ../src/xz/xz.1:2847 #, no-wrap msgid "7" msgstr "7" #. type: tbl table -#: ../src/xz/xz.1:852 +#: ../src/xz/xz.1:847 #, no-wrap msgid "-4e" msgstr "-4e" #. type: tbl table -#: ../src/xz/xz.1:853 ../src/xz/xz.1:3008 +#: ../src/xz/xz.1:848 ../src/xz/xz.1:2847 #, no-wrap msgid "-5e" msgstr "-5e" #. type: tbl table -#: ../src/xz/xz.1:854 ../src/xz/xz.1:3009 +#: ../src/xz/xz.1:849 ../src/xz/xz.1:2848 #, no-wrap msgid "-6e" msgstr "-6e" #. type: tbl table -#: ../src/xz/xz.1:855 +#: ../src/xz/xz.1:850 #, no-wrap msgid "-7e" msgstr "-7e" #. type: tbl table -#: ../src/xz/xz.1:856 +#: ../src/xz/xz.1:851 #, no-wrap msgid "-8e" msgstr "-8e" #. type: tbl table -#: ../src/xz/xz.1:857 +#: ../src/xz/xz.1:852 #, no-wrap msgid "-9e" msgstr "-9e" #. type: Plain text -#: ../src/xz/xz.1:869 -msgid "For example, there are a total of four presets that use 8\\ MiB dictionary, whose order from the fastest to the slowest is B<-5>, B<-6>, B<-5e>, and B<-6e>." -msgstr "Zum Beispiel gibt es insgesamt vier Voreinstellungen, die ein 8\\ MiB großes Wörterbuch verwenden, deren Reihenfolge von der schnellsten zur langsamsten B<-5>, B<-6>, B<-5e> und B<-6e> ist." +#: ../src/xz/xz.1:864 +msgid "" +"For example, there are a total of four presets that use 8\\ MiB dictionary, " +"whose order from the fastest to the slowest is B<-5>, B<-6>, B<-5e>, and " +"B<-6e>." +msgstr "" +"Zum Beispiel gibt es insgesamt vier Voreinstellungen, die ein 8\\ MiB großes " +"Wörterbuch verwenden, deren Reihenfolge von der schnellsten zur langsamsten " +"B<-5>, B<-6>, B<-5e> und B<-6e> ist." #. type: TP -#: ../src/xz/xz.1:869 +#: ../src/xz/xz.1:864 #, no-wrap msgid "B<--fast>" msgstr "B<--fast>" #. type: TP -#: ../src/xz/xz.1:872 +#: ../src/xz/xz.1:867 #, no-wrap msgid "B<--best>" msgstr "B<--best>" #. type: Plain text -#: ../src/xz/xz.1:883 -msgid "These are somewhat misleading aliases for B<-0> and B<-9>, respectively. These are provided only for backwards compatibility with LZMA Utils. Avoid using these options." -msgstr "sind etwas irreführende Aliase für B<-0> beziehungsweise B<-9>. Sie werden nur zwecks Abwärtskompatibilität zu den LZMA-Dienstprogrammen bereitgestellt. Sie sollten diese Optionen besser nicht verwenden." +#: ../src/xz/xz.1:878 +msgid "" +"These are somewhat misleading aliases for B<-0> and B<-9>, respectively. " +"These are provided only for backwards compatibility with LZMA Utils. Avoid " +"using these options." +msgstr "" +"sind etwas irreführende Aliase für B<-0> beziehungsweise B<-9>. Sie werden " +"nur zwecks Abwärtskompatibilität zu den LZMA-Dienstprogrammen " +"bereitgestellt. Sie sollten diese Optionen besser nicht verwenden." #. type: TP -#: ../src/xz/xz.1:883 +#: ../src/xz/xz.1:878 #, no-wrap msgid "B<--block-size=>I" msgstr "B<--block-size=>I" # CHECK multi-threading and makes limited random-access #. type: Plain text -#: ../src/xz/xz.1:896 -msgid "When compressing to the B<.xz> format, split the input data into blocks of I bytes. The blocks are compressed independently from each other, which helps with multi-threading and makes limited random-access decompression possible. This option is typically used to override the default block size in multi-threaded mode, but this option can be used in single-threaded mode too." -msgstr "teilt beim Komprimieren in das B<.xz>-Format die Eingabedaten in Blöcke der angegebenen I in Byte. Die Blöcke werden unabhängig voneinander komprimiert, was dem Multi-Threading entgegen kommt und Zufallszugriffe bei der Dekompression begrenzt. Diese Option wird typischerweise eingesetzt, um die vorgegebene Blockgröße im Multi-Thread-Modus außer Kraft zu setzen, aber sie kann auch im Einzel-Thread-Modus angewendet werden." +#: ../src/xz/xz.1:891 +msgid "" +"When compressing to the B<.xz> format, split the input data into blocks of " +"I bytes. The blocks are compressed independently from each other, " +"which helps with multi-threading and makes limited random-access " +"decompression possible. This option is typically used to override the " +"default block size in multi-threaded mode, but this option can be used in " +"single-threaded mode too." +msgstr "" +"teilt beim Komprimieren in das B<.xz>-Format die Eingabedaten in Blöcke der " +"angegebenen I in Byte. Die Blöcke werden unabhängig voneinander " +"komprimiert, was dem Multi-Threading entgegen kommt und Zufallszugriffe bei " +"der Dekompression begrenzt. Diese Option wird typischerweise eingesetzt, um " +"die vorgegebene Blockgröße im Multi-Thread-Modus außer Kraft zu setzen, aber " +"sie kann auch im Einzel-Thread-Modus angewendet werden." #. type: Plain text -#: ../src/xz/xz.1:913 -msgid "In multi-threaded mode about three times I bytes will be allocated in each thread for buffering input and output. The default I is three times the LZMA2 dictionary size or 1 MiB, whichever is more. Typically a good value is 2\\(en4 times the size of the LZMA2 dictionary or at least 1 MiB. Using I less than the LZMA2 dictionary size is waste of RAM because then the LZMA2 dictionary buffer will never get fully used. In multi-threaded mode, the sizes of the blocks are stored in the block headers. This size information is required for multi-threaded decompression." -msgstr "Im Multi-Thread-Modus wird etwa die dreifache I in jedem Thread zur Pufferung der Ein- und Ausgabe belegt. Die vorgegebene I ist das Dreifache der Größe des LZMA2-Wörterbuchs oder 1 MiB, je nachdem, was mehr ist. Typischerweise ist das Zwei- bis Vierfache der Größe des LZMA2-Wörterbuchs oder wenigstens 1 MB ein guter Wert. Eine I, die geringer ist als die des LZMA2-Wörterbuchs, ist Speicherverschwendung, weil dann der LZMA2-Wörterbuchpuffer niemals vollständig genutzt werden würde. Im Multi-Thread-Modus wird die Größe der Blöcke wird in den Block-Headern gespeichert. Die Größeninformation wird für eine Multi-Thread-Dekompression genutzt." +#: ../src/xz/xz.1:909 +msgid "" +"In multi-threaded mode about three times I bytes will be allocated in " +"each thread for buffering input and output. The default I is three " +"times the LZMA2 dictionary size or 1 MiB, whichever is more. Typically a " +"good value is 2\\(en4 times the size of the LZMA2 dictionary or at least 1 " +"MiB. Using I less than the LZMA2 dictionary size is waste of RAM " +"because then the LZMA2 dictionary buffer will never get fully used. The " +"sizes of the blocks are stored in the block headers, which a future version " +"of B will use for multi-threaded decompression." +msgstr "" +"Im Multi-Thread-Modus wird etwa die dreifache I in jedem Thread zur " +"Pufferung der Ein- und Ausgabe belegt. Die vorgegebene I ist das " +"Dreifache der Größe des LZMA2-Wörterbuchs oder 1 MiB, je nachdem, was mehr " +"ist. Typischerweise ist das Zwei- bis Vierfache der Größe des LZMA2-" +"Wörterbuchs oder wenigstens 1 MB ein guter Wert. Eine I, die geringer " +"ist als die des LZMA2-Wörterbuchs, ist Speicherverschwendung, weil dann der " +"LZMA2-Wörterbuchpuffer niemals vollständig genutzt werden würde. Die Größe " +"der Blöcke wird in den Block-Headern gespeichert, die von einer zukünftigen " +"Version von B für eine Multi-Thread-Dekompression genutzt wird." #. type: Plain text -#: ../src/xz/xz.1:922 -msgid "In single-threaded mode no block splitting is done by default. Setting this option doesn't affect memory usage. No size information is stored in block headers, thus files created in single-threaded mode won't be identical to files created in multi-threaded mode. The lack of size information also means that B won't be able decompress the files in multi-threaded mode." -msgstr "Im Einzel-Thread-Modus werden die Blöcke standardmäßig nicht geteilt. Das Setzen dieser Option wirkt sich nicht auf den Speicherbedarf aus. In den Block-Headern werden keine Größeninformationen gespeichert, daher werden im Einzel-Thread-Modus erzeugte Dateien nicht zu den im Multi-Thread-Modus erzeugten Dateien identisch sein. Das Fehlen der Größeninformation bedingt auch, dass B nicht in der Lage sein wird, die Dateien im Multi-Thread-Modus zu dekomprimieren." +#: ../src/xz/xz.1:918 +msgid "" +"In single-threaded mode no block splitting is done by default. Setting this " +"option doesn't affect memory usage. No size information is stored in block " +"headers, thus files created in single-threaded mode won't be identical to " +"files created in multi-threaded mode. The lack of size information also " +"means that a future version of B won't be able decompress the files in " +"multi-threaded mode." +msgstr "" +"Im Einzel-Thread-Modus werden die Blöcke standardmäßig nicht geteilt. Das " +"Setzen dieser Option wirkt sich nicht auf den Speicherbedarf aus. In den " +"Block-Headern werden keine Größeninformationen gespeichert, daher werden im " +"Einzel-Thread-Modus erzeugte Dateien nicht zu den im Multi-Thread-Modus " +"erzeugten Dateien identisch sein. Das Fehlen der Größeninformation bedingt " +"auch, dass eine zukünftige Version von B nicht in der Lage sein wird, " +"die Dateien im Multi-Thread-Modus zu dekomprimieren." #. type: TP -#: ../src/xz/xz.1:922 +#: ../src/xz/xz.1:918 #, no-wrap -msgid "B<--block-list=>I" -msgstr "B<--block-list=>I" - -#. type: Plain text -#: ../src/xz/xz.1:928 -msgid "When compressing to the B<.xz> format, start a new block with an optional custom filter chain after the given intervals of uncompressed data." -msgstr "beginnt bei der Kompression in das B<.xz>-Format nach den angegebenen Intervallen unkomprimierter Daten einen neuen Block, optional mit einer benutzerdefinierten Filterkette." - -#. type: Plain text -#: ../src/xz/xz.1:938 -msgid "The I are a comma-separated list. Each item consists of an optional filter chain number between 0 and 9 followed by a colon (B<:>) and a required size of uncompressed data. Omitting an item (two or more consecutive commas) is a shorthand to use the size and filters of the previous item." -msgstr "Die I werden in einer durch Kommata getrennten Liste angegeben. Jeder Block besteht aus einer optionalen Filterkettennummer zwischen 0 und 9, gefolgt von einem Doppelpunkt (B<:>) und der Größe der unkomprimierten Daten (diese Angabe ist erforderlich). Überspringen eines Blocks (zwei oder mehr aufeinander folgende Kommata) ist ein Kürzel dafür, die Größe und die Filter des vorherigen Blocks zu verwenden." - -#. type: Plain text -#: ../src/xz/xz.1:947 -msgid "If the input file is bigger than the sum of the sizes in I, the last item is repeated until the end of the file. A special value of B<0> may be used as the last size to indicate that the rest of the file should be encoded as a single block." -msgstr "Falls die Eingabedatei größer ist als die Summe der I, dann wird der letzte in I angegebene Wert bis zum Ende der Datei wiederholt. Mit dem speziellen Wert B<0> können Sie angeben, dass der Rest der Datei als einzelner Block kodiert werden soll." - -#. type: Plain text -#: ../src/xz/xz.1:964 -msgid "An alternative filter chain for each block can be specified in combination with the B<--filters1=>I \\&...\\& B<--filters9=>I options. These options define filter chains with an identifier between 1\\(en9. Filter chain 0 can be used to refer to the default filter chain, which is the same as not specifying a filter chain. The filter chain identifier can be used before the uncompressed size, followed by a colon (B<:>). For example, if one specifies B<--block-list=1:2MiB,3:2MiB,2:4MiB,,2MiB,0:4MiB> then blocks will be created using:" -msgstr "Eine alternative Filterkette für jeden Block kann in Kombination mit den Optionen B<--filters1=>I \\&…\\& B<--filters9=>I angegeben werden. Diese Optionen definieren Filterketten mit einem Bezeichner zwischen 1 und 9. Die Filterkette 0 bezeichnet hierbei die voreingestellte Filterkette, was dem Nichtangeben einer Filterkette gleichkommt. Der Filterkettenbezeichner kann vor der unkomprimierten Größe verwendet werden, gefolgt von einem Doppelpunkt (B<:>). Falls Sie beispielsweise B<--block-list=1:2MiB,3:2MiB,2:4MiB,,2MiB,0:4MiB> angeben, werden die Blöcke folgendermaßen erstellt:" +msgid "B<--block-list=>I" +msgstr "B<--block-list=>I" #. type: Plain text -#: ../src/xz/xz.1:969 -msgid "The filter chain specified by B<--filters1> and 2 MiB input" -msgstr "Die durch B<--filters1> angegebene Filterkette und 2 MiB Eingabe" - -#. type: Plain text -#: ../src/xz/xz.1:973 -msgid "The filter chain specified by B<--filters3> and 2 MiB input" -msgstr "Die durch B<--filters3> angegebene Filterkette und 2 MiB Eingabe" - -#. type: Plain text -#: ../src/xz/xz.1:977 ../src/xz/xz.1:981 -msgid "The filter chain specified by B<--filters2> and 4 MiB input" -msgstr "Die durch B<--filters2> angegebene Filterkette und 4 MiB Eingabe" +#: ../src/xz/xz.1:924 +msgid "" +"When compressing to the B<.xz> format, start a new block after the given " +"intervals of uncompressed data." +msgstr "" +"beginnt bei der Kompression in das B<.xz>-Format nach den angegebenen " +"Intervallen unkomprimierter Daten einen neuen Block." #. type: Plain text -#: ../src/xz/xz.1:983 -msgid "The default filter chain and 2 MiB input" -msgstr "Die vorgegebene Filterkette und 2 MiB Eingabe" +#: ../src/xz/xz.1:930 +msgid "" +"The uncompressed I of the blocks are specified as a comma-separated " +"list. Omitting a size (two or more consecutive commas) is a shorthand to " +"use the size of the previous block." +msgstr "" +"Die unkomprimierte I der Blöcke wird in einer durch Kommata " +"getrennten Liste angegeben. Auslassen einer Größe (zwei oder mehr " +"aufeinander folgende Kommata) ist ein Kürzel dafür, die Größe des vorherigen " +"Blocks zu verwenden." #. type: Plain text -#: ../src/xz/xz.1:986 -msgid "The default filter chain and 4 MiB input for every block until end of input." -msgstr "Die vorgegebene Filterkette und 4 MiB Eingabe für jeden Block bis zum Ende der Eingabe." +#: ../src/xz/xz.1:940 +msgid "" +"If the input file is bigger than the sum of I, the last value in " +"I is repeated until the end of the file. A special value of B<0> may " +"be used as the last value to indicate that the rest of the file should be " +"encoded as a single block." +msgstr "" +"Falls die Eingabedatei größer ist als die Summe der I, dann wird der " +"letzte in I angegebene Wert bis zum Ende der Datei wiederholt. Mit " +"dem speziellen Wert B<0> können Sie angeben, dass der Rest der Datei als " +"einzelner Block kodiert werden soll." # FIXME encoder → compressor #. type: Plain text -#: ../src/xz/xz.1:1000 -msgid "If one specifies a size that exceeds the encoder's block size (either the default value in threaded mode or the value specified with B<--block-size=>I), the encoder will create additional blocks while keeping the boundaries specified in I. For example, if one specifies B<--block-size=10MiB> B<--block-list=5MiB,10MiB,8MiB,12MiB,24MiB> and the input file is 80 MiB, one will get 11 blocks: 5, 10, 8, 10, 2, 10, 10, 4, 10, 10, and 1 MiB." -msgstr "Falls Sie eine Größe angeben, welche die Blockgröße des Encoders übersteigen (entweder den Vorgabewert im Thread-Modus oder den mit B<--block-size=>I angegebenen Wert), wird der Encoder zusätzliche Blöcke erzeugen, wobei die in den I angegebenen Grenzen eingehalten werden. Wenn Sie zum Beispiel B<--block-size=10MiB> B<--block-list=5MiB,10MiB,8MiB,12MiB,24MiB> angeben und die Eingabedatei 80 MiB groß ist, erhalten Sie 11 Blöcke: 5, 10, 8, 10, 2, 10, 10, 4, 10, 10 und 1 MiB." +#: ../src/xz/xz.1:955 +msgid "" +"If one specifies I that exceed the encoder's block size (either the " +"default value in threaded mode or the value specified with B<--block-" +"size=>I), the encoder will create additional blocks while keeping the " +"boundaries specified in I. For example, if one specifies B<--block-" +"size=10MiB> B<--block-list=5MiB,10MiB,8MiB,12MiB,24MiB> and the input file " +"is 80 MiB, one will get 11 blocks: 5, 10, 8, 10, 2, 10, 10, 4, 10, 10, and 1 " +"MiB." +msgstr "" +"Falls Sie I angeben, welche die Blockgröße des Encoders übersteigen " +"(entweder den Vorgabewert im Thread-Modus oder den mit B<--block-" +"size=>I angegebenen Wert), wird der Encoder zusätzliche Blöcke " +"erzeugen, wobei die in den I angegebenen Grenzen eingehalten werden. " +"Wenn Sie zum Beispiel B<--block-size=10MiB> B<--block-" +"list=5MiB,10MiB,8MiB,12MiB,24MiB> angeben und die Eingabedatei 80 MiB groß " +"ist, erhalten Sie 11 Blöcke: 5, 10, 8, 10, 2, 10, 10, 4, 10, 10 und 1 MiB." #. type: Plain text -#: ../src/xz/xz.1:1006 -msgid "In multi-threaded mode the sizes of the blocks are stored in the block headers. This isn't done in single-threaded mode, so the encoded output won't be identical to that of the multi-threaded mode." -msgstr "Im Multi-Thread-Modus werden die Blockgrößen in den Block-Headern gespeichert. Dies geschieht im Einzel-Thread-Modus nicht, daher wird die kodierte Ausgabe zu der im Multi-Thread-Modus nicht identisch sein." +#: ../src/xz/xz.1:961 +msgid "" +"In multi-threaded mode the sizes of the blocks are stored in the block " +"headers. This isn't done in single-threaded mode, so the encoded output " +"won't be identical to that of the multi-threaded mode." +msgstr "" +"Im Multi-Thread-Modus werden die Blockgrößen in den Block-Headern " +"gespeichert. Dies geschieht im Einzel-Thread-Modus nicht, daher wird die " +"kodierte Ausgabe zu der im Multi-Thread-Modus nicht identisch sein." #. type: TP -#: ../src/xz/xz.1:1006 +#: ../src/xz/xz.1:961 #, no-wrap msgid "B<--flush-timeout=>I" msgstr "B<--flush-timeout=>I" #. type: Plain text -#: ../src/xz/xz.1:1023 -msgid "When compressing, if more than I milliseconds (a positive integer) has passed since the previous flush and reading more input would block, all the pending input data is flushed from the encoder and made available in the output stream. This can be useful if B is used to compress data that is streamed over a network. Small I values make the data available at the receiving end with a small delay, but large I values give better compression ratio." -msgstr "löscht bei der Kompression die ausstehenden Daten aus dem Encoder und macht sie im Ausgabedatenstrom verfügbar, wenn mehr als die angegebene I in Millisekunden (als positive Ganzzahl) seit dem vorherigen Löschen vergangen ist und das Lesen weiterer Eingaben blockieren würde. Dies kann nützlich sein, wenn B zum Komprimieren von über das Netzwerk eingehenden Daten verwendet wird. Kleine I-Werte machen die Daten unmittelbar nach dem Empfang nach einer kurzen Verzögerung verfügbar, während große I-Werte ein besseres Kompressionsverhältnis bewirken." +#: ../src/xz/xz.1:978 +msgid "" +"When compressing, if more than I milliseconds (a positive integer) " +"has passed since the previous flush and reading more input would block, all " +"the pending input data is flushed from the encoder and made available in the " +"output stream. This can be useful if B is used to compress data that is " +"streamed over a network. Small I values make the data available at " +"the receiving end with a small delay, but large I values give " +"better compression ratio." +msgstr "" +"löscht bei der Kompression die ausstehenden Daten aus dem Encoder und macht " +"sie im Ausgabedatenstrom verfügbar, wenn mehr als die angegebene I in " +"Millisekunden (als positive Ganzzahl) seit dem vorherigen Löschen vergangen " +"ist und das Lesen weiterer Eingaben blockieren würde. Dies kann nützlich " +"sein, wenn B zum Komprimieren von über das Netzwerk eingehenden Daten " +"verwendet wird. Kleine I-Werte machen die Daten unmittelbar nach dem " +"Empfang nach einer kurzen Verzögerung verfügbar, während große I-Werte " +"ein besseres Kompressionsverhältnis bewirken." #. type: Plain text -#: ../src/xz/xz.1:1031 -msgid "This feature is disabled by default. If this option is specified more than once, the last one takes effect. The special I value of B<0> can be used to explicitly disable this feature." -msgstr "Dieses Funktionsmerkmal ist standardmäßig deaktiviert. Wenn diese Option mehrfach angegeben wird, ist die zuletzt angegebene wirksam. Für die Angabe der I kann der spezielle Wert B<0> verwendet werden, um dieses Funktionsmerkmal explizit zu deaktivieren." +#: ../src/xz/xz.1:986 +msgid "" +"This feature is disabled by default. If this option is specified more than " +"once, the last one takes effect. The special I value of B<0> can " +"be used to explicitly disable this feature." +msgstr "" +"Dieses Funktionsmerkmal ist standardmäßig deaktiviert. Wenn diese Option " +"mehrfach angegeben wird, ist die zuletzt angegebene wirksam. Für die Angabe " +"der I kann der spezielle Wert B<0> verwendet werden, um dieses " +"Funktionsmerkmal explizit zu deaktivieren." #. type: Plain text -#: ../src/xz/xz.1:1033 +#: ../src/xz/xz.1:988 msgid "This feature is not available on non-POSIX systems." -msgstr "Dieses Funktionsmerkmal ist außerhalb von POSIX-Systemen nicht verfügbar." +msgstr "" +"Dieses Funktionsmerkmal ist außerhalb von POSIX-Systemen nicht verfügbar." #. FIXME #. type: Plain text -#: ../src/xz/xz.1:1041 -msgid "B Currently B is unsuitable for decompressing the stream in real time due to how B does buffering." -msgstr "B Gegenwärtig ist B aufgrund der Art und Weise, wie B puffert, für Dekompression in Echtzeit ungeeignet." +#: ../src/xz/xz.1:996 +msgid "" +"B Currently B is unsuitable for " +"decompressing the stream in real time due to how B does buffering." +msgstr "" +"B Gegenwärtig ist B " +"aufgrund der Art und Weise, wie B puffert, für Dekompression in Echtzeit " +"ungeeignet." #. type: TP -#: ../src/xz/xz.1:1041 +#: ../src/xz/xz.1:996 #, no-wrap msgid "B<--memlimit-compress=>I" msgstr "B<--memlimit-compress=>I" #. type: Plain text -#: ../src/xz/xz.1:1046 -msgid "Set a memory usage limit for compression. If this option is specified multiple times, the last one takes effect." -msgstr "legt eine Grenze für die Speichernutzung bei der Kompression fest. Wenn diese Option mehrmals angegeben wird, ist die zuletzt angegebene wirksam." +#: ../src/xz/xz.1:1001 +msgid "" +"Set a memory usage limit for compression. If this option is specified " +"multiple times, the last one takes effect." +msgstr "" +"legt eine Grenze für die Speichernutzung bei der Kompression fest. Wenn " +"diese Option mehrmals angegeben wird, ist die zuletzt angegebene wirksam." #. type: Plain text -#: ../src/xz/xz.1:1059 -msgid "If the compression settings exceed the I, B will attempt to adjust the settings downwards so that the limit is no longer exceeded and display a notice that automatic adjustment was done. The adjustments are done in this order: reducing the number of threads, switching to single-threaded mode if even one thread in multi-threaded mode exceeds the I, and finally reducing the LZMA2 dictionary size." -msgstr "Falls die Kompressionseinstellungen die I überschreiten, versucht B, die Einstellungen nach unten anzupassen, so dass die Grenze nicht mehr überschritten wird und zeigt einen Hinweis an, dass eine automatische Anpassung vorgenommen wurde. Die Anpassungen werden in folgender Reihenfolge angewendet: Reduzierung der Anzahl der Threads, Wechsel in den Einzelthread-Modus, falls sogar ein einziger Thread im Multithread-Modus die I überschreitet, und schlussendlich die Reduzierung der Größe des LZMA2-Wörterbuchs." +#: ../src/xz/xz.1:1014 +msgid "" +"If the compression settings exceed the I, B will attempt to " +"adjust the settings downwards so that the limit is no longer exceeded and " +"display a notice that automatic adjustment was done. The adjustments are " +"done in this order: reducing the number of threads, switching to single-" +"threaded mode if even one thread in multi-threaded mode exceeds the " +"I, and finally reducing the LZMA2 dictionary size." +msgstr "" +"Falls die Kompressionseinstellungen die I überschreiten, versucht " +"B, die Einstellungen nach unten anzupassen, so dass die Grenze nicht " +"mehr überschritten wird und zeigt einen Hinweis an, dass eine automatische " +"Anpassung vorgenommen wurde. Die Anpassungen werden in folgender Reihenfolge " +"angewendet: Reduzierung der Anzahl der Threads, Wechsel in den Einzelthread-" +"Modus, falls sogar ein einziger Thread im Multithread-Modus die I " +"überschreitet, und schlussendlich die Reduzierung der Größe des LZMA2-" +"Wörterbuchs." #. type: Plain text -#: ../src/xz/xz.1:1067 -msgid "When compressing with B<--format=raw> or if B<--no-adjust> has been specified, only the number of threads may be reduced since it can be done without affecting the compressed output." -msgstr "Beim Komprimieren mit B<--format=raw> oder falls B<--no-adjust> angegeben wurde, wird nur die Anzahl der Threads reduziert, da nur so die komprimierte Ausgabe nicht beeinflusst wird." +#: ../src/xz/xz.1:1022 +msgid "" +"When compressing with B<--format=raw> or if B<--no-adjust> has been " +"specified, only the number of threads may be reduced since it can be done " +"without affecting the compressed output." +msgstr "" +"Beim Komprimieren mit B<--format=raw> oder falls B<--no-adjust> angegeben " +"wurde, wird nur die Anzahl der Threads reduziert, da nur so die komprimierte " +"Ausgabe nicht beeinflusst wird." #. type: Plain text -#: ../src/xz/xz.1:1074 -msgid "If the I cannot be met even with the adjustments described above, an error is displayed and B will exit with exit status 1." -msgstr "Falls die I nicht anhand der vorstehend beschriebenen Anpassungen gesetzt werden kann, wird ein Fehler angezeigt und B wird mit dem Exit-Status 1 beendet." +#: ../src/xz/xz.1:1029 +msgid "" +"If the I cannot be met even with the adjustments described above, an " +"error is displayed and B will exit with exit status 1." +msgstr "" +"Falls die I nicht anhand der vorstehend beschriebenen Anpassungen " +"gesetzt werden kann, wird ein Fehler angezeigt und B wird mit dem Exit-" +"Status 1 beendet." #. type: Plain text -#: ../src/xz/xz.1:1078 +#: ../src/xz/xz.1:1033 msgid "The I can be specified in multiple ways:" msgstr "Die I kann auf verschiedene Arten angegeben werden:" # FIXME integer suffix #. type: Plain text -#: ../src/xz/xz.1:1088 -msgid "The I can be an absolute value in bytes. Using an integer suffix like B can be useful. Example: B<--memlimit-compress=80MiB>" -msgstr "Die I kann ein absoluter Wert in Byte sein. Ein Suffix wie B kann dabei hilfreich sein. Beispiel: B<--memlimit-compress=80MiB>." +#: ../src/xz/xz.1:1043 +msgid "" +"The I can be an absolute value in bytes. Using an integer suffix " +"like B can be useful. Example: B<--memlimit-compress=80MiB>" +msgstr "" +"Die I kann ein absoluter Wert in Byte sein. Ein Suffix wie B " +"kann dabei hilfreich sein. Beispiel: B<--memlimit-compress=80MiB>." #. type: Plain text -#: ../src/xz/xz.1:1100 -msgid "The I can be specified as a percentage of total physical memory (RAM). This can be useful especially when setting the B environment variable in a shell initialization script that is shared between different computers. That way the limit is automatically bigger on systems with more memory. Example: B<--memlimit-compress=70%>" -msgstr "Die I kann als Prozentsatz des physischen Gesamtspeichers (RAM) angegeben werden. Dies ist insbesondere nützlich, wenn in einem Shell-Initialisierungsskript, das mehrere unterschiedliche Rechner gemeinsam verwenden, die Umgebungsvariable B gesetzt ist. Auf diese Weise ist die Grenze auf Systemen mit mehr Speicher höher. Beispiel: B<--memlimit-compress=70%>" +#: ../src/xz/xz.1:1055 +msgid "" +"The I can be specified as a percentage of total physical memory " +"(RAM). This can be useful especially when setting the B " +"environment variable in a shell initialization script that is shared between " +"different computers. That way the limit is automatically bigger on systems " +"with more memory. Example: B<--memlimit-compress=70%>" +msgstr "" +"Die I kann als Prozentsatz des physischen Gesamtspeichers (RAM) " +"angegeben werden. Dies ist insbesondere nützlich, wenn in einem Shell-" +"Initialisierungsskript, das mehrere unterschiedliche Rechner gemeinsam " +"verwenden, die Umgebungsvariable B gesetzt ist. Auf diese Weise " +"ist die Grenze auf Systemen mit mehr Speicher höher. Beispiel: B<--memlimit-" +"compress=70%>" #. type: Plain text -#: ../src/xz/xz.1:1110 -msgid "The I can be reset back to its default value by setting it to B<0>. This is currently equivalent to setting the I to B (no memory usage limit)." -msgstr "Mit B<0> kann die I auf den Standardwert zurückgesetzt werden. Dies ist gegenwärtig gleichbedeutend mit dem Setzen der I auf B (keine Speicherbegrenzung)." +#: ../src/xz/xz.1:1065 +msgid "" +"The I can be reset back to its default value by setting it to B<0>. " +"This is currently equivalent to setting the I to B (no memory " +"usage limit)." +msgstr "" +"Mit B<0> kann die I auf den Standardwert zurückgesetzt werden. Dies " +"ist gegenwärtig gleichbedeutend mit dem Setzen der I auf B " +"(keine Speicherbegrenzung)." #. type: Plain text -#: ../src/xz/xz.1:1134 -msgid "For 32-bit B there is a special case: if the I would be over B<4020\\ MiB>, the I is set to B<4020\\ MiB>. On MIPS32 B<2000\\ MiB> is used instead. (The values B<0> and B aren't affected by this. A similar feature doesn't exist for decompression.) This can be helpful when a 32-bit executable has access to 4\\ GiB address space (2 GiB on MIPS32) while hopefully doing no harm in other situations." -msgstr "Für die 32-Bit-Version von B gibt es einen Spezialfall: Falls die Grenze über B<4020\\ MiB> liegt, wird die I auf B<4020\\ MiB> gesetzt. Auf MIPS32 wird stattdessen B<2000\\ MB> verwendet (die Werte B<0> und B werden hiervon nicht beeinflusst; für die Dekompression gibt es keine vergleichbare Funktion). Dies kann hilfreich sein, wenn ein 32-Bit-Executable auf einen 4\\ GiB großen Adressraum (2 GiB auf MIPS32) zugreifen kann, wobei wir hoffen wollen, dass es in anderen Situationen keine negativen Effekte hat." +#: ../src/xz/xz.1:1089 +msgid "" +"For 32-bit B there is a special case: if the I would be over " +"B<4020\\ MiB>, the I is set to B<4020\\ MiB>. On MIPS32 B<2000\\ " +"MiB> is used instead. (The values B<0> and B aren't affected by this. " +"A similar feature doesn't exist for decompression.) This can be helpful " +"when a 32-bit executable has access to 4\\ GiB address space (2 GiB on " +"MIPS32) while hopefully doing no harm in other situations." +msgstr "" +"Für die 32-Bit-Version von B gibt es einen Spezialfall: Falls die Grenze " +"über B<4020\\ MiB> liegt, wird die I auf B<4020\\ MiB> gesetzt. Auf " +"MIPS32 wird stattdessen B<2000\\ MB> verwendet (die Werte B<0> und B " +"werden hiervon nicht beeinflusst; für die Dekompression gibt es keine " +"vergleichbare Funktion). Dies kann hilfreich sein, wenn ein 32-Bit-" +"Executable auf einen 4\\ GiB großen Adressraum (2 GiB auf MIPS32) zugreifen " +"kann, wobei wir hoffen wollen, dass es in anderen Situationen keine " +"negativen Effekte hat." #. type: Plain text -#: ../src/xz/xz.1:1137 +#: ../src/xz/xz.1:1092 msgid "See also the section B." msgstr "Siehe auch den Abschnitt B." #. type: TP -#: ../src/xz/xz.1:1137 +#: ../src/xz/xz.1:1092 #, no-wrap msgid "B<--memlimit-decompress=>I" msgstr "B<--memlimit-decompress=>I" #. type: Plain text -#: ../src/xz/xz.1:1151 -msgid "Set a memory usage limit for decompression. This also affects the B<--list> mode. If the operation is not possible without exceeding the I, B will display an error and decompressing the file will fail. See B<--memlimit-compress=>I for possible ways to specify the I." -msgstr "legt eine Begrenzung des Speicherverbrauchs für die Dekompression fest. Dies beeinflusst auch den Modus B<--list>. Falls die Aktion nicht ausführbar ist, ohne die I zu überschreiten, gibt B eine Fehlermeldung aus und die Dekompression wird fehlschlagen. Siehe B<--memlimit-compress=>I zu möglichen Wegen, die I anzugeben." +#: ../src/xz/xz.1:1106 +msgid "" +"Set a memory usage limit for decompression. This also affects the B<--list> " +"mode. If the operation is not possible without exceeding the I, " +"B will display an error and decompressing the file will fail. See B<--" +"memlimit-compress=>I for possible ways to specify the I." +msgstr "" +"legt eine Begrenzung des Speicherverbrauchs für die Dekompression fest. Dies " +"beeinflusst auch den Modus B<--list>. Falls die Aktion nicht ausführbar ist, " +"ohne die I zu überschreiten, gibt B eine Fehlermeldung aus und " +"die Dekompression wird fehlschlagen. Siehe B<--memlimit-compress=>I " +"zu möglichen Wegen, die I anzugeben." #. type: TP -#: ../src/xz/xz.1:1151 +#: ../src/xz/xz.1:1106 #, no-wrap msgid "B<--memlimit-mt-decompress=>I" msgstr "B<--memlimit-mt-decompress=>I" #. type: Plain text -#: ../src/xz/xz.1:1173 -msgid "Set a memory usage limit for multi-threaded decompression. This can only affect the number of threads; this will never make B refuse to decompress a file. If I is too low to allow any multi-threading, the I is ignored and B will continue in single-threaded mode. Note that if also B<--memlimit-decompress> is used, it will always apply to both single-threaded and multi-threaded modes, and so the effective I for multi-threading will never be higher than the limit set with B<--memlimit-decompress>." -msgstr "legt eine Begrenzung des Speicherverbrauchs für Multithread-Dekompression fest. Dies beeinflusst lediglich die Anzahl der Threads; B wird dadurch niemals die Dekompression einer Datei verweigern. Falls die I für jegliches Multithreading zu niedrig ist, wird sie ignoriert und B setzt im Einzelthread-modus fort. Beachten Sie auch, dass bei der Verwendung von B<--memlimit-decompress> dies stets sowohl auf den Einzelthread-als auch auf den Multithread-Modus angewendet wird und so die effektive I für den Multithread-Modus niemals höher sein wird als die mit B<--memlimit-decompress> gesetzte Grenze." +#: ../src/xz/xz.1:1128 +msgid "" +"Set a memory usage limit for multi-threaded decompression. This can only " +"affect the number of threads; this will never make B refuse to " +"decompress a file. If I is too low to allow any multi-threading, the " +"I is ignored and B will continue in single-threaded mode. Note " +"that if also B<--memlimit-decompress> is used, it will always apply to both " +"single-threaded and multi-threaded modes, and so the effective I for " +"multi-threading will never be higher than the limit set with B<--memlimit-" +"decompress>." +msgstr "" +"legt eine Begrenzung des Speicherverbrauchs für Multithread-Dekompression " +"fest. Dies beeinflusst lediglich die Anzahl der Threads; B wird dadurch " +"niemals die Dekompression einer Datei verweigern. Falls die I für " +"jegliches Multithreading zu niedrig ist, wird sie ignoriert und B setzt " +"im Einzelthread-modus fort. Beachten Sie auch, dass bei der Verwendung von " +"B<--memlimit-decompress> dies stets sowohl auf den Einzelthread-als auch auf " +"den Multithread-Modus angewendet wird und so die effektive I für den " +"Multithread-Modus niemals höher sein wird als die mit B<--memlimit-" +"decompress> gesetzte Grenze." #. type: Plain text -#: ../src/xz/xz.1:1180 -msgid "In contrast to the other memory usage limit options, B<--memlimit-mt-decompress=>I has a system-specific default I. B can be used to see the current value." -msgstr "Im Gegensatz zu anderen Optionen zur Begrenzung des Speicherverbrauchs hat B<--memlimit-mt-decompress=>I eine systemspezifisch vorgegebene I. Mit B können Sie deren aktuellen Wert anzeigen lassen." +#: ../src/xz/xz.1:1135 +msgid "" +"In contrast to the other memory usage limit options, B<--memlimit-mt-" +"decompress=>I has a system-specific default I. B can be used to see the current value." +msgstr "" +"Im Gegensatz zu anderen Optionen zur Begrenzung des Speicherverbrauchs hat " +"B<--memlimit-mt-decompress=>I eine systemspezifisch vorgegebene " +"I. Mit B können Sie deren aktuellen Wert anzeigen " +"lassen." #. type: Plain text -#: ../src/xz/xz.1:1196 -msgid "This option and its default value exist because without any limit the threaded decompressor could end up allocating an insane amount of memory with some input files. If the default I is too low on your system, feel free to increase the I but never set it to a value larger than the amount of usable RAM as with appropriate input files B will attempt to use that amount of memory even with a low number of threads. Running out of memory or swapping will not improve decompression performance." -msgstr "Diese Option und ihr Standardwert existieren, weil die unbegrenzte threadbezogene Dekompression bei einigen Eingabedateien zu unglaublich großem Speicherverbrauch führen würde. Falls die vorgegebene I auf Ihrem System zu niedrig ist, können Sie die I durchaus erhöhen, aber setzen Sie sie niemals auf einen Wert größer als die Menge des nutzbaren Speichers, da B bei entsprechenden Eingabedateien versuchen wird, diese Menge an Speicher auch bei einer geringen Anzahl von Threads zu verwnden. Speichermangel oder Auslagerung verbessern die Dekomprimierungsleistung nicht." +#: ../src/xz/xz.1:1151 +msgid "" +"This option and its default value exist because without any limit the " +"threaded decompressor could end up allocating an insane amount of memory " +"with some input files. If the default I is too low on your system, " +"feel free to increase the I but never set it to a value larger than " +"the amount of usable RAM as with appropriate input files B will attempt " +"to use that amount of memory even with a low number of threads. Running out " +"of memory or swapping will not improve decompression performance." +msgstr "" +"Diese Option und ihr Standardwert existieren, weil die unbegrenzte " +"threadbezogene Dekompression bei einigen Eingabedateien zu unglaublich " +"großem Speicherverbrauch führen würde. Falls die vorgegebene I auf " +"Ihrem System zu niedrig ist, können Sie die I durchaus erhöhen, aber " +"setzen Sie sie niemals auf einen Wert größer als die Menge des nutzbaren " +"Speichers, da B bei entsprechenden Eingabedateien versuchen wird, diese " +"Menge an Speicher auch bei einer geringen Anzahl von Threads zu verwnden. " +"Speichermangel oder Auslagerung verbessern die Dekomprimierungsleistung " +"nicht." #. type: Plain text -#: ../src/xz/xz.1:1208 -msgid "See B<--memlimit-compress=>I for possible ways to specify the I. Setting I to B<0> resets the I to the default system-specific value." -msgstr "Siehe B<--memlimit-compress=>I für mögliche Wege zur Angabe der I. Sezen der I auf B<0> setzt die I auf den vorgegebenen systemspezifischen Wert zurück." +#: ../src/xz/xz.1:1163 +msgid "" +"See B<--memlimit-compress=>I for possible ways to specify the " +"I. Setting I to B<0> resets the I to the default " +"system-specific value." +msgstr "" +"Siehe B<--memlimit-compress=>I für mögliche Wege zur Angabe der " +"I. Sezen der I auf B<0> setzt die I auf den " +"vorgegebenen systemspezifischen Wert zurück." #. type: TP -#: ../src/xz/xz.1:1208 +#: ../src/xz/xz.1:1163 #, no-wrap msgid "B<-M> I, B<--memlimit=>I, B<--memory=>I" msgstr "B<-M> I, B<--memlimit=>I, B<--memory=>I" #. type: Plain text -#: ../src/xz/xz.1:1214 -msgid "This is equivalent to specifying B<--memlimit-compress=>I B<--memlimit-decompress=>I B<--memlimit-mt-decompress=>I." -msgstr "Dies ist gleichbedeutend mit B<--memlimit-compress=>I B<--memlimit-decompress=>I B<--memlimit-mt-decompress=>I." +#: ../src/xz/xz.1:1169 +msgid "" +"This is equivalent to specifying B<--memlimit-compress=>I B<--" +"memlimit-decompress=>I B<--memlimit-mt-decompress=>I." +msgstr "" +"Dies ist gleichbedeutend mit B<--memlimit-compress=>I B<--memlimit-" +"decompress=>I B<--memlimit-mt-decompress=>I." #. type: TP -#: ../src/xz/xz.1:1214 +#: ../src/xz/xz.1:1169 #, no-wrap msgid "B<--no-adjust>" msgstr "B<--no-adjust>" #. type: Plain text -#: ../src/xz/xz.1:1224 -msgid "Display an error and exit if the memory usage limit cannot be met without adjusting settings that affect the compressed output. That is, this prevents B from switching the encoder from multi-threaded mode to single-threaded mode and from reducing the LZMA2 dictionary size. Even when this option is used the number of threads may be reduced to meet the memory usage limit as that won't affect the compressed output." -msgstr "zeigt einen Fehler an und beendet, falls die Grenze der Speichernutzung nicht ohne Änderung der Einstellungen, welche die komprimierte Ausgabe beeinflussen, berücksichtigt werden kann. Das bedeutet, dass B daran gehindert wird, den Encoder vom Multithread-Modus in den Einzelthread-Modus zu versetzen und die Größe des LZMA2-Wörterbuchs zu reduzieren. Allerdings kann bei Verwendung dieser Option dennoch die Anzahl der Threads reduziert werden, um die Grenze der Speichernutzung zu halten, sofern dies die komprimierte Ausgabe nicht beeinflusst." +#: ../src/xz/xz.1:1179 +msgid "" +"Display an error and exit if the memory usage limit cannot be met without " +"adjusting settings that affect the compressed output. That is, this " +"prevents B from switching the encoder from multi-threaded mode to single-" +"threaded mode and from reducing the LZMA2 dictionary size. Even when this " +"option is used the number of threads may be reduced to meet the memory usage " +"limit as that won't affect the compressed output." +msgstr "" +"zeigt einen Fehler an und beendet, falls die Grenze der Speichernutzung " +"nicht ohne Änderung der Einstellungen, welche die komprimierte Ausgabe " +"beeinflussen, berücksichtigt werden kann. Das bedeutet, dass B daran " +"gehindert wird, den Encoder vom Multithread-Modus in den Einzelthread-Modus " +"zu versetzen und die Größe des LZMA2-Wörterbuchs zu reduzieren. Allerdings " +"kann bei Verwendung dieser Option dennoch die Anzahl der Threads reduziert " +"werden, um die Grenze der Speichernutzung zu halten, sofern dies die " +"komprimierte Ausgabe nicht beeinflusst." #. type: Plain text -#: ../src/xz/xz.1:1227 -msgid "Automatic adjusting is always disabled when creating raw streams (B<--format=raw>)." -msgstr "Die automatische Anpassung ist beim Erzeugen von Rohdatenströmen (B<--format=raw>) immer deaktiviert." +#: ../src/xz/xz.1:1182 +msgid "" +"Automatic adjusting is always disabled when creating raw streams (B<--" +"format=raw>)." +msgstr "" +"Die automatische Anpassung ist beim Erzeugen von Rohdatenströmen (B<--" +"format=raw>) immer deaktiviert." #. type: TP -#: ../src/xz/xz.1:1227 +#: ../src/xz/xz.1:1182 #, no-wrap msgid "B<-T> I, B<--threads=>I" msgstr "B<-T> I, B<--threads=>I" #. type: Plain text -#: ../src/xz/xz.1:1242 -msgid "Specify the number of worker threads to use. Setting I to a special value B<0> makes B use up to as many threads as the processor(s) on the system support. The actual number of threads can be fewer than I if the input file is not big enough for threading with the given settings or if using more threads would exceed the memory usage limit." -msgstr "gibt die Anzahl der zu verwendenden Arbeits-Threads an. Wenn Sie I auf einen speziellen Wert B<0> setzen, verwendet B maximal so viele Threads, wie der/die Prozessor(en) im System untestützen. Die tatsächliche Anzahl kann geringer sein als die angegebenen I, wenn die Eingabedatei nicht groß genug für Threading mit den gegebenen Einstellungen ist oder wenn mehr Threads die Speicherbegrenzung übersteigen würden." - -#. type: Plain text -#: ../src/xz/xz.1:1261 -msgid "The single-threaded and multi-threaded compressors produce different output. Single-threaded compressor will give the smallest file size but only the output from the multi-threaded compressor can be decompressed using multiple threads. Setting I to B<1> will use the single-threaded mode. Setting I to any other value, including B<0>, will use the multi-threaded compressor even if the system supports only one hardware thread. (B 5.2.x used single-threaded mode in this situation.)" -msgstr "Die Multithread- bzw. Einzelthread-Kompressoren erzeugen unterschiedliche Ausgaben. Der Einzelthread-Kompressor erzeugt die geringste Dateigröße, aber nur die Ausgabe des Multithread-Kompressors kann mit mehreren Threads wieder dekomprimiert werden. Das Setzen der Anzahl der I auf B<1> wird den Einzelthread-Modus verwenden. Das Setzen der Anzahl der I auf einen anderen Wert einschließlich B<0> verwendet den Multithread-Kompressor, und zwar sogar dann, wenn das System nur einen einzigen Hardware-Thread unterstützt (B 5.2.x verwendete in diesem Fall noch den Einzelthread-Modus)." +#: ../src/xz/xz.1:1197 +msgid "" +"Specify the number of worker threads to use. Setting I to a " +"special value B<0> makes B use up to as many threads as the processor(s) " +"on the system support. The actual number of threads can be fewer than " +"I if the input file is not big enough for threading with the given " +"settings or if using more threads would exceed the memory usage limit." +msgstr "" +"gibt die Anzahl der zu verwendenden Arbeits-Threads an. Wenn Sie I " +"auf einen speziellen Wert B<0> setzen, verwendet B maximal so viele " +"Threads, wie der/die Prozessor(en) im System untestützen. Die tatsächliche " +"Anzahl kann geringer sein als die angegebenen I, wenn die " +"Eingabedatei nicht groß genug für Threading mit den gegebenen Einstellungen " +"ist oder wenn mehr Threads die Speicherbegrenzung übersteigen würden." #. type: Plain text -#: ../src/xz/xz.1:1280 -msgid "To use multi-threaded mode with only one thread, set I to B<+1>. The B<+> prefix has no effect with values other than B<1>. A memory usage limit can still make B switch to single-threaded mode unless B<--no-adjust> is used. Support for the B<+> prefix was added in B 5.4.0." -msgstr "Um den Multithread-Modus mit nur einem einzigen Thread zu verwenden, setzen Sie die Anzahl der I auf B<+1>. Das Präfix B<+> hat mit Werten verschieden von B<1> keinen Effekt. Eine Begrenzung des Speicherverbrauchs kann B dennoch veranlassen, den Einzelthread-Modus zu verwenden, außer wenn B<--no-adjust> verwendet wird. Die Unterstützung für das Präfix B<+> wurde in B 5.4.0 hinzugefügt." +#: ../src/xz/xz.1:1216 +msgid "" +"The single-threaded and multi-threaded compressors produce different " +"output. Single-threaded compressor will give the smallest file size but " +"only the output from the multi-threaded compressor can be decompressed using " +"multiple threads. Setting I to B<1> will use the single-threaded " +"mode. Setting I to any other value, including B<0>, will use the " +"multi-threaded compressor even if the system supports only one hardware " +"thread. (B 5.2.x used single-threaded mode in this situation.)" +msgstr "" +"Die Multithread- bzw. Einzelthread-Kompressoren erzeugen unterschiedliche " +"Ausgaben. Der Einzelthread-Kompressor erzeugt die geringste Dateigröße, aber " +"nur die Ausgabe des Multithread-Kompressors kann mit mehreren Threads wieder " +"dekomprimiert werden. Das Setzen der Anzahl der I auf B<1> wird den " +"Einzelthread-Modus verwenden. Das Setzen der Anzahl der I auf " +"einen anderen Wert einschließlich B<0> verwendet den Multithread-Kompressor, " +"und zwar sogar dann, wenn das System nur einen einzigen Hardware-Thread " +"unterstützt (B 5.2.x verwendete in diesem Fall noch den Einzelthread-" +"Modus)." #. type: Plain text -#: ../src/xz/xz.1:1295 -msgid "If an automatic number of threads has been requested and no memory usage limit has been specified, then a system-specific default soft limit will be used to possibly limit the number of threads. It is a soft limit in sense that it is ignored if the number of threads becomes one, thus a soft limit will never stop B from compressing or decompressing. This default soft limit will not make B switch from multi-threaded mode to single-threaded mode. The active limits can be seen with B." -msgstr "Falls das automatische Setzen der Anzahl der Threads angefordert und keine Speicherbegrenzung angegeben wurde, dann wird eine systemspezifisch vorgegebene weiche Grenze verwendet, um eventuell die Anzahl der Threads zu begrenzen. Es ist eine weiche Grenze im Sinne davon, dass sie ignoriert wird, falls die Anzahl der Threads 1 ist; daher wird eine weiche Grenze B niemals an der Kompression oder Dekompression hindern. Diese vorgegebene weiche Grenze veranlasst B nicht, vom Multithread-Modus in den Einzelthread-Modus zu wechseln. Die aktiven Grenzen können Sie mit dem Befehl B anzeigen lassen." +#: ../src/xz/xz.1:1235 +msgid "" +"To use multi-threaded mode with only one thread, set I to B<+1>. " +"The B<+> prefix has no effect with values other than B<1>. A memory usage " +"limit can still make B switch to single-threaded mode unless B<--no-" +"adjust> is used. Support for the B<+> prefix was added in B 5.4.0." +msgstr "" +"Um den Multithread-Modus mit nur einem einzigen Thread zu verwenden, setzen " +"Sie die Anzahl der I auf B<+1>. Das Präfix B<+> hat mit Werten " +"verschieden von B<1> keinen Effekt. Eine Begrenzung des Speicherverbrauchs " +"kann B dennoch veranlassen, den Einzelthread-Modus zu verwenden, außer " +"wenn B<--no-adjust> verwendet wird. Die Unterstützung für das Präfix B<+> " +"wurde in B 5.4.0 hinzugefügt." #. type: Plain text -#: ../src/xz/xz.1:1302 -msgid "Currently the only threading method is to split the input into blocks and compress them independently from each other. The default block size depends on the compression level and can be overridden with the B<--block-size=>I option." -msgstr "Die gegenwärtig einzige Threading-Methode teilt die Eingabe in Blöcke und komprimiert diese unabhängig voneinander. Die vorgegebene Blockgröße ist von der Kompressionsstufe abhängig und kann mit der Option B<--block-size=>I außer Kraft gesetzt werden." +#: ../src/xz/xz.1:1250 +msgid "" +"If an automatic number of threads has been requested and no memory usage " +"limit has been specified, then a system-specific default soft limit will be " +"used to possibly limit the number of threads. It is a soft limit in sense " +"that it is ignored if the number of threads becomes one, thus a soft limit " +"will never stop B from compressing or decompressing. This default soft " +"limit will not make B switch from multi-threaded mode to single-threaded " +"mode. The active limits can be seen with B." +msgstr "" +"Falls das automatische Setzen der Anzahl der Threads angefordert und keine " +"Speicherbegrenzung angegeben wurde, dann wird eine systemspezifisch " +"vorgegebene weiche Grenze verwendet, um eventuell die Anzahl der Threads zu " +"begrenzen. Es ist eine weiche Grenze im Sinne davon, dass sie ignoriert " +"wird, falls die Anzahl der Threads 1 ist; daher wird eine weiche Grenze " +"B niemals an der Kompression oder Dekompression hindern. Diese " +"vorgegebene weiche Grenze veranlasst B nicht, vom Multithread-Modus in " +"den Einzelthread-Modus zu wechseln. Die aktiven Grenzen können Sie mit dem " +"Befehl B anzeigen lassen." #. type: Plain text -#: ../src/xz/xz.1:1310 -msgid "Threaded decompression only works on files that contain multiple blocks with size information in block headers. All large enough files compressed in multi-threaded mode meet this condition, but files compressed in single-threaded mode don't even if B<--block-size=>I has been used." -msgstr "Eine thread-basierte Dekompression wird nur bei Dateien funktionieren, die mehrere Blöcke mit Größeninformationen in deren Headern enthalten. Alle im Multi-Thread-Modus komprimierten Dateien, die groß genug sind, erfüllen diese Bedingung, im Einzel-Thread-Modus komprimierte Dateien dagegen nicht, selbst wenn B<--block-size=>I verwendet wurde." +#: ../src/xz/xz.1:1257 +msgid "" +"Currently the only threading method is to split the input into blocks and " +"compress them independently from each other. The default block size depends " +"on the compression level and can be overridden with the B<--block-" +"size=>I option." +msgstr "" +"Die gegenwärtig einzige Threading-Methode teilt die Eingabe in Blöcke und " +"komprimiert diese unabhängig voneinander. Die vorgegebene Blockgröße ist von " +"der Kompressionsstufe abhängig und kann mit der Option B<--block-" +"size=>I außer Kraft gesetzt werden." #. type: Plain text -#: ../src/xz/xz.1:1319 -msgid "The default value for I is B<0>. In B 5.4.x and older the default is B<1>." -msgstr "Der Vorgabewert für I is B<0>. In B 5.4.x und älteren Versionen ist der Vorgabewert B<1>." +#: ../src/xz/xz.1:1265 +msgid "" +"Threaded decompression only works on files that contain multiple blocks with " +"size information in block headers. All large enough files compressed in " +"multi-threaded mode meet this condition, but files compressed in single-" +"threaded mode don't even if B<--block-size=>I has been used." +msgstr "" +"Eine thread-basierte Dekompression wird nur bei Dateien funktionieren, die " +"mehrere Blöcke mit Größeninformationen in deren Headern enthalten. Alle im " +"Multi-Thread-Modus komprimierten Dateien, die groß genug sind, erfüllen " +"diese Bedingung, im Einzel-Thread-Modus komprimierte Dateien dagegen nicht, " +"selbst wenn B<--block-size=>I verwendet wurde." #. type: SS -#: ../src/xz/xz.1:1320 ../src/xz/xz.1:2980 +#: ../src/xz/xz.1:1266 ../src/xz/xz.1:2819 #, no-wrap msgid "Custom compressor filter chains" msgstr "Benutzerdefinierte Filterketten für die Kompression" #. type: Plain text -#: ../src/xz/xz.1:1336 -msgid "A custom filter chain allows specifying the compression settings in detail instead of relying on the settings associated to the presets. When a custom filter chain is specified, preset options (B<-0> \\&...\\& B<-9> and B<--extreme>) earlier on the command line are forgotten. If a preset option is specified after one or more custom filter chain options, the new preset takes effect and the custom filter chain options specified earlier are forgotten." -msgstr "Eine benutzerdefinierte Filterkette ermöglicht die Angabe detaillierter Kompressionseinstellungen, anstatt von den Voreinstellungen auszugehen. Wenn eine benutzerdefinierte Filterkette angegeben wird, werden die vorher in der Befehlszeile angegebenen Voreinstellungsoptionen (B<-0> … B<-9> und B<--extreme>) außer Kraft gesetzt. Wenn eine Voreinstellungsoption nach einer oder mehreren benutzerdefinierten Filterkettenoptionen angegeben wird, dann wird die neue Voreinstellung wirksam und die zuvor angegebenen Filterkettenoptionen werden außer Kraft gesetzt." - -#. type: Plain text -#: ../src/xz/xz.1:1343 -msgid "A filter chain is comparable to piping on the command line. When compressing, the uncompressed input goes to the first filter, whose output goes to the next filter (if any). The output of the last filter gets written to the compressed file. The maximum number of filters in the chain is four, but typically a filter chain has only one or two filters." -msgstr "Eine Filterkette ist mit dem Piping (der Weiterleitung) in der Befehlszeile vergleichbar. Bei der Kompression gelangt die unkomprimierte Eingabe in den ersten Filter, dessen Ausgabe wiederum in den zweiten Filter geleitet wird (sofern ein solcher vorhanden ist). Die Ausgabe des letzten Filters wird in die komprimierte Datei geschrieben. In einer Filterkette sind maximal vier Filter zulässig, aber typischerweise besteht eine Filterkette nur aus einem oder zwei Filtern." - -#. type: Plain text -#: ../src/xz/xz.1:1351 -msgid "Many filters have limitations on where they can be in the filter chain: some filters can work only as the last filter in the chain, some only as a non-last filter, and some work in any position in the chain. Depending on the filter, this limitation is either inherent to the filter design or exists to prevent security issues." -msgstr "Bei vielen Filtern ist die Positionierung in der Filterkette eingeschränkt: Einige Filter sind nur als letzte in der Kette verwendbar, einige können nicht als letzte Filter gesetzt werden, und andere funktionieren an beliebiger Stelle. Abhängig von dem Filter ist diese Beschränkung entweder auf das Design des Filters selbst zurückzuführen oder ist aus Sicherheitsgründen vorhanden." - -#. type: Plain text -#: ../src/xz/xz.1:1374 -msgid "A custom filter chain can be specified in two different ways. The options B<--filters=>I and B<--filters1=>I \\&...\\& B<--filters9=>I allow specifying an entire filter chain in one option using the liblzma filter string syntax. Alternatively, a filter chain can be specified by using one or more individual filter options in the order they are wanted in the filter chain. That is, the order of the individual filter options is significant! When decoding raw streams (B<--format=raw>), the filter chain must be specified in the same order as it was specified when compressing. Any individual filter or preset options specified before the full chain option (B<--filters=>I) will be forgotten. Individual filters specified after the full chain option will reset the filter chain." -msgstr "Eine benutzerdefinierte Filterkette kann auf zwei verschiedene Arten angegeben werden. Die Optionen B<--filters=>I und B<--filters1=>I \\&…\\& B<--filters9=>I ermöglichen die Angabe einer ganzen Filterkette in einer einzelnen Option gemäß der Liblzma-Filterzeichenkettensyntax. Alternativ können Sie eine Filterkette mit einer oder mehreren individuellen Filteroptionen in der Reihenfolge angeben, in der sie in der Filterkette verwendet werden sollen. Daher ist die Reihenfolge der individuellen Filteroptionen wichtig! Beim Dekodieren von Rohdatenströmen (B<--format=raw>) muss die Filterkette in der gleichen Reihenfolge wie bei der Komprimierung angegeben werden. Alle individuellen Filter- oder Voreinstellungsoptionen, die I der vollen Filterkettenoption (B<--filters=>I) angegeben werden, werden verworfen. Individuelle Filter, die I der vollen Filterkettenoption angegeben werden, setzen die Filterkette zurück" - -#. type: Plain text -#: ../src/xz/xz.1:1383 -msgid "Both the full and individual filter options take filter-specific I as a comma-separated list. Extra commas in I are ignored. Every option has a default value, so specify those you want to change." -msgstr "Sowohl vollständige als auch individuelle Filteroptionen akzeptieren filterspezifische I in einer durch Kommata getrennten Liste. Zusätzliche Kommata in den I werden ignoriert. Jede Option hat einen Standardwert, daher brauchen Sie nur jene anzugeben, die Sie ändern wollen." +#: ../src/xz/xz.1:1282 +msgid "" +"A custom filter chain allows specifying the compression settings in detail " +"instead of relying on the settings associated to the presets. When a custom " +"filter chain is specified, preset options (B<-0> \\&...\\& B<-9> and B<--" +"extreme>) earlier on the command line are forgotten. If a preset option is " +"specified after one or more custom filter chain options, the new preset " +"takes effect and the custom filter chain options specified earlier are " +"forgotten." +msgstr "" +"Eine benutzerdefinierte Filterkette ermöglicht die Angabe detaillierter " +"Kompressionseinstellungen, anstatt von den Voreinstellungen auszugehen. Wenn " +"eine benutzerdefinierte Filterkette angegeben wird, werden die vorher in der " +"Befehlszeile angegebenen Voreinstellungsoptionen (B<-0> … B<-9> und B<--" +"extreme>) außer Kraft gesetzt. Wenn eine Voreinstellungsoption nach einer " +"oder mehreren benutzerdefinierten Filterkettenoptionen angegeben wird, dann " +"wird die neue Voreinstellung wirksam und die zuvor angegebenen " +"Filterkettenoptionen werden außer Kraft gesetzt." #. type: Plain text -#: ../src/xz/xz.1:1392 -msgid "To see the whole filter chain and I, use B (that is, use B<--verbose> twice). This works also for viewing the filter chain options used by presets." -msgstr "Um die gesamte Filterkette und die I anzuzeigen, rufen Sie B auf (was gleichbedeutend mit der zweimaligen Angabe von B<--verbose> ist). Dies funktioniert auch zum Betrachten der von den Voreinstellungen verwendeten Filterkettenoptionen." - -#. type: TP -#: ../src/xz/xz.1:1392 -#, no-wrap -msgid "B<--filters=>I" -msgstr "B<--filters=>I" +#: ../src/xz/xz.1:1289 +msgid "" +"A filter chain is comparable to piping on the command line. When " +"compressing, the uncompressed input goes to the first filter, whose output " +"goes to the next filter (if any). The output of the last filter gets " +"written to the compressed file. The maximum number of filters in the chain " +"is four, but typically a filter chain has only one or two filters." +msgstr "" +"Eine Filterkette ist mit dem Piping (der Weiterleitung) in der Befehlszeile " +"vergleichbar. Bei der Kompression gelangt die unkomprimierte Eingabe in den " +"ersten Filter, dessen Ausgabe wiederum in den zweiten Filter geleitet wird " +"(sofern ein solcher vorhanden ist). Die Ausgabe des letzten Filters wird in " +"die komprimierte Datei geschrieben. In einer Filterkette sind maximal vier " +"Filter zulässig, aber typischerweise besteht eine Filterkette nur aus einem " +"oder zwei Filtern." #. type: Plain text -#: ../src/xz/xz.1:1413 -msgid "Specify the full filter chain or a preset in a single option. Each filter can be separated by spaces or two dashes (B<-->). I may need to be quoted on the shell command line so it is parsed as a single option. To denote I, use B<:> or B<=>. A preset can be prefixed with a B<-> and followed with zero or more flags. The only supported flag is B to apply the same options as B<--extreme>." -msgstr "gibt die vollständige Filterkette oder eine Voreinstellung in einer einzelnen Option an. Mehrere Filter können durch Leerzeichen oder zwei Minuszeichen (B<-->) voneinander getrennt werden. Es kann notwendig sein, die I in der Shell-Befehlszeile zu maskieren, so dass diese als einzelne Option ausgewertet werden. Um Optionen Werte zuzuordnen, verwenden Sie B<:> oder B<=>. Einer Voreinstellung kann ein B<-> vorangestellt werden, dem keiner oder mehrere Schalter folgen. Der einzige unterstützte Schalter ist B zum Anwenden der gleichen Optionen wie B<--extreme>." - -#. type: TP -#: ../src/xz/xz.1:1413 -#, no-wrap -msgid "B<--filters1>=I ... B<--filters9>=I" -msgstr "B<--filters1>=I … B<--filters9>=I" +#: ../src/xz/xz.1:1297 +msgid "" +"Many filters have limitations on where they can be in the filter chain: some " +"filters can work only as the last filter in the chain, some only as a non-" +"last filter, and some work in any position in the chain. Depending on the " +"filter, this limitation is either inherent to the filter design or exists to " +"prevent security issues." +msgstr "" +"Bei vielen Filtern ist die Positionierung in der Filterkette eingeschränkt: " +"Einige Filter sind nur als letzte in der Kette verwendbar, einige können " +"nicht als letzte Filter gesetzt werden, und andere funktionieren an " +"beliebiger Stelle. Abhängig von dem Filter ist diese Beschränkung entweder " +"auf das Design des Filters selbst zurückzuführen oder ist aus " +"Sicherheitsgründen vorhanden." #. type: Plain text -#: ../src/xz/xz.1:1417 -msgid "Specify up to nine additional filter chains that can be used with B<--block-list>." -msgstr "gibt bis zu neun optionale Filterketten an, die mit B<--block-list> verwendet werden können." +#: ../src/xz/xz.1:1305 +msgid "" +"A custom filter chain is specified by using one or more filter options in " +"the order they are wanted in the filter chain. That is, the order of filter " +"options is significant! When decoding raw streams (B<--format=raw>), the " +"filter chain is specified in the same order as it was specified when " +"compressing." +msgstr "" +"Eine benutzerdefinierte Filterkette wird durch eine oder mehrere " +"Filteroptionen in der Reihenfolge angegeben, in der sie in der Filterkette " +"wirksam werden sollen. Daher ist die Reihenfolge der Filteroptionen von " +"signifikanter Bedeutung! Beim Dekodieren von Rohdatenströmen (B<--" +"format=raw>) wird die Filterkette in der gleichen Reihenfolge angegeben wie " +"bei der Kompression." #. type: Plain text -#: ../src/xz/xz.1:1421 -msgid "For example, when compressing an archive with executable files followed by text files, the executable part could use a filter chain with a BCJ filter and the text part only the LZMA2 filter." -msgstr "Wenn Sie beispielsweise ein Archiv mit ausführbaren Dateien gefolgt von Textdateien komprimieren, könnte der Teil mit den ausführbaren Dateien eine Filterkette mit einem BCJ-Filter und der Textdateiteil lediglich den LZMA2-Filter verwenden." - -#. type: TP -#: ../src/xz/xz.1:1421 -#, no-wrap -msgid "B<--filters-help>" -msgstr "B<--filters-help>" +#: ../src/xz/xz.1:1314 +msgid "" +"Filters take filter-specific I as a comma-separated list. Extra " +"commas in I are ignored. Every option has a default value, so you " +"need to specify only those you want to change." +msgstr "" +"Filter akzeptieren filterspezifische I in einer durch Kommata " +"getrennten Liste. Zusätzliche Kommata in den I werden ignoriert. " +"Jede Option hat einen Standardwert, daher brauchen Sie nur jene anzugeben, " +"die Sie ändern wollen." #. type: Plain text -#: ../src/xz/xz.1:1431 -msgid "Display a help message describing how to specify presets and custom filter chains in the B<--filters> and B<--filters1=>I \\&...\\& B<--filters9=>I options, and exit successfully." -msgstr "zeigt eine Hilfemeldung an, welche beschreibt, wie Voreinstellungen und benutzerdefinierte Filterketten in den Optionen B<--filters> und B<--filters1=>I \\&… \\& B<--filters9=>I angegeben werden und beendet das Programm." +#: ../src/xz/xz.1:1323 +msgid "" +"To see the whole filter chain and I, use B (that is, use " +"B<--verbose> twice). This works also for viewing the filter chain options " +"used by presets." +msgstr "" +"Um die gesamte Filterkette und die I anzuzeigen, rufen Sie B auf (was gleichbedeutend mit der zweimaligen Angabe von B<--verbose> " +"ist). Dies funktioniert auch zum Betrachten der von den Voreinstellungen " +"verwendeten Filterkettenoptionen." #. type: TP -#: ../src/xz/xz.1:1431 +#: ../src/xz/xz.1:1323 #, no-wrap msgid "B<--lzma1>[B<=>I]" msgstr "B<--lzma1>[B<=>I]" #. type: TP -#: ../src/xz/xz.1:1434 +#: ../src/xz/xz.1:1326 #, no-wrap msgid "B<--lzma2>[B<=>I]" msgstr "B<--lzma2>[B<=>I]" #. type: Plain text -#: ../src/xz/xz.1:1439 -msgid "Add LZMA1 or LZMA2 filter to the filter chain. These filters can be used only as the last filter in the chain." -msgstr "fügt LZMA1- oder LZMA2-Filter zur Filterkette hinzu. Diese Filter können nur als letzte Filter in der Kette verwendet werden." +#: ../src/xz/xz.1:1331 +msgid "" +"Add LZMA1 or LZMA2 filter to the filter chain. These filters can be used " +"only as the last filter in the chain." +msgstr "" +"fügt LZMA1- oder LZMA2-Filter zur Filterkette hinzu. Diese Filter können nur " +"als letzte Filter in der Kette verwendet werden." #. type: Plain text -#: ../src/xz/xz.1:1451 -msgid "LZMA1 is a legacy filter, which is supported almost solely due to the legacy B<.lzma> file format, which supports only LZMA1. LZMA2 is an updated version of LZMA1 to fix some practical issues of LZMA1. The B<.xz> format uses LZMA2 and doesn't support LZMA1 at all. Compression speed and ratios of LZMA1 and LZMA2 are practically the same." -msgstr "LZMA1 ist ein veralteter Filter, welcher nur wegen des veralteten B<.lzma>-Dateiformats unterstützt wird, welches nur LZMA1 unterstützt. LZMA2 ist eine aktualisierte Version von LZMA1, welche einige praktische Probleme von LZMA1 behebt. Das B<.xz>-Format verwendet LZMA2 und unterstützt LZMA1 gar nicht. Kompressionsgeschwindigkeit und -verhältnis sind bei LZMA1 und LZMA2 praktisch gleich." +#: ../src/xz/xz.1:1343 +msgid "" +"LZMA1 is a legacy filter, which is supported almost solely due to the legacy " +"B<.lzma> file format, which supports only LZMA1. LZMA2 is an updated " +"version of LZMA1 to fix some practical issues of LZMA1. The B<.xz> format " +"uses LZMA2 and doesn't support LZMA1 at all. Compression speed and ratios " +"of LZMA1 and LZMA2 are practically the same." +msgstr "" +"LZMA1 ist ein veralteter Filter, welcher nur wegen des veralteten B<.lzma>-" +"Dateiformats unterstützt wird, welches nur LZMA1 unterstützt. LZMA2 ist eine " +"aktualisierte Version von LZMA1, welche einige praktische Probleme von LZMA1 " +"behebt. Das B<.xz>-Format verwendet LZMA2 und unterstützt LZMA1 gar nicht. " +"Kompressionsgeschwindigkeit und -verhältnis sind bei LZMA1 und LZMA2 " +"praktisch gleich." #. type: Plain text -#: ../src/xz/xz.1:1454 +#: ../src/xz/xz.1:1346 msgid "LZMA1 and LZMA2 share the same set of I:" msgstr "LZMA1 und LZMA2 haben die gleichen I:" #. type: TP -#: ../src/xz/xz.1:1455 +#: ../src/xz/xz.1:1347 #, no-wrap msgid "BI" msgstr "BI" #. type: Plain text -#: ../src/xz/xz.1:1482 -msgid "Reset all LZMA1 or LZMA2 I to I. I consist of an integer, which may be followed by single-letter preset modifiers. The integer can be from B<0> to B<9>, matching the command line options B<-0> \\&...\\& B<-9>. The only supported modifier is currently B, which matches B<--extreme>. If no B is specified, the default values of LZMA1 or LZMA2 I are taken from the preset B<6>." -msgstr "setzt alle LZMA1- oder LZMA2-I auf die I zurück. Diese I wird in Form einer Ganzzahl angegeben, der ein aus einem einzelnen Buchstaben bestehender Voreinstellungsmodifikator folgen kann. Die Ganzzahl kann B<0> bis B<9> sein, entsprechend den Befehlszeilenoptionen B<-0> … B<-9>. Gegenwärtig ist B der einzige unterstützte Modifikator, was B<--extreme> entspricht. Wenn keine B angegeben ist, werden die Standardwerte der LZMA1- oder LZMA2-I der Voreinstellung B<6> entnommen." +#: ../src/xz/xz.1:1374 +msgid "" +"Reset all LZMA1 or LZMA2 I to I. I consist of an " +"integer, which may be followed by single-letter preset modifiers. The " +"integer can be from B<0> to B<9>, matching the command line options B<-0> " +"\\&...\\& B<-9>. The only supported modifier is currently B, which " +"matches B<--extreme>. If no B is specified, the default values of " +"LZMA1 or LZMA2 I are taken from the preset B<6>." +msgstr "" +"setzt alle LZMA1- oder LZMA2-I auf die I zurück. " +"Diese I wird in Form einer Ganzzahl angegeben, der ein aus " +"einem einzelnen Buchstaben bestehender Voreinstellungsmodifikator folgen " +"kann. Die Ganzzahl kann B<0> bis B<9> sein, entsprechend den " +"Befehlszeilenoptionen B<-0> … B<-9>. Gegenwärtig ist B der einzige " +"unterstützte Modifikator, was B<--extreme> entspricht. Wenn keine " +"B angegeben ist, werden die Standardwerte der LZMA1- oder " +"LZMA2-I der Voreinstellung B<6> entnommen." #. type: TP -#: ../src/xz/xz.1:1482 +#: ../src/xz/xz.1:1374 #, no-wrap msgid "BI" msgstr "BI" # FIXME Dezimaltrenner in 1.5 GB #. type: Plain text -#: ../src/xz/xz.1:1497 -msgid "Dictionary (history buffer) I indicates how many bytes of the recently processed uncompressed data is kept in memory. The algorithm tries to find repeating byte sequences (matches) in the uncompressed data, and replace them with references to the data currently in the dictionary. The bigger the dictionary, the higher is the chance to find a match. Thus, increasing dictionary I usually improves compression ratio, but a dictionary bigger than the uncompressed file is waste of memory." -msgstr "Die I des Wörterbuchs (Chronikpuffers) gibt an, wie viel Byte der kürzlich verarbeiteten unkomprimierten Daten im Speicher behalten werden sollen. Der Algorithmus versucht, sich wiederholende Byte-Abfolgen (Übereinstimmungen) in den unkomprimierten Daten zu finden und diese durch Referenzen zu den Daten zu ersetzen, die sich gegenwärtig im Wörterbuch befinden. Je größer das Wörterbuch, umso größer ist die Chance, eine Übereinstimmung zu finden. Daher bewirkt eine Erhöhung der I des Wörterbuchs üblicherweise ein besseres Kompressionsverhältnis, aber ein Wörterbuch, das größer ist als die unkomprimierte Datei, wäre Speicherverschwendung." +#: ../src/xz/xz.1:1389 +msgid "" +"Dictionary (history buffer) I indicates how many bytes of the " +"recently processed uncompressed data is kept in memory. The algorithm tries " +"to find repeating byte sequences (matches) in the uncompressed data, and " +"replace them with references to the data currently in the dictionary. The " +"bigger the dictionary, the higher is the chance to find a match. Thus, " +"increasing dictionary I usually improves compression ratio, but a " +"dictionary bigger than the uncompressed file is waste of memory." +msgstr "" +"Die I des Wörterbuchs (Chronikpuffers) gibt an, wie viel Byte der " +"kürzlich verarbeiteten unkomprimierten Daten im Speicher behalten werden " +"sollen. Der Algorithmus versucht, sich wiederholende Byte-Abfolgen " +"(Übereinstimmungen) in den unkomprimierten Daten zu finden und diese durch " +"Referenzen zu den Daten zu ersetzen, die sich gegenwärtig im Wörterbuch " +"befinden. Je größer das Wörterbuch, umso größer ist die Chance, eine " +"Übereinstimmung zu finden. Daher bewirkt eine Erhöhung der I des " +"Wörterbuchs üblicherweise ein besseres Kompressionsverhältnis, aber ein " +"Wörterbuch, das größer ist als die unkomprimierte Datei, wäre " +"Speicherverschwendung." #. type: Plain text -#: ../src/xz/xz.1:1506 -msgid "Typical dictionary I is from 64\\ KiB to 64\\ MiB. The minimum is 4\\ KiB. The maximum for compression is currently 1.5\\ GiB (1536\\ MiB). The decompressor already supports dictionaries up to one byte less than 4\\ GiB, which is the maximum for the LZMA1 and LZMA2 stream formats." -msgstr "Typische Wörterbuch-I liegen im Bereich von 64\\ KiB bis 64\\ MiB. Das Minimum ist 4\\ KiB. Das Maximum für die Kompression ist gegenwärtig 1.5\\ GiB (1536\\ MiB). Bei der Dekompression wird bereits eine Wörterbuchgröße bis zu 4\\ GiB minus 1 Byte unterstützt, welche das Maximum für die LZMA1- und LZMA2-Datenstromformate ist." +#: ../src/xz/xz.1:1398 +msgid "" +"Typical dictionary I is from 64\\ KiB to 64\\ MiB. The minimum is 4\\ " +"KiB. The maximum for compression is currently 1.5\\ GiB (1536\\ MiB). The " +"decompressor already supports dictionaries up to one byte less than 4\\ GiB, " +"which is the maximum for the LZMA1 and LZMA2 stream formats." +msgstr "" +"Typische Wörterbuch-I liegen im Bereich von 64\\ KiB bis 64\\ MiB. " +"Das Minimum ist 4\\ KiB. Das Maximum für die Kompression ist gegenwärtig " +"1.5\\ GiB (1536\\ MiB). Bei der Dekompression wird bereits eine " +"Wörterbuchgröße bis zu 4\\ GiB minus 1 Byte unterstützt, welche das Maximum " +"für die LZMA1- und LZMA2-Datenstromformate ist." #. type: Plain text -#: ../src/xz/xz.1:1533 -msgid "Dictionary I and match finder (I) together determine the memory usage of the LZMA1 or LZMA2 encoder. The same (or bigger) dictionary I is required for decompressing that was used when compressing, thus the memory usage of the decoder is determined by the dictionary size used when compressing. The B<.xz> headers store the dictionary I either as 2^I or 2^I + 2^(I-1), so these I are somewhat preferred for compression. Other I will get rounded up when stored in the B<.xz> headers." -msgstr "Die I des Wörterbuchs und der Übereinstimmungsfinder (I<Üf>) bestimmen zusammen den Speicherverbrauch des LZMA1- oder LZMA2-Kodierers. Bei der Dekompression ist ein Wörterbuch der gleichen I (oder ein noch größeres) wie bei der Kompression erforderlich, daher wird der Speicherverbrauch des Dekoders durch die Größe des bei der Kompression verwendeten Wörterbuchs bestimmt. Die B<.xz>-Header speichern die I des Wörterbuchs entweder als 2^I oder 2^I + 2^(I-1), so dass diese I für die Kompression etwas bevorzugt werden. Andere I werden beim Speichern in den B<.xz>-Headern aufgerundet." +#: ../src/xz/xz.1:1425 +msgid "" +"Dictionary I and match finder (I) together determine the memory " +"usage of the LZMA1 or LZMA2 encoder. The same (or bigger) dictionary " +"I is required for decompressing that was used when compressing, thus " +"the memory usage of the decoder is determined by the dictionary size used " +"when compressing. The B<.xz> headers store the dictionary I either as " +"2^I or 2^I + 2^(I-1), so these I are somewhat preferred for " +"compression. Other I will get rounded up when stored in the B<.xz> " +"headers." +msgstr "" +"Die I des Wörterbuchs und der Übereinstimmungsfinder (I<Üf>) " +"bestimmen zusammen den Speicherverbrauch des LZMA1- oder LZMA2-Kodierers. " +"Bei der Dekompression ist ein Wörterbuch der gleichen I (oder ein " +"noch größeres) wie bei der Kompression erforderlich, daher wird der " +"Speicherverbrauch des Dekoders durch die Größe des bei der Kompression " +"verwendeten Wörterbuchs bestimmt. Die B<.xz>-Header speichern die I " +"des Wörterbuchs entweder als 2^I oder 2^I + 2^(I-1), so dass diese " +"I für die Kompression etwas bevorzugt werden. Andere I " +"werden beim Speichern in den B<.xz>-Headern aufgerundet." #. type: TP -#: ../src/xz/xz.1:1533 +#: ../src/xz/xz.1:1425 #, no-wrap msgid "BI" msgstr "BI" #. type: Plain text -#: ../src/xz/xz.1:1542 -msgid "Specify the number of literal context bits. The minimum is 0 and the maximum is 4; the default is 3. In addition, the sum of I and I must not exceed 4." -msgstr "gibt die Anzahl der literalen Kontextbits an. Das Minimum ist 0 und das Maximum 4; der Standardwert ist 3. Außerdem darf die Summe von I und I nicht größer als 4 sein." +#: ../src/xz/xz.1:1434 +msgid "" +"Specify the number of literal context bits. The minimum is 0 and the " +"maximum is 4; the default is 3. In addition, the sum of I and I " +"must not exceed 4." +msgstr "" +"gibt die Anzahl der literalen Kontextbits an. Das Minimum ist 0 und das " +"Maximum 4; der Standardwert ist 3. Außerdem darf die Summe von I und " +"I nicht größer als 4 sein." #. type: Plain text -#: ../src/xz/xz.1:1547 -msgid "All bytes that cannot be encoded as matches are encoded as literals. That is, literals are simply 8-bit bytes that are encoded one at a time." -msgstr "Alle Bytes, die nicht als Übereinstimmungen kodiert werden können, werden als Literale kodiert. Solche Literale sind einfache 8-bit-Bytes, die jeweils für sich kodiert werden." +#: ../src/xz/xz.1:1439 +msgid "" +"All bytes that cannot be encoded as matches are encoded as literals. That " +"is, literals are simply 8-bit bytes that are encoded one at a time." +msgstr "" +"Alle Bytes, die nicht als Übereinstimmungen kodiert werden können, werden " +"als Literale kodiert. Solche Literale sind einfache 8-bit-Bytes, die jeweils " +"für sich kodiert werden." #. type: Plain text -#: ../src/xz/xz.1:1561 -msgid "The literal coding makes an assumption that the highest I bits of the previous uncompressed byte correlate with the next byte. For example, in typical English text, an upper-case letter is often followed by a lower-case letter, and a lower-case letter is usually followed by another lower-case letter. In the US-ASCII character set, the highest three bits are 010 for upper-case letters and 011 for lower-case letters. When I is at least 3, the literal coding can take advantage of this property in the uncompressed data." -msgstr "Bei der Literalkodierung wird angenommen, dass die höchsten I-Bits des zuvor unkomprimierten Bytes mit dem nächsten Byte in Beziehung stehen. Zum Beispiel folgt in typischen englischsprachigen Texten auf einen Großbuchstaben ein Kleinbuchstabe und auf einen Kleinbuchstaben üblicherweise wieder ein Kleinbuchstabe. Im US-ASCII-Zeichensatz sind die höchsten drei Bits 010 für Großbuchstaben und 011 für Kleinbuchstaben. Wenn I mindestens 3 ist, kann die literale Kodierung diese Eigenschaft der unkomprimierten Daten ausnutzen." +#: ../src/xz/xz.1:1453 +msgid "" +"The literal coding makes an assumption that the highest I bits of the " +"previous uncompressed byte correlate with the next byte. For example, in " +"typical English text, an upper-case letter is often followed by a lower-case " +"letter, and a lower-case letter is usually followed by another lower-case " +"letter. In the US-ASCII character set, the highest three bits are 010 for " +"upper-case letters and 011 for lower-case letters. When I is at least " +"3, the literal coding can take advantage of this property in the " +"uncompressed data." +msgstr "" +"Bei der Literalkodierung wird angenommen, dass die höchsten I-Bits des " +"zuvor unkomprimierten Bytes mit dem nächsten Byte in Beziehung stehen. Zum " +"Beispiel folgt in typischen englischsprachigen Texten auf einen " +"Großbuchstaben ein Kleinbuchstabe und auf einen Kleinbuchstaben " +"üblicherweise wieder ein Kleinbuchstabe. Im US-ASCII-Zeichensatz sind die " +"höchsten drei Bits 010 für Großbuchstaben und 011 für Kleinbuchstaben. Wenn " +"I mindestens 3 ist, kann die literale Kodierung diese Eigenschaft der " +"unkomprimierten Daten ausnutzen." #. type: Plain text -#: ../src/xz/xz.1:1570 -msgid "The default value (3) is usually good. If you want maximum compression, test B. Sometimes it helps a little, and sometimes it makes compression worse. If it makes it worse, test B too." -msgstr "Der Vorgabewert (3) ist üblicherweise gut. Wenn Sie die maximale Kompression erreichen wollen, versuchen Sie B. Manchmal hilft es ein wenig, doch manchmal verschlechtert es die Kompression. Im letzteren Fall versuchen Sie zum Beispiel auch\\& B." +#: ../src/xz/xz.1:1462 +msgid "" +"The default value (3) is usually good. If you want maximum compression, " +"test B. Sometimes it helps a little, and sometimes it makes " +"compression worse. If it makes it worse, test B too." +msgstr "" +"Der Vorgabewert (3) ist üblicherweise gut. Wenn Sie die maximale Kompression " +"erreichen wollen, versuchen Sie B. Manchmal hilft es ein wenig, doch " +"manchmal verschlechtert es die Kompression. Im letzteren Fall versuchen Sie " +"zum Beispiel auch\\& B." #. type: TP -#: ../src/xz/xz.1:1570 +#: ../src/xz/xz.1:1462 #, no-wrap msgid "BI" msgstr "BI" #. type: Plain text -#: ../src/xz/xz.1:1574 -msgid "Specify the number of literal position bits. The minimum is 0 and the maximum is 4; the default is 0." -msgstr "gibt die Anzahl der literalen Positionsbits an. Das Minimum ist 0 und das Maximum 4; die Vorgabe ist 0." +#: ../src/xz/xz.1:1466 +msgid "" +"Specify the number of literal position bits. The minimum is 0 and the " +"maximum is 4; the default is 0." +msgstr "" +"gibt die Anzahl der literalen Positionsbits an. Das Minimum ist 0 und das " +"Maximum 4; die Vorgabe ist 0." #. type: Plain text -#: ../src/xz/xz.1:1581 -msgid "I affects what kind of alignment in the uncompressed data is assumed when encoding literals. See I below for more information about alignment." -msgstr "I beeinflusst, welche Art der Ausrichtung der unkomprimierten Daten beim Kodieren von Literalen angenommen wird. Siehe I weiter unten für weitere Informationen zur Ausrichtung." +#: ../src/xz/xz.1:1473 +msgid "" +"I affects what kind of alignment in the uncompressed data is assumed " +"when encoding literals. See I below for more information about " +"alignment." +msgstr "" +"I beeinflusst, welche Art der Ausrichtung der unkomprimierten Daten beim " +"Kodieren von Literalen angenommen wird. Siehe I weiter unten für weitere " +"Informationen zur Ausrichtung." #. type: TP -#: ../src/xz/xz.1:1581 +#: ../src/xz/xz.1:1473 #, no-wrap msgid "BI" msgstr "BI" #. type: Plain text -#: ../src/xz/xz.1:1585 -msgid "Specify the number of position bits. The minimum is 0 and the maximum is 4; the default is 2." -msgstr "legt die Anzahl der Positions-Bits fest. Das Minimum ist 0 und das Maximum 4; Standard ist 2." +#: ../src/xz/xz.1:1477 +msgid "" +"Specify the number of position bits. The minimum is 0 and the maximum is 4; " +"the default is 2." +msgstr "" +"legt die Anzahl der Positions-Bits fest. Das Minimum ist 0 und das Maximum " +"4; Standard ist 2." #. type: Plain text -#: ../src/xz/xz.1:1592 -msgid "I affects what kind of alignment in the uncompressed data is assumed in general. The default means four-byte alignment (2^I=2^2=4), which is often a good choice when there's no better guess." -msgstr "I beeinflusst, welche Art der Ausrichtung der unkomprimierten Daten generell angenommen wird. Standardmäßig wird eine Vier-Byte-Ausrichtung angenommen (2^I=2^2=4), was oft eine gute Wahl ist, wenn es keine bessere Schätzung gibt." +#: ../src/xz/xz.1:1484 +msgid "" +"I affects what kind of alignment in the uncompressed data is assumed in " +"general. The default means four-byte alignment (2^I=2^2=4), which is " +"often a good choice when there's no better guess." +msgstr "" +"I beeinflusst, welche Art der Ausrichtung der unkomprimierten Daten " +"generell angenommen wird. Standardmäßig wird eine Vier-Byte-Ausrichtung " +"angenommen (2^I=2^2=4), was oft eine gute Wahl ist, wenn es keine " +"bessere Schätzung gibt." #. type: Plain text -#: ../src/xz/xz.1:1606 -msgid "When the alignment is known, setting I accordingly may reduce the file size a little. For example, with text files having one-byte alignment (US-ASCII, ISO-8859-*, UTF-8), setting B can improve compression slightly. For UTF-16 text, B is a good choice. If the alignment is an odd number like 3 bytes, B might be the best choice." -msgstr "Wenn die Ausrichtung bekannt ist, kann das entsprechende Setzen von I die Dateigröße ein wenig verringern. Wenn Textdateien zum Beispiel eine Ein-Byte-Ausrichtung haben (US-ASCII, ISO-8859-*, UTF-8), kann das Setzen von B die Kompression etwas verbessern. Für UTF-16-Text ist B eine gute Wahl. Wenn die Ausrichtung eine ungerade Zahl wie beispielsweise 3 Byte ist, könnte B die beste Wahl sein." +#: ../src/xz/xz.1:1498 +msgid "" +"When the alignment is known, setting I accordingly may reduce the file " +"size a little. For example, with text files having one-byte alignment (US-" +"ASCII, ISO-8859-*, UTF-8), setting B can improve compression " +"slightly. For UTF-16 text, B is a good choice. If the alignment is " +"an odd number like 3 bytes, B might be the best choice." +msgstr "" +"Wenn die Ausrichtung bekannt ist, kann das entsprechende Setzen von I " +"die Dateigröße ein wenig verringern. Wenn Textdateien zum Beispiel eine Ein-" +"Byte-Ausrichtung haben (US-ASCII, ISO-8859-*, UTF-8), kann das Setzen von " +"B die Kompression etwas verbessern. Für UTF-16-Text ist B eine " +"gute Wahl. Wenn die Ausrichtung eine ungerade Zahl wie beispielsweise 3 Byte " +"ist, könnte B die beste Wahl sein." #. type: Plain text -#: ../src/xz/xz.1:1614 -msgid "Even though the assumed alignment can be adjusted with I and I, LZMA1 and LZMA2 still slightly favor 16-byte alignment. It might be worth taking into account when designing file formats that are likely to be often compressed with LZMA1 or LZMA2." -msgstr "Obwohl die angenommene Ausrichtung mit I und I angepasst werden kann, bevorzugen LZMA1 und LZMA2 noch etwas die 16-Byte-Ausrichtung. Das sollten Sie vielleicht beim Design von Dateiformaten berücksichtigen, die wahrscheinlich oft mit LZMA1 oder LZMA2 komprimiert werden." +#: ../src/xz/xz.1:1506 +msgid "" +"Even though the assumed alignment can be adjusted with I and I, " +"LZMA1 and LZMA2 still slightly favor 16-byte alignment. It might be worth " +"taking into account when designing file formats that are likely to be often " +"compressed with LZMA1 or LZMA2." +msgstr "" +"Obwohl die angenommene Ausrichtung mit I und I angepasst werden " +"kann, bevorzugen LZMA1 und LZMA2 noch etwas die 16-Byte-Ausrichtung. Das " +"sollten Sie vielleicht beim Design von Dateiformaten berücksichtigen, die " +"wahrscheinlich oft mit LZMA1 oder LZMA2 komprimiert werden." #. type: TP -#: ../src/xz/xz.1:1614 +#: ../src/xz/xz.1:1506 #, no-wrap msgid "BI" msgstr "BI<Üf>" #. type: Plain text -#: ../src/xz/xz.1:1629 -msgid "Match finder has a major effect on encoder speed, memory usage, and compression ratio. Usually Hash Chain match finders are faster than Binary Tree match finders. The default depends on the I: 0 uses B, 1\\(en3 use B, and the rest use B." -msgstr "Der Übereinstimmungsfinder hat einen großen Einfluss auf die Geschwindigkeit des Kodierers, den Speicherbedarf und das Kompressionsverhältnis. Üblicherweise sind auf Hash-Ketten basierende Übereinstimmungsfinder schneller als jene, die mit Binärbäumen arbeiten. Die Vorgabe hängt von der I ab: 0 verwendet B, 1-3 verwenden B und der Rest verwendet B." +#: ../src/xz/xz.1:1521 +msgid "" +"Match finder has a major effect on encoder speed, memory usage, and " +"compression ratio. Usually Hash Chain match finders are faster than Binary " +"Tree match finders. The default depends on the I: 0 uses B, " +"1\\(en3 use B, and the rest use B." +msgstr "" +"Der Übereinstimmungsfinder hat einen großen Einfluss auf die Geschwindigkeit " +"des Kodierers, den Speicherbedarf und das Kompressionsverhältnis. " +"Üblicherweise sind auf Hash-Ketten basierende Übereinstimmungsfinder " +"schneller als jene, die mit Binärbäumen arbeiten. Die Vorgabe hängt von der " +"I ab: 0 verwendet B, 1-3 verwenden B und der " +"Rest verwendet B." #. type: Plain text -#: ../src/xz/xz.1:1635 -msgid "The following match finders are supported. The memory usage formulas below are rough approximations, which are closest to the reality when I is a power of two." -msgstr "Die folgenden Übereinstimmungsfinder werden unterstützt. Die Formeln zur Ermittlung des Speicherverbrauchs sind grobe Schätzungen, die der Realität am nächsten kommen, wenn I eine Zweierpotenz ist." +#: ../src/xz/xz.1:1527 +msgid "" +"The following match finders are supported. The memory usage formulas below " +"are rough approximations, which are closest to the reality when I is a " +"power of two." +msgstr "" +"Die folgenden Übereinstimmungsfinder werden unterstützt. Die Formeln zur " +"Ermittlung des Speicherverbrauchs sind grobe Schätzungen, die der Realität " +"am nächsten kommen, wenn I eine Zweierpotenz ist." #. type: TP -#: ../src/xz/xz.1:1636 +#: ../src/xz/xz.1:1528 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:1639 +#: ../src/xz/xz.1:1531 msgid "Hash Chain with 2- and 3-byte hashing" msgstr "Hash-Kette mit 2- und 3-Byte-Hashing" #. type: Plain text -#: ../src/xz/xz.1:1643 ../src/xz/xz.1:1692 +#: ../src/xz/xz.1:1535 ../src/xz/xz.1:1584 msgid "Minimum value for I: 3" msgstr "Minimalwert für I: 3" #. type: Plain text -#: ../src/xz/xz.1:1645 ../src/xz/xz.1:1664 ../src/xz/xz.1:1694 -#: ../src/xz/xz.1:1713 +#: ../src/xz/xz.1:1537 ../src/xz/xz.1:1556 ../src/xz/xz.1:1586 +#: ../src/xz/xz.1:1605 msgid "Memory usage:" msgstr "Speicherbedarf:" #. type: Plain text -#: ../src/xz/xz.1:1650 +#: ../src/xz/xz.1:1542 msgid "I * 7.5 (if I E= 16 MiB);" msgstr "I * 7,5 (falls I E= 16 MiB);" #. type: Plain text -#: ../src/xz/xz.1:1655 +#: ../src/xz/xz.1:1547 msgid "I * 5.5 + 64 MiB (if I E 16 MiB)" msgstr "I * 5,5 + 64 MiB (falls I E 16 MiB)" #. type: TP -#: ../src/xz/xz.1:1655 +#: ../src/xz/xz.1:1547 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:1658 +#: ../src/xz/xz.1:1550 msgid "Hash Chain with 2-, 3-, and 4-byte hashing" msgstr "Hash-Kette mit 2-, 3- und 4-Byte-Hashing" #. type: Plain text -#: ../src/xz/xz.1:1662 ../src/xz/xz.1:1711 +#: ../src/xz/xz.1:1554 ../src/xz/xz.1:1603 msgid "Minimum value for I: 4" msgstr "Minimaler Wert für I: 4" #. type: Plain text -#: ../src/xz/xz.1:1669 +#: ../src/xz/xz.1:1561 msgid "I * 7.5 (if I E= 32 MiB);" msgstr "I * 7,5 (falls I E= 32 MiB ist);" #. type: Plain text -#: ../src/xz/xz.1:1674 +#: ../src/xz/xz.1:1566 msgid "I * 6.5 (if I E 32 MiB)" msgstr "I * 6,5 (falls I E 32 MiB ist)" #. type: TP -#: ../src/xz/xz.1:1674 +#: ../src/xz/xz.1:1566 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:1677 +#: ../src/xz/xz.1:1569 msgid "Binary Tree with 2-byte hashing" msgstr "Binärbaum mit 2-Byte-Hashing" #. type: Plain text -#: ../src/xz/xz.1:1681 +#: ../src/xz/xz.1:1573 msgid "Minimum value for I: 2" msgstr "Minimaler Wert für I: 2" #. type: Plain text -#: ../src/xz/xz.1:1685 +#: ../src/xz/xz.1:1577 msgid "Memory usage: I * 9.5" msgstr "Speicherverbrauch: I * 9.5" #. type: TP -#: ../src/xz/xz.1:1685 +#: ../src/xz/xz.1:1577 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:1688 +#: ../src/xz/xz.1:1580 msgid "Binary Tree with 2- and 3-byte hashing" msgstr "Binärbaum mit 2- und 3-Byte-Hashing" #. type: Plain text -#: ../src/xz/xz.1:1699 +#: ../src/xz/xz.1:1591 msgid "I * 11.5 (if I E= 16 MiB);" msgstr "I * 11,5 (falls I E= 16 MiB ist);" #. type: Plain text -#: ../src/xz/xz.1:1704 +#: ../src/xz/xz.1:1596 msgid "I * 9.5 + 64 MiB (if I E 16 MiB)" msgstr "I * 9,5 + 64 MiB (falls I E 16 MiB ist)" #. type: TP -#: ../src/xz/xz.1:1704 +#: ../src/xz/xz.1:1596 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:1707 +#: ../src/xz/xz.1:1599 msgid "Binary Tree with 2-, 3-, and 4-byte hashing" msgstr "Binärbaum mit 2-, 3- und 4-Byte-Hashing" #. type: Plain text -#: ../src/xz/xz.1:1718 +#: ../src/xz/xz.1:1610 msgid "I * 11.5 (if I E= 32 MiB);" msgstr "I * 11,5 (falls I E= 32 MiB ist);" #. type: Plain text -#: ../src/xz/xz.1:1723 +#: ../src/xz/xz.1:1615 msgid "I * 10.5 (if I E 32 MiB)" msgstr "I * 10,5 (falls I E 32 MiB ist)" #. type: TP -#: ../src/xz/xz.1:1724 +#: ../src/xz/xz.1:1616 #, no-wrap msgid "BI" msgstr "BI" #. type: Plain text -#: ../src/xz/xz.1:1745 -msgid "Compression I specifies the method to analyze the data produced by the match finder. Supported I are B and B. The default is B for I 0\\(en3 and B for I 4\\(en9." -msgstr "gibt die Methode zum Analysieren der vom Übereinstimmungsfinder gelieferten Daten an. Als I werden B und B unterstützt. Die Vorgabe ist B für die I 0-3 und B für die I 4-9." +#: ../src/xz/xz.1:1637 +msgid "" +"Compression I specifies the method to analyze the data produced by the " +"match finder. Supported I are B and B. The default is " +"B for I 0\\(en3 and B for I 4\\(en9." +msgstr "" +"gibt die Methode zum Analysieren der vom Übereinstimmungsfinder gelieferten " +"Daten an. Als I werden B und B unterstützt. Die Vorgabe " +"ist B für die I 0-3 und B für die " +"I 4-9." #. type: Plain text -#: ../src/xz/xz.1:1754 -msgid "Usually B is used with Hash Chain match finders and B with Binary Tree match finders. This is also what the I do." -msgstr "Üblicherweise wird B mit Hashketten-basierten Übereinstimmungsfindern und B mit Binärbaum-basierten Übereinstimmungsfindern verwendet. So machen es auch die I." +#: ../src/xz/xz.1:1646 +msgid "" +"Usually B is used with Hash Chain match finders and B with " +"Binary Tree match finders. This is also what the I do." +msgstr "" +"Üblicherweise wird B mit Hashketten-basierten Übereinstimmungsfindern " +"und B mit Binärbaum-basierten Übereinstimmungsfindern verwendet. So " +"machen es auch die I." #. type: TP -#: ../src/xz/xz.1:1754 +#: ../src/xz/xz.1:1646 #, no-wrap msgid "BI" msgstr "BI" #. type: Plain text -#: ../src/xz/xz.1:1761 -msgid "Specify what is considered to be a nice length for a match. Once a match of at least I bytes is found, the algorithm stops looking for possibly better matches." -msgstr "gibt an, was als annehmbarer Wert für eine Übereinstimmung angesehen werden kann. Wenn eine Übereinstimmung gefunden wird, die mindestens diesen I-Wert hat, sucht der Algorithmus nicht weiter nach besseren Übereinstimmungen." +#: ../src/xz/xz.1:1653 +msgid "" +"Specify what is considered to be a nice length for a match. Once a match of " +"at least I bytes is found, the algorithm stops looking for possibly " +"better matches." +msgstr "" +"gibt an, was als annehmbarer Wert für eine Übereinstimmung angesehen werden " +"kann. Wenn eine Übereinstimmung gefunden wird, die mindestens diesen I-" +"Wert hat, sucht der Algorithmus nicht weiter nach besseren Übereinstimmungen." #. type: Plain text -#: ../src/xz/xz.1:1768 -msgid "I can be 2\\(en273 bytes. Higher values tend to give better compression ratio at the expense of speed. The default depends on the I." -msgstr "Der I-Wert kann 2-273 Byte sein. Höhere Werte tendieren zu einem besseren Kompressionsverhältnis, aber auf Kosten der Geschwindigkeit. Die Vorgabe hängt von der I ab." +#: ../src/xz/xz.1:1660 +msgid "" +"I can be 2\\(en273 bytes. Higher values tend to give better " +"compression ratio at the expense of speed. The default depends on the " +"I." +msgstr "" +"Der I-Wert kann 2-273 Byte sein. Höhere Werte tendieren zu einem " +"besseren Kompressionsverhältnis, aber auf Kosten der Geschwindigkeit. Die " +"Vorgabe hängt von der I ab." #. type: TP -#: ../src/xz/xz.1:1768 +#: ../src/xz/xz.1:1660 #, no-wrap msgid "BI" msgstr "BI" #. type: Plain text -#: ../src/xz/xz.1:1778 -msgid "Specify the maximum search depth in the match finder. The default is the special value of 0, which makes the compressor determine a reasonable I from I and I." -msgstr "legt die maximale Suchtiefe im Übereinstimmungsfinder fest. Vorgegeben ist der spezielle Wert 0, der den Kompressor veranlasst, einen annehmbaren Wert für I aus I<Üf> und I-Wert zu bestimmen." +#: ../src/xz/xz.1:1670 +msgid "" +"Specify the maximum search depth in the match finder. The default is the " +"special value of 0, which makes the compressor determine a reasonable " +"I from I and I." +msgstr "" +"legt die maximale Suchtiefe im Übereinstimmungsfinder fest. Vorgegeben ist " +"der spezielle Wert 0, der den Kompressor veranlasst, einen annehmbaren Wert " +"für I aus I<Üf> und I-Wert zu bestimmen." #. type: Plain text -#: ../src/xz/xz.1:1789 -msgid "Reasonable I for Hash Chains is 4\\(en100 and 16\\(en1000 for Binary Trees. Using very high values for I can make the encoder extremely slow with some files. Avoid setting the I over 1000 unless you are prepared to interrupt the compression in case it is taking far too long." -msgstr "Die angemessene I für Hash-Ketten ist 4-100 und 16-1000 für Binärbäume. Hohe Werte für die I können den Kodierer bei einigen Dateien extrem verlangsamen. Vermeiden Sie es, die I über einen Wert von 100 zu setzen, oder stellen Sie sich darauf ein, die Kompression abzubrechen, wenn sie zu lange dauert." +#: ../src/xz/xz.1:1681 +msgid "" +"Reasonable I for Hash Chains is 4\\(en100 and 16\\(en1000 for Binary " +"Trees. Using very high values for I can make the encoder extremely " +"slow with some files. Avoid setting the I over 1000 unless you are " +"prepared to interrupt the compression in case it is taking far too long." +msgstr "" +"Die angemessene I für Hash-Ketten ist 4-100 und 16-1000 für " +"Binärbäume. Hohe Werte für die I können den Kodierer bei einigen " +"Dateien extrem verlangsamen. Vermeiden Sie es, die I über einen Wert " +"von 100 zu setzen, oder stellen Sie sich darauf ein, die Kompression " +"abzubrechen, wenn sie zu lange dauert." #. type: Plain text -#: ../src/xz/xz.1:1800 -msgid "When decoding raw streams (B<--format=raw>), LZMA2 needs only the dictionary I. LZMA1 needs also I, I, and I." -msgstr "Beim Dekodieren von Rohdatenströmen (B<--format=raw>) benötigt LZMA2 nur die Wörterbuch-I. LZMA1 benötigt außerdem I, I und I." +#: ../src/xz/xz.1:1692 +msgid "" +"When decoding raw streams (B<--format=raw>), LZMA2 needs only the dictionary " +"I. LZMA1 needs also I, I, and I." +msgstr "" +"Beim Dekodieren von Rohdatenströmen (B<--format=raw>) benötigt LZMA2 nur die " +"Wörterbuch-I. LZMA1 benötigt außerdem I, I und I." #. type: TP -#: ../src/xz/xz.1:1800 +#: ../src/xz/xz.1:1692 #, no-wrap msgid "B<--x86>[B<=>I]" msgstr "B<--x86>[B<=>I]" #. type: TP -#: ../src/xz/xz.1:1803 +#: ../src/xz/xz.1:1695 #, no-wrap msgid "B<--arm>[B<=>I]" msgstr "B<--arm>[B<=>I]" #. type: TP -#: ../src/xz/xz.1:1805 +#: ../src/xz/xz.1:1697 #, no-wrap msgid "B<--armthumb>[B<=>I]" msgstr "B<--armthumb>[B<=>I]" #. type: TP -#: ../src/xz/xz.1:1807 +#: ../src/xz/xz.1:1699 #, no-wrap msgid "B<--arm64>[B<=>I]" msgstr "B<--arm64>[B<=>I]" #. type: TP -#: ../src/xz/xz.1:1809 +#: ../src/xz/xz.1:1701 #, no-wrap msgid "B<--powerpc>[B<=>I]" msgstr "B<--powerpc>[B<=>I]" #. type: TP -#: ../src/xz/xz.1:1811 +#: ../src/xz/xz.1:1703 #, no-wrap msgid "B<--ia64>[B<=>I]" msgstr "B<--ia64>[B<=>I]" #. type: TP -#: ../src/xz/xz.1:1813 +#: ../src/xz/xz.1:1705 #, no-wrap msgid "B<--sparc>[B<=>I]" msgstr "B<--sparc>[B<=>I]" #. type: Plain text -#: ../src/xz/xz.1:1819 -msgid "Add a branch/call/jump (BCJ) filter to the filter chain. These filters can be used only as a non-last filter in the filter chain." -msgstr "fügt ein »Branch/Call/Jump«-(BCJ-)Filter zur Filterkette hinzu. Diese Filter können nicht als letzter Filter in der Filterkette verwendet werden." +#: ../src/xz/xz.1:1711 +msgid "" +"Add a branch/call/jump (BCJ) filter to the filter chain. These filters can " +"be used only as a non-last filter in the filter chain." +msgstr "" +"fügt ein »Branch/Call/Jump«-(BCJ-)Filter zur Filterkette hinzu. Diese Filter " +"können nicht als letzter Filter in der Filterkette verwendet werden." #. type: Plain text -#: ../src/xz/xz.1:1833 -msgid "A BCJ filter converts relative addresses in the machine code to their absolute counterparts. This doesn't change the size of the data but it increases redundancy, which can help LZMA2 to produce 0\\(en15\\ % smaller B<.xz> file. The BCJ filters are always reversible, so using a BCJ filter for wrong type of data doesn't cause any data loss, although it may make the compression ratio slightly worse. The BCJ filters are very fast and use an insignificant amount of memory." -msgstr "Ein BCJ-Filter wandelt relative Adressen im Maschinencode in deren absolute Gegenstücke um. Die Datengröße wird dadurch nicht geändert, aber die Redundanz erhöht, was LZMA2 dabei helfen kann, eine um 10 bis 15% kleinere B<.xz>-Datei zu erstellen. Die BCJ-Filter sind immer reversibel, daher verursacht die Anwendung eines BCJ-Filters auf den falschen Datentyp keinen Datenverlust, wobei aber das Kompressionsverhältnis etwas schlechter werden könnte. Die BCJ-Filter sind sehr schnell und verbrauchen nur wenig mehr Speicher." +#: ../src/xz/xz.1:1725 +msgid "" +"A BCJ filter converts relative addresses in the machine code to their " +"absolute counterparts. This doesn't change the size of the data but it " +"increases redundancy, which can help LZMA2 to produce 0\\(en15\\ % smaller " +"B<.xz> file. The BCJ filters are always reversible, so using a BCJ filter " +"for wrong type of data doesn't cause any data loss, although it may make the " +"compression ratio slightly worse. The BCJ filters are very fast and use an " +"insignificant amount of memory." +msgstr "" +"Ein BCJ-Filter wandelt relative Adressen im Maschinencode in deren absolute " +"Gegenstücke um. Die Datengröße wird dadurch nicht geändert, aber die " +"Redundanz erhöht, was LZMA2 dabei helfen kann, eine um 10 bis 15% kleinere " +"B<.xz>-Datei zu erstellen. Die BCJ-Filter sind immer reversibel, daher " +"verursacht die Anwendung eines BCJ-Filters auf den falschen Datentyp keinen " +"Datenverlust, wobei aber das Kompressionsverhältnis etwas schlechter werden " +"könnte. Die BCJ-Filter sind sehr schnell und verbrauchen nur wenig mehr " +"Speicher." #. type: Plain text -#: ../src/xz/xz.1:1836 +#: ../src/xz/xz.1:1728 msgid "These BCJ filters have known problems related to the compression ratio:" -msgstr "Diese BCJ-Filter haben bekannte Probleme mit dem Kompressionsverhältnis:" +msgstr "" +"Diese BCJ-Filter haben bekannte Probleme mit dem Kompressionsverhältnis:" #. type: Plain text -#: ../src/xz/xz.1:1843 -msgid "Some types of files containing executable code (for example, object files, static libraries, and Linux kernel modules) have the addresses in the instructions filled with filler values. These BCJ filters will still do the address conversion, which will make the compression worse with these files." -msgstr "In einigen Dateitypen, die ausführbaren Code enthalten (zum Beispiel Objektdateien, statische Bibliotheken und Linux-Kernelmodule), sind die Adressen in den Anweisungen mit Füllwerten gefüllt. Diese BCJ-Filter führen dennoch die Adressumwandlung aus, wodurch die Kompression bei diesen Dateien schlechter wird." +#: ../src/xz/xz.1:1735 +msgid "" +"Some types of files containing executable code (for example, object files, " +"static libraries, and Linux kernel modules) have the addresses in the " +"instructions filled with filler values. These BCJ filters will still do the " +"address conversion, which will make the compression worse with these files." +msgstr "" +"In einigen Dateitypen, die ausführbaren Code enthalten (zum Beispiel " +"Objektdateien, statische Bibliotheken und Linux-Kernelmodule), sind die " +"Adressen in den Anweisungen mit Füllwerten gefüllt. Diese BCJ-Filter führen " +"dennoch die Adressumwandlung aus, wodurch die Kompression bei diesen Dateien " +"schlechter wird." #. type: Plain text -#: ../src/xz/xz.1:1853 -msgid "If a BCJ filter is applied on an archive, it is possible that it makes the compression ratio worse than not using a BCJ filter. For example, if there are similar or even identical executables then filtering will likely make the files less similar and thus compression is worse. The contents of non-executable files in the same archive can matter too. In practice one has to try with and without a BCJ filter to see which is better in each situation." -msgstr "Falls ein BCJ-Filter auf ein Archiv angewendet wird, ist es möglich, dass das Kompressionsverhältnis schlechter als ohne Filter wird. Falls es beispielsweise ähnliche oder sogar identische ausführbare Dateien gibt, dann werden diese durch die Filterung wahrscheinlich »unähnlicher« und verschlechtern dadurch das Kompressionsverhältnis. Der Inhalt nicht-ausführbarer Dateien im gleichen Archiv kann sich ebenfalls darauf auswirken. In der Praxis werden Sie durch Versuche mit oder ohne BCJ-Filter selbst herausfinden müssen, was situationsbezogen besser ist." +#: ../src/xz/xz.1:1745 +msgid "" +"If a BCJ filter is applied on an archive, it is possible that it makes the " +"compression ratio worse than not using a BCJ filter. For example, if there " +"are similar or even identical executables then filtering will likely make " +"the files less similar and thus compression is worse. The contents of non-" +"executable files in the same archive can matter too. In practice one has to " +"try with and without a BCJ filter to see which is better in each situation." +msgstr "" +"Falls ein BCJ-Filter auf ein Archiv angewendet wird, ist es möglich, dass " +"das Kompressionsverhältnis schlechter als ohne Filter wird. Falls es " +"beispielsweise ähnliche oder sogar identische ausführbare Dateien gibt, dann " +"werden diese durch die Filterung wahrscheinlich »unähnlicher« und " +"verschlechtern dadurch das Kompressionsverhältnis. Der Inhalt nicht-" +"ausführbarer Dateien im gleichen Archiv kann sich ebenfalls darauf " +"auswirken. In der Praxis werden Sie durch Versuche mit oder ohne BCJ-Filter " +"selbst herausfinden müssen, was situationsbezogen besser ist." #. type: Plain text -#: ../src/xz/xz.1:1858 -msgid "Different instruction sets have different alignment: the executable file must be aligned to a multiple of this value in the input data to make the filter work." -msgstr "Verschiedene Befehlssätze haben unterschiedliche Ausrichtungen: Die ausführbare Datei muss in den Eingabedateien einem Vielfachen dieses Wertes entsprechen, damit dieser Filter funktioniert." +#: ../src/xz/xz.1:1750 +msgid "" +"Different instruction sets have different alignment: the executable file " +"must be aligned to a multiple of this value in the input data to make the " +"filter work." +msgstr "" +"Verschiedene Befehlssätze haben unterschiedliche Ausrichtungen: Die " +"ausführbare Datei muss in den Eingabedateien einem Vielfachen dieses Wertes " +"entsprechen, damit dieser Filter funktioniert." #. type: tbl table -#: ../src/xz/xz.1:1865 +#: ../src/xz/xz.1:1757 #, no-wrap msgid "Filter" msgstr "Filter" #. type: tbl table -#: ../src/xz/xz.1:1865 +#: ../src/xz/xz.1:1757 #, no-wrap msgid "Alignment" msgstr "Ausrichtung" #. type: tbl table -#: ../src/xz/xz.1:1865 +#: ../src/xz/xz.1:1757 #, no-wrap msgid "Notes" msgstr "Hinweise" #. type: tbl table -#: ../src/xz/xz.1:1866 +#: ../src/xz/xz.1:1758 #, no-wrap msgid "x86" msgstr "x86" #. type: tbl table -#: ../src/xz/xz.1:1866 +#: ../src/xz/xz.1:1758 #, no-wrap msgid "32-bit or 64-bit x86" msgstr "32-Bit oder 64-Bit x86" #. type: tbl table -#: ../src/xz/xz.1:1867 +#: ../src/xz/xz.1:1759 #, no-wrap msgid "ARM" msgstr "ARM" #. type: tbl table -#: ../src/xz/xz.1:1868 +#: ../src/xz/xz.1:1760 #, no-wrap msgid "ARM-Thumb" msgstr "ARM-Thumb" #. type: tbl table -#: ../src/xz/xz.1:1869 +#: ../src/xz/xz.1:1761 #, no-wrap msgid "ARM64" msgstr "ARM64" #. type: tbl table -#: ../src/xz/xz.1:1869 +#: ../src/xz/xz.1:1761 #, no-wrap msgid "4096-byte alignment is best" msgstr "4096-Byte-Ausrichtung ist optimal" #. type: tbl table -#: ../src/xz/xz.1:1870 +#: ../src/xz/xz.1:1762 #, no-wrap msgid "PowerPC" msgstr "PowerPC" #. type: tbl table -#: ../src/xz/xz.1:1870 +#: ../src/xz/xz.1:1762 #, no-wrap msgid "Big endian only" msgstr "Nur Big Endian" #. type: tbl table -#: ../src/xz/xz.1:1871 +#: ../src/xz/xz.1:1763 #, no-wrap msgid "IA-64" msgstr "IA-64" #. type: tbl table -#: ../src/xz/xz.1:1871 +#: ../src/xz/xz.1:1763 #, no-wrap msgid "16" msgstr "16" #. type: tbl table -#: ../src/xz/xz.1:1871 +#: ../src/xz/xz.1:1763 #, no-wrap msgid "Itanium" msgstr "Itanium" #. type: tbl table -#: ../src/xz/xz.1:1872 +#: ../src/xz/xz.1:1764 #, no-wrap msgid "SPARC" msgstr "SPARC" -#. type: tbl table -#: ../src/xz/xz.1:1873 -#, no-wrap -msgid "RISC-V" -msgstr "RISC-V" - -#. type: Plain text -#: ../src/xz/xz.1:1883 -msgid "Since the BCJ-filtered data is usually compressed with LZMA2, the compression ratio may be improved slightly if the LZMA2 options are set to match the alignment of the selected BCJ filter. Examples:" -msgstr "Da die BCJ-gefilterten Daten üblicherweise mit LZMA2 komprimiert sind, kann das Kompressionsverhältnis dadurch etwas verbessert werden, dass die LZMA2-Optionen so gesetzt werden, dass sie der Ausrichtung des gewählten BCJ-Filters entsprechen. Beispiele:" - -#. type: Plain text -#: ../src/xz/xz.1:1889 -msgid "IA-64 filter has 16-byte alignment so B is good with LZMA2 (2^4=16)." -msgstr "Der IA-64-Filter hat eine 16-Byte-Ausrichtung, daher ist B für LZMA2 passend (2^4=16)." - -#. type: Plain text -#: ../src/xz/xz.1:1904 -msgid "RISC-V code has 2-byte or 4-byte alignment depending on whether the file contains 16-bit compressed instructions (the C extension). When 16-bit instructions are used, B or B is good. When 16-bit instructions aren't present, B is the best. B can be used to check if \"RVC\" appears on the \"Flags\" line." -msgstr "RISC-V-Code hat eine 2-Byte- oder 4-Byte-Ausrichtung, abhängig davon, ob die Datei 16-bit-komprimierte Instruktionen enthält (die C-Erweiterung). Wenn 16-bit-Instruktionen verwendet werden, ist B oder B passend. Wenn keine 16-bit-Instruktionen vorhanden sind, ist B am besten. Mit B können Sie überprüfen, ob »RVC« in der »Flags«-Zeile auftritt." - -#. type: Plain text -#: ../src/xz/xz.1:1908 -msgid "ARM64 is always 4-byte aligned so B is the best." -msgstr "ARM64 hat stets eine 4-Byte-Ausrichtung, daher ist B am besten." - #. type: Plain text -#: ../src/xz/xz.1:1913 -msgid "The x86 filter is an exception. It's usually good to stick to LZMA2's defaults (B) when compressing x86 executables." -msgstr "Der x86-Filter stellt eine Ausnahme dar. Es ist üblicherweise eine gute Wahl, bei den Voreinstellungen von LZMA2 (B) zu bleiben, wenn Sie ausführbare x86-Dateien komprimieren" +#: ../src/xz/xz.1:1781 +msgid "" +"Since the BCJ-filtered data is usually compressed with LZMA2, the " +"compression ratio may be improved slightly if the LZMA2 options are set to " +"match the alignment of the selected BCJ filter. For example, with the IA-64 " +"filter, it's good to set B or even B with LZMA2 " +"(2^4=16). The x86 filter is an exception; it's usually good to stick to " +"LZMA2's default four-byte alignment when compressing x86 executables." +msgstr "" +"Da die BCJ-gefilterten Daten üblicherweise mit LZMA2 komprimiert sind, kann " +"das Kompressionsverhältnis dadurch etwas verbessert werden, dass die LZMA2-" +"Optionen so gesetzt werden, dass sie der Ausrichtung des gewählten BCJ-" +"Filters entsprechen. Zum Beispiel ist es beim IA-64-Filter eine gute Wahl, " +"B oder sogar B mit LZMA2 zu setzen (2^4=16). Der x86-" +"Filter bildet dabei eine Ausnahme; Sie sollten bei der für LZMA2 " +"voreingestellten 4-Byte-Ausrichtung bleiben, wenn Sie x86-Binärdateien " +"komprimieren." #. type: Plain text -#: ../src/xz/xz.1:1917 +#: ../src/xz/xz.1:1784 msgid "All BCJ filters support the same I:" msgstr "Alle BCJ-Filter unterstützen die gleichen I:" #. type: TP -#: ../src/xz/xz.1:1918 +#: ../src/xz/xz.1:1785 #, no-wrap msgid "BI" msgstr "BI" #. type: Plain text -#: ../src/xz/xz.1:1932 -msgid "Specify the start I that is used when converting between relative and absolute addresses. The I must be a multiple of the alignment of the filter (see the table above). The default is zero. In practice, the default is good; specifying a custom I is almost never useful." -msgstr "gibt den Start-I an, der bei der Umwandlung zwischen relativen und absoluten Adressen verwendet wird. Der I muss ein Vielfaches der Filterausrichtung sein (siehe die Tabelle oben). Der Standardwert ist 0. In der Praxis ist dieser Standardwert gut; die Angabe eines benutzerdefinierten I ist fast immer unnütz." +#: ../src/xz/xz.1:1799 +msgid "" +"Specify the start I that is used when converting between relative " +"and absolute addresses. The I must be a multiple of the alignment " +"of the filter (see the table above). The default is zero. In practice, the " +"default is good; specifying a custom I is almost never useful." +msgstr "" +"gibt den Start-I an, der bei der Umwandlung zwischen relativen und " +"absoluten Adressen verwendet wird. Der I muss ein Vielfaches der " +"Filterausrichtung sein (siehe die Tabelle oben). Der Standardwert ist 0. In " +"der Praxis ist dieser Standardwert gut; die Angabe eines benutzerdefinierten " +"I ist fast immer unnütz." #. type: TP -#: ../src/xz/xz.1:1933 +#: ../src/xz/xz.1:1800 #, no-wrap msgid "B<--delta>[B<=>I]" msgstr "B<--delta>[B<=>I]" #. type: Plain text -#: ../src/xz/xz.1:1938 -msgid "Add the Delta filter to the filter chain. The Delta filter can be only used as a non-last filter in the filter chain." -msgstr "fügt den Delta-Filter zur Filterkette hinzu. Der Delta-Filter kann nicht als letzter Filter in der Filterkette verwendet werden." +#: ../src/xz/xz.1:1805 +msgid "" +"Add the Delta filter to the filter chain. The Delta filter can be only used " +"as a non-last filter in the filter chain." +msgstr "" +"fügt den Delta-Filter zur Filterkette hinzu. Der Delta-Filter kann nicht als " +"letzter Filter in der Filterkette verwendet werden." #. type: Plain text -#: ../src/xz/xz.1:1947 -msgid "Currently only simple byte-wise delta calculation is supported. It can be useful when compressing, for example, uncompressed bitmap images or uncompressed PCM audio. However, special purpose algorithms may give significantly better results than Delta + LZMA2. This is true especially with audio, which compresses faster and better, for example, with B(1)." -msgstr "Gegenwärtig wird nur eine einfache, Byte-bezogene Delta-Berechnung unterstützt. Beim Komprimieren von zum Beispiel unkomprimierten Bitmap-Bildern oder unkomprimierten PCM-Audiodaten kann es jedoch sinnvoll sein. Dennoch können für spezielle Zwecke entworfene Algorithmen deutlich bessere Ergebnisse als Delta und LZMA2 liefern. Dies trifft insbesondere auf Audiodaten zu, die sich zum Beispiel mit B(1) schneller und besser komprimieren lassen." +#: ../src/xz/xz.1:1814 +msgid "" +"Currently only simple byte-wise delta calculation is supported. It can be " +"useful when compressing, for example, uncompressed bitmap images or " +"uncompressed PCM audio. However, special purpose algorithms may give " +"significantly better results than Delta + LZMA2. This is true especially " +"with audio, which compresses faster and better, for example, with B(1)." +msgstr "" +"Gegenwärtig wird nur eine einfache, Byte-bezogene Delta-Berechnung " +"unterstützt. Beim Komprimieren von zum Beispiel unkomprimierten Bitmap-" +"Bildern oder unkomprimierten PCM-Audiodaten kann es jedoch sinnvoll sein. " +"Dennoch können für spezielle Zwecke entworfene Algorithmen deutlich bessere " +"Ergebnisse als Delta und LZMA2 liefern. Dies trifft insbesondere auf " +"Audiodaten zu, die sich zum Beispiel mit B(1) schneller und besser " +"komprimieren lassen." #. type: Plain text -#: ../src/xz/xz.1:1950 +#: ../src/xz/xz.1:1817 msgid "Supported I:" msgstr "Unterstützte I:" #. type: TP -#: ../src/xz/xz.1:1951 +#: ../src/xz/xz.1:1818 #, no-wrap msgid "BI" msgstr "BI" #. type: Plain text -#: ../src/xz/xz.1:1959 -msgid "Specify the I of the delta calculation in bytes. I must be 1\\(en256. The default is 1." -msgstr "gibt den I der Delta-Berechnung in Byte an. Zulässige Werte für den I sind 1 bis 256. Der Vorgabewert ist 1." +#: ../src/xz/xz.1:1826 +msgid "" +"Specify the I of the delta calculation in bytes. I must " +"be 1\\(en256. The default is 1." +msgstr "" +"gibt den I der Delta-Berechnung in Byte an. Zulässige Werte für den " +"I sind 1 bis 256. Der Vorgabewert ist 1." #. type: Plain text -#: ../src/xz/xz.1:1964 -msgid "For example, with B and eight-byte input A1 B1 A2 B3 A3 B5 A4 B7, the output will be A1 B1 01 02 01 02 01 02." -msgstr "Zum Beispiel wird mit B und der 8-Byte-Eingabe A1 B1 A2 B3 A3 B5 A4 B7 die Ausgabe A1 B1 01 02 01 02 01 02 sein." +#: ../src/xz/xz.1:1831 +msgid "" +"For example, with B and eight-byte input A1 B1 A2 B3 A3 B5 A4 B7, " +"the output will be A1 B1 01 02 01 02 01 02." +msgstr "" +"Zum Beispiel wird mit B und der 8-Byte-Eingabe A1 B1 A2 B3 A3 B5 A4 " +"B7 die Ausgabe A1 B1 01 02 01 02 01 02 sein." #. type: SS -#: ../src/xz/xz.1:1966 +#: ../src/xz/xz.1:1833 #, no-wrap msgid "Other options" msgstr "Andere Optionen" #. type: TP -#: ../src/xz/xz.1:1967 ../src/xzdec/xzdec.1:81 +#: ../src/xz/xz.1:1834 ../src/xzdec/xzdec.1:83 #, no-wrap msgid "B<-q>, B<--quiet>" msgstr "B<-q>, B<--quiet>" #. type: Plain text -#: ../src/xz/xz.1:1974 -msgid "Suppress warnings and notices. Specify this twice to suppress errors too. This option has no effect on the exit status. That is, even if a warning was suppressed, the exit status to indicate a warning is still used." -msgstr "unterdrückt Warnungen und Hinweise. Geben Sie dies zweimal an, um auch Fehlermeldungen zu unterdrücken. Diese Option wirkt sich nicht auf den Exit-Status aus. Das bedeutet, das selbst bei einer unterdrückten Warnung der Exit-Status zur Anzeige einer Warnung dennoch verwendet wird." +#: ../src/xz/xz.1:1841 +msgid "" +"Suppress warnings and notices. Specify this twice to suppress errors too. " +"This option has no effect on the exit status. That is, even if a warning " +"was suppressed, the exit status to indicate a warning is still used." +msgstr "" +"unterdrückt Warnungen und Hinweise. Geben Sie dies zweimal an, um auch " +"Fehlermeldungen zu unterdrücken. Diese Option wirkt sich nicht auf den Exit-" +"Status aus. Das bedeutet, das selbst bei einer unterdrückten Warnung der " +"Exit-Status zur Anzeige einer Warnung dennoch verwendet wird." #. type: TP -#: ../src/xz/xz.1:1974 +#: ../src/xz/xz.1:1841 #, no-wrap msgid "B<-v>, B<--verbose>" msgstr "B<-v>, B<--verbose>" #. type: Plain text -#: ../src/xz/xz.1:1983 -msgid "Be verbose. If standard error is connected to a terminal, B will display a progress indicator. Specifying B<--verbose> twice will give even more verbose output." -msgstr "bewirkt ausführliche Ausgaben. Wenn die Standardfehlerausgabe mit einem Terminal verbunden ist, zeigt B den Fortschritt an. Durch zweimalige Angabe von B<--verbose> wird die Ausgabe noch ausführlicher." +#: ../src/xz/xz.1:1850 +msgid "" +"Be verbose. If standard error is connected to a terminal, B will " +"display a progress indicator. Specifying B<--verbose> twice will give even " +"more verbose output." +msgstr "" +"bewirkt ausführliche Ausgaben. Wenn die Standardfehlerausgabe mit einem " +"Terminal verbunden ist, zeigt B den Fortschritt an. Durch zweimalige " +"Angabe von B<--verbose> wird die Ausgabe noch ausführlicher." #. type: Plain text -#: ../src/xz/xz.1:1985 +#: ../src/xz/xz.1:1852 msgid "The progress indicator shows the following information:" msgstr "Der Fortschrittsanzeiger stellt die folgenden Informationen dar:" #. type: Plain text -#: ../src/xz/xz.1:1990 -msgid "Completion percentage is shown if the size of the input file is known. That is, the percentage cannot be shown in pipes." -msgstr "Der Prozentsatz des Fortschritts wird angezeigt, wenn die Größe der Eingabedatei bekannt ist. Das bedeutet, dass der Prozentsatz in Weiterleitungen (Pipes) nicht angezeigt werden kann." +#: ../src/xz/xz.1:1857 +msgid "" +"Completion percentage is shown if the size of the input file is known. That " +"is, the percentage cannot be shown in pipes." +msgstr "" +"Der Prozentsatz des Fortschritts wird angezeigt, wenn die Größe der " +"Eingabedatei bekannt ist. Das bedeutet, dass der Prozentsatz in " +"Weiterleitungen (Pipes) nicht angezeigt werden kann." #. type: Plain text -#: ../src/xz/xz.1:1993 -msgid "Amount of compressed data produced (compressing) or consumed (decompressing)." -msgstr "Menge der erzeugten komprimierten Daten (bei der Kompression) oder der verarbeiteten Daten (bei der Dekompression)." +#: ../src/xz/xz.1:1860 +msgid "" +"Amount of compressed data produced (compressing) or consumed " +"(decompressing)." +msgstr "" +"Menge der erzeugten komprimierten Daten (bei der Kompression) oder der " +"verarbeiteten Daten (bei der Dekompression)." #. type: Plain text -#: ../src/xz/xz.1:1996 -msgid "Amount of uncompressed data consumed (compressing) or produced (decompressing)." -msgstr "Menge der verarbeiteten unkomprimierten Daten (bei der Kompression) oder der erzeugten Daten (bei der Dekompression)." +#: ../src/xz/xz.1:1863 +msgid "" +"Amount of uncompressed data consumed (compressing) or produced " +"(decompressing)." +msgstr "" +"Menge der verarbeiteten unkomprimierten Daten (bei der Kompression) oder der " +"erzeugten Daten (bei der Dekompression)." #. type: Plain text -#: ../src/xz/xz.1:2000 -msgid "Compression ratio, which is calculated by dividing the amount of compressed data processed so far by the amount of uncompressed data processed so far." -msgstr "Kompressionsverhältnis, das mittels Dividieren der Menge der bisher komprimierten Daten durch die Menge der bisher verarbeiteten unkomprimierten Daten ermittelt wird." +#: ../src/xz/xz.1:1867 +msgid "" +"Compression ratio, which is calculated by dividing the amount of compressed " +"data processed so far by the amount of uncompressed data processed so far." +msgstr "" +"Kompressionsverhältnis, das mittels Dividieren der Menge der bisher " +"komprimierten Daten durch die Menge der bisher verarbeiteten unkomprimierten " +"Daten ermittelt wird." #. type: Plain text -#: ../src/xz/xz.1:2007 -msgid "Compression or decompression speed. This is measured as the amount of uncompressed data consumed (compression) or produced (decompression) per second. It is shown after a few seconds have passed since B started processing the file." -msgstr "Kompressions- oder Dekompressionsgeschwindigkeit. Diese wird anhand der Menge der unkomprimierten verarbeiteten Daten (bei der Kompression) oder der Menge der erzeugten Daten (bei der Dekompression) pro Sekunde gemessen. Die Anzeige startet einige Sekunden nachdem B mit der Verarbeitung der Datei begonnen hat." +#: ../src/xz/xz.1:1874 +msgid "" +"Compression or decompression speed. This is measured as the amount of " +"uncompressed data consumed (compression) or produced (decompression) per " +"second. It is shown after a few seconds have passed since B started " +"processing the file." +msgstr "" +"Kompressions- oder Dekompressionsgeschwindigkeit. Diese wird anhand der " +"Menge der unkomprimierten verarbeiteten Daten (bei der Kompression) oder der " +"Menge der erzeugten Daten (bei der Dekompression) pro Sekunde gemessen. Die " +"Anzeige startet einige Sekunden nachdem B mit der Verarbeitung der Datei " +"begonnen hat." #. type: Plain text -#: ../src/xz/xz.1:2009 +#: ../src/xz/xz.1:1876 msgid "Elapsed time in the format M:SS or H:MM:SS." msgstr "Die vergangene Zeit im Format M:SS oder H:MM:SS." #. type: Plain text -#: ../src/xz/xz.1:2017 -msgid "Estimated remaining time is shown only when the size of the input file is known and a couple of seconds have already passed since B started processing the file. The time is shown in a less precise format which never has any colons, for example, 2 min 30 s." -msgstr "Die geschätzte verbleibende Zeit wird nur angezeigt, wenn die Größe der Eingabedatei bekannt ist und bereits einige Sekunden vergangen sind, nachdem B mit der Verarbeitung der Datei begonnen hat. Die Zeit wird in einem weniger präzisen Format ohne Doppelpunkte angezeigt, zum Beispiel 2 min 30 s." +#: ../src/xz/xz.1:1884 +msgid "" +"Estimated remaining time is shown only when the size of the input file is " +"known and a couple of seconds have already passed since B started " +"processing the file. The time is shown in a less precise format which never " +"has any colons, for example, 2 min 30 s." +msgstr "" +"Die geschätzte verbleibende Zeit wird nur angezeigt, wenn die Größe der " +"Eingabedatei bekannt ist und bereits einige Sekunden vergangen sind, nachdem " +"B mit der Verarbeitung der Datei begonnen hat. Die Zeit wird in einem " +"weniger präzisen Format ohne Doppelpunkte angezeigt, zum Beispiel 2 min 30 s." #. type: Plain text -#: ../src/xz/xz.1:2032 -msgid "When standard error is not a terminal, B<--verbose> will make B print the filename, compressed size, uncompressed size, compression ratio, and possibly also the speed and elapsed time on a single line to standard error after compressing or decompressing the file. The speed and elapsed time are included only when the operation took at least a few seconds. If the operation didn't finish, for example, due to user interruption, also the completion percentage is printed if the size of the input file is known." -msgstr "Wenn die Standardfehlerausgabe kein Terminal ist, schreibt B mit B<--verbose> nach dem Komprimieren oder Dekomprimieren der Datei in einer einzelnen Zeile den Dateinamen, die komprimierte Größe, die unkomprimierte Größe, das Kompressionsverhältnis und eventuell auch die Geschwindigkeit und die vergangene Zeit in die Standardfehlerausgabe. Die Geschwindigkeit und die vergangene Zeit werden nur angezeigt, wenn der Vorgang mindestens ein paar Sekunden gedauert hat. Wurde der Vorgang nicht beendet, zum Beispiel weil ihn der Benutzer abgebrochen hat, wird außerdem der Prozentsatz des erreichten Verarbeitungsfortschritts aufgenommen, sofern die Größe der Eingabedatei bekannt ist." +#: ../src/xz/xz.1:1899 +msgid "" +"When standard error is not a terminal, B<--verbose> will make B print " +"the filename, compressed size, uncompressed size, compression ratio, and " +"possibly also the speed and elapsed time on a single line to standard error " +"after compressing or decompressing the file. The speed and elapsed time are " +"included only when the operation took at least a few seconds. If the " +"operation didn't finish, for example, due to user interruption, also the " +"completion percentage is printed if the size of the input file is known." +msgstr "" +"Wenn die Standardfehlerausgabe kein Terminal ist, schreibt B mit B<--" +"verbose> nach dem Komprimieren oder Dekomprimieren der Datei in einer " +"einzelnen Zeile den Dateinamen, die komprimierte Größe, die unkomprimierte " +"Größe, das Kompressionsverhältnis und eventuell auch die Geschwindigkeit und " +"die vergangene Zeit in die Standardfehlerausgabe. Die Geschwindigkeit und " +"die vergangene Zeit werden nur angezeigt, wenn der Vorgang mindestens ein " +"paar Sekunden gedauert hat. Wurde der Vorgang nicht beendet, zum Beispiel " +"weil ihn der Benutzer abgebrochen hat, wird außerdem der Prozentsatz des " +"erreichten Verarbeitungsfortschritts aufgenommen, sofern die Größe der " +"Eingabedatei bekannt ist." #. type: TP -#: ../src/xz/xz.1:2032 ../src/xzdec/xzdec.1:87 +#: ../src/xz/xz.1:1899 ../src/xzdec/xzdec.1:89 #, no-wrap msgid "B<-Q>, B<--no-warn>" msgstr "B<-Q>, B<--no-warn>" #. type: Plain text -#: ../src/xz/xz.1:2042 -msgid "Don't set the exit status to 2 even if a condition worth a warning was detected. This option doesn't affect the verbosity level, thus both B<--quiet> and B<--no-warn> have to be used to not display warnings and to not alter the exit status." -msgstr "setzt den Exit-Status nicht auf 2, selbst wenn eine Bedingung erfüllt ist, die eine Warnung gerechtfertigt hätte. Diese Option wirkt sich nicht auf die Ausführlichkeitsstufe aus, daher müssen sowohl B<--quiet> als auch B<--no-warn> angegeben werden, um einerseits keine Warnungen anzuzeigen und andererseits auch den Exit-Status nicht zu ändern." +#: ../src/xz/xz.1:1909 +msgid "" +"Don't set the exit status to 2 even if a condition worth a warning was " +"detected. This option doesn't affect the verbosity level, thus both B<--" +"quiet> and B<--no-warn> have to be used to not display warnings and to not " +"alter the exit status." +msgstr "" +"setzt den Exit-Status nicht auf 2, selbst wenn eine Bedingung erfüllt ist, " +"die eine Warnung gerechtfertigt hätte. Diese Option wirkt sich nicht auf die " +"Ausführlichkeitsstufe aus, daher müssen sowohl B<--quiet> als auch B<--no-" +"warn> angegeben werden, um einerseits keine Warnungen anzuzeigen und " +"andererseits auch den Exit-Status nicht zu ändern." #. type: TP -#: ../src/xz/xz.1:2042 +#: ../src/xz/xz.1:1909 #, no-wrap msgid "B<--robot>" msgstr "B<--robot>" #. type: Plain text -#: ../src/xz/xz.1:2054 -msgid "Print messages in a machine-parsable format. This is intended to ease writing frontends that want to use B instead of liblzma, which may be the case with various scripts. The output with this option enabled is meant to be stable across B releases. See the section B for details." -msgstr "gibt Meldungen in einem maschinenlesbaren Format aus. Dadurch soll das Schreiben von Frontends erleichtert werden, die B anstelle von Liblzma verwenden wollen, was in verschiedenen Skripten der Fall sein kann. Die Ausgabe mit dieser aktivierten Option sollte über mehrere B-Veröffentlichungen stabil sein. Details hierzu finden Sie im Abschnitt B." +#: ../src/xz/xz.1:1921 +msgid "" +"Print messages in a machine-parsable format. This is intended to ease " +"writing frontends that want to use B instead of liblzma, which may be " +"the case with various scripts. The output with this option enabled is meant " +"to be stable across B releases. See the section B for " +"details." +msgstr "" +"gibt Meldungen in einem maschinenlesbaren Format aus. Dadurch soll das " +"Schreiben von Frontends erleichtert werden, die B anstelle von Liblzma " +"verwenden wollen, was in verschiedenen Skripten der Fall sein kann. Die " +"Ausgabe mit dieser aktivierten Option sollte über mehrere B-" +"Veröffentlichungen stabil sein. Details hierzu finden Sie im Abschnitt " +"B." #. type: TP -#: ../src/xz/xz.1:2054 +#: ../src/xz/xz.1:1921 #, no-wrap msgid "B<--info-memory>" msgstr "B<--info-memory>" #. type: Plain text -#: ../src/xz/xz.1:2061 -msgid "Display, in human-readable format, how much physical memory (RAM) and how many processor threads B thinks the system has and the memory usage limits for compression and decompression, and exit successfully." -msgstr "zeigt in einem menschenlesbaren Format an, wieviel physischen Speicher (RAM) und wie viele Prozessor-Threads das System nach Annahme von B hat, sowie die Speicherbedarfsbegrenzung für Kompression und Dekompression, und beendet das Programm erfolgreich." +#: ../src/xz/xz.1:1928 +msgid "" +"Display, in human-readable format, how much physical memory (RAM) and how " +"many processor threads B thinks the system has and the memory usage " +"limits for compression and decompression, and exit successfully." +msgstr "" +"zeigt in einem menschenlesbaren Format an, wieviel physischen Speicher (RAM) " +"und wie viele Prozessor-Threads das System nach Annahme von B hat, sowie " +"die Speicherbedarfsbegrenzung für Kompression und Dekompression, und beendet " +"das Programm erfolgreich." #. type: TP -#: ../src/xz/xz.1:2061 ../src/xzdec/xzdec.1:94 +#: ../src/xz/xz.1:1928 ../src/xzdec/xzdec.1:96 #, no-wrap msgid "B<-h>, B<--help>" msgstr "B<-h>, B<--help>" #. type: Plain text -#: ../src/xz/xz.1:2065 -msgid "Display a help message describing the most commonly used options, and exit successfully." -msgstr "zeigt eine Hilfemeldung mit den am häufigsten genutzten Optionen an und beendet das Programm erfolgreich." +#: ../src/xz/xz.1:1932 +msgid "" +"Display a help message describing the most commonly used options, and exit " +"successfully." +msgstr "" +"zeigt eine Hilfemeldung mit den am häufigsten genutzten Optionen an und " +"beendet das Programm erfolgreich." #. type: TP -#: ../src/xz/xz.1:2065 +#: ../src/xz/xz.1:1932 #, no-wrap msgid "B<-H>, B<--long-help>" msgstr "B<-H>, B<--long-help>" # FIXME Satzpunkt fehlt #. type: Plain text -#: ../src/xz/xz.1:2070 -msgid "Display a help message describing all features of B, and exit successfully" -msgstr "zeigt eine Hilfemeldung an, die alle Funktionsmerkmale von B beschreibt und beendet das Programm erfolgreich." +#: ../src/xz/xz.1:1937 +msgid "" +"Display a help message describing all features of B, and exit " +"successfully" +msgstr "" +"zeigt eine Hilfemeldung an, die alle Funktionsmerkmale von B beschreibt " +"und beendet das Programm erfolgreich." #. type: TP -#: ../src/xz/xz.1:2070 ../src/xzdec/xzdec.1:97 +#: ../src/xz/xz.1:1937 ../src/xzdec/xzdec.1:99 #, no-wrap msgid "B<-V>, B<--version>" msgstr "B<-V>, B<--version>" #. type: Plain text -#: ../src/xz/xz.1:2079 -msgid "Display the version number of B and liblzma in human readable format. To get machine-parsable output, specify B<--robot> before B<--version>." -msgstr "zeigt die Versionsnummer von B und Liblzma in einem menschenlesbaren Format an. Um eine maschinell auswertbare Ausgabe zu erhalten, geben Sie B<--robot> vor B<--version> an." +#: ../src/xz/xz.1:1946 +msgid "" +"Display the version number of B and liblzma in human readable format. " +"To get machine-parsable output, specify B<--robot> before B<--version>." +msgstr "" +"zeigt die Versionsnummer von B und Liblzma in einem menschenlesbaren " +"Format an. Um eine maschinell auswertbare Ausgabe zu erhalten, geben Sie B<--" +"robot> vor B<--version> an." #. type: SH -#: ../src/xz/xz.1:2080 +#: ../src/xz/xz.1:1947 #, no-wrap msgid "ROBOT MODE" msgstr "ROBOTER-MODUS" #. type: Plain text -#: ../src/xz/xz.1:2097 -msgid "The robot mode is activated with the B<--robot> option. It makes the output of B easier to parse by other programs. Currently B<--robot> is supported only together with B<--list>, B<--filters-help>, B<--info-memory>, and B<--version>. It will be supported for compression and decompression in the future." -msgstr "Der Roboter-Modus wird mit der Option B<--robot> aktiviert. Er bewirkt, dass die Ausgabe von B leichter von anderen Programmen ausgewertet werden kann. Gegenwärtig wird B<--robot> nur zusammen mit B<--list>, B<--filters-help>, B<--info-memory> und B<--version> unterstützt. In der Zukunft wird dieser Modus auch für Kompression und Dekompression unterstützt." +#: ../src/xz/xz.1:1963 +msgid "" +"The robot mode is activated with the B<--robot> option. It makes the output " +"of B easier to parse by other programs. Currently B<--robot> is " +"supported only together with B<--version>, B<--info-memory>, and B<--list>. " +"It will be supported for compression and decompression in the future." +msgstr "" +"Der Roboter-Modus wird mit der Option B<--robot> aktiviert. Er bewirkt, dass " +"die Ausgabe von B leichter von anderen Programmen ausgewertet werden " +"kann. Gegenwärtig wird B<--robot> nur zusammen mit B<--version>, B<--info-" +"memory> und B<--list> unterstützt. In der Zukunft wird dieser Modus auch für " +"Kompression und Dekompression unterstützt." + +#. type: SS +#: ../src/xz/xz.1:1964 +#, no-wrap +msgid "Version" +msgstr "Version" + +#. type: Plain text +#: ../src/xz/xz.1:1969 +msgid "" +"B prints the version number of B and liblzma in " +"the following format:" +msgstr "" +"B gibt die Versionsnummern von B und Liblzma im " +"folgenden Format aus:" + +#. type: Plain text +#: ../src/xz/xz.1:1971 +msgid "BI" +msgstr "BI" + +#. type: Plain text +#: ../src/xz/xz.1:1973 +msgid "BI" +msgstr "BI" + +#. type: TP +#: ../src/xz/xz.1:1973 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: ../src/xz/xz.1:1976 +msgid "Major version." +msgstr "Hauptversion." + +#. type: TP +#: ../src/xz/xz.1:1976 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: ../src/xz/xz.1:1981 +msgid "" +"Minor version. Even numbers are stable. Odd numbers are alpha or beta " +"versions." +msgstr "" +"Unterversion. Gerade Zahlen bezeichnen eine stabile Version. Ungerade Zahlen " +"bezeichnen Alpha- oder Betaversionen." + +#. type: TP +#: ../src/xz/xz.1:1981 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: ../src/xz/xz.1:1985 +msgid "" +"Patch level for stable releases or just a counter for development releases." +msgstr "" +"Patch-Stufe für stabile Veröffentlichungen oder einfach nur ein Zähler für " +"Entwicklungsversionen." + +#. type: TP +#: ../src/xz/xz.1:1985 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: ../src/xz/xz.1:1993 +msgid "" +"Stability. 0 is alpha, 1 is beta, and 2 is stable. I should be always 2 " +"when I is even." +msgstr "" +"Stabilität. 0 ist Alpha, 1 ist Beta und 2 ist stabil. I sollte immer 2 " +"sein, wenn I eine gerade Zahl ist." + +#. type: Plain text +#: ../src/xz/xz.1:1998 +msgid "" +"I are the same on both lines if B and liblzma are from the " +"same XZ Utils release." +msgstr "" +"I sind in beiden Zeilen gleich, sofern B und Liblzma aus der " +"gleichen Veröffentlichung der XZ-Utils stammen." + +#. type: Plain text +#: ../src/xz/xz.1:2004 +msgid "Examples: 4.999.9beta is B<49990091> and 5.0.0 is B<50000002>." +msgstr "Beispiele: 4.999.9beta ist B<49990091> und 5.0.0 is B<50000002>." + +#. type: SS +#: ../src/xz/xz.1:2005 +#, no-wrap +msgid "Memory limit information" +msgstr "Informationen zur Speicherbedarfsbegrenzung" + +#. type: Plain text +#: ../src/xz/xz.1:2008 +msgid "" +"B prints a single line with multiple tab-separated " +"columns:" +msgstr "" +"B gibt eine einzelne Zeile mit mehreren durch " +"Tabulatoren getrennten Spalten aus:" + +#. type: IP +#: ../src/xz/xz.1:2008 +#, no-wrap +msgid "1." +msgstr "1." + +#. type: Plain text +#: ../src/xz/xz.1:2010 +msgid "Total amount of physical memory (RAM) in bytes." +msgstr "Gesamter physischer Speicher (RAM) in Byte." + +#. type: IP +#: ../src/xz/xz.1:2010 ../src/xz/xz.1:2125 ../src/xz/xz.1:2162 +#: ../src/xz/xz.1:2188 ../src/xz/xz.1:2258 ../src/xz/xz.1:2285 +#, no-wrap +msgid "2." +msgstr "2." + +#. type: Plain text +#: ../src/xz/xz.1:2017 +msgid "" +"Memory usage limit for compression in bytes (B<--memlimit-compress>). A " +"special value of B<0> indicates the default setting which for single-" +"threaded mode is the same as no limit." +msgstr "" +"Speicherbedarfsbegrenzung für die Kompression in Byte (B<--memlimit-" +"compress>). Ein spezieller Wert von B<0> bezeichnet die Standardeinstellung, " +"die im Einzelthread-Modus bedeutet, dass keine Begrenzung vorhanden ist." + +#. type: IP +#: ../src/xz/xz.1:2017 ../src/xz/xz.1:2127 ../src/xz/xz.1:2164 +#: ../src/xz/xz.1:2190 ../src/xz/xz.1:2263 ../src/xz/xz.1:2287 +#, no-wrap +msgid "3." +msgstr "3." + +#. type: Plain text +#: ../src/xz/xz.1:2024 +msgid "" +"Memory usage limit for decompression in bytes (B<--memlimit-decompress>). A " +"special value of B<0> indicates the default setting which for single-" +"threaded mode is the same as no limit." +msgstr "" +"Speicherbedarfsbegrenzung für die Dekompression in Byte (B<--memlimit-" +"decompress>). Ein spezieller Wert von B<0> bezeichnet die " +"Standardeinstellung, die im Einzelthread-Modus bedeutet, dass keine " +"Begrenzung vorhanden ist." + +#. type: IP +#: ../src/xz/xz.1:2024 ../src/xz/xz.1:2129 ../src/xz/xz.1:2166 +#: ../src/xz/xz.1:2193 ../src/xz/xz.1:2273 ../src/xz/xz.1:2289 +#, no-wrap +msgid "4." +msgstr "4." + +#. type: Plain text +#: ../src/xz/xz.1:2036 +msgid "" +"Since B 5.3.4alpha: Memory usage for multi-threaded decompression in " +"bytes (B<--memlimit-mt-decompress>). This is never zero because a system-" +"specific default value shown in the column 5 is used if no limit has been " +"specified explicitly. This is also never greater than the value in the " +"column 3 even if a larger value has been specified with B<--memlimit-mt-" +"decompress>." +msgstr "" +"Seit B 5.3.4alpha: Die Speichernutzung für Multithread-Dekompression in " +"Byte (B<--memlimit-mt-decompress>). Dies ist niemals B<0>, da ein " +"systemspezifischer Vorgabewert (gezeigt in Spalte 5) verwendet wird, falls " +"keine Grenze ausdrücklich angegeben wurde. Dies ist außerdem niemals größer " +"als der Wert in in Spalte 3, selbst wenn mit B<--memlimit-mt-decompress> ein " +"größerer Wert angegeben wurde." + +#. type: IP +#: ../src/xz/xz.1:2036 ../src/xz/xz.1:2131 ../src/xz/xz.1:2168 +#: ../src/xz/xz.1:2195 ../src/xz/xz.1:2291 +#, no-wrap +msgid "5." +msgstr "5." + +#. type: Plain text +#: ../src/xz/xz.1:2048 +msgid "" +"Since B 5.3.4alpha: A system-specific default memory usage limit that is " +"used to limit the number of threads when compressing with an automatic " +"number of threads (B<--threads=0>) and no memory usage limit has been " +"specified (B<--memlimit-compress>). This is also used as the default value " +"for B<--memlimit-mt-decompress>." +msgstr "" +"Seit B 5.3.4alpha: Eine systemspezifisch vorgegebene Begrenzung des " +"Speicherverbrauchs, die zur Begrenzung der Anzahl der Threads beim " +"Komprimieren mit automatischer Anzahl der Threads (B<--threads=0>) und wenn " +"keine Speicherbedarfsbegrenzung angegeben wurde (B<--memlimit-compress>) " +"verwendet wird. Dies wird auch als Standardwert für B<--memlimit-mt-" +"decompress> verwendet." + +#. type: IP +#: ../src/xz/xz.1:2048 ../src/xz/xz.1:2133 ../src/xz/xz.1:2170 +#: ../src/xz/xz.1:2197 ../src/xz/xz.1:2293 +#, no-wrap +msgid "6." +msgstr "6." + +#. type: Plain text +#: ../src/xz/xz.1:2053 +msgid "Since B 5.3.4alpha: Number of available processor threads." +msgstr "Seit B 5.3.4alpha: Anzahl der verfügbaren Prozessorthreads." + +#. type: Plain text +#: ../src/xz/xz.1:2057 +msgid "" +"In the future, the output of B may have more " +"columns, but never more than a single line." +msgstr "" +"In der Zukunft könnte die Ausgabe von B weitere " +"Spalten enthalten, aber niemals mehr als eine einzelne Zeile." #. type: SS -#: ../src/xz/xz.1:2098 +#: ../src/xz/xz.1:2058 #, no-wrap msgid "List mode" msgstr "Listenmodus" #. type: Plain text -#: ../src/xz/xz.1:2103 -msgid "B uses tab-separated output. The first column of every line has a string that indicates the type of the information found on that line:" -msgstr "B verwendet eine durch Tabulatoren getrennte Ausgabe. In der ersten Spalte jeder Zeile bezeichnet eine Zeichenkette den Typ der Information, die in dieser Zeile enthalten ist:" +#: ../src/xz/xz.1:2063 +msgid "" +"B uses tab-separated output. The first column of every " +"line has a string that indicates the type of the information found on that " +"line:" +msgstr "" +"B verwendet eine durch Tabulatoren getrennte Ausgabe. In " +"der ersten Spalte jeder Zeile bezeichnet eine Zeichenkette den Typ der " +"Information, die in dieser Zeile enthalten ist:" #. type: TP -#: ../src/xz/xz.1:2103 +#: ../src/xz/xz.1:2063 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:2107 -msgid "This is always the first line when starting to list a file. The second column on the line is the filename." -msgstr "Dies ist stets die erste Zeile, wenn eine Datei aufgelistet wird. Die zweite Spalte in der Zeile enthält den Dateinamen." +#: ../src/xz/xz.1:2067 +msgid "" +"This is always the first line when starting to list a file. The second " +"column on the line is the filename." +msgstr "" +"Dies ist stets die erste Zeile, wenn eine Datei aufgelistet wird. Die zweite " +"Spalte in der Zeile enthält den Dateinamen." #. type: TP -#: ../src/xz/xz.1:2107 +#: ../src/xz/xz.1:2067 #, no-wrap msgid "B" msgstr "B" # CHECK overall #. type: Plain text -#: ../src/xz/xz.1:2115 -msgid "This line contains overall information about the B<.xz> file. This line is always printed after the B line." -msgstr "Diese Zeile enthält allgemeine Informationen zur B<.xz>-Datei. Diese Zeile wird stets nach der B-Zeile ausgegeben." +#: ../src/xz/xz.1:2075 +msgid "" +"This line contains overall information about the B<.xz> file. This line is " +"always printed after the B line." +msgstr "" +"Diese Zeile enthält allgemeine Informationen zur B<.xz>-Datei. Diese Zeile " +"wird stets nach der B-Zeile ausgegeben." #. type: TP -#: ../src/xz/xz.1:2115 +#: ../src/xz/xz.1:2075 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:2125 -msgid "This line type is used only when B<--verbose> was specified. There are as many B lines as there are streams in the B<.xz> file." -msgstr "Dieser Zeilentyp wird nur verwendet, wenn B<--verbose> angegeben wurde. Es gibt genau so viele B-Zeilen, wie Datenströme in der B<.xz>-Datei enthalten sind." +#: ../src/xz/xz.1:2085 +msgid "" +"This line type is used only when B<--verbose> was specified. There are as " +"many B lines as there are streams in the B<.xz> file." +msgstr "" +"Dieser Zeilentyp wird nur verwendet, wenn B<--verbose> angegeben wurde. Es " +"gibt genau so viele B-Zeilen, wie Datenströme in der B<.xz>-Datei " +"enthalten sind." #. type: TP -#: ../src/xz/xz.1:2125 +#: ../src/xz/xz.1:2085 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:2140 -msgid "This line type is used only when B<--verbose> was specified. There are as many B lines as there are blocks in the B<.xz> file. The B lines are shown after all the B lines; different line types are not interleaved." -msgstr "Dieser Zeilentyp wird nur verwendet, wenn B<--verbose> angegeben wurde. Es gibt so viele B-Zeilen, wie Blöcke in der B<.xz>-Datei. Die B-Zeilen werden nach allen B-Zeilen angezeigt; verschiedene Zeilentypen werden nicht verschachtelt." +#: ../src/xz/xz.1:2100 +msgid "" +"This line type is used only when B<--verbose> was specified. There are as " +"many B lines as there are blocks in the B<.xz> file. The B " +"lines are shown after all the B lines; different line types are not " +"interleaved." +msgstr "" +"Dieser Zeilentyp wird nur verwendet, wenn B<--verbose> angegeben wurde. Es " +"gibt so viele B-Zeilen, wie Blöcke in der B<.xz>-Datei. Die B-" +"Zeilen werden nach allen B-Zeilen angezeigt; verschiedene " +"Zeilentypen werden nicht verschachtelt." #. type: TP -#: ../src/xz/xz.1:2140 +#: ../src/xz/xz.1:2100 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:2155 -msgid "This line type is used only when B<--verbose> was specified twice. This line is printed after all B lines. Like the B line, the B line contains overall information about the B<.xz> file." -msgstr "Dieser Zeilentyp wird nur verwendet, wenn B<--verbose> zwei Mal angegeben wurde. Diese Zeile wird nach allen B-Zeilen ausgegeben. Wie die B-Zeile enthält die B-Zeile allgemeine Informationen zur B<.xz>-Datei." +#: ../src/xz/xz.1:2115 +msgid "" +"This line type is used only when B<--verbose> was specified twice. This " +"line is printed after all B lines. Like the B line, the " +"B line contains overall information about the B<.xz> file." +msgstr "" +"Dieser Zeilentyp wird nur verwendet, wenn B<--verbose> zwei Mal angegeben " +"wurde. Diese Zeile wird nach allen B-Zeilen ausgegeben. Wie die " +"B-Zeile enthält die B-Zeile allgemeine Informationen zur B<." +"xz>-Datei." #. type: TP -#: ../src/xz/xz.1:2155 +#: ../src/xz/xz.1:2115 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: ../src/xz/xz.1:2159 -msgid "This line is always the very last line of the list output. It shows the total counts and sizes." -msgstr "Diese Zeile ist immer die letzte der Listenausgabe. Sie zeigt die Gesamtanzahlen und -größen an." +#: ../src/xz/xz.1:2119 +msgid "" +"This line is always the very last line of the list output. It shows the " +"total counts and sizes." +msgstr "" +"Diese Zeile ist immer die letzte der Listenausgabe. Sie zeigt die " +"Gesamtanzahlen und -größen an." #. type: Plain text -#: ../src/xz/xz.1:2163 +#: ../src/xz/xz.1:2123 msgid "The columns of the B lines:" msgstr "Die Spalten der B-Zeilen:" -#. type: IP -#: ../src/xz/xz.1:2165 ../src/xz/xz.1:2202 ../src/xz/xz.1:2228 -#: ../src/xz/xz.1:2298 ../src/xz/xz.1:2325 ../src/xz/xz.1:2414 -#, no-wrap -msgid "2." -msgstr "2." - #. type: Plain text -#: ../src/xz/xz.1:2167 +#: ../src/xz/xz.1:2127 msgid "Number of streams in the file" msgstr "Anzahl der Datenströme in der Datei" -#. type: IP -#: ../src/xz/xz.1:2167 ../src/xz/xz.1:2204 ../src/xz/xz.1:2230 -#: ../src/xz/xz.1:2303 ../src/xz/xz.1:2327 ../src/xz/xz.1:2421 -#, no-wrap -msgid "3." -msgstr "3." - #. type: Plain text -#: ../src/xz/xz.1:2169 +#: ../src/xz/xz.1:2129 msgid "Total number of blocks in the stream(s)" msgstr "Gesamtanzahl der Blöcke in den Datenströmen" -#. type: IP -#: ../src/xz/xz.1:2169 ../src/xz/xz.1:2206 ../src/xz/xz.1:2233 -#: ../src/xz/xz.1:2313 ../src/xz/xz.1:2329 ../src/xz/xz.1:2428 -#, no-wrap -msgid "4." -msgstr "4." - #. type: Plain text -#: ../src/xz/xz.1:2171 +#: ../src/xz/xz.1:2131 msgid "Compressed size of the file" msgstr "Komprimierte Größe der Datei" -#. type: IP -#: ../src/xz/xz.1:2171 ../src/xz/xz.1:2208 ../src/xz/xz.1:2235 -#: ../src/xz/xz.1:2331 ../src/xz/xz.1:2440 -#, no-wrap -msgid "5." -msgstr "5." - #. type: Plain text -#: ../src/xz/xz.1:2173 +#: ../src/xz/xz.1:2133 msgid "Uncompressed size of the file" msgstr "Unkomprimierte Größe der Datei" -#. type: IP -#: ../src/xz/xz.1:2173 ../src/xz/xz.1:2210 ../src/xz/xz.1:2237 -#: ../src/xz/xz.1:2333 ../src/xz/xz.1:2452 -#, no-wrap -msgid "6." -msgstr "6." - #. type: Plain text -#: ../src/xz/xz.1:2179 -msgid "Compression ratio, for example, B<0.123>. If ratio is over 9.999, three dashes (B<--->) are displayed instead of the ratio." -msgstr "Das Kompressionsverhältnis, zum Beispiel B<0.123>. Wenn das Verhältnis über 9.999 liegt, werden drei Minuszeichen (B<--->) anstelle des Kompressionsverhältnisses angezeigt." +#: ../src/xz/xz.1:2139 +msgid "" +"Compression ratio, for example, B<0.123>. If ratio is over 9.999, three " +"dashes (B<--->) are displayed instead of the ratio." +msgstr "" +"Das Kompressionsverhältnis, zum Beispiel B<0.123>. Wenn das Verhältnis über " +"9.999 liegt, werden drei Minuszeichen (B<--->) anstelle des " +"Kompressionsverhältnisses angezeigt." #. type: IP -#: ../src/xz/xz.1:2179 ../src/xz/xz.1:2212 ../src/xz/xz.1:2239 -#: ../src/xz/xz.1:2335 +#: ../src/xz/xz.1:2139 ../src/xz/xz.1:2172 ../src/xz/xz.1:2199 +#: ../src/xz/xz.1:2295 #, no-wrap msgid "7." msgstr "7." #. type: Plain text -#: ../src/xz/xz.1:2192 -msgid "Comma-separated list of integrity check names. The following strings are used for the known check types: B, B, B, and B. For unknown check types, BI is used, where I is the Check ID as a decimal number (one or two digits)." -msgstr "Durch Kommata getrennte Liste der Namen der Integritätsprüfungen. Für die bekannten Überprüfungstypen werden folgende Zeichenketten verwendet: B, B, B und B. BI wird verwendet, wobei I die Kennung der Überprüfung als Dezimalzahl angibt (ein- oder zweistellig)." +#: ../src/xz/xz.1:2152 +msgid "" +"Comma-separated list of integrity check names. The following strings are " +"used for the known check types: B, B, B, and " +"B. For unknown check types, BI is used, where I is " +"the Check ID as a decimal number (one or two digits)." +msgstr "" +"Durch Kommata getrennte Liste der Namen der Integritätsprüfungen. Für die " +"bekannten Überprüfungstypen werden folgende Zeichenketten verwendet: " +"B, B, B und B. BI wird verwendet, " +"wobei I die Kennung der Überprüfung als Dezimalzahl angibt (ein- oder " +"zweistellig)." #. type: IP -#: ../src/xz/xz.1:2192 ../src/xz/xz.1:2214 ../src/xz/xz.1:2241 -#: ../src/xz/xz.1:2338 +#: ../src/xz/xz.1:2152 ../src/xz/xz.1:2174 ../src/xz/xz.1:2201 +#: ../src/xz/xz.1:2298 #, no-wrap msgid "8." msgstr "8." #. type: Plain text -#: ../src/xz/xz.1:2194 +#: ../src/xz/xz.1:2154 msgid "Total size of stream padding in the file" msgstr "Gesamtgröße der Datenstromauffüllung in der Datei" #. type: Plain text -#: ../src/xz/xz.1:2200 +#: ../src/xz/xz.1:2160 msgid "The columns of the B lines:" msgstr "Die Spalten der B-Zeilen:" #. type: Plain text -#: ../src/xz/xz.1:2204 +#: ../src/xz/xz.1:2164 msgid "Stream number (the first stream is 1)" msgstr "Datenstromnummer (der erste Datenstrom ist 1)" #. type: Plain text -#: ../src/xz/xz.1:2206 +#: ../src/xz/xz.1:2166 msgid "Number of blocks in the stream" msgstr "Anzahl der Blöcke im Datenstrom" #. type: Plain text -#: ../src/xz/xz.1:2208 +#: ../src/xz/xz.1:2168 msgid "Compressed start offset" msgstr "Komprimierte Startposition" #. type: Plain text -#: ../src/xz/xz.1:2210 +#: ../src/xz/xz.1:2170 msgid "Uncompressed start offset" msgstr "Unkomprimierte Startposition" #. type: Plain text -#: ../src/xz/xz.1:2212 +#: ../src/xz/xz.1:2172 msgid "Compressed size (does not include stream padding)" msgstr "Komprimierte Größe (schließt die Datenstromauffüllung nicht mit ein)" #. type: Plain text -#: ../src/xz/xz.1:2214 ../src/xz/xz.1:2243 ../src/xz/xz.1:2333 +#: ../src/xz/xz.1:2174 ../src/xz/xz.1:2203 ../src/xz/xz.1:2293 msgid "Uncompressed size" msgstr "Unkomprimierte Größe" #. type: Plain text -#: ../src/xz/xz.1:2216 ../src/xz/xz.1:2245 +#: ../src/xz/xz.1:2176 ../src/xz/xz.1:2205 msgid "Compression ratio" msgstr "Kompressionsverhältnis" #. type: IP -#: ../src/xz/xz.1:2216 ../src/xz/xz.1:2243 ../src/xz/xz.1:2340 +#: ../src/xz/xz.1:2176 ../src/xz/xz.1:2203 ../src/xz/xz.1:2300 #, no-wrap msgid "9." msgstr "9." #. type: Plain text -#: ../src/xz/xz.1:2218 ../src/xz/xz.1:2247 +#: ../src/xz/xz.1:2178 ../src/xz/xz.1:2207 msgid "Name of the integrity check" msgstr "Name der Integritätsprüfung" #. type: IP -#: ../src/xz/xz.1:2218 ../src/xz/xz.1:2245 ../src/xz/xz.1:2356 +#: ../src/xz/xz.1:2178 ../src/xz/xz.1:2205 ../src/xz/xz.1:2316 #, no-wrap msgid "10." msgstr "10." #. type: Plain text -#: ../src/xz/xz.1:2220 +#: ../src/xz/xz.1:2180 msgid "Size of stream padding" msgstr "Größe der Datenstromauffüllung" #. type: Plain text -#: ../src/xz/xz.1:2226 +#: ../src/xz/xz.1:2186 msgid "The columns of the B lines:" msgstr "Die Spalten der B-Zeilen:" #. type: Plain text -#: ../src/xz/xz.1:2230 +#: ../src/xz/xz.1:2190 msgid "Number of the stream containing this block" msgstr "Anzahl der in diesem Block enthaltenen Datenströme" #. type: Plain text -#: ../src/xz/xz.1:2233 -msgid "Block number relative to the beginning of the stream (the first block is 1)" +#: ../src/xz/xz.1:2193 +msgid "" +"Block number relative to the beginning of the stream (the first block is 1)" msgstr "Blocknummer relativ zum Anfang des Datenstroms (der erste Block ist 1)" #. type: Plain text -#: ../src/xz/xz.1:2235 +#: ../src/xz/xz.1:2195 msgid "Block number relative to the beginning of the file" msgstr "Blocknummer relativ zum Anfang der Datei" #. type: Plain text -#: ../src/xz/xz.1:2237 +#: ../src/xz/xz.1:2197 msgid "Compressed start offset relative to the beginning of the file" msgstr "Komprimierter Startversatz relativ zum Beginn der Datei" #. type: Plain text -#: ../src/xz/xz.1:2239 +#: ../src/xz/xz.1:2199 msgid "Uncompressed start offset relative to the beginning of the file" msgstr "Unkomprimierter Startversatz relativ zum Beginn der Datei" #. type: Plain text -#: ../src/xz/xz.1:2241 +#: ../src/xz/xz.1:2201 msgid "Total compressed size of the block (includes headers)" msgstr "Komprimierte Gesamtgröße des Blocks (einschließlich Header)" #. type: Plain text -#: ../src/xz/xz.1:2259 -msgid "If B<--verbose> was specified twice, additional columns are included on the B lines. These are not displayed with a single B<--verbose>, because getting this information requires many seeks and can thus be slow:" -msgstr "Wenn B<--verbose> zwei Mal angegeben wurde, werden zusätzliche Spalten in die B-Zeilen eingefügt. Diese werden mit einem einfachen B<--verbose> nicht angezeigt, da das Ermitteln dieser Informationen viele Suchvorgänge erfordert und daher recht langsam sein kann:" +#: ../src/xz/xz.1:2219 +msgid "" +"If B<--verbose> was specified twice, additional columns are included on the " +"B lines. These are not displayed with a single B<--verbose>, because " +"getting this information requires many seeks and can thus be slow:" +msgstr "" +"Wenn B<--verbose> zwei Mal angegeben wurde, werden zusätzliche Spalten in " +"die B-Zeilen eingefügt. Diese werden mit einem einfachen B<--verbose> " +"nicht angezeigt, da das Ermitteln dieser Informationen viele Suchvorgänge " +"erfordert und daher recht langsam sein kann:" #. type: IP -#: ../src/xz/xz.1:2261 ../src/xz/xz.1:2361 +#: ../src/xz/xz.1:2221 ../src/xz/xz.1:2321 #, no-wrap msgid "11." msgstr "11." #. type: Plain text -#: ../src/xz/xz.1:2263 +#: ../src/xz/xz.1:2223 msgid "Value of the integrity check in hexadecimal" msgstr "Wert der Integritätsprüfung in hexadezimaler Notation" #. type: IP -#: ../src/xz/xz.1:2263 ../src/xz/xz.1:2371 +#: ../src/xz/xz.1:2223 ../src/xz/xz.1:2331 #, no-wrap msgid "12." msgstr "12." #. type: Plain text -#: ../src/xz/xz.1:2265 +#: ../src/xz/xz.1:2225 msgid "Block header size" msgstr "Block-Header-Größe" #. type: IP -#: ../src/xz/xz.1:2265 +#: ../src/xz/xz.1:2225 #, no-wrap msgid "13." msgstr "13." #. type: Plain text -#: ../src/xz/xz.1:2275 -msgid "Block flags: B indicates that compressed size is present, and B indicates that uncompressed size is present. If the flag is not set, a dash (B<->) is shown instead to keep the string length fixed. New flags may be added to the end of the string in the future." -msgstr "Block-Schalter: B gibt an, dass die komprimierte Größe verfügbar ist, und B gibt an, dass die unkomprimierte Größe verfügbar ist. Falls der Schalter nicht gesetzt ist, wird stattdessen ein Bindestrich (B<->) angezeigt, um die Länge der Zeichenkette beizubehalten. In Zukunft könnten neue Schalter am Ende der Zeichenkette hinzugefügt werden." +#: ../src/xz/xz.1:2235 +msgid "" +"Block flags: B indicates that compressed size is present, and B " +"indicates that uncompressed size is present. If the flag is not set, a dash " +"(B<->) is shown instead to keep the string length fixed. New flags may be " +"added to the end of the string in the future." +msgstr "" +"Block-Schalter: B gibt an, dass die komprimierte Größe verfügbar ist, und " +"B gibt an, dass die unkomprimierte Größe verfügbar ist. Falls der " +"Schalter nicht gesetzt ist, wird stattdessen ein Bindestrich (B<->) " +"angezeigt, um die Länge der Zeichenkette beizubehalten. In Zukunft könnten " +"neue Schalter am Ende der Zeichenkette hinzugefügt werden." #. type: IP -#: ../src/xz/xz.1:2275 +#: ../src/xz/xz.1:2235 #, no-wrap msgid "14." msgstr "14." #. type: Plain text -#: ../src/xz/xz.1:2278 -msgid "Size of the actual compressed data in the block (this excludes the block header, block padding, and check fields)" -msgstr "Größe der tatsächlichen komprimierten Daten im Block. Ausgeschlossen sind hierbei die Block-Header, die Blockauffüllung und die Prüffelder." +#: ../src/xz/xz.1:2238 +msgid "" +"Size of the actual compressed data in the block (this excludes the block " +"header, block padding, and check fields)" +msgstr "" +"Größe der tatsächlichen komprimierten Daten im Block. Ausgeschlossen sind " +"hierbei die Block-Header, die Blockauffüllung und die Prüffelder." #. type: IP -#: ../src/xz/xz.1:2278 +#: ../src/xz/xz.1:2238 #, no-wrap msgid "15." msgstr "15." #. type: Plain text -#: ../src/xz/xz.1:2283 -msgid "Amount of memory (in bytes) required to decompress this block with this B version" -msgstr "Größe des Speichers (in Byte), der zum Dekomprimieren dieses Blocks mit dieser B-Version benötigt wird." +#: ../src/xz/xz.1:2243 +msgid "" +"Amount of memory (in bytes) required to decompress this block with this " +"B version" +msgstr "" +"Größe des Speichers (in Byte), der zum Dekomprimieren dieses Blocks mit " +"dieser B-Version benötigt wird." #. type: IP -#: ../src/xz/xz.1:2283 +#: ../src/xz/xz.1:2243 #, no-wrap msgid "16." msgstr "16." #. type: Plain text -#: ../src/xz/xz.1:2290 -msgid "Filter chain. Note that most of the options used at compression time cannot be known, because only the options that are needed for decompression are stored in the B<.xz> headers." -msgstr "Filterkette. Beachten Sie, dass die meisten der bei der Kompression verwendeten Optionen nicht bekannt sein können, da in den B<.xz>-Headern nur die für die Dekompression erforderlichen Optionen gespeichert sind." +#: ../src/xz/xz.1:2250 +msgid "" +"Filter chain. Note that most of the options used at compression time cannot " +"be known, because only the options that are needed for decompression are " +"stored in the B<.xz> headers." +msgstr "" +"Filterkette. Beachten Sie, dass die meisten der bei der Kompression " +"verwendeten Optionen nicht bekannt sein können, da in den B<.xz>-Headern nur " +"die für die Dekompression erforderlichen Optionen gespeichert sind." #. type: Plain text -#: ../src/xz/xz.1:2296 +#: ../src/xz/xz.1:2256 msgid "The columns of the B lines:" msgstr "Die Spalten der B-Zeilen:" #. type: Plain text -#: ../src/xz/xz.1:2303 -msgid "Amount of memory (in bytes) required to decompress this file with this B version" -msgstr "Größe des Speichers (in Byte), der zum Dekomprimieren dieser Datei mit dieser B-Version benötigt wird." +#: ../src/xz/xz.1:2263 +msgid "" +"Amount of memory (in bytes) required to decompress this file with this B " +"version" +msgstr "" +"Größe des Speichers (in Byte), der zum Dekomprimieren dieser Datei mit " +"dieser B-Version benötigt wird." #. type: Plain text -#: ../src/xz/xz.1:2309 ../src/xz/xz.1:2367 -msgid "B or B indicating if all block headers have both compressed size and uncompressed size stored in them" -msgstr "B oder B geben an, ob in allen Block-Headern sowohl die komprimierte als auch die unkomprimierte Größe gespeichert ist." +#: ../src/xz/xz.1:2269 ../src/xz/xz.1:2327 +msgid "" +"B or B indicating if all block headers have both compressed size " +"and uncompressed size stored in them" +msgstr "" +"B oder B geben an, ob in allen Block-Headern sowohl die " +"komprimierte als auch die unkomprimierte Größe gespeichert ist." #. type: Plain text -#: ../src/xz/xz.1:2313 ../src/xz/xz.1:2371 +#: ../src/xz/xz.1:2273 ../src/xz/xz.1:2331 msgid "I B I<5.1.2alpha:>" msgstr "I B I<5.1.2alpha:>" #. type: Plain text -#: ../src/xz/xz.1:2317 ../src/xz/xz.1:2375 +#: ../src/xz/xz.1:2277 ../src/xz/xz.1:2335 msgid "Minimum B version required to decompress the file" -msgstr "Minimale B-Version, die zur Dekompression der Datei erforderlich ist" +msgstr "" +"Minimale B-Version, die zur Dekompression der Datei erforderlich ist" #. type: Plain text -#: ../src/xz/xz.1:2323 +#: ../src/xz/xz.1:2283 msgid "The columns of the B line:" msgstr "Die Spalten der B-Zeile:" #. type: Plain text -#: ../src/xz/xz.1:2327 +#: ../src/xz/xz.1:2287 msgid "Number of streams" msgstr "Anzahl der Datenströme" #. type: Plain text -#: ../src/xz/xz.1:2329 +#: ../src/xz/xz.1:2289 msgid "Number of blocks" msgstr "Anzahl der Blöcke" #. type: Plain text -#: ../src/xz/xz.1:2331 +#: ../src/xz/xz.1:2291 msgid "Compressed size" msgstr "Komprimierte Größe" #. type: Plain text -#: ../src/xz/xz.1:2335 +#: ../src/xz/xz.1:2295 msgid "Average compression ratio" msgstr "Durchschnittliches Kompressionsverhältnis" #. type: Plain text -#: ../src/xz/xz.1:2338 -msgid "Comma-separated list of integrity check names that were present in the files" -msgstr "Durch Kommata getrennte Liste der Namen der Integritätsprüfungen, die in den Dateien präsent waren." +#: ../src/xz/xz.1:2298 +msgid "" +"Comma-separated list of integrity check names that were present in the files" +msgstr "" +"Durch Kommata getrennte Liste der Namen der Integritätsprüfungen, die in den " +"Dateien präsent waren." #. type: Plain text -#: ../src/xz/xz.1:2340 +#: ../src/xz/xz.1:2300 msgid "Stream padding size" msgstr "Größe der Datenstromauffüllung" #. type: Plain text -#: ../src/xz/xz.1:2346 -msgid "Number of files. This is here to keep the order of the earlier columns the same as on B lines." -msgstr "Anzahl der Dateien. Dies dient dazu, die Reihenfolge der vorigen Spalten an die in den B-Zeilen anzugleichen." - -#. type: Plain text -#: ../src/xz/xz.1:2354 -msgid "If B<--verbose> was specified twice, additional columns are included on the B line:" -msgstr "Wenn B<--verbose> zwei Mal angegeben wird, werden zusätzliche Spalten in die B-Zeile eingefügt:" - -#. type: Plain text -#: ../src/xz/xz.1:2361 -msgid "Maximum amount of memory (in bytes) required to decompress the files with this B version" -msgstr "Maximale Größe des Speichers (in Byte), der zum Dekomprimieren der Dateien mit dieser B-Version benötigt wird." - -#. type: Plain text -#: ../src/xz/xz.1:2381 -msgid "Future versions may add new line types and new columns can be added to the existing line types, but the existing columns won't be changed." -msgstr "Zukünftige Versionen könnten neue Zeilentypen hinzufügen, weiterhin könnten auch in den vorhandenen Zeilentypen weitere Spalten hinzugefügt werden, aber die existierenden Spalten werden nicht geändert." - -#. type: SS -#: ../src/xz/xz.1:2382 -#, no-wrap -msgid "Filters help" -msgstr "Filterhilfe" - -#. type: Plain text -#: ../src/xz/xz.1:2385 -msgid "B prints the supported filters in the following format:" -msgstr "B gibt die unterstützten Filter im folgenden Format aus:" - -#. type: Plain text -#: ../src/xz/xz.1:2387 -msgid "IB<:>I
    -
    liblzma (XZ Utils) 5.6.0 +
    liblzma (XZ Utils) 5.4.5